feat: improve gb.CurrentVersion()

kevincobain2000 · Dec 6, 2023 · f8d305e · f8d305e
1 parent 3ef853a
commit f8d305e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/gobrew.go b/gobrew.go
@@ -11,6 +11,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"runtime"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -431,9 +432,14 @@ func (gb *GoBrew) CurrentVersion() string {
 		return ""
 	}
 
-	version := strings.ReplaceAll(fp, strings.Join([]string{"go", "bin"}, string(os.PathSeparator)), "")
-	version = strings.ReplaceAll(version, gb.versionsDir, "")
-	version = strings.ReplaceAll(version, string(os.PathSeparator), "")
+	version := strings.TrimSuffix(fp, strings.Join([]string{"go", "bin"}, string(os.PathSeparator)))
+	paths := strings.Split(version, string(os.PathSeparator))
+	slices.Reverse(paths)
+	for _, version = range paths {
+		if version != "" {
+			break
+		}
+	}
 	return version
 }
 

diff --git a/gobrew_test.go b/gobrew_test.go
@@ -63,7 +63,7 @@ func TestNewGobrewHomeDirUsesGoBrewRoot(t *testing.T) {
 }
 
 func TestJudgeVersion(t *testing.T) {
-	t.Parallel()
+	//t.Parallel()
 	tests := []struct {
 		version     string
 		wantVersion string
@@ -107,7 +107,7 @@ func TestJudgeVersion(t *testing.T) {
 	for _, test := range tests {
 		test := test
 		t.Run(test.version, func(t *testing.T) {
-			t.Parallel()
+			//t.Parallel()
 			gb := NewGoBrew()
 			version := gb.judgeVersion(test.version)
 			assert.Equal(t, test.wantVersion, version)
@@ -180,7 +180,7 @@ func TestUpgrade(t *testing.T) {
 }
 
 func TestDoNotUpgradeLatestVersion(t *testing.T) {
-	t.Parallel()
+	//t.Parallel()
 	t.Skip("skipping test...needs to rewrite")
 	tempDir := t.TempDir()
 
@@ -239,3 +239,25 @@ func TestInteractive(t *testing.T) {
 	currentVersion = strings.Replace(currentVersion, "private", "", -1)
 	assert.Equal(t, currentVersion, latestVersion)
 }
+
+func TestPrune(t *testing.T) {
+	t.Parallel()
+	tempDir := t.TempDir()
+	gb := NewGoBrewDirectory(tempDir)
+	gb.Install("1.20")
+	gb.Install("1.19")
+	gb.Use("1.19")
+	gb.Prune()
+	assert.Equal(t, false, gb.existsVersion("1.20"))
+	assert.Equal(t, true, gb.existsVersion("1.19"))
+}
+
+func TestGoBrew_CurrentVersion(t *testing.T) {
+	t.Parallel()
+	tempDir := t.TempDir()
+	gb := NewGoBrewDirectory(tempDir)
+	assert.Equal(t, true, gb.CurrentVersion() == "")
+	gb.Install("1.19")
+	gb.Use("1.19")
+	assert.Equal(t, true, gb.CurrentVersion() == "1.19")
+}