Merge pull request #4359 from Joshua-Anderson/app-args-fix

fix(client-go): pass arguments when using root command to list

Author: mboersma

client-go/deis.go

@@ -62,20 +62,19 @@ Shortcut commands, use 'deis shortcuts' to see all::
 Use 'git push deis master' to deploy to an application.
 `
 	// Reorganize some command line flags and commands.
-	argv = parseArgs(argv)
+	command, argv := parseArgs(argv)
 	// Give docopt an optional final false arg so it doesn't call os.Exit().
-	args, err := docopt.Parse(usage, argv, false, version.Version, true, false)
+	_, err := docopt.Parse(usage, []string{command}, false, version.Version, true, false)
 
 	if err != nil {
 		fmt.Println(err)
 		return 1
 	}
 
-	if len(args) == 0 {
+	if len(argv) == 0 {
 		return 0
 	}
 
-	command := args["<command>"]
 	// Dispatch the command, passing the argv through so subcommands can
 	// re-parse it according to their usage strings.
 	switch command {
@@ -110,18 +109,27 @@ Use 'git push deis master' to deploy to an application.
 	case "help":
 		fmt.Print(usage)
 		return 0
+	case "--version":
+		return 0
 	default:
 		env := os.Environ()
-		command = "deis-" + argv[0]
+		extCmd := "deis-" + command
 
-		binary, err := exec.LookPath(command.(string))
+		binary, err := exec.LookPath(extCmd)
 		if err != nil {
 			parser.PrintUsage()
 			return 1
 		}
 
-		cmdArgv := []string{command.(string)}
-		cmdArgv = append(cmdArgv, argv[1:]...)
+		cmdArgv := []string{extCmd}
+
+		cmdSplit := strings.Split(argv[0], command+":")
+
+		if len(cmdSplit) > 1 {
+			argv[0] = cmdSplit[1]
+		}
+
+		cmdArgv = append(cmdArgv, argv...)
 
 		err = syscall.Exec(binary, cmdArgv, env)
 		if err != nil {
@@ -138,35 +146,35 @@ Use 'git push deis master' to deploy to an application.
 
 // parseArgs returns the provided args with "--help" as the last arg if need be,
 // expands shortcuts and formats commands to be properly routed.
-func parseArgs(argv []string) []string {
+func parseArgs(argv []string) (string, []string) {
 	if len(argv) == 1 {
-		// rearrange "deisctl --help" as "deisctl help"
+		// rearrange "deis --help" as "deis help"
 		if argv[0] == "--help" || argv[0] == "-h" {
 			argv[0] = "help"
 		}
 	}
 
 	if len(argv) >= 2 {
-		// Rearrange "deisctl help <command>" to "deisctl <command> --help".
+		// Rearrange "deis help <command>" to "deis <command> --help".
 		if argv[0] == "help" || argv[0] == "--help" || argv[0] == "-h" {
 			argv = append(argv[1:], "--help")
 		}
 	}
 
-	// Split commands with colons [apps:create, ...] -> [apps, create, ...].
 	if len(argv) > 0 {
 		argv[0] = replaceShortcut(argv[0])
 
 		index := strings.Index(argv[0], ":")
 
 		if index != -1 {
 			command := argv[0]
-			argv[0] = command[:index]
-			argv = append(argv[:1], append([]string{command[(index + 1):]}, argv[1:]...)...)
+			return command[:index], argv
 		}
+
+		return argv[0], argv
 	}
 
-	return argv
+	return "", argv
 }
 
 func replaceShortcut(command string) string {

client-go/deis_test.go

@@ -12,10 +12,14 @@ func TestHelpReformatting(t *testing.T) {
 	expected := "help"
 
 	for _, test := range tests {
-		actual := parseArgs([]string{test})
+		actual, argv := parseArgs([]string{test})
 
-		if actual[0] != expected {
-			t.Errorf("Expected %s, Got %s", expected, actual[0])
+		if actual != expected {
+			t.Errorf("Expected %s, Got %s", expected, actual)
+		}
+
+		if len(argv) != 1 {
+			t.Errorf("Expected length of 1, Got %d", len(argv))
 		}
 	}
 }
@@ -24,25 +28,36 @@ func TestHelpReformattingWithCommand(t *testing.T) {
 	t.Parallel()
 
 	tests := []string{"--help", "-h", "help"}
-	expected := "--help"
+	expected := "test"
+	expectedArgv := []string{"test", "--help"}
 
 	for _, test := range tests {
-		actual := parseArgs([]string{test, "test"})
+		actual, argv := parseArgs([]string{test, "test"})
+
+		if actual != expected {
+			t.Errorf("Expected %s, Got %s", expected, actual)
+		}
 
-		if actual[1] != expected {
-			t.Errorf("Expected %s, Got %s", expected, actual[1])
+		if !reflect.DeepEqual(expectedArgv, argv) {
+			t.Errorf("Expected %v, Got %v", expectedArgv, argv)
 		}
 	}
 }
 
 func TestCommandSplitting(t *testing.T) {
 	t.Parallel()
 
-	expected := []string{"apps", "create", "test", "foo"}
-	actual := parseArgs([]string{"apps:create", "test", "foo"})
+	expected := "apps"
+	expectedArgv := []string{"apps:create", "test", "foo"}
+
+	actual, argv := parseArgs(expectedArgv)
+
+	if actual != expected {
+		t.Errorf("Expected %s, Got %s", expected, actual)
+	}
 
-	if !reflect.DeepEqual(expected, actual) {
-		t.Errorf("Expected %v, Got %v", expected, actual)
+	if !reflect.DeepEqual(expectedArgv, argv) {
+		t.Errorf("Expected %v, Got %v", expectedArgv, argv)
 	}
 }
 

client-go/parser/apps.go

@@ -1,7 +1,6 @@
 package parser
 
 import (
-	"fmt"
 	"strconv"
 	"strings"
 
@@ -24,29 +23,32 @@ apps:destroy       destroy an application
 
 Use 'deis help [command]' to learn more.
 `
