Merge pull request #33 from nao1215/fix-version-control

Changed to get version information from ldflags

Author: nao1215

.goreleaser.yml

@@ -8,7 +8,7 @@ before:
 builds:
   - main: .
     ldflags:
-      - -s -w
+      - -s -w '-X github.com/nao1215/gup/internal/cmdinfo.Version=v{{ .Version }}'
     env:
       - CGO_ENABLED=0
     goos:

Makefile

@@ -1,6 +1,7 @@
 .PHONY: build test clean vet fmt chkfmt
 
 APP         = gup
+VERSION     = $(shell git describe --tags --abbrev=0)
 GO          = go
 GO_BUILD    = $(GO) build
 GO_FORMAT   = $(GO) fmt
@@ -14,6 +15,7 @@ GOOS        = linux
 GOARCH      = amd64
 GO_PKGROOT  = ./...
 GO_PACKAGES = $(shell $(GO_LIST) $(GO_PKGROOT))
+GO_LDFLAGS  = -ldflags '-X github.com/nao1215/gup/internal/cmdinfo.Version=${VERSION}'
 
 build:  ## Build binary
 	env GO111MODULE=on GOOS=$(GOOS) GOARCH=$(GOARCH) $(GO_BUILD) $(GO_LDFLAGS) -o $(APP) main.go

cmd/version.go

@@ -9,9 +9,9 @@ import (
 
 var versionCmd = &cobra.Command{
 	Use:   "version",
-	Short: "Show " + cmdinfo.Name() + " command version information",
+	Short: "Show " + cmdinfo.Name + " command version information",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println(cmdinfo.Version())
+		fmt.Println(cmdinfo.GetVersion())
 	},
 }
 

internal/cmdinfo/cmdinfo.go

@@ -2,20 +2,23 @@ package cmdinfo
 
 import (
 	"fmt"
+	"runtime/debug"
 )
 
-const (
-	name    = "gup"
-	version = "0.10.3"
-)
+// Version value is set by ldflags
+var Version string
 
-// Version return gup command version.
-func Version() string {
-	return fmt.Sprintf("%s version %s (under Apache License version 2.0)",
-		Name(), version)
-}
+// Name is command name
+const Name = "gup"
 
-// Name return command name.
-func Name() string {
-	return name
+// GetVersion return gup command version.
+// Version global variable is set by ldflags.
+func GetVersion() string {
+	version := "unknown"
+	if Version != "" {
+		version = Version
+	} else if buildInfo, ok := debug.ReadBuildInfo(); ok {
+		version = buildInfo.Main.Version
+	}
+	return fmt.Sprintf("%s version %s (under Apache License version 2.0)", Name, version)
 }

internal/completion/completion.go

@@ -246,12 +246,12 @@ func bashCompletionFilePath() string {
 
 // fishCompletionFilePath return fish-completion file path.
 func fishCompletionFilePath() string {
-	return filepath.Join(os.Getenv("HOME"), ".config", "fish", "completions", cmdinfo.Name()+".fish")
+	return filepath.Join(os.Getenv("HOME"), ".config", "fish", "completions", cmdinfo.Name+".fish")
 }
 
 // zshCompletionFilePath return zsh-completion file path.
 func zshCompletionFilePath() string {
-	return filepath.Join(os.Getenv("HOME"), ".zsh", "completion", "_"+cmdinfo.Name())
+	return filepath.Join(os.Getenv("HOME"), ".zsh", "completion", "_"+cmdinfo.Name)
 }
 
 // zshrcPath return .zshrc path.

internal/config/config.go

@@ -26,9 +26,9 @@ func DirPath() string {
 		// current directory. The .config directory path is displayed
 		// when reporting the completion of the export subcommand.
 		// So, user notices that the output destination is strange.
-		return filepath.Join(os.Getenv("HOME"), ".config", cmdinfo.Name())
+		return filepath.Join(os.Getenv("HOME"), ".config", cmdinfo.Name)
 	}
-	return filepath.Join(home, ".config", cmdinfo.Name())
+	return filepath.Join(home, ".config", cmdinfo.Name)
 }
 
 // ReadConfFile return contents of configuration-file (package information)

internal/print/print.go

@@ -20,25 +20,25 @@ var (
 // Info print information message at STDOUT.
 func Info(msg string) {
 	fmt.Fprintf(Stdout, "%s:%s: %s\n",
-		cmdinfo.Name(), color.GreenString("INFO "), msg)
+		cmdinfo.Name, color.GreenString("INFO "), msg)
 }
 
 // Warn print warning message at STDERR.
 func Warn(err interface{}) {
 	fmt.Fprintf(Stderr, "%s:%s: %v\n",
-		cmdinfo.Name(), color.YellowString("WARN "), err)
+		cmdinfo.Name, color.YellowString("WARN "), err)
 }
 
 // Err print error message at STDERR.
 func Err(err interface{}) {
 	fmt.Fprintf(Stderr, "%s:%s: %v\n",
-		cmdinfo.Name(), color.HiYellowString("ERROR"), err)
+		cmdinfo.Name, color.HiYellowString("ERROR"), err)
 }
 
 // Fatal print dying message at STDERR.
 func Fatal(err interface{}) {
 	fmt.Fprintf(Stderr, "%s:%s: %v\n",
-		cmdinfo.Name(), color.RedString("FATAL"), err)
+		cmdinfo.Name, color.RedString("FATAL"), err)
 	os.Exit(1)
 }
 
@@ -47,7 +47,7 @@ func Question(ask string) bool {
 	var response string
 
 	fmt.Fprintf(Stdout, "%s:%s: %s",
-		cmdinfo.Name(), color.GreenString("CHECK"), ask+" [Y/n] ")
+		cmdinfo.Name, color.GreenString("CHECK"), ask+" [Y/n] ")
 	_, err := fmt.Scanln(&response)
 	if err != nil {
 		// If user input only enter.