Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,19 @@ func newRootCmd() *cobra.Command {
},
}

var rootCmd = &cobra.Command{Use: "scharf", Long: asciiLogo, Version: cliVersion()}
rootCmd.SetVersionTemplate("{{.Version}}\n")
var rootCmd = &cobra.Command{
Use: "scharf",
Long: asciiLogo,
Run: func(cmd *cobra.Command, args []string) {
showVersion, _ := cmd.Flags().GetBool("version")
if showVersion {
fmt.Fprintln(cmd.OutOrStdout(), cliVersion())
return
}
_ = cmd.Help()
},
}
rootCmd.Flags().BoolP("version", "V", false, "Print Scharf version information")
rootCmd.AddCommand(cmdLookup, cmdFind, cmdList, cmdAudit, cmdAutoFix, cmdUpgrade, cmdUpgradeAllSHA, cmdVersion)

return rootCmd
Expand Down
13 changes: 12 additions & 1 deletion main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ func TestUpgradeSHAWithoutFromVersionShowsUsage(t *testing.T) {
}

func TestVersionInfoExposedOnCLI(t *testing.T) {
for _, args := range [][]string{{"--version"}, {"version"}} {
var expected string
for _, args := range [][]string{{"--version"}, {"version"}, {"-V"}} {
stdout, stderr, err := executeRoot(args...)
if err != nil {
t.Fatalf("unexpected error for %v: %v (stderr: %s)", args, err, stderr)
Expand All @@ -49,5 +50,15 @@ func TestVersionInfoExposedOnCLI(t *testing.T) {
if !strings.Contains(stdout, "commit") || !strings.Contains(stdout, "built") {
t.Fatalf("stdout = %q; want version details including commit and build metadata", stdout)
}
if !strings.HasPrefix(stdout, "version: ") {
t.Fatalf("stdout = %q; want direct version output without Cobra prefix", stdout)
}
if expected == "" {
expected = stdout
continue
}
if stdout != expected {
t.Fatalf("stdout for %v = %q; want %q", args, stdout, expected)
}
}
}
Loading