refactor: rename package 'subcmd' to 'gateway'

tyru · tyru · commit 6bc8a50c4866 · 2018-10-27T23:58:59.000+09:00
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 
 NAME := volt
 SRC := $(shell find . -type d -name 'vendor' -prune -o -type f -name '*.go' -print)
-VERSION := $(shell sed -n -E 's/var voltVersion = "([^"]+)"/\1/p' subcmd/version.go)
+VERSION := $(shell sed -n -E 's/var voltVersion = "([^"]+)"/\1/p' gateway/version.go)
 RELEASE_LDFLAGS := -s -w -extldflags '-static'
 RELEASE_OS := linux windows darwin
 RELEASE_ARCH := amd64 386
diff --git a/gateway/build.go b/gateway/build.go
@@ -1,12 +1,12 @@
-package subcmd
+package gateway
 
 import (
 	"flag"
 	"fmt"
 	"os"
 
+	"github.com/vim-volt/volt/gateway/builder"
 	"github.com/vim-volt/volt/logger"
-	"github.com/vim-volt/volt/subcmd/builder"
 	"github.com/vim-volt/volt/transaction"
 )
 
diff --git a/gateway/build_test.go b/gateway/build_test.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import (
 	"bytes"
@@ -13,10 +13,10 @@ import (
 	"github.com/haya14busa/go-vimlparser"
 	"github.com/vim-volt/volt/config"
 	"github.com/vim-volt/volt/fileutil"
+	"github.com/vim-volt/volt/gateway/builder"
 	"github.com/vim-volt/volt/internal/testutil"
 	"github.com/vim-volt/volt/lockjson"
 	"github.com/vim-volt/volt/pathutil"
-	"github.com/vim-volt/volt/subcmd/builder"
 )
 
 // Checks:
diff --git a/gateway/builder/base.go b/gateway/builder/base.go
@@ -12,10 +12,10 @@ import (
 
 	"github.com/hashicorp/go-multierror"
 	"github.com/vim-volt/volt/fileutil"
+	"github.com/vim-volt/volt/gateway/buildinfo"
 	"github.com/vim-volt/volt/lockjson"
 	"github.com/vim-volt/volt/logger"
 	"github.com/vim-volt/volt/pathutil"
-	"github.com/vim-volt/volt/subcmd/buildinfo"
 )
 
 // BaseBuilder is a base struct which all builders must implement
diff --git a/gateway/builder/builder.go b/gateway/builder/builder.go
@@ -5,9 +5,9 @@ import (
 	"os"
 
 	"github.com/vim-volt/volt/config"
+	"github.com/vim-volt/volt/gateway/buildinfo"
 	"github.com/vim-volt/volt/logger"
 	"github.com/vim-volt/volt/pathutil"
-	"github.com/vim-volt/volt/subcmd/buildinfo"
 )
 
 // Builder creates/updates ~/.vim/pack/volt directory
diff --git a/gateway/builder/copy.go b/gateway/builder/copy.go
@@ -10,12 +10,12 @@ import (
 
 	"github.com/hashicorp/go-multierror"
 	"github.com/vim-volt/volt/fileutil"
+	"github.com/vim-volt/volt/gateway/buildinfo"
 	"github.com/vim-volt/volt/gitutil"
 	"github.com/vim-volt/volt/lockjson"
 	"github.com/vim-volt/volt/logger"
 	"github.com/vim-volt/volt/pathutil"
 	"github.com/vim-volt/volt/plugconf"
-	"github.com/vim-volt/volt/subcmd/buildinfo"
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
diff --git a/gateway/builder/symlink.go b/gateway/builder/symlink.go
@@ -11,12 +11,12 @@ import (
 
 	"gopkg.in/src-d/go-git.v4"
 
+	"github.com/vim-volt/volt/gateway/buildinfo"
 	"github.com/vim-volt/volt/gitutil"
 	"github.com/vim-volt/volt/lockjson"
 	"github.com/vim-volt/volt/logger"
 	"github.com/vim-volt/volt/pathutil"
 	"github.com/vim-volt/volt/plugconf"
-	"github.com/vim-volt/volt/subcmd/buildinfo"
 )
 
 type symlinkBuilder struct {
diff --git a/gateway/buildinfo/buildinfo.go b/gateway/buildinfo/buildinfo.go
diff --git a/gateway/cmd.go b/gateway/cmd.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import (
 	"flag"
diff --git a/gateway/disable.go b/gateway/disable.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import (
 	"flag"
diff --git a/gateway/enable.go b/gateway/enable.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import (
 	"flag"
diff --git a/gateway/get.go b/gateway/get.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import (
 	"flag"
@@ -17,12 +17,12 @@ import (
 
 	"github.com/vim-volt/volt/config"
 	"github.com/vim-volt/volt/fileutil"
+	"github.com/vim-volt/volt/gateway/builder"
 	"github.com/vim-volt/volt/gitutil"
 	"github.com/vim-volt/volt/lockjson"
 	"github.com/vim-volt/volt/logger"
 	"github.com/vim-volt/volt/pathutil"
 	"github.com/vim-volt/volt/plugconf"
-	"github.com/vim-volt/volt/subcmd/builder"
 	"github.com/vim-volt/volt/transaction"
 
 	multierror "github.com/hashicorp/go-multierror"
diff --git a/gateway/get_test.go b/gateway/get_test.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import (
 	"bytes"
diff --git a/gateway/help.go b/gateway/help.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import (
 	"flag"
diff --git a/gateway/help_test.go b/gateway/help_test.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import (
 	"strings"
diff --git a/gateway/list.go b/gateway/list.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import (
 	"encoding/json"
diff --git a/gateway/list_test.go b/gateway/list_test.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import (
 	"strconv"
diff --git a/gateway/migrate.go b/gateway/migrate.go
@@ -1,13 +1,13 @@
-package subcmd
+package gateway
 
 import (
 	"flag"
 	"fmt"
 	"github.com/pkg/errors"
 	"os"
 
+	"github.com/vim-volt/volt/gateway/migrate"
 	"github.com/vim-volt/volt/logger"
-	"github.com/vim-volt/volt/subcmd/migrate"
 )
 
 func init() {
diff --git a/gateway/migrate/lockjson.go b/gateway/migrate/lockjson.go
diff --git a/gateway/migrate/migrater.go b/gateway/migrate/migrater.go
diff --git a/gateway/migrate/plugconf-config-func.go b/gateway/migrate/plugconf-config-func.go
@@ -7,11 +7,11 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/vim-volt/volt/gateway/builder"
 	"github.com/vim-volt/volt/lockjson"
 	"github.com/vim-volt/volt/logger"
 	"github.com/vim-volt/volt/pathutil"
 	"github.com/vim-volt/volt/plugconf"
-	"github.com/vim-volt/volt/subcmd/builder"
 	"github.com/vim-volt/volt/transaction"
 )
 
diff --git a/gateway/profile.go b/gateway/profile.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import (
 	"flag"
@@ -8,10 +8,10 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/hashicorp/go-multierror"
+	"github.com/vim-volt/volt/gateway/builder"
 	"github.com/vim-volt/volt/lockjson"
 	"github.com/vim-volt/volt/logger"
 	"github.com/vim-volt/volt/pathutil"
-	"github.com/vim-volt/volt/subcmd/builder"
 	"github.com/vim-volt/volt/transaction"
 )
 
@@ -29,8 +29,8 @@ func (cmd *profileCmd) ProhibitRootExecution(args []string) bool {
 	if len(args) == 0 {
 		return true
 	}
-	subCmd := args[0]
-	switch subCmd {
+	gateway := args[0]
+	switch gateway {
 	case "show":
 		return false
 	case "list":
@@ -110,8 +110,8 @@ func (cmd *profileCmd) Run(cmdctx *CmdContext) *Error {
 		return &Error{Code: 10, Msg: err.Error()}
 	}
 
-	subCmd := args[0]
-	switch subCmd {
+	gateway := args[0]
+	switch gateway {
 	case "set":
 		err = cmd.doSet(args[1:])
 	case "show":
@@ -129,7 +129,7 @@ func (cmd *profileCmd) Run(cmdctx *CmdContext) *Error {
 	case "rm":
 		err = cmd.doRm(args[1:])
 	default:
-		return &Error{Code: 11, Msg: "Unknown subcommand: " + subCmd}
+		return &Error{Code: 11, Msg: "Unknown subcommand: " + gateway}
 	}
 
 	if err != nil {
@@ -519,10 +519,10 @@ func (cmd *profileCmd) doRm(args []string) error {
 	return nil
 }
 
-func (cmd *profileCmd) parseAddArgs(lockJSON *lockjson.LockJSON, subCmd string, args []string) (string, []pathutil.ReposPath, error) {
+func (cmd *profileCmd) parseAddArgs(lockJSON *lockjson.LockJSON, gateway string, args []string) (string, []pathutil.ReposPath, error) {
 	if len(args) == 0 {
 		cmd.FlagSet().Usage()
-		logger.Errorf("'volt profile %s' receives profile name and one or more repositories.", subCmd)
+		logger.Errorf("'volt profile %s' receives profile name and one or more repositories.", gateway)
 		return "", nil, nil
 	}
 
diff --git a/gateway/profile_test.go b/gateway/profile_test.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import (
 	"encoding/json"
diff --git a/gateway/rm.go b/gateway/rm.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import (
 	"flag"
@@ -10,11 +10,11 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/vim-volt/volt/fileutil"
+	"github.com/vim-volt/volt/gateway/builder"
 	"github.com/vim-volt/volt/lockjson"
 	"github.com/vim-volt/volt/logger"
 	"github.com/vim-volt/volt/pathutil"
 	"github.com/vim-volt/volt/plugconf"
-	"github.com/vim-volt/volt/subcmd/builder"
 	"github.com/vim-volt/volt/transaction"
 )
 
diff --git a/gateway/rm_test.go b/gateway/rm_test.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import (
 	"fmt"
diff --git a/gateway/self_upgrade.go b/gateway/self_upgrade.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import (
 	"encoding/json"
diff --git a/gateway/self_upgrade_test.go b/gateway/self_upgrade_test.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import (
 	"io/ioutil"
diff --git a/gateway/version.go b/gateway/version.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import (
 	"flag"
diff --git a/gateway/version_test.go b/gateway/version_test.go
@@ -1,4 +1,4 @@
-package subcmd
+package gateway
 
 import "testing"
 
diff --git a/main.go b/main.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/vim-volt/volt/config"
+	"github.com/vim-volt/volt/gateway"
 	"github.com/vim-volt/volt/lockjson"
 	"github.com/vim-volt/volt/logger"
-	"github.com/vim-volt/volt/subcmd"
 )
 
 func main() {
@@ -39,7 +39,7 @@ func run(args []string) (int, string) {
 		return 1, err.Error()
 	}
 
-	c := subcmd.LookUpCmd(subCmd)
+	c := gateway.LookUpCmd(subCmd)
 	if c == nil {
 		return 3, "Unknown command '" + subCmd + "'"
 	}
@@ -62,24 +62,24 @@ func run(args []string) (int, string) {
 		return 30, errors.Wrap(err, "failed to read config.toml").Error()
 	}
 
-	result := c.Run(&subcmd.CmdContext{
+	result := c.Run(&gateway.CmdContext{
 		Args:     args,
 		LockJSON: lockJSON,
 		Config:   cfg,
 	})
 	return result.Code, result.Msg
 }
 
-func expandAlias(subCmd string, args []string) (string, []string, error) {
+func expandAlias(gateway string, args []string) (string, []string, error) {
 	cfg, err := config.Read()
 	if err != nil {
 		return "", nil, errors.Wrap(err, "could not read config.toml")
 	}
-	if newArgs, exists := cfg.Alias[subCmd]; exists && len(newArgs) > 0 {
-		subCmd = newArgs[0]
+	if newArgs, exists := cfg.Alias[gateway]; exists && len(newArgs) > 0 {
+		gateway = newArgs[0]
 		args = append(newArgs[1:], args...)
 	}
-	return subCmd, args, nil
+	return gateway, args, nil
 }
 
 // On Windows, this function always returns nil.

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ import (`
`5`	`5`	`"os"`
`6`	`6`
`7`	`7`	`"github.com/vim-volt/volt/config"`
	`8`	`+ "github.com/vim-volt/volt/gateway/buildinfo"`
`8`	`9`	`"github.com/vim-volt/volt/logger"`
`9`	`10`	`"github.com/vim-volt/volt/pathutil"`
`10`		`- "github.com/vim-volt/volt/subcmd/buildinfo"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`// Builder creates/updates ~/.vim/pack/volt directory`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package subcmd`
	`1`	`+package gateway`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"flag"`