Skip to content

The cross-harness, self-improving memory layer for AI agents. Join our community: https://discord.com/invite/zdNChS2fBu

Make version check a flag

Cursor Agent5f56f8ddef45
diff --git a/cli/beacon/cmd/version.go b/cli/beacon/cmd/version.go
index c7c1837a..8399b27a 100644
--- a/cli/beacon/cmd/version.go
+++ b/cli/beacon/cmd/version.go
@@ -9,14 +9,23 @@ import (
)
var versionCmd = &cobra.Command{
- Use: "version",
- Short: "Display the version of the Beacon CLI",
- Long: `Display the version number, git commit, and build date of the Beacon CLI.`,
- Run: func(cmd *cobra.Command, args []string) {
- fmt.Println("beacon version", version.GetFullVersion())
- },
+ Use: "version",
+ Short: "Display the version of the Beacon CLI",
+ Long: `Display the version number, git commit, and build date of the Beacon CLI.`,
+ Args: cobra.NoArgs,
+ SilenceUsage: true,
+ RunE: runVersion,
+}
+
+func runVersion(cmd *cobra.Command, args []string) error {
+ fmt.Fprintln(cmd.OutOrStdout(), "beacon version", version.GetFullVersion())
+ if versionCheck {
+ return runVersionCheck(cmd, args)
+ }
+ return nil
}
func init() {
+ versionCmd.Flags().BoolVar(&versionCheck, "check", false, "Check whether a newer Beacon CLI release is available")
rootCmd.AddCommand(versionCmd)
}
diff --git a/cli/beacon/cmd/version_check.go b/cli/beacon/cmd/version_check.go
index 064fd842..ade9d215 100644
--- a/cli/beacon/cmd/version_check.go
+++ b/cli/beacon/cmd/version_check.go
@@ -16,19 +16,14 @@ type versionChecker interface {
}
var (
+ versionCheck = false
+
newVersionChecker = func(currentVersion string) versionChecker {
return updatecheck.DefaultChecker(currentVersion)
}
versionCheckTimeout = 2 * time.Second
)
-var versionCheckCmd = &cobra.Command{
- Use: "check",
- Short: "Check whether a newer Beacon CLI release is available",
- SilenceUsage: true,
- RunE: runVersionCheck,
-}
-
func runVersionCheck(cmd *cobra.Command, args []string) error {
parent := cmd.Context()
if parent == nil {
@@ -53,7 +48,7 @@ func runVersionCheck(cmd *cobra.Command, args []string) error {
}
if result.UpdateAvailable {
fmt.Fprintf(out, "Beacon %s is available. Current version: %s\n", result.LatestVersion, result.CurrentVersion)
- fmt.Fprintln(out, "Upgrade with Homebrew: brew upgrade beacon")
+ fmt.Fprintln(out, "If installed with Homebrew: brew upgrade beacon")
if result.ReleaseURL != "" {
fmt.Fprintf(out, "Download: %s\n", result.ReleaseURL)
}
@@ -62,7 +57,3 @@ func runVersionCheck(cmd *cobra.Command, args []string) error {
fmt.Fprintf(out, "Beacon %s is up to date.\n", result.CurrentVersion)
return nil
}
-
-func init() {
- versionCmd.AddCommand(versionCheckCmd)
-}
diff --git a/cli/beacon/cmd/version_check_test.go b/cli/beacon/cmd/version_check_test.go
index 0f761aa3..078037f8 100644
--- a/cli/beacon/cmd/version_check_test.go
+++ b/cli/beacon/cmd/version_check_test.go
@@ -25,13 +25,66 @@ func (c stubVersionChecker) Check(context.Context) (updatecheck.Result, error) {
return c.result, nil
}
-func TestVersionCheckCommandRegistered(t *testing.T) {
- cmd, _, err := rootCmd.Find([]string{"version", "check"})
+func TestVersionCheckFlagRegistered(t *testing.T) {
+ cmd, _, err := rootCmd.Find([]string{"version"})
if err != nil {
- t.Fatalf("Find version check returned error: %v", err)
+ t.Fatalf("Find version returned error: %v", err)
}
- if cmd == nil || cmd.Use != "check" {
- t.Fatalf("version check command not registered: %#v", cmd)
+ if cmd == nil {
+ t.Fatal("version command not registered")
+ }
+ if cmd.Flags().Lookup("check") == nil {
+ t.Fatal("version command missing --check flag")
+ }
+}
+
+func TestRunVersionWithoutCheckPrintsVersionOnly(t *testing.T) {
+ restoreVersion := setVersionForTest(t, "v0.0.10")
+ defer restoreVersion()
+ restoreFlag := setVersionCheckForTest(t, false)
+ defer restoreFlag()
+ restoreChecker := setVersionCheckerForTest(t, stubVersionChecker{err: errors.New("should not run")})
+ defer restoreChecker()
+
+ cmd := &cobra.Command{}
+ var out bytes.Buffer
+ cmd.SetOut(&out)
+ if err := runVersion(cmd, nil); err != nil {
+ t.Fatalf("runVersion returned error: %v", err)
+ }
+ got := out.String()
+ if !strings.Contains(got, "beacon version v0.0.10") {
+ t.Fatalf("output = %q, want version", got)
+ }
+ if strings.Contains(got, "unable to check") {
+ t.Fatalf("output = %q, update check unexpectedly ran", got)
+ }
+}
+
+func TestRunVersionWithCheckPrintsVersionAndUpdateResult(t *testing.T) {
+ restoreVersion := setVersionForTest(t, "v0.0.10")
+ defer restoreVersion()
+ restoreFlag := setVersionCheckForTest(t, true)
+ defer restoreFlag()
+ restoreChecker := setVersionCheckerForTest(t, stubVersionChecker{
+ result: updatecheck.Result{CurrentVersion: "v0.0.10", LatestVersion: "v0.0.10"},
+ })
+ defer restoreChecker()
+
+ cmd := &cobra.Command{}
+ var out bytes.Buffer
+ cmd.SetOut(&out)
+ if err := runVersion(cmd, nil); err != nil {
+ t.Fatalf("runVersion returned error: %v", err)
+ }
+ got := out.String()
+ for _, want := range []string{
+ "beacon version v0.0.10",
+ "Beacon v0.0.10 is up to date.",
+ } {
+ if !strings.Contains(got, want) {
+ t.Fatalf("output = %q, want %q", got, want)
+ }
}
}
@@ -55,7 +108,7 @@ func TestRunVersionCheckReportsAvailableUpdate(t *testing.T) {
})
for _, want := range []string{
"Beacon v0.0.12 is available. Current version: v0.0.10",
- "Upgrade with Homebrew: brew upgrade beacon",
+ "If installed with Homebrew: brew upgrade beacon",
"Download: https://example.test/releases/v0.0.12",
} {
if !strings.Contains(got, want) {
@@ -131,3 +184,10 @@ func setVersionCheckerForTest(t *testing.T, checker versionChecker) func() {
}
return func() { newVersionChecker = old }
}
+
+func setVersionCheckForTest(t *testing.T, enabled bool) func() {
+ t.Helper()
+ old := versionCheck
+ versionCheck = enabled
+ return func() { versionCheck = old }
+}