Merge pull request #4 from teaglebuilt/release/1.0.0

fix pull test

Author: teaglebuilt

.github/workflows/release.yaml

@@ -46,7 +46,7 @@ jobs:
       uses: cli/gh-extension-precompile@v2
       with:
         go-version: stable
-        binary-name: 'gh-subrepo'
+        binary-name: gh-subrepo
 
     - name: Upload binaries to GitHub Release
       uses: softprops/action-gh-release@v2

cmd/pull/pull_test.go

@@ -5,39 +5,37 @@ import (
 	"path/filepath"
 	"testing"
 
-	"gopkg.in/ini.v1"
+	"github.com/stretchr/testify/assert"
+	utils "github.com/teaglebuilt/gh-subrepo/internal"
 )
 
-func TestLoadGitRepoFile(t *testing.T) {
+func TestPullCmd_NoGitRepo(t *testing.T) {
 	tmpDir, err := os.MkdirTemp("", "test-pull-*")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	subrepoDir := filepath.Join(tmpDir, "subrepo")
-	os.Mkdir(subrepoDir, 0o755)
-
-	gitrepoContent := `[subrepo]
-remote = https://github.com/example/repo.git
-branch = main
-`
-	gitrepoPath := filepath.Join(subrepoDir, ".gitrepo")
-	if err := os.WriteFile(gitrepoPath, []byte(gitrepoContent), 0o644); err != nil {
-		t.Fatalf("Failed to write .gitrepo: %v", err)
-	}
-
-	cfg, err := ini.Load(gitrepoPath)
-	if err != nil {
-		t.Fatalf("Failed to load .gitrepo: %v", err)
-	}
-
-	remote := cfg.Section("subrepo").Key("remote").String()
-	if remote != "https://github.com/example/repo.git" {
-		t.Fatalf("Expected remote URL to match, got %s", remote)
-	}
-
-	branch := cfg.Section("subrepo").Key("branch").String()
-	if branch != "main" {
-		t.Fatalf("Expected branch to be 'main', got %s", branch)
-	}
+	assert.NoError(t, err)
+	defer os.RemoveAll(tmpDir)
+
+	cwd, err := os.Getwd()
+	assert.NoError(t, err)
+	defer os.Chdir(cwd)
+
+	assert.NoError(t, os.Chdir(tmpDir))
+
+	_, err = utils.GitRepoRoot()
+	assert.Error(t, err, "Expected error when not in a git repo")
+}
+
+func TestPullCmd_MissingGitrepoFile(t *testing.T) {
+	repoRoot, err := os.MkdirTemp("", "test-pull-gitrepo-*")
+	assert.NoError(t, err)
+	defer os.RemoveAll(repoRoot)
+
+	subdir := "vendor/lib"
+	assert.NoError(t, os.MkdirAll(filepath.Join(repoRoot, subdir), 0o755))
+
+	err = utils.ExecCmd(repoRoot, "git", "init", "-b", "main")
+	assert.NoError(t, err)
+
+	gitrepoPath := filepath.Join(repoRoot, subdir, ".gitrepo")
+	_, err = os.Stat(gitrepoPath)
+	assert.True(t, os.IsNotExist(err), "Expected .gitrepo file not to exist")
 }

cmd/push/push_test.go

@@ -16,14 +16,14 @@ func TestPushGitRepoFile(t *testing.T) {
 	defer os.RemoveAll(tmpDir)
 
 	subrepoDir := filepath.Join(tmpDir, "subrepo")
-	os.Mkdir(subrepoDir, 0755)
+	os.Mkdir(subrepoDir, 0o755)
 
 	gitrepoContent := `[subrepo]
-remote = https://github.com/example/pushrepo.git
-branch = develop
-`
+		remote = https://github.com/example/pushrepo.git
+		branch = develop
+	`
 	gitrepoPath := filepath.Join(subrepoDir, ".gitrepo")
-	if err := os.WriteFile(gitrepoPath, []byte(gitrepoContent), 0644); err != nil {
+	if err := os.WriteFile(gitrepoPath, []byte(gitrepoContent), 0o644); err != nil {
 		t.Fatalf("Failed to write .gitrepo: %v", err)
 	}