Merge pull request #55 from LinuxSuRen/version

Add support to print version of app

Author: Zhao Xiaojie

Makefile

@@ -2,7 +2,9 @@ NAME := jcli
 CGO_ENABLED = 0
 GO := go
 BUILD_TARGET = build
-BUILDFLAGS = 
+COMMIT := $(shell git rev-parse --short HEAD)
+VERSION := dev-$(shell git describe --tags $(shell git rev-list --tags --max-count=1))
+BUILDFLAGS = -ldflags "-X github.com/linuxsuren/jenkins-cli/app.version=$(VERSION) -X github.com/linuxsuren/jenkins-cli/app.commit=$(COMMIT)"
 COVERED_MAIN_SRC_FILE=./main
 
 darwin: ## Build for OSX

app/cmd/root.go

@@ -30,9 +30,8 @@ var rootCmd = &cobra.Command{
 		}
 
 		if rootOptions.Version {
-			fmt.Printf("Version: v%.2f.%d%s", app.CurrentVersion.Number,
-				app.CurrentVersion.PatchLevel,
-				app.CurrentVersion.Suffix)
+			fmt.Printf("Version: %s\n", app.GetVersion())
+			fmt.Printf("Commit: %s\n", app.GetCommit())
 		}
 	},
 }

app/version.go

@@ -1,14 +1,14 @@
 package app
 
-// Version represents the Jenkins CLI build version.
-type Version struct {
-	// Major and minor version.
-	Number float32
+var (
+	version string
+	commit  string
+)
 
-	// Increment this for bug releases
-	PatchLevel int
+func GetVersion() string {
+	return version
+}
 
-	// JCLI Suffix is the suffix used in the Jenkins CLI version string.
-	// It will be blank for release versions.
-	Suffix string
+func GetCommit() string {
+	return commit
 }

app/version_current.go

@@ -15,7 +15,7 @@ echo "Updating $VERSION to $NEW_TAG"
 # NEEDS_TAG=`git describe --contains $GIT_COMMIT`
 
 if [[ -z "${NEEDS_TAG}" ]]; then
-    make release
+    make release VERSION=${NEW_TAG}
     hub release create -c -a release/jcli-darwin-amd64.tar.gz \
 -a release/jcli-linux-amd64.tar.gz \
 -a release/jcli-windows-386.tar.gz ${NEW_TAG}