ref(*): rewrite to use path/filepath for better OS compatibility

Author: Joshua-Anderson

cmd/keys.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"fmt"
 	"io/ioutil"
-	"path"
+	"path/filepath"
 	"strconv"
 	"strings"
 
@@ -78,7 +78,7 @@ func KeyAdd(keyLocation string) error {
 		return err
 	}
 
-	fmt.Printf("Uploading %s to deis...", path.Base(key.Name))
+	fmt.Printf("Uploading %s to deis...", filepath.Base(key.Name))
 
 	if _, err = keys.New(c, key.ID, key.Public); err != nil {
 		fmt.Println()
@@ -99,7 +99,7 @@ func chooseKey() (api.KeyCreateRequest, error) {
 	fmt.Println("Found the following SSH public keys:")
 
 	for i, key := range keys {
-		fmt.Printf("%d) %s %s\n", i+1, path.Base(key.Name), key.ID)
+		fmt.Printf("%d) %s %s\n", i+1, filepath.Base(key.Name), key.ID)
 	}
 
 	fmt.Println("0) Enter path to pubfile (or use keys:add <key_path>)")
@@ -132,7 +132,7 @@ func chooseKey() (api.KeyCreateRequest, error) {
 }
 
 func listKeys() ([]api.KeyCreateRequest, error) {
-	folder := path.Join(client.FindHome(), ".ssh")
+	folder := filepath.Join(client.FindHome(), ".ssh")
 	files, err := ioutil.ReadDir(folder)
 
 	if err != nil {
@@ -142,8 +142,8 @@ func listKeys() ([]api.KeyCreateRequest, error) {
 	var keys []api.KeyCreateRequest
 
 	for _, file := range files {
-		if path.Ext(file.Name()) == ".pub" {
-			key, err := getKey(path.Join(folder, file.Name()))
+		if filepath.Ext(file.Name()) == ".pub" {
+			key, err := getKey(filepath.Join(folder, file.Name()))
 
 			if err == nil {
 				keys = append(keys, key)
@@ -163,7 +163,7 @@ func getKey(filename string) (api.KeyCreateRequest, error) {
 		return api.KeyCreateRequest{}, err
 	}
 
-	backupID := strings.Split(path.Base(filename), ".")[0]
+	backupID := strings.Split(filepath.Base(filename), ".")[0]
 	keyInfo, err := ssh.ParsePubKey(backupID, keyContents)
 	if err != nil {
 		return api.KeyCreateRequest{}, fmt.Errorf("%s is not a valid ssh key", filename)

cmd/keys_test.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"io/ioutil"
 	"os"
-	"path"
+	"path/filepath"
 	"reflect"
 	"testing"
 
@@ -54,7 +54,7 @@ func TestGetKeyNoComment(t *testing.T) {
 	toWrite := []byte("ssh-rsa abc")
 
 	expected := api.KeyCreateRequest{
-		ID:     path.Base(file.Name()),
+		ID:     filepath.Base(file.Name()),
 		Public: string(toWrite),
 		Name:   file.Name(),
 	}
@@ -83,7 +83,7 @@ func TestListKeys(t *testing.T) {
 
 	os.Setenv("HOME", name)
 
-	folder := path.Join(name, ".ssh")
+	folder := filepath.Join(name, ".ssh")
 
 	if err = os.Mkdir(folder, 0755); err != nil {
 		t.Fatal(err)
@@ -96,17 +96,17 @@ func TestListKeys(t *testing.T) {
 		{
 			ID:     "test@example.com",
 			Public: string(toWrite),
-			Name:   path.Join(folder, fileNames[0]),
+			Name:   filepath.Join(folder, fileNames[0]),
 		},
 		{
 			ID:     "test@example.com",
 			Public: string(toWrite),
-			Name:   path.Join(folder, fileNames[1]),
+			Name:   filepath.Join(folder, fileNames[1]),
 		},
 	}
 
 	for _, file := range fileNames {
-		if err = ioutil.WriteFile(path.Join(folder, file), toWrite, 0775); err != nil {
+		if err = ioutil.WriteFile(filepath.Join(folder, file), toWrite, 0775); err != nil {
 			t.Fatal(err)
 		}
 	}

controller/client/client.go

@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
-	"path"
+	"path/filepath"
 )
 
 // Client oversees the interaction between the client and controller
@@ -94,7 +94,7 @@ func (c Client) Save() error {
 		return err
 	}
 
-	if err = os.MkdirAll(path.Join(FindHome(), "/.deis/"), 0775); err != nil {
+	if err = os.MkdirAll(filepath.Join(FindHome(), "/.deis/"), 0775); err != nil {
 		return err
 	}
 

controller/client/client_test.go

@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"net/url"
 	"os"
-	"path"
+	"path/filepath"
 	"testing"
 )
 
@@ -19,12 +19,12 @@ func createTempProfile(contents string) error {
 
 	os.Unsetenv("DEIS_PROFILE")
 	os.Setenv("HOME", name)
-	folder := path.Join(name, "/.deis/")
+	folder := filepath.Join(name, ".deis")
 	if err = os.Mkdir(folder, 0755); err != nil {
 		return err
 	}
 
-	if err = ioutil.WriteFile(path.Join(folder, "client.json"), []byte(contents), 0775); err != nil {
+	if err = ioutil.WriteFile(filepath.Join(folder, "client.json"), []byte(contents), 0775); err != nil {
 		return err
 	}
 

controller/client/utils.go

@@ -3,7 +3,7 @@ package client
 import (
 	"fmt"
 	"os"
-	"path"
+	"path/filepath"
 
 	"github.com/deis/workflow-cli/version"
 )
@@ -15,7 +15,7 @@ func locateSettingsFile() string {
 		filename = "client"
 	}
 
-	return path.Join(FindHome(), ".deis", filename+".json")
+	return filepath.Join(FindHome(), ".deis", filename+".json")
 }
 
 func checkAPICompatibility(serverAPIVersion string) {

controller/client/utils_test.go

@@ -1,3 +1,5 @@
+// +build linux darwin
+
 package client
 
 import (

pkg/git/git.go

@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
-	"path"
+	"path/filepath"
 	"strings"
 )
 
@@ -77,7 +77,7 @@ func DetectAppName(host string) (string, error) {
 	// Don't return an error if remote can't be found, return directory name instead.
 	if err != nil {
 		dir, err := os.Getwd()
-		return strings.ToLower(path.Base(dir)), err
+		return strings.ToLower(filepath.Base(dir)), err
 	}
 
 	ss := strings.Split(remote, "/")