Merge pull request #255 from smt116/master

fix(deis.go): do not add top level command to cmdArgs

Author: mboersma

README.md

@@ -79,25 +79,19 @@ $ mv deis /usr/local/bin
 
 To compile the client from scratch, ensure you have Docker installed and run
 
-	$ make bootstrap
-	$ make build
-
-`make bootstrap` will fetch all required dependencies, while `make build` will compile and install
-the client in the current directory.
-
-	$ ./deis --version
+    $ make
 
 ### From Scratch on Windows
 
 To compile the client from scratch, open PowerShell and execute the following commands in the source directory.
 
-	$ .\make bootstrap
-	$ .\make build
+    $ .\make bootstrap
+    $ .\make build
 
 `.\make bootstrap` will fetch all required dependencies, while `.\make build` will compile and install
 the client in the current directory.
 
-	$ .\deis --version
+    $ .\deis --version
 
 ## Usage
 

deis.go

@@ -14,6 +14,8 @@ import (
 	docopt "github.com/docopt/docopt-go"
 )
 
+const extensionPrefix = "deis-"
+
 // main exits with the return value of Command(os.Args[1:]), deferring all logic to
 // a func we can test.
 func main() {
@@ -154,23 +156,14 @@ Use 'git push deis master' to deploy to an application.
 		err = parser.Whitelist(argv, &cmdr)
 	default:
 		env := os.Environ()
-		extCmd := "deis-" + command
 
-		binary, err := exec.LookPath(extCmd)
+		binary, err := exec.LookPath(extensionPrefix + command)
 		if err != nil {
 			parser.PrintUsage(&cmdr)
 			return 1
 		}
 
-		cmdArgv := []string{extCmd}
-
-		cmdSplit := strings.Split(argv[0], command+":")
-
-		if len(cmdSplit) > 1 {
-			argv[0] = cmdSplit[1]
-		}
-
-		cmdArgv = append(cmdArgv, argv...)
+		cmdArgv := prepareCmdArgs(command, argv)
 
 		err = syscall.Exec(binary, cmdArgv, env)
 		if err != nil {
@@ -249,6 +242,18 @@ func parseArgs(argv []string) (string, []string) {
 	return "", argv
 }
 
+// split original command and pass its first element in arguments
+func prepareCmdArgs(command string, argv []string) []string {
+	cmdArgv := []string{extensionPrefix + command}
+	cmdSplit := strings.Split(argv[0], command+":")
+
+	if len(cmdSplit) > 1 {
+		cmdArgv = append(cmdArgv, cmdSplit[1])
+	}
+
+	return append(cmdArgv, argv[1:]...)
+}
+
 func replaceShortcut(command string) string {
 	expandedCommand := cli.Shortcuts[command]
 	if expandedCommand == "" {

deis_test.go

@@ -63,6 +63,32 @@ func TestCommandSplitting(t *testing.T) {
 	}
 }
 
+func TestTopLevelCommandArgsPreparing(t *testing.T) {
+	t.Parallel()
+
+	command := "ssh"
+	argv := []string{"ssh"}
+	expected := []string{"deis-ssh"}
+	actual := prepareCmdArgs(command, argv)
+
+	if !reflect.DeepEqual(expected, actual) {
+		t.Errorf("Expected %v, Got %v", expected, actual)
+	}
+}
+
+func TestCommandWithParameterArgsPreparing(t *testing.T) {
+	t.Parallel()
+
+	command := "ssh --help"
+	argv := []string{"ssh --help"}
+	expected := []string{"deis-ssh --help"}
+	actual := prepareCmdArgs(command, argv)
+
+	if !reflect.DeepEqual(expected, actual) {
+		t.Errorf("Expected %v, Got %v", expected, actual)
+	}
+}
+
 func TestReplaceShortcutRepalce(t *testing.T) {
 	t.Parallel()