Merge pull request docker-archive-public#2734 from dgageot/shell-detect-package

dgageot · dgageot · commit d771d65dc4e4 · 2016-01-04T16:14:21.000+01:00
Extract shell detection to its own package
diff --git a/commands/commands.go b/commands/commands.go
@@ -19,7 +19,6 @@ import (
 )
 
 var (
-	ErrUnknownShell       = errors.New("Error: Unknown shell")
 	ErrNoMachineSpecified = errors.New("Error: Expected to get one or more machine names as arguments")
 	ErrExpectedOneMachine = errors.New("Error: Expected one machine name as an argument")
 	ErrTooManyArguments   = errors.New("Error: Too many arguments given")
diff --git a/commands/env.go b/commands/env.go
@@ -9,6 +9,7 @@ import (
 	"text/template"
 
 	"github.com/docker/machine/commands/mcndirs"
+	"github.com/docker/machine/commands/shell"
 	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/check"
 	"github.com/docker/machine/libmachine/log"
@@ -200,7 +201,7 @@ func getShell(userShell string) (string, error) {
 	if userShell != "" {
 		return userShell, nil
 	}
-	return detectShell()
+	return shell.Detect()
 }
 
 func findNoProxyFromEnv() (string, string) {
diff --git a/commands/shell/shell.go b/commands/shell/shell.go
@@ -1,14 +1,20 @@
 // +build !windows
 
-package commands
+package shell
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
 )
 
-func detectShell() (string, error) {
+var (
+	ErrUnknownShell = errors.New("Error: Unknown shell")
+)
+
+// Detect detects user's current shell.
+func Detect() (string, error) {
 	shell := os.Getenv("SHELL")
 
 	if shell == "" {
diff --git a/commands/shell/shell_test.go b/commands/shell/shell_test.go
@@ -1,4 +1,4 @@
-package commands
+package shell
 
 import (
 	"os"
@@ -11,7 +11,7 @@ func TestDetectBash(t *testing.T) {
 	originalShell := os.Getenv("SHELL")
 	os.Setenv("SHELL", "/bin/bash")
 	defer os.Setenv("SHELL", originalShell)
-	shell, err := detectShell()
+	shell, err := Detect()
 	assert.Nil(t, err)
 	assert.Equal(t, "bash", shell)
 }
@@ -23,7 +23,7 @@ func TestDetectFish(t *testing.T) {
 	originalFishdir := os.Getenv("__fish_bin_dir")
 	os.Setenv("__fish_bin_dir", "/usr/local/Cellar/fish/2.2.0/bin")
 	defer os.Setenv("__fish_bin_dir", originalFishdir)
-	shell, err := detectShell()
+	shell, err := Detect()
 	assert.Nil(t, err)
 	assert.Equal(t, "fish", shell)
 }
diff --git a/commands/shell/shell_unix_test.go b/commands/shell/shell_unix_test.go
@@ -1,6 +1,6 @@
 // +build !windows
 
-package commands
+package shell
 
 import (
 	"fmt"
@@ -14,7 +14,7 @@ func TestUnknowShell(t *testing.T) {
 	originalShell := os.Getenv("SHELL")
 	os.Setenv("SHELL", "")
 	defer os.Setenv("SHELL", originalShell)
-	shell, err := detectShell()
+	shell, err := Detect()
 	fmt.Println(shell)
 	assert.Equal(t, err, ErrUnknownShell)
 	assert.Equal(t, "", shell)
diff --git a/commands/shell/shell_windows.go b/commands/shell/shell_windows.go
@@ -1,4 +1,4 @@
-package commands
+package shell
 
 import (
 	"fmt"
@@ -50,7 +50,7 @@ func startedBy() (exefile string, err error) {
 	return name, nil
 }
 
-func detectShell() (string, error) {
+func Detect() (string, error) {
 	shell := os.Getenv("SHELL")
 
 	if shell == "" {
diff --git a/commands/shell/shell_windows_test.go b/commands/shell/shell_windows_test.go
@@ -1,4 +1,4 @@
-package commands
+package shell
 
 import (
 	"os"
@@ -11,7 +11,7 @@ func TestDetect(t *testing.T) {
 	originalShell := os.Getenv("SHELL")
 	os.Setenv("SHELL", "")
 	defer os.Setenv("SHELL", originalShell)
-	shell, err := detectShell()
+	shell, err := Detect()
 	assert.Nil(t, err)
 	assert.Equal(t, "cmd", shell)
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ import (`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`var (`
`22`		`- ErrUnknownShell = errors.New("Error: Unknown shell")`
`23`	`22`	`ErrNoMachineSpecified = errors.New("Error: Expected to get one or more machine names as arguments")`
`24`	`23`	`ErrExpectedOneMachine = errors.New("Error: Expected one machine name as an argument")`
`25`	`24`	`ErrTooManyArguments = errors.New("Error: Too many arguments given")`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import (`
`9`	`9`	`"text/template"`
`10`	`10`
`11`	`11`	`"github.com/docker/machine/commands/mcndirs"`
	`12`	`+ "github.com/docker/machine/commands/shell"`
`12`	`13`	`"github.com/docker/machine/libmachine"`
`13`	`14`	`"github.com/docker/machine/libmachine/check"`
`14`	`15`	`"github.com/docker/machine/libmachine/log"`
`@@ -200,7 +201,7 @@ func getShell(userShell string) (string, error) {`
`200`	`201`	`if userShell != "" {`
`201`	`202`	`return userShell, nil`
`202`	`203`	`}`
`203`		`- return detectShell()`
	`204`	`+ return shell.Detect()`
`204`	`205`	`}`
`205`	`206`
`206`	`207`	`func findNoProxyFromEnv() (string, string) {`