add JavaScript deps parser

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.4.0 to 1.5.1.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.4.0...v1.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

fx.go

@@ -17,7 +17,7 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 )
 
-const version = "0.8.88"
+const version = "0.9.1"
 
 func init() {
 	go checkForUpdate()
@@ -179,6 +179,13 @@ func main() {
 			Name:    "list",
 			Aliases: []string{"ls"},
 			Usage:   "list deployed services",
+			Flags: []cli.Flag{
+				cli.StringFlag{
+					Name:  "format, f",
+					Value: "table",
+					Usage: "output format, 'table' and 'JSON' supported",
+				},
+			},
 			Action: handle(
 				middlewares.Parse("list"),
 				middlewares.LoadConfig,

go.mod

@@ -5,8 +5,8 @@ go 1.12
 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/apex/log v1.1.2
-	github.com/briandowns/spinner v1.7.0
+	github.com/briandowns/spinner v1.9.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
@@ -15,7 +15,7 @@ require (
 	github.com/gin-gonic/gin v1.4.0
 	github.com/gobuffalo/envy v1.8.1 // indirect
 	github.com/gobuffalo/packr v1.30.1
-	github.com/golang/mock v1.3.1
+	github.com/golang/mock v1.4.0
 	github.com/golang/snappy v0.0.1 // indirect
 	github.com/google/go-querystring v1.0.0
 	github.com/google/uuid v1.1.1
@@ -37,8 +37,8 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/rogpeppe/go-internal v1.5.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.6.1
+	github.com/spf13/viper v1.6.2
-	github.com/stretchr/testify v1.4.0
+	github.com/stretchr/testify v1.5.1
 	github.com/ugorji/go v1.1.7 // indirect
 	github.com/urfave/cli v1.22.2
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect

go.sum

@@ -23,6 +23,9 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/apex/log v1.1.1 h1:BwhRZ0qbjYtTob0I+2M+smavV0kOC8XgcnGZcyL9liA=
 github.com/apex/log v1.1.1/go.mod h1:Ls949n1HFtXfbDcjiTTFQqkVUrte0puoIBfO3SVgwOA=
+github.com/apex/log v1.1.2 h1:bnDuVoi+o98wOdVqfEzNDlY0tcmBia7r4YkjS9EqGYk=
+github.com/apex/log v1.1.2/go.mod h1:SyfRweFO+TlkIJ3DVizTSeI1xk7jOIIqOnUPZQTTsww=
+github.com/apex/logs v0.0.3/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo=
 github.com/aphistic/golf v0.0.0-20180712155816-02c07f170c5a/go.mod h1:3NqKYiepwy8kCu4PNA+aP7WUV72eXWJeP9/r3/K9aLE=
 github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3stzu0Xys=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
@@ -32,6 +35,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
 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/briandowns/spinner v1.9.0 h1:+OMAisemaHar1hjuJ3Z2hIvNhQl9Y7GLPWUwwz2Pxo8=
+github.com/briandowns/spinner v1.9.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=
@@ -110,6 +115,8 @@ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0 h1:Rd1kQnQu0Hq3qvJppYSG0HtP+f5LPPUiDswTLiEegLg=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -316,6 +323,8 @@ github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M=
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk=
 github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
+github.com/spf13/viper v1.6.2 h1:7aKfF+e8/k68gda3LOjo5RxiUqddoFxVq4BKBPrxk5E=
+github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -325,6 +334,8 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0=
@@ -412,6 +423,7 @@ golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191223224216-5a3cf8467b4e h1:z2Flw7sLy7DxaQi3zDOvI9X+Kb06+G9iZJlkEyHvujE=
 golang.org/x/sys v0.0.0-20191223224216-5a3cf8467b4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
@@ -490,6 +502,10 @@ k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKf
 k8s.io/utils v0.0.0-20190920012459-5008bf6f8cd6/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 k8s.io/utils v0.0.0-20190923111123-69764acb6e8e h1:BXSmdH6S3YGLlhC89DZp+sNdYSmwNeDU6Xu5ZpzGOlM=
 k8s.io/utils v0.0.0-20190923111123-69764acb6e8e/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY=
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4=
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=

handlers/list.go

@@ -3,19 +3,19 @@ package handlers
 import (
 	"github.com/metrue/fx/context"
 	"github.com/metrue/fx/infra"
-	"github.com/metrue/fx/pkg/render"
+	"github.com/metrue/fx/pkg/renderrer"
 )
 
 // List command handle
 func List(ctx context.Contexter) (err error) {
 	cli := ctx.GetCliContext()
 	deployer := ctx.Get("deployer").(infra.Deployer)
+	format := ctx.Get("format").(string)
 
 	services, err := deployer.List(ctx.GetContext(), cli.Args().First())
 	if err != nil {
 		return err
 	}
 
-	render.Table(services)
+	return renderrer.Render(services, format)
-	return nil
 }

handlers/up.go

@@ -4,7 +4,7 @@ import (
 	"github.com/apex/log"
 	"github.com/metrue/fx/context"
 	"github.com/metrue/fx/infra"
-	"github.com/metrue/fx/pkg/render"
+	"github.com/metrue/fx/pkg/renderrer"
 	"github.com/metrue/fx/types"
 )
 
@@ -42,6 +42,5 @@ func Up(ctx context.Contexter) (err error) {
 	if err != nil {
 		return err
 	}
-	render.Table([]types.Service{service})
+	return renderrer.Render([]types.Service{service}, "table")
-	return nil
 }

infra/docker/deployer.go

@@ -86,12 +86,6 @@ func (d *Deployer) Ping(ctx context.Context) error {
 
 // List services
 func (d *Deployer) List(ctx context.Context, name string) (svcs []types.Service, err error) {
-	const task = "listing"
-	spinner.Start(task)
-	defer func() {
-		spinner.Stop(task, err)
-	}()
-
 	// FIXME support remote host
 	return d.cli.ListContainer(ctx, name)
 }

middlewares/parse.go

@@ -42,6 +42,8 @@ func Parse(action string) func(ctx context.Contexter) (err error) {
 		case "list":
 			name := cli.Args().First()
 			ctx.Set("filter", name)
+			format := cli.String("format")
+			ctx.Set("format", format)
 		case "image_build":
 			sources := []string{}
 			for _, s := range cli.Args() {

packer/deps.go

@@ -0,0 +1,53 @@
+package packer
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+)
+
+// JavaScriptExt extension of JavaScript source file
+const JavaScriptExt = ".js"
+
+func depsJavaScript(src string) ([]string, error) {
+	deps := []string{}
+	file, err := os.Open(src)
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := strings.TrimSpace(scanner.Text())
+		if strings.HasPrefix(line, "import") || strings.HasPrefix(line, "require") {
+			reg, err := regexp.Compile(`(\'.*\'|\".*\")`)
+			if err != nil {
+				return nil, err
+			}
+			str := reg.FindString(line)
+			if str != "" {
+				deps = append(deps, strings.ReplaceAll(strings.ReplaceAll(str, "\"", ""), "'", ""))
+			}
+		}
+	}
+
+	if err := scanner.Err(); err != nil {
+		return nil, err
+	}
+	return deps, nil
+}
+
+// Deps to get the dependencies required from a source code in a file
+func Deps(src string) ([]string, error) {
+	switch filepath.Ext(src) {
+	case JavaScriptExt:
+		{
+			return depsJavaScript(src)
+		}
+	}
+	return nil, fmt.Errorf("not support language: %s", filepath.Ext(src))
+}

packer/deps_test.go

@@ -0,0 +1,63 @@
+package packer
+
+import (
+	"io/ioutil"
+	"os"
+	"reflect"
+	"testing"
+)
+
+func TestDeps(t *testing.T) {
+	cases := []struct {
+		name    string
+		content string
+		expect  []string
+	}{
+		{name: "import with singe quote", content: "import 'pkg1'", expect: []string{"pkg1"}},
+		{name: "import with double quote", content: `import "pkg1"`, expect: []string{"pkg1"}},
+		{name: "require with singe quote", content: "require 'pkg1'", expect: []string{"pkg1"}},
+		{name: "require with double quote", content: `require "pkg1"`, expect: []string{"pkg1"}},
+		{
+			name: "require and import with singe quote",
+			content: `
+require 'pkg1'
+import 'pkg2'`,
+			expect: []string{"pkg1", "pkg2"},
+		},
+		{
+			name: "require and import with double quote",
+			content: `
+require "pkg1"
+import "pkg2"`,
+			expect: []string{"pkg1", "pkg2"},
+		},
+		{
+			name: "require and import with double quote and single quote",
+			content: `
+require 'pkg1'
+import "pkg2"`,
+			expect: []string{"pkg1", "pkg2"},
+		},
+	}
+
+	for _, c := range cases {
+		fd, err := ioutil.TempFile("", "dep_pkg_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		err = ioutil.WriteFile(fd.Name(), []byte(c.content), 0666)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		deps, err := Deps(fd.Name())
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !reflect.DeepEqual(deps, c.expect) {
+			t.Fatalf("%s: should get %s but got %s", c.name, c.expect, deps)
+		}
+	}
+}

pkg/render/render.go

@@ -1,27 +0,0 @@
-package render
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/metrue/fx/types"
-	"github.com/olekukonko/tablewriter"
-)
-
-// Table output services as table format
-func Table(services []types.Service) {
-	data := [][]string{}
-	for _, s := range services {
-		col := []string{
-			s.ID,
-			s.Name,
-			fmt.Sprintf("%s:%d", s.Host, +s.Port),
-		}
-		data = append(data, col)
-	}
-
-	table := tablewriter.NewWriter(os.Stdout)
-	table.SetHeader([]string{"ID", "Name", "Endpoint"})
-	table.AppendBulk(data)
-	table.Render()
-}

pkg/render/render_test.go

@@ -1,19 +0,0 @@
-package render
-
-import (
-	"testing"
-
-	"github.com/metrue/fx/types"
-)
-
-func TestTable(t *testing.T) {
-	services := []types.Service{
-		types.Service{
-			ID:   "id-1",
-			Name: "name-1",
-			Host: "127.0.0.1",
-			Port: 1000,
-		},
-	}
-	Table(services)
-}

pkg/renderrer/renderrer.go

@@ -0,0 +1,53 @@
+package renderrer
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/metrue/fx/types"
+	"github.com/olekukonko/tablewriter"
+)
+
+const formatJSON = "json"
+
+//nolint:unused,varcheck,deadcode
+const formatTable = "table"
+
+// Render render output with given format
+func Render(services []types.Service, format string) error {
+	if strings.ToLower(format) == formatJSON {
+		return toJSON(services)
+	}
+	return toTable(services)
+}
+
+func toTable(services []types.Service) error {
+	data := [][]string{}
+	for _, s := range services {
+		col := []string{
+			s.ID,
+			s.Name,
+			fmt.Sprintf("%s:%d", s.Host, +s.Port),
+		}
+		data = append(data, col)
+	}
+
+	table := tablewriter.NewWriter(os.Stdout)
+	table.SetHeader([]string{"ID", "Name", "Endpoint"})
+	table.AppendBulk(data)
+	table.Render()
+	return nil
+}
+
+func toJSON(services []types.Service) error {
+	output, err := json.Marshal(services)
+	if err != nil {
+		return err
+	}
+	if _, err := fmt.Print(string(output)); err != nil {
+		return err
+	}
+	return nil
+}

pkg/renderrer/renderrer_test.go

@@ -0,0 +1,24 @@
+package renderrer
+
+import (
+	"testing"
+
+	"github.com/metrue/fx/types"
+)
+
+func TestRenderrer(t *testing.T) {
+	services := []types.Service{
+		types.Service{
+			ID:   "id-1",
+			Name: "name-1",
+			Host: "127.0.0.1",
+			Port: 1000,
+		},
+	}
+	t.Run("toTable", func(t *testing.T) {
+		Render(services, "table")
+	})
+	t.Run("toJSON", func(t *testing.T) {
+		Render(services, "json")
+	})
+}