Merge pull request #222 from bacongobbler/213-fix-git-remote-help

fix(cmd): fix help string when git remote already exists

Author: Matthew Fisher

cmd/apps.go

@@ -50,7 +50,7 @@ func (d DeisCmd) AppCreate(id, buildpack, remote string, noRemote bool) error {
 
 	if !noRemote {
 		if err = git.CreateRemote(s.Client.ControllerURL.Host, remote, app.ID); err != nil {
-			if err.Error() == "exit status 128" {
+			if strings.Contains(err.Error(), fmt.Sprintf("fatal: remote %s already exists.", remote)) {
 				msg := "A git remote with the name %s already exists. To overwrite this remote run:\n"
 				msg += "deis git:remote --force --remote %s --app %s"
 				return fmt.Errorf(msg, remote, remote, app.ID)

cmd/apps_test.go

@@ -1,6 +1,18 @@
 package cmd
 
-import "testing"
+import (
+	"bytes"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"testing"
+
+	"github.com/arschles/assert"
+
+	"github.com/deis/workflow-cli/pkg/git"
+	"github.com/deis/workflow-cli/pkg/testutil"
+)
 
 type expandURLCases struct {
 	Input    string
@@ -27,3 +39,42 @@ func TestExpandUrl(t *testing.T) {
 		}
 	}
 }
+
+func TestRemoteExists(t *testing.T) {
+	cf, server, err := testutil.NewTestServerAndClient()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer server.Close()
+
+	server.Mux.HandleFunc("/v2/apps/", func(w http.ResponseWriter, r *http.Request) {
+		testutil.SetHeaders(w)
+		fmt.Fprintf(w, `{
+    "owner": "jkirk",
+    "id": "foo",
+    "created": "2014-01-01T00:00:00UTC",
+    "updated": "2014-01-01T00:00:00UTC",
+    "uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75"
+}`)
+	})
+
+	// create a remote first before running apps:create
+	dir, err := ioutil.TempDir("", "apps")
+	assert.NoErr(t, err)
+
+	defer os.RemoveAll(dir)
+
+	assert.NoErr(t, os.Chdir(dir))
+
+	assert.NoErr(t, git.Init())
+	assert.NoErr(t, git.CreateRemote("localhost", "deis", "appname"))
+
+	var b bytes.Buffer
+	cmdr := DeisCmd{WOut: &b, ConfigFile: cf}
+
+	err = cmdr.AppCreate("foo", "", "deis", false)
+
+	assert.Equal(t, err.Error(), `A git remote with the name deis already exists. To overwrite this remote run:
+deis git:remote --force --remote deis --app foo`,
+		"output")
+}

pkg/git/git.go

@@ -26,8 +26,17 @@ func gitError(err *exec.ExitError, cmd []string) error {
 // CreateRemote adds a git remote in the current directory.
 func CreateRemote(host, remote, appID string) error {
 	cmd := []string{"git", "remote", "add", remote, RemoteURL(host, appID)}
-	_, err := exec.Command(cmd[0], cmd[1:]...).Output()
-	if err != nil {
+	if _, err := exec.Command(cmd[0], cmd[1:]...).Output(); err != nil {
+		return gitError(err.(*exec.ExitError), cmd)
+	}
+
+	return nil
+}
+
+// Init creates a new git repository in the local directory.
+func Init() error {
+	cmd := []string{"git", "init"}
+	if _, err := exec.Command(cmd[0], cmd[1:]...).Output(); err != nil {
 		return gitError(err.(*exec.ExitError), cmd)
 	}
 
@@ -54,8 +63,7 @@ func DeleteAppRemotes(host, appID string) error {
 // DeleteRemote removes a remote from the repository
 func DeleteRemote(name string) error {
 	cmd := []string{"git", "remote", "remove", name}
-	_, err := exec.Command(cmd[0], cmd[1:]...).Output()
-	if err != nil {
+	if _, err := exec.Command(cmd[0], cmd[1:]...).Output(); err != nil {
 		return gitError(err.(*exec.ExitError), cmd)
 	}