Merge pull request #18 from meltwater/addVersion

Added command: version
meltwater · Mar 14, 2017 · ca56ce1 · ca56ce1
2 parents e7e9196 + 8168257
commit ca56ce1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
 export GO15VENDOREXPERIMENT=1
+VERSION := $(shell git describe --tags)
 
 all: tools deps fmt build test lint
 
@@ -15,7 +16,8 @@ fmt:
 	go fmt ./...
 
 build:
-	 CGO_ENABLED=0 go build -o "secretary-`uname -s`-`uname -m`"
+	 CGO_ENABLED=0 go build -o "secretary-`uname -s`-`uname -m`" \
+	 -ldflags "-X main.version=${VERSION}"
 	 ln -sf "secretary-`uname -s`-`uname -m`" secretary
 
 test:

diff --git a/main.go b/main.go
@@ -8,9 +8,24 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var version = "undefined"
+
 func main() {
 	rootCmd := &cobra.Command{Use: "secretary"}
 
+	// Version command
+	{
+		cmdVersion := &cobra.Command{
+			Use:   "version",
+			Short: "prints the version of secretary",
+			Run: func(cmd *cobra.Command, args []string) {
+				fmt.Println(version)
+			},
+		}
+
+		rootCmd.AddCommand(cmdVersion)
+	}
+
 	// Key generation command
 	{
 		var keyPath string