refactor: Rename Git.Remote to Git.RemoteExists

Moves the existence check into the Git helper and return a true/false,
rather than leaving it up to the caller.  This should ease future
work.

Author: 0xDEC0DE

internal/git.go

@@ -25,5 +25,5 @@ type GitManager interface {
 	Clone(gitURL, origin, cloneDir string) error
 	Worktree(cloneDir, version, dstDir string) error
 	Update(origin, cloneDir string) error
-	Remote(cloneDir string) (string, error)
+	RemoteExists(cloneDir string, remote string) (bool, error)
 }

internal/git/git.go

@@ -25,6 +25,7 @@ package git
 
 import (
 	"log/slog"
+	"strings"
 
 	"github.com/avfs/avfs"
 
@@ -118,7 +119,11 @@ func (g *Git) Worktree(
 	return err
 }
 
-// Return the name of the repo remote.
-func (g *Git) Remote(cloneDir string) (string, error) {
-	return g.execManager.RunCmdInDir("git", []string{"remote"}, cloneDir)
+// Check if the remote exists in the given cloneDir.
+func (g *Git) RemoteExists(cloneDir string, remote string) (bool, error) {
+	retVal, err := g.execManager.RunCmdInDir("git", []string{"remote"}, cloneDir)
+	if err != nil {
+		return false, err
+	}
+	return strings.Contains(retVal, remote), nil
 }

internal/git/git_public_test.go

@@ -162,7 +162,7 @@ func (suite *GitManagerPublicTestSuite) TestUpdateError() {
 
 func (suite *GitManagerPublicTestSuite) TestRemoteOk() {
 	suite.mockExec.EXPECT().RunCmdInDir("git", []string{"remote"}, suite.cloneDir).Return("", nil)
-	_, err := suite.gm.Remote(suite.cloneDir)
+	_, err := suite.gm.RemoteExists(suite.cloneDir, suite.origin)
 	assert.NoError(suite.T(), err)
 }
 
@@ -171,7 +171,7 @@ func (suite *GitManagerPublicTestSuite) TestRemoteError() {
 	suite.mockExec.EXPECT().
 		RunCmdInDir("git", []string{"remote"}, suite.cloneDir).
 		Return("", errors)
-	_, err := suite.gm.Remote(suite.cloneDir)
+	_, err := suite.gm.RemoteExists(suite.cloneDir, suite.origin)
 	assert.Error(suite.T(), err)
 }
 

internal/mocks/git.go

@@ -25,5 +25,5 @@ type GitManager interface {
 	Clone(gitURL, origin, cloneDir string) error
 	Worktree(cloneDir, version, dstDir string) error
 	Update(origin, cloneDir string) error
-	Remote(cloneDir string) (string, error)
+	RemoteExists(cloneDir string, remote string) (bool, error)
 }

internal/mocks/git/git_mock.go

@@ -58,8 +58,8 @@ func (r *Repository) Clone(
 	cloneDir string,
 ) (string, error) {
 	targetDir := r.appFs.Join(cloneDir, replacer.Replace(c.Git))
-	remote, err := r.gitManager.Remote(targetDir)
-	if err == nil && !strings.Contains(remote, ORIGIN) {
+	remote, err := r.gitManager.RemoteExists(targetDir, ORIGIN)
+	if !remote && err == nil {
 		r.logger.Info(
 			"remote does not exist in clone, invalidating cache",
 			slog.Any("remote", ORIGIN),

internal/repository/repository.go

@@ -96,7 +96,7 @@ func (suite *RepositoryPublicTestSuite) TestCloneOk() {
 
 	errors := errors.New("tests error")
 	gomock.InOrder(
-		suite.mockGit.EXPECT().Remote(targetDir).Return("", errors),
+		suite.mockGit.EXPECT().RemoteExists(targetDir, repository.ORIGIN).Return(false, errors),
 		suite.mockGit.EXPECT().Clone(suite.gitURL, repository.ORIGIN, targetDir).Return(nil),
 	)
 
@@ -114,7 +114,7 @@ func (suite *RepositoryPublicTestSuite) TestCloneReturnsErrorWhenCloneErrors() {
 
 	errors := errors.New("tests error")
 	gomock.InOrder(
-		suite.mockGit.EXPECT().Remote(gomock.Any()).Return("", errors),
+		suite.mockGit.EXPECT().RemoteExists(gomock.Any(), gomock.Any()).Return(false, errors),
 		suite.mockGit.EXPECT().Clone(gomock.Any(), gomock.Any(), gomock.Any()).Return(errors),
 	)
 
@@ -131,7 +131,7 @@ func (suite *RepositoryPublicTestSuite) TestCloneDoesNotCloneWhenCloneDirExists(
 	}
 	targetDir := suite.appFs.Join(suite.cloneDir, suite.cacheDir)
 
-	suite.mockGit.EXPECT().Remote(targetDir).Return(repository.ORIGIN, nil)
+	suite.mockGit.EXPECT().RemoteExists(targetDir, repository.ORIGIN).Return(true, nil)
 	suite.mockGit.EXPECT().Update(repository.ORIGIN, targetDir).Return(nil)
 
 	_, err := repo.Clone(c, suite.cloneDir)
@@ -148,7 +148,7 @@ func (suite *RepositoryPublicTestSuite) TestCloneInvalidatesCaches() {
 	targetDir := suite.appFs.Join(suite.cloneDir, suite.cacheDir)
 
 	gomock.InOrder(
-		suite.mockGit.EXPECT().Remote(targetDir).Return("invalid", nil),
+		suite.mockGit.EXPECT().RemoteExists(targetDir, repository.ORIGIN).Return(false, nil),
 		suite.mockGit.EXPECT().Clone(suite.gitURL, repository.ORIGIN, targetDir).Return(nil),
 	)
 
@@ -166,7 +166,7 @@ func (suite *RepositoryPublicTestSuite) TestCloneUpdateCloneDirThrowsError() {
 	targetDir := suite.appFs.Join(suite.cloneDir, suite.cacheDir)
 
 	errors := errors.New("tests error")
-	suite.mockGit.EXPECT().Remote(targetDir).Return(repository.ORIGIN, nil)
+	suite.mockGit.EXPECT().RemoteExists(targetDir, repository.ORIGIN).Return(true, nil)
 	suite.mockGit.EXPECT().Update(repository.ORIGIN, targetDir).Return(errors)
 
 	_, err := repo.Clone(c, suite.cloneDir)