Feature bob git push

bobgit/add_test.go

@@ -14,6 +14,10 @@ import (
 
 var addTestDataPath = "testdata/add"
 
+// disable running tests for add,
+// helpful while writing other tests
+var runAddTests = true
+
 func TestGitAdd(t *testing.T) {
 	type input struct {
 		// environment holds a function creating
@@ -335,65 +339,68 @@ func TestGitAdd(t *testing.T) {
 		},
 	}
 
-	for _, test := range tests {
-		dir, err := ioutil.TempDir("", test.name+"-*")
-		assert.Nil(t, err)
-
-		statusBeforeFile := test.name + "_before"
-		statusAfterFile := test.name + "_after"
-
-		// Don't cleanup in testdir mode
-		if !createTestDirs {
-			defer os.RemoveAll(dir)
-		}
+	if runAddTests {
 
-		if debug || createTestDirs {
-			println("Using test dir " + dir)
-		}
+		for _, test := range tests {
+			dir, err := ioutil.TempDir("", test.name+"-*")
+			assert.Nil(t, err)
 
-		test.input.environment(dir)
+			statusBeforeFile := test.name + "_before"
+			statusAfterFile := test.name + "_after"
 
-		if createTestDirs {
-			continue
-		}
+			// Don't cleanup in testdir mode
+			if !createTestDirs {
+				defer os.RemoveAll(dir)
+			}
 
-		execdir := filepath.Join(dir, test.execdir)
+			if debug || createTestDirs {
+				println("Using test dir " + dir)
+			}
 
-		statusBefore, err := getStatus(execdir)
-		assert.Nil(t, err)
+			test.input.environment(dir)
 
-		targets := strings.Split(test.target, " ")
-		err = executeAdd(execdir, targets...)
-		assert.Nil(t, err)
+			if createTestDirs {
+				continue
+			}
 
-		statusAfter, err := getStatus(execdir)
-		assert.Nil(t, err)
+			execdir := filepath.Join(dir, test.execdir)
 
-		if update {
-			err = os.RemoveAll(filepath.Join(addTestDataPath, statusBeforeFile))
-			assert.Nil(t, err)
-			err = os.RemoveAll(filepath.Join(addTestDataPath, statusAfterFile))
+			statusBefore, err := getStatus(execdir)
 			assert.Nil(t, err)
-			err = os.MkdirAll(addTestDataPath, 0775)
-			assert.Nil(t, err)
-			err = os.WriteFile(filepath.Join(addTestDataPath, statusBeforeFile), []byte(statusBefore.String()), 0664)
-			assert.Nil(t, err)
-			err = os.WriteFile(filepath.Join(addTestDataPath, statusAfterFile), []byte(statusAfter.String()), 0664)
-			assert.Nil(t, err)
-			continue
-		}
 
-		expectBefore, err := os.ReadFile(filepath.Join(addTestDataPath, statusBeforeFile))
-		assert.Nil(t, err, test.name)
-
-		diff := cmp.Diff(statusBefore.String(), string(expectBefore))
-		assert.Equal(t, "", diff, statusBeforeFile)
+			targets := strings.Split(test.target, " ")
+			err = executeAdd(execdir, targets...)
+			assert.Nil(t, err)
 
-		expectAfter, err := os.ReadFile(filepath.Join(addTestDataPath, statusAfterFile))
-		assert.Nil(t, err, test.name)
+			statusAfter, err := getStatus(execdir)
+			assert.Nil(t, err)
 
-		diff = cmp.Diff(statusAfter.String(), string(expectAfter))
-		assert.Equal(t, "", diff, statusAfterFile)
+			if update {
+				err = os.RemoveAll(filepath.Join(addTestDataPath, statusBeforeFile))
+				assert.Nil(t, err)
+				err = os.RemoveAll(filepath.Join(addTestDataPath, statusAfterFile))
+				assert.Nil(t, err)
+				err = os.MkdirAll(addTestDataPath, 0775)
+				assert.Nil(t, err)
+				err = os.WriteFile(filepath.Join(addTestDataPath, statusBeforeFile), []byte(statusBefore.String()), 0664)
+				assert.Nil(t, err)
+				err = os.WriteFile(filepath.Join(addTestDataPath, statusAfterFile), []byte(statusAfter.String()), 0664)
+				assert.Nil(t, err)
+				continue
+			}
+
+			expectBefore, err := os.ReadFile(filepath.Join(addTestDataPath, statusBeforeFile))
+			assert.Nil(t, err, test.name)
+
+			diff := cmp.Diff(statusBefore.String(), string(expectBefore))
+			assert.Equal(t, "", diff, statusBeforeFile)
+
+			expectAfter, err := os.ReadFile(filepath.Join(addTestDataPath, statusAfterFile))
+			assert.Nil(t, err, test.name)
+
+			diff = cmp.Diff(statusAfter.String(), string(expectAfter))
+			assert.Equal(t, "", diff, statusAfterFile)
+		}
 	}
 
 	if createTestDirs || update {

bobgit/bobgit.go

@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 
 	"github.com/Benchkram/errz"
+	"github.com/cli/cli/git"
 )
 
 var (
@@ -72,6 +73,30 @@ func findRepos(root string) ([]string, error) {
 	return repoNames, nil
 }
 
+// getRepoConfig detects repository current branch and
+// returns the Branch Config with remote name, url and merge ref
+func getRepoConfig(root string, repo string) (_ *git.BranchConfig, err error) {
+	repoPath := filepath.Join(root, repo)
+
+	err = os.Chdir(repoPath)
+	if err != nil {
+		return nil, err
+	}
+
+	defer func() {
+		err = os.Chdir(root)
+		errz.Fatal(err)
+	}()
+
+	branch, err := git.CurrentBranch()
+	if err != nil {
+		return nil, err
+	}
+
+	config := git.ReadBranchConfig(branch)
+	return &config, nil
+}
+
 // formatRepoNameForOutput returns formatted reponame for output.
 //
 // Example: "." => "/", "second-level" => "second-level/"

bobgit/commit_test.go

@@ -15,6 +15,10 @@ import (
 
 var commitTestDataPath = "testdata/commit"
 
+// disable running tests for commit,
+// helpful while writing other tests
+var runCommitTests = true
+
 func TestCommit(t *testing.T) {
 
 	type input struct {
@@ -304,80 +308,83 @@ func TestCommit(t *testing.T) {
 		},
 	}
 
-	for _, test := range tests {
-		dir, err := ioutil.TempDir("", test.name+"-*")
-		assert.Nil(t, err)
-
-		// Don't cleanup in testdir mode
-		if !createTestDirs {
-			defer os.RemoveAll(dir)
-		}
+	if runCommitTests {
 
-		if debug || createTestDirs {
-			println("Using test dir " + dir)
-		}
-
-		test.input.environment(dir)
+		for _, test := range tests {
+			dir, err := ioutil.TempDir("", test.name+"-*")
+			assert.Nil(t, err)
 
-		if createTestDirs {
-			continue
-		}
+			// Don't cleanup in testdir mode
+			if !createTestDirs {
+				defer os.RemoveAll(dir)
+			}
 
-		execdir := filepath.Join(dir, test.execdir)
-		statusBeforeFile := test.name + "_before"
-		statusAfterFile := test.name + "_after"
+			if debug || createTestDirs {
+				println("Using test dir " + dir)
+			}
 
-		statusBefore, err := getStatus(execdir)
-		assert.Nil(t, err)
+			test.input.environment(dir)
 
-		s, err := executeCommit(execdir, test.message)
-		if test.expectedErr != nil {
-			if errors.Is(err, test.expectedErr) {
+			if createTestDirs {
 				continue
 			}
-			assert.Fail(t, fmt.Sprintf("expected error [%s] got [%s]", test.expectedErr.Error(), err.Error()))
-		}
 
-		// ignore the error caused by test.message nill
-		if err != nil && !errors.Is(err, ErrEmptyCommitMessage) {
-			assert.Nil(t, err)
-		}
-
-		assert.Equal(t, s, test.output, test.name)
+			execdir := filepath.Join(dir, test.execdir)
+			statusBeforeFile := test.name + "_before"
+			statusAfterFile := test.name + "_after"
 
-		statusAfter, err := getStatus(execdir)
-		assert.Nil(t, err)
+			statusBefore, err := getStatus(execdir)
+			assert.Nil(t, err)
 
-		if update {
-			// tests expecting a error don't need to compare their before and after putputs
+			s, err := executeCommit(execdir, test.message)
 			if test.expectedErr != nil {
-				continue
+				if errors.Is(err, test.expectedErr) {
+					continue
+				}
+				assert.Fail(t, fmt.Sprintf("expected error [%s] got [%s]", test.expectedErr.Error(), err.Error()))
 			}
 
-			err = os.RemoveAll(filepath.Join(commitTestDataPath, statusBeforeFile))
-			assert.Nil(t, err)
-			err = os.RemoveAll(filepath.Join(commitTestDataPath, statusAfterFile))
-			assert.Nil(t, err)
-			err = os.MkdirAll(commitTestDataPath, 0775)
-			assert.Nil(t, err)
-			err = os.WriteFile(filepath.Join(commitTestDataPath, statusBeforeFile), []byte(statusBefore.String()), 0664)
-			assert.Nil(t, err)
-			err = os.WriteFile(filepath.Join(commitTestDataPath, statusAfterFile), []byte(statusAfter.String()), 0664)
+			// ignore the error caused by test.message nill
+			if err != nil && !errors.Is(err, ErrEmptyCommitMessage) {
+				assert.Nil(t, err)
+			}
+
+			assert.Equal(t, s, test.output, test.name)
+
+			statusAfter, err := getStatus(execdir)
 			assert.Nil(t, err)
-			continue
-		}
 
-		expectBefore, err := os.ReadFile(filepath.Join(commitTestDataPath, statusBeforeFile))
-		assert.Nil(t, err, test.name)
+			if update {
+				// tests expecting a error don't need to compare their before and after putputs
+				if test.expectedErr != nil {
+					continue
+				}
+
+				err = os.RemoveAll(filepath.Join(commitTestDataPath, statusBeforeFile))
+				assert.Nil(t, err)
+				err = os.RemoveAll(filepath.Join(commitTestDataPath, statusAfterFile))
+				assert.Nil(t, err)
+				err = os.MkdirAll(commitTestDataPath, 0775)
+				assert.Nil(t, err)
+				err = os.WriteFile(filepath.Join(commitTestDataPath, statusBeforeFile), []byte(statusBefore.String()), 0664)
+				assert.Nil(t, err)
+				err = os.WriteFile(filepath.Join(commitTestDataPath, statusAfterFile), []byte(statusAfter.String()), 0664)
+				assert.Nil(t, err)
+				continue
+			}
+
+			expectBefore, err := os.ReadFile(filepath.Join(commitTestDataPath, statusBeforeFile))
+			assert.Nil(t, err, test.name)
 
-		diff := cmp.Diff(statusBefore.String(), string(expectBefore))
-		assert.Equal(t, "", diff, statusBeforeFile)
+			diff := cmp.Diff(statusBefore.String(), string(expectBefore))
+			assert.Equal(t, "", diff, statusBeforeFile)
 
-		expectAfter, err := os.ReadFile(filepath.Join(commitTestDataPath, statusAfterFile))
-		assert.Nil(t, err, test.name)
+			expectAfter, err := os.ReadFile(filepath.Join(commitTestDataPath, statusAfterFile))
+			assert.Nil(t, err, test.name)
 
-		diff = cmp.Diff(statusAfter.String(), string(expectAfter))
-		assert.Equal(t, "", diff, statusAfterFile)
+			diff = cmp.Diff(statusAfter.String(), string(expectAfter))
+			assert.Equal(t, "", diff, statusAfterFile)
+		}
 	}
 
 	if createTestDirs || update {