Merge pull request #25 from avakarev/slightly-improve-version-cmd

Slightly improve and simplify `version` command

.goreleaser.yml

@@ -12,7 +12,7 @@ builds:
     binary: dotfiles
     flags:
       - -trimpath
-    ldflags: "-s -w -X {{.Env.BUILDMETA}}.GitCommit={{.ShortCommit}} -X {{.Env.BUILDMETA}}.BuildDate={{.Date}} -X {{.Env.BUILDMETA}}.Version={{.Version}}"
+    ldflags: "-s -w -X {{.Env.BUILDMETA}}.Commit={{.ShortCommit}} -X {{.Env.BUILDMETA}}.Date={{.Date}} -X {{.Env.BUILDMETA}}.Version={{.Version}}"
     goos:
       - linux
       - darwin

cmd/version.go

@@ -18,9 +18,9 @@ var versionCmd = &cobra.Command{
 		w := tabwriter.NewWriter(log.Writer(), 0, 0, 2, ' ', 0)
 		f := "%s\t%s\t\n"
 
-		fmt.Fprintf(w, f, "GitCommit", buildmeta.GitCommit)
-		fmt.Fprintf(w, f, "BuildDate", buildmeta.BuildDate)
 		fmt.Fprintf(w, f, "Version", buildmeta.Version)
+		fmt.Fprintf(w, f, "Date", buildmeta.Date)
+		fmt.Fprintf(w, f, "Commit", buildmeta.Commit)
 		fmt.Fprintf(w, f, "Compiler", buildmeta.Compiler)
 
 		w.Flush()

internal/buildmeta/buildmeta.go

@@ -4,8 +4,8 @@ import "runtime"
 
 // Build meta information, populated at build-time
 var (
-	GitCommit string
-	BuildDate string
-	Version   string
-	Compiler  = runtime.Version()
+	Version  string
+	Date     string
+	Commit   string
+	Compiler = runtime.Version()
 )