Merge pull request #164 from scop/fix/current-uptodate-version

Output current rather than latest version in up-to-date messages

Author: nao1215

internal/goutil/goutil.go

@@ -78,7 +78,7 @@ func (p *Package) SetLatestVer() {
 // CurrentToLatestStr returns string about the current version and the latest version
 func (p *Package) CurrentToLatestStr() string {
 	if p.IsAlreadyUpToDate() {
-		return "Already up-to-date: " + color.GreenString(p.Version.Latest) + " / " + color.GreenString(p.GoVersion.Current)
+		return "Already up-to-date: " + color.GreenString(p.Version.Current) + " / " + color.GreenString(p.GoVersion.Current)
 	}
 	var ret string
 	if p.Version.Current != p.Version.Latest {
@@ -96,7 +96,7 @@ func (p *Package) CurrentToLatestStr() string {
 // VersionCheckResultStr returns string about command version check.
 func (p *Package) VersionCheckResultStr() string {
 	if p.IsAlreadyUpToDate() {
-		return "Already up-to-date: " + color.GreenString(p.Version.Latest) + " / " + color.GreenString(p.GoVersion.Current)
+		return "Already up-to-date: " + color.GreenString(p.Version.Current) + " / " + color.GreenString(p.GoVersion.Current)
 	}
 	var ret string
 	// TODO: yellow only if latest > current

internal/goutil/goutil_test.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"os"
 	"path/filepath"
+	"regexp"
 	"runtime"
 	"strings"
 	"testing"
@@ -673,6 +674,30 @@ func TestGoPaths_StartDryRunMode_fail_if_key_not_set(t *testing.T) {
 //  Type: Package
 // ----------------------------------------------------------------------------
 
+func TestPackage_CurrentToLatestStr_up_to_date(t *testing.T) {
+	pkgInfo := Package{
+		Name:       "foo",
+		ImportPath: "github.com/dummy_name/dummy",
+		ModulePath: "github.com/dummy_name/dummy/foo",
+		Version: &Version{
+			Current: "v1.42.2",
+			Latest:  "v1.9.1",
+		},
+		GoVersion: &Version{
+			Current: "go1.22.4",
+			Latest:  "go1.22.4",
+		},
+	}
+
+	// Assert to contain the expected message
+	wantContain := "up-to-date: v1.42.2"
+	got := pkgInfo.CurrentToLatestStr()
+
+	if !strings.Contains(got, wantContain) {
+		t.Errorf("got: %v, want: %v", got, wantContain)
+	}
+}
+
 func TestPackage_CurrentToLatestStr_not_up_to_date(t *testing.T) {
 	pkgInfo := Package{
 		Name:       "foo",
@@ -697,6 +722,30 @@ func TestPackage_CurrentToLatestStr_not_up_to_date(t *testing.T) {
 	}
 }
 
+func TestPackage_VersionCheckResultStr_up_to_date(t *testing.T) {
+	pkgInfo := Package{
+		Name:       "foo",
+		ImportPath: "github.com/dummy_name/dummy",
+		ModulePath: "github.com/dummy_name/dummy/foo",
+		Version: &Version{
+			Current: "v2.5.0",
+			Latest:  "v1.9.1",
+		},
+		GoVersion: &Version{
+			Current: "go1.22.4",
+			Latest:  "go1.22.4",
+		},
+	}
+
+	// Assert to contain the expected message
+	wantContain := "up-to-date: v2.5.0"
+	got := pkgInfo.VersionCheckResultStr()
+
+	if !strings.Contains(got, wantContain) {
+		t.Errorf("got: %v, want: %v", got, wantContain)
+	}
+}
+
 func TestPackage_VersionCheckResultStr_not_up_to_date(t *testing.T) {
 	pkgInfo := Package{
 		Name:       "foo",
@@ -721,6 +770,30 @@ func TestPackage_VersionCheckResultStr_not_up_to_date(t *testing.T) {
 	}
 }
 
+func TestPackage_VersionCheckResultStr_go_up_to_date(t *testing.T) {
+	pkgInfo := Package{
+		Name:       "foo",
+		ImportPath: "github.com/dummy_name/dummy",
+		ModulePath: "github.com/dummy_name/dummy/foo",
+		Version: &Version{
+			Current: "v1.9.1",
+			Latest:  "v1.9.1",
+		},
+		GoVersion: &Version{
+			Current: "go1.99.9",
+			Latest:  "go1.22.4",
+		},
+	}
+
+	// Assert to contain the expected message
+	wantContain := regexp.MustCompile(`up-to-date:.* go1\.99\.9`)
+	got := pkgInfo.VersionCheckResultStr()
+
+	if !wantContain.MatchString(got) {
+		t.Errorf("got: %v, want: %v", got, wantContain)
+	}
+}
+
 func TestPackage_VersionCheckResultStr_go_not_up_to_date(t *testing.T) {
 	pkgInfo := Package{
 		Name:       "foo",