refactor output (#356)

* enable progress bar
* add spinner pkg
* fix lint

README.md

@@ -40,6 +40,8 @@ Feel free hacking fx to support the languages not listed. Welcome to tweet me [@
 
 # Installation
 
+Binaries are available for Windows, MacOS and Linux/Unix on x86. For other architectures and platforms, follow instructions to [build fx from source](#buildtest).
+
 * MacOS
 
 ```
@@ -59,9 +61,9 @@ curl -o- https://raw.githubusercontent.com/metrue/fx/master/scripts/install.sh |
 curl -o- https://raw.githubusercontent.com/metrue/fx/master/scripts/install.sh | sudo bash
 ```
 
-fx will be installed into /usr/local/bin, sometimes you may need `source ~/.zshrc` or `source ~/.bashrc` to make fx available in `$PAHT`.
+fx will be installed into /usr/local/bin, sometimes you may need `source ~/.zshrc` or `source ~/.bashrc` to make fx available in `$PATH`.
 
-* Window
+* Windows
 
 You can go the release page to [download](https://github.com/metrue/fx/releases) fx manually;
 
@@ -229,6 +231,7 @@ fx uses [Project](https://github.com/metrue/fx/projects/4) to manage the develop
 Docker: make sure [Docker](https://docs.docker.com/engine/installation/) installed and running on your server.
 
 
+<a name="buildtest"></a>
 #### Build & Test
 
 ```

container_runtimes/docker/http/api.go

@@ -377,8 +377,6 @@ func (api *API) StartContainer(ctx context.Context, name string, image string, b
 		return fmt.Errorf("container id is missing")
 	}
 
-	log.Infof("container %s created", name)
-
 	// start container
 	path = fmt.Sprintf("/containers/%s/start", createRes.ID)
 	url := fmt.Sprintf("%s%s", api.endpoint, path)
@@ -402,7 +400,6 @@ func (api *API) StartContainer(ctx context.Context, name string, image string, b
 		msg := fmt.Sprintf("start container met issue: %s", string(b))
 		return errors.New(msg)
 	}
-	log.Infof("container %s started", name)
 
 	if _, err = api.inspect(createRes.ID); err != nil {
 		msg := fmt.Sprintf("inspect container %s error", name)

container_runtimes/docker/sdk/docker.go

@@ -76,7 +76,9 @@ func (d *Docker) BuildImage(ctx context.Context, workdir string, name string) er
 	if err != nil {
 		return err
 	}
-	log.Info(string(body))
+	if os.Getenv("DEBUG") != "" {
+		log.Info(string(body))
+	}
 
 	return nil
 }

deploy/docker/docker.go

@@ -3,7 +3,6 @@ package docker
 import (
 	"context"
 	"fmt"
-	"log"
 	"os"
 	"time"
 
@@ -49,18 +48,15 @@ func (d *Docker) Deploy(ctx context.Context, fn types.Func, name string, ports [
 	defer os.RemoveAll(workdir)
 
 	if err := packer.PackIntoDir(fn, workdir); err != nil {
-		log.Fatalf("could not pack function %v: %v", fn, err)
 		return err
 	}
 
 	if err := d.cli.BuildImage(ctx, workdir, name); err != nil {
-		log.Fatalf("could not build image: %v", err)
 		return err
 	}
 
 	nameWithTag := name + ":latest"
 	if err := d.cli.TagImage(ctx, name, nameWithTag); err != nil {
-		log.Fatalf("could not tag image: %v", err)
 		return err
 	}
 

docs/lightsail.yml

@@ -1,16 +0,0 @@
-# fx on Amazon Lightsai
-
-* make sure your instance have docker installed and running,
-* make sure your instance can be ssh login (with user and password)
-
-```
-ssh <user>@<host>
-```
-
-* make sure your instance accept port 8866
-
-* then you can deploy function to remote host
-
-```
-DOCKER_REMOTE_HOST_ADDR=<your host> DOCKER_REMOTE_HOST_USER=<your user> DOCKER_REMOTE_HOST_PASSWORD=<your password> ./build/fx up -p 1234 test/functions/func.js
-```

docs/ubuntu.md

@@ -0,0 +1,46 @@
+# fx on Ubuntu
+
+> The guide is verified on Amazon Lightsail ubuntu 18.08 instance
+
+## Install Docker
+
+```shell
+apt-get remove -y docker docker-engine docker.io containerd runc
+apt-get update -y
+apt-get install -y apt-transport-https ca-certificates curl software-properties-common lsb-core
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
+add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+apt-get update -y
+apt-get install -y docker-ce
+docker run hello-world
+```
+
+## Install fx
+
+```shell
+$ curl -o- https://raw.githubusercontent.com/metrue/fx/master/scripts/install.sh | sudo bash
+```
+
+## Deploy a function onto localhost
+
+```shell
+$ cat func.js
+
+module.exports = (ctx) => {
+  ctx.body = 'hello world'
+}
+
+$ fx up -n test -p 2000 func.js
+$ curl 127.0.0.1:2000
+```
+
+##  Deploy a function onto remote host
+
+* make sure your instance can be ssh login
+* make sure your instance accept port 8866
+
+then you can deploy function to remote host
+
+```shell
+DOCKER_REMOTE_HOST_ADDR=<your host> DOCKER_REMOTE_HOST_USER=<your user> DOCKER_REMOTE_HOST_PASSWORD=<your password> fx up -p 2000 test/functions/func.js
+```

fx.go

@@ -15,7 +15,7 @@ import (
 	"github.com/urfave/cli"
 )
 
-const version = "0.8.1"
+const version = "0.8.3"
 
 func init() {
 	go checkForUpdate()
@@ -181,6 +181,6 @@ func main() {
 	}
 
 	if err := app.Run(os.Args); err != nil {
-		log.Fatalf("fx startup with fatal: %v", err)
+		os.Exit(1)
 	}
 }

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
 	github.com/Microsoft/go-winio v0.4.14 // indirect
 	github.com/apex/log v1.1.1
+	github.com/briandowns/spinner v1.7.0
 	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/docker v0.0.0-20190313072916-46036c230805
 	github.com/docker/go-connections v0.4.0
@@ -20,6 +21,7 @@ require (
 	github.com/googleapis/gnostic v0.3.1 // indirect
 	github.com/gorilla/mux v1.7.3 // indirect
 	github.com/imdario/mergo v0.3.7 // indirect
+	github.com/logrusorgru/aurora v0.0.0-20191017060258-dc85c304c434
 	github.com/metrue/go-ssh-client v0.0.0-20190810064746-98a7a27048f3
 	github.com/mholt/archiver v3.1.1+incompatible
 	github.com/morikuni/aec v1.0.0 // indirect

go.sum

@@ -29,6 +29,8 @@ github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN
 github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/briandowns/spinner v1.7.0 h1:aan1hBBOoscry2TXAkgtxkJiq7Se0+9pt+TUWaPrB4g=
+github.com/briandowns/spinner v1.7.0/go.mod h1://Zf9tMcxfRUA36V23M6YGEAv+kECGfvpnLTnb8n4XQ=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
@@ -64,6 +66,7 @@ github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdf
 github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -174,11 +177,14 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/logrusorgru/aurora v0.0.0-20191017060258-dc85c304c434 h1:im9kkmH0WWwxzegiv18gSUJbuXR9y028rXrWuPp6Jug=
+github.com/logrusorgru/aurora v0.0.0-20191017060258-dc85c304c434/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
+github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc=

hack/install_docker.sh

@@ -3,15 +3,11 @@ set -e
 # ++
 # verified on Ubuntu 16.04 x64
 # ++
-user_host=$1
-
-ssh ${user_host} 'bash -s' <<EOF
-  apt-get remove -y docker docker-engine docker.io containerd runc
-  apt-get update -y
-  apt-get install -y apt-transport-https ca-certificates curl software-properties-common lsb-core
-  curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
-  add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu \$(lsb_release -cs) stable"
-  apt-get update -y
-  apt-get install -y docker-ce
-  docker run hello-world
-EOF
+apt-get remove -y docker docker-engine docker.io containerd runc
+apt-get update -y
+apt-get install -y apt-transport-https ca-certificates curl software-properties-common lsb-core
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
+add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+apt-get update -y
+apt-get install -y docker-ce
+docker run hello-world

handlers/down.go

@@ -3,11 +3,17 @@ package handlers
 import (
 	"github.com/metrue/fx/context"
 	"github.com/metrue/fx/deploy"
+	"github.com/metrue/fx/pkg/spinner"
 )
 
 // Down command handle
 func Down() HandleFunc {
 	return func(ctx *context.Context) (err error) {
+		spinner.Start("deploying")
+		defer func() {
+			spinner.Stop(err)
+		}()
+
 		cli := ctx.GetCliContext()
 		services := cli.Args()
 		runner := ctx.Get("deployer").(deploy.Deployer)

handlers/list.go

@@ -3,12 +3,18 @@ package handlers
 import (
 	"github.com/metrue/fx/context"
 	"github.com/metrue/fx/deploy"
+	"github.com/metrue/fx/pkg/spinner"
 	"github.com/metrue/fx/utils"
 )
 
 // List command handle
 func List() HandleFunc {
-	return func(ctx *context.Context) error {
+	return func(ctx *context.Context) (err error) {
+		spinner.Start("deploying")
+		defer func() {
+			spinner.Stop(err)
+		}()
+
 		cli := ctx.GetCliContext()
 		deployer := ctx.Get("deployer").(deploy.Deployer)
 

handlers/up.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/apex/log"
 	"github.com/metrue/fx/context"
 	"github.com/metrue/fx/deploy"
+	"github.com/metrue/fx/pkg/spinner"
 	"github.com/metrue/fx/types"
 	"github.com/metrue/fx/utils"
 	"github.com/pkg/errors"
@@ -24,22 +24,16 @@ var PortRange = struct {
 // Up command handle
 func Up() HandleFunc {
 	return func(ctx *context.Context) (err error) {
+		spinner.Start("deploying")
+		defer func() {
+			spinner.Stop(err)
+		}()
+
 		cli := ctx.GetCliContext()
 		funcFile := cli.Args().First()
 		name := cli.String("name")
 		port := cli.Int("port")
 
-		defer func() {
-			if r := recover(); r != nil {
-				log.Fatalf("fatal error happened: %v", r)
-			}
-
-			if err != nil {
-				log.Fatalf("deploy function %s (%s) failed: %v", err)
-			}
-			log.Infof("function %s (%s) deployed successfully", name, funcFile)
-		}()
-
 		if port < PortRange.min || port > PortRange.max {
 			return fmt.Errorf("invalid port number: %d, port number should in range of %d -  %d", port, PortRange.min, PortRange.max)
 		}

middlewares/setup.go

@@ -11,10 +11,41 @@ import (
 	"github.com/metrue/fx/deploy"
 	dockerDeployer "github.com/metrue/fx/deploy/docker"
 	k8sDeployer "github.com/metrue/fx/deploy/kubernetes"
+	"github.com/metrue/fx/pkg/spinner"
+	"github.com/metrue/fx/provision"
 )
 
 // Setup create k8s or docker cli
 func Setup(ctx *context.Context) (err error) {
+	spinner.Start("setup")
+	defer func() {
+		spinner.Stop(err)
+	}()
+
+	host := os.Getenv("DOCKER_REMOTE_HOST_ADDR")
+	user := os.Getenv("DOCKER_REMOTE_HOST_USER")
+	passord := os.Getenv("DOCKER_REMOTE_HOST_PASSWORD")
+	var docker containerruntimes.ContainerRuntime
+	if host != "" && user != "" {
+		provisioner := provision.NewWithHost(host, user, passord)
+		if !provisioner.IsFxAgentRunning() {
+			if err := provisioner.StartFxAgent(); err != nil {
+				return err
+			}
+		}
+
+		docker, err = dockerHTTP.Create(host, constants.AgentPort)
+		if err != nil {
+			return err
+		}
+	} else {
+		docker, err = dockerSDK.CreateClient(ctx)
+		if err != nil {
+			return err
+		}
+	}
+	ctx.Set("docker", docker)
+
 	var deployer deploy.Deployer
 	if os.Getenv("KUBECONFIG") != "" {
 		deployer, err = k8sDeployer.Create()
@@ -29,21 +60,5 @@ func Setup(ctx *context.Context) (err error) {
 	}
 	ctx.Set("deployer", deployer)
 
-	host := os.Getenv("DOCKER_REMOTE_HOST_ADDR")
-	user := os.Getenv("DOCKER_REMOTE_HOST_USER")
-	var docker containerruntimes.ContainerRuntime
-	if host != "" && user != "" {
-		docker, err = dockerHTTP.Create(host, constants.AgentPort)
-		if err != nil {
-			return err
-		}
-	} else {
-		docker, err = dockerSDK.CreateClient(ctx)
-		if err != nil {
-			return err
-		}
-	}
-	ctx.Set("docker", docker)
-
 	return nil
 }

pkg/spinner/spiner.go

@@ -0,0 +1,51 @@
+package spinner
+
+import (
+	"fmt"
+	"math/rand"
+	"time"
+
+	"github.com/briandowns/spinner"
+	aurora "github.com/logrusorgru/aurora"
+)
+
+var s *spinner.Spinner
+
+func init() {
+	style := spinner.CharSets[36]
+	interval := 100 * time.Millisecond
+	s = spinner.New(style, interval)
+}
+
+// Start spinner
+func Start(task string) {
+	colors := []string{
+		"red",
+		"green",
+		"yellow",
+		"blue",
+		"magenta",
+		"cyan",
+		"white",
+	}
+
+	rand.Seed(time.Now().UnixNano())
+	// nolint
+	s.Color(colors[rand.Intn(len(colors))])
+	s.Prefix = task + " "
+	s.Start()
+}
+
+// Stop spinner
+func Stop(err error) {
+	if err != nil {
+		fmt.Println(aurora.Red("\u2717"))
+		fmt.Println(aurora.Red("*****************"))
+		fmt.Println(err)
+		fmt.Println(aurora.Red("*****************"))
+	}
+
+	s.Restart()
+	time.Sleep(100 * time.Millisecond)
+	s.Stop()
+}