chore(cmd): Clean up version logic and prefix with * if tree is dirty

.goreleaser.yaml

@@ -13,10 +13,7 @@ builds:
     ldflags:
       - -s
       - -w
-      - -X main.version=v{{.Version}}
-      - -X main.commit={{.ShortCommit}}
-      - -X main.date={{.CommitDate}}
-      - -X main.builtBy=goreleaser
+      - -X main.version={{.Version}}
     goarch:
       - amd64
       - arm

cmd/cmd.go

@@ -15,15 +15,14 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func New(version, commit string) *cobra.Command {
+func New(opts ...Option) *cobra.Command {
 	tmplSubcommand := NewProfiles(FormatText)
 
 	cmd := &cobra.Command{
 		Use:   "pwgen",
 		Short: "Generate passphrases",
 		Long: `Generate passphrases using the EFF Diceware Wordlists.
 See https://www.eff.org/dice for details on the available wordlists.`,
-		Version: buildVersion(version, commit),
 		PreRunE: preRun,
 		RunE:    run,
 
@@ -101,14 +100,11 @@ See https://www.eff.org/dice for details on the available wordlists.`,
 		panic(err)
 	}
 
-	return cmd
-}
-
-func buildVersion(version, commit string) string {
-	if commit != "" {
-		version += " (" + commit + ")"
+	for _, opt := range opts {
+		opt(cmd)
 	}
-	return version
+
+	return cmd
 }
 
 func preRun(cmd *cobra.Command, _ []string) error {

cmd/opt.go

@@ -0,0 +1,11 @@
+package cmd
+
+import "github.com/spf13/cobra"
+
+type Option func(cmd *cobra.Command)
+
+func WithVersion(version string) Option {
+	return func(cmd *cobra.Command) {
+		cmd.Version = buildVersion(version)
+	}
+}

cmd/version.go

@@ -0,0 +1,31 @@
+package cmd
+
+import "runtime/debug"
+
+func buildVersion(version string) string {
+	var commit string
+	var modified bool
+	if info, ok := debug.ReadBuildInfo(); ok {
+		for _, setting := range info.Settings {
+			switch setting.Key {
+			case "vcs.revision":
+				commit = setting.Value
+			case "vcs.modified":
+				if setting.Value == "true" {
+					modified = true
+				}
+			}
+		}
+	}
+
+	if commit != "" {
+		if len(commit) > 8 {
+			commit = commit[:8]
+		}
+		if modified {
+			commit = "*" + commit
+		}
+		version += " (" + commit + ")"
+	}
+	return version
+}

internal/generate/completions/main.go

@@ -34,7 +34,7 @@ func main() {
 		panic(err)
 	}
 
-	rootCmd := cmd.New("", "")
+	rootCmd := cmd.New()
 	name := rootCmd.Name()
 	var buf bytes.Buffer
 	rootCmd.SetOut(&buf)

internal/generate/docs/main.go

@@ -18,7 +18,7 @@ func main() {
 	}
 
 	var buf bytes.Buffer
-	root := cmd.New("", "")
+	root := cmd.New()
 	tmpl := cmd.NewProfiles(cmd.FormatMarkdown)
 	if err := doc.GenMarkdown(root, &buf); err != nil {
 		panic(err)

internal/generate/manpages/main.go

@@ -35,7 +35,7 @@ func main() {
 		panic(err)
 	}
 
-	rootCmd := cmd.New("", "")
+	rootCmd := cmd.New()
 	rootName := rootCmd.Name()
 
 	date, err := time.Parse(time.RFC3339, dateParam)

main.go

@@ -7,14 +7,10 @@ import (
 	"github.com/gabe565/pwgen-go/cmd"
 )
 
-//nolint:gochecknoglobals
-var (
-	version = "beta"
-	commit  = ""
-)
+var version = "beta"
 
 func main() {
-	rootCmd := cmd.New(version, commit)
+	rootCmd := cmd.New(cmd.WithVersion(version))
 	if err := rootCmd.Execute(); err != nil {
 		os.Exit(1)
 	}