style: better update notifier display

Author: everdrone

cmd/version.go

@@ -20,8 +20,8 @@ var VersionCmd = &cobra.Command{
 
 		newVersion, _ := update.CheckForUpdates()
 		if newVersion != "" {
-			cmd.Printf("\nNew version available: %s\n", newVersion)
-			cmd.Printf("Download it at https://github.com/everdrone/grab/releases/latest\n")
+			cmd.Printf("\nNew version available %s → %s\n", config.Version, newVersion)
+			cmd.Printf("https://github.com/everdrone/grab/releases/latest\n")
 		}
 	},
 }

cmd/version_test.go

@@ -33,8 +33,8 @@ func TestVersionCmd(t *testing.T) {
 				w.Write([]byte(`{"tag_name": "v987.654.321"}`))
 			},
 			want: "grab v" + config.Version + " " + config.BuildOS + "/" + config.BuildArch + " (" + config.CommitHash[:7] + ")\n\n" +
-				"New version available: v987.654.321\n" +
-				"Download it at https://github.com/everdrone/grab/releases/latest\n",
+				"New version available " + config.Version + " → 987.654.321\n" +
+				"https://github.com/everdrone/grab/releases/latest\n",
 		},
 	}
 

internal/update/check.go

@@ -32,17 +32,19 @@ func CheckForUpdates() (string, error) {
 		return "", fmt.Errorf("no tag name")
 	}
 
-	if version, ok := tagName.(string); ok {
-		if version[0] != 'v' {
-			version = "v" + version
+	if latest, ok := tagName.(string); ok {
+		if latest[0] != 'v' {
+			latest = "v" + latest
 		}
 
-		if !semver.IsValid(version) {
-			return "", fmt.Errorf("invalid version: %s", version)
+		if !semver.IsValid(latest) {
+			return "", fmt.Errorf("invalid version: %s", latest)
 		}
 
-		if semver.Compare(version, "v"+config.Version) == 1 {
-			return version, nil
+		current := "v" + config.Version
+
+		if semver.Compare(latest, current) == 1 {
+			return latest[1:], nil
 		}
 	} else {
 		return "", fmt.Errorf("invalid tag name")

internal/update/check_test.go

@@ -79,7 +79,7 @@ func TestCheckForUpdates(t *testing.T) {
 			handler: func(w http.ResponseWriter, r *http.Request) {
 				w.Write([]byte(`{"tag_name": "v987.654.321"}`))
 			},
-			want:    "v987.654.321",
+			want:    "987.654.321",
 			wantErr: false,
 		},
 	}