Merge pull request #133 from rkscv/use-go-env

Get `GOPATH` with `go env`
nao1215 · Mar 23, 2024 · 7f46f0d · 7f46f0d
2 parents 7a4a982 + b78ea8b
commit 7f46f0d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 68 deletions.
diff --git a/cmd/remove_test.go b/cmd/remove_test.go
@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"bytes"
-	"go/build"
 	"io"
 	"os"
 	"path/filepath"
@@ -136,47 +135,6 @@ func Test_remove(t *testing.T) {
 	}
 }
 
-func Test_remove_gobin_is_empty(t *testing.T) {
-	t.Run("GOPATH and GOBIN is empty", func(t *testing.T) {
-		t.Setenv("GOBIN", "")
-		t.Setenv("GOPATH", "")
-
-		oldBuildGopath := build.Default.GOPATH
-		build.Default.GOPATH = ""
-		defer func() { build.Default.GOPATH = oldBuildGopath }()
-
-		orgStdout := print.Stdout
-		orgStderr := print.Stderr
-		pr, pw, err := os.Pipe()
-		if err != nil {
-			t.Fatal(err)
-		}
-		print.Stdout = pw
-		print.Stderr = pw
-
-		cmd := &cobra.Command{}
-		cmd.Flags().BoolP("force", "f", false, "Forcibly remove the file")
-		if got := remove(cmd, []string{"dummy"}); got != 1 {
-			t.Errorf("remove() = %v, want %v", got, 1)
-		}
-		pw.Close()
-		print.Stdout = orgStdout
-		print.Stderr = orgStderr
-
-		buf := bytes.Buffer{}
-		_, err = io.Copy(&buf, pr)
-		if err != nil {
-			t.Error(err)
-		}
-		defer pr.Close()
-		got := strings.Split(buf.String(), "\n")
-
-		if diff := cmp.Diff([]string{"gup:ERROR: $GOPATH is not set", ""}, got); diff != "" {
-			t.Errorf("value is mismatch (-want +got):\n%s", diff)
-		}
-	})
-}
-
 func Test_removeLoop(t *testing.T) {
 	type args struct {
 		gobin  string

diff --git a/internal/goutil/goutil.go b/internal/goutil/goutil.go
@@ -244,6 +244,10 @@ func goPath() string {
 	if gopath != "" {
 		return gopath
 	}
+	out, err := exec.Command(goExe, "env", keyGoPath).Output()
+	if err == nil {
+		return strings.TrimSpace(string(out))
+	}
 	return build.Default.GOPATH
 }
 

diff --git a/internal/goutil/goutil_test.go b/internal/goutil/goutil_test.go
@@ -3,7 +3,6 @@ package goutil
 import (
 	"bytes"
 	"errors"
-	"go/build"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -135,13 +134,13 @@ func TestGetPackageVersion_getting_error_from_gobin(t *testing.T) {
 	t.Setenv("GOPATH", "")
 
 	// Backup and defer restore
-	oldBuildDefaultGOPATH := build.Default.GOPATH
+	oldKeyGoPath := keyGoPath
 	defer func() {
-		build.Default.GOPATH = oldBuildDefaultGOPATH
+		keyGoPath = oldKeyGoPath
 	}()
 
 	// Mock the value
-	build.Default.GOPATH = ""
+	keyGoPath = t.Name()
 
 	// Setting GOBIN, GOPATH and build.Default.GOPATH to empty string
 	// should be an error internally and return "unknown" as a version.
@@ -179,13 +178,13 @@ func TestGoBin_gobin_and_gopath_is_empty(t *testing.T) {
 	t.Setenv("GOPATH", "")
 
 	// Backup and defer restore
-	oldBuildDefaultGOPATH := build.Default.GOPATH
+	oldKeyGoPath := keyGoPath
 	defer func() {
-		build.Default.GOPATH = oldBuildDefaultGOPATH
+		keyGoPath = oldKeyGoPath
 	}()
 
 	// Mock the value
-	build.Default.GOPATH = ""
+	keyGoPath = t.Name()
 
 	wantContain := "$GOPATH is not set"
 	result, got := GoBin()
@@ -224,25 +223,6 @@ func TestGoBin_golden(t *testing.T) {
 	}
 }
 
-func Test_goPath_get_from_build_default_gopath(t *testing.T) {
-	// Backup and defer restore
-	oldKeyGoPath := keyGoPath
-	defer func() {
-		keyGoPath = oldKeyGoPath
-	}()
-
-	// Mock the private global variable.
-	// os.Getenv() in the goPath() shuld return empty since it doesn't exist.
-	keyGoPath = t.Name()
-
-	// Assert to be equal
-	want := build.Default.GOPATH
-	got := goPath()
-	if want != got {
-		t.Errorf("goPath() should return default GOPATH. got: %v, want: %v", got, want)
-	}
-}
-
 func TestInstall_arg_is_command_line_arguments(t *testing.T) {
 	err := InstallLatest("command-line-arguments")