-	if len(argv) < 2 {
-		return appsList([]string{"apps:list"})
-	}
 
-	switch argv[1] {
-	case "create":
-		return appCreate(combineCommand(argv))
-	case "list":
-		return appsList(combineCommand(argv))
-	case "info":
-		return appInfo(combineCommand(argv))
-	case "open":
-		return appOpen(combineCommand(argv))
-	case "logs":
-		return appLogs(combineCommand(argv))
-	case "run":
-		return appRun(combineCommand(argv))
-	case "destroy":
-		return appDestroy(combineCommand(argv))
-	case "--help":
-		fmt.Print(usage)
-		return nil
+	switch argv[0] {
+	case "apps:create":
+		return appCreate(argv)
+	case "apps:list":
+		return appsList(argv)
+	case "apps:info":
+		return appInfo(argv)
+	case "apps:open":
+		return appOpen(argv)
+	case "apps:logs":
+		return appLogs(argv)
+	case "apps:run":
+		return appRun(argv)
+	case "apps:destroy":
+		return appDestroy(argv)
 	default:
+		if printHelp(argv, usage) {
+			return nil
+		}
+
+		if argv[0] == "apps" {
+			argv[0] = "apps:list"
+			return appsList(argv)
+		}
+
 		PrintUsage()
 		return nil
 	}

client-go/parser/auth.go

@@ -22,26 +22,23 @@ auth:regenerate        regenerate user tokens
 
 Use 'deis help [command]' to learn more.
 `
-	if len(argv) < 2 {
-		return nil
-	}
 
-	switch argv[1] {
-	case "register":
-		return authRegister(combineCommand(argv))
-	case "login":
-		return authLogin(combineCommand(argv))
-	case "logout":
-		return authLogout(combineCommand(argv))
-	case "passwd":
-		return authPasswd(combineCommand(argv))
-	case "whoami":
-		return authWhoami(combineCommand(argv))
-	case "cancel":
-		return authCancel(combineCommand(argv))
-	case "regenerate":
-		return authRegenerate(combineCommand(argv))
-	case "--help":
+	switch argv[0] {
+	case "auth:register":
+		return authRegister(argv)
+	case "auth:login":
+		return authLogin(argv)
+	case "auth:logout":
+		return authLogout(argv)
+	case "auth:passwd":
+		return authPasswd(argv)
+	case "auth:whoami":
+		return authWhoami(argv)
+	case "auth:cancel":
+		return authCancel(argv)
+	case "auth:regenerate":
+		return authRegenerate(argv)
+	case "auth":
 		fmt.Print(usage)
 		return nil
 	default:

client-go/parser/builds.go

@@ -1,8 +1,6 @@
 package parser
 
 import (
-	"fmt"
-
 	"github.com/deis/deis/client-go/cmd"
 	docopt "github.com/docopt/docopt-go"
 )
@@ -17,19 +15,22 @@ builds:create      imports an image and deploys as a new release
 
 Use 'deis help [command]' to learn more.
 `
-	if len(argv) < 2 {
-		return buildsList([]string{"builds:list"})
-	}
 
-	switch argv[1] {
-	case "list":
-		return buildsList(combineCommand(argv))
-	case "create":
-		return buildsCreate(combineCommand(argv))
-	case "--help":
-		fmt.Print(usage)
-		return nil
+	switch argv[0] {
+	case "builds:list":
+		return buildsList(argv)
+	case "builds:create":
+		return buildsCreate(argv)
 	default:
+		if printHelp(argv, usage) {
+			return nil
+		}
+
+		if argv[0] == "builds" {
+			argv[0] = "builds:list"
+			return buildsList(argv)
+		}
+
 		PrintUsage()
 		return nil
 	}

client-go/parser/certs.go

@@ -1,8 +1,6 @@
 package parser
 
 import (
-	"fmt"
-
 	"github.com/deis/deis/client-go/cmd"
 	docopt "github.com/docopt/docopt-go"
 )
@@ -18,21 +16,24 @@ certs:remove          remove an SSL certificate from an app
 
 Use 'deis help [command]' to learn more.
 `
-	if len(argv) < 2 {
-		return certsList([]string{"certs:list"})
-	}
 
-	switch argv[1] {
-	case "list":
-		return certsList(combineCommand(argv))
-	case "add":
-		return certAdd(combineCommand(argv))
-	case "remove":
-		return certRemove(combineCommand(argv))
-	case "--help":
-		fmt.Print(usage)
-		return nil
+	switch argv[0] {
+	case "certs:list":
+		return certsList(argv)
+	case "certs:add":
+		return certAdd(argv)
+	case "certs:remove":
+		return certRemove(argv)
 	default:
+		if printHelp(argv, usage) {
+			return nil
+		}
+
+		if argv[0] == "certs" {
+			argv[0] = "certs:list"
+			return certsList(argv)
+		}
+
 		PrintUsage()
 		return nil
 	}