Added jaas version support

Signed-off-by: dungeonmaster18 <[email protected]>

Author: imumesh18

Dockerfile

@@ -5,11 +5,11 @@ MAINTAINER [email protected]
 RUN mkdir -p /go/src/github.com/alexellis/jaas
 WORKDIR /go/src/github.com/alexellis/jaas
 
-COPY vendor     vendor
-COPY cmd        cmd
-COPY main.go    .
+COPY . .
 
-RUN CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-s -w" -installsuffix cgo -o /root/jaas
+RUN VERSION=$(git describe --all --exact-match `git rev-parse HEAD` | grep tags | sed 's/tags\///') \
+    && GIT_COMMIT=$(git rev-list -1 HEAD) \
+    && CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w -X github.com/alexellis/jaas/version.GitCommit=${GIT_COMMIT} -X github.com/alexellis/jaas/version.Version=${VERSION}" -a -installsuffix cgo -o /root/jaas
 
 FROM alpine:3.6
 WORKDIR /root/

Gopkg.lock

@@ -29,7 +29,7 @@ Run ad-hoc commands`,
 }
 
 func executeRoot(cmd *cobra.Command, args []string) error {
-	fmt.Printf("JaaS!")
+	fmt.Printf(figletStr)
 	cmd.Help()
 
 	return nil

cmd/jaas.go

@@ -0,0 +1,60 @@
+// Copyright (c) Alex Ellis 2017. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+package cmd
+
+import (
+	"fmt"
+	"runtime"
+
+	"github.com/alexellis/jaas/version"
+	"github.com/morikuni/aec"
+	"github.com/spf13/cobra"
+)
+
+// GitCommit injected at build-time
+var (
+	shortVersion bool
+)
+
+func init() {
+	versionCmd.Flags().BoolVar(&shortVersion, "short-version", false, "Just print Git SHA")
+
+	rootCmd.AddCommand(versionCmd)
+}
+
+// versionCmd displays version information
+var versionCmd = &cobra.Command{
+	Use:   "version [--short-version]",
+	Short: "Display the clients version information",
+	Long: fmt.Sprintf(`The version command returns the current clients version information.
+
+This currently consists of the GitSHA from which the client was built.
+- https://github.com/alexellis/jaas/tree/%s`, version.GitCommit),
+	Example: `  jaas version
+  jaas version --short-version`,
+	Run: runVersion,
+}
+
+func runVersion(cmd *cobra.Command, args []string) {
+	if shortVersion {
+		fmt.Println(version.BuildVersion())
+	} else {
+		figletColoured := aec.BlueF.Apply(figletStr)
+		if runtime.GOOS == "windows" {
+			figletColoured = aec.GreenF.Apply(figletStr)
+		}
+		fmt.Printf(figletColoured)
+		fmt.Printf("Commit: %s\n", version.GitCommit)
+		fmt.Printf("Version: %s\n", version.BuildVersion())
+	}
+}
+
+const figletStr = `
+     _             ____  
+    | | __ _  __ _/ ___| 
+ _  | |/ _` + "`" + ` |/ _` + "`" + `  \___ \ 
+| |_| | (_| | (_| |___) |
+ \___/ \__,_|\__,_|____/ 
+ 
+`

cmd/version.go

@@ -0,0 +1,60 @@
+// Copyright (c) Alex Ellis 2017. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+package cmd
+
+import (
+	"regexp"
+	"testing"
+
+	"github.com/alexellis/jaas/test"
+	"github.com/alexellis/jaas/version"
+)
+
+func Test_addVersionDev(t *testing.T) {
+	version.GitCommit = "sha-test"
+
+	stdOut := test.CaptureStdout(func() {
+		rootCmd.SetArgs([]string{"version"})
+		rootCmd.Execute()
+	})
+
+	if found, err := regexp.MatchString(`(?m:Commit: sha-test)`, stdOut); err != nil || !found {
+		t.Fatalf("Output is not as expected:\n%s", stdOut)
+	}
+
+	if found, err := regexp.MatchString(`(?m:Version: dev)`, stdOut); err != nil || !found {
+		t.Fatalf("Output is not as expected:\n%s", stdOut)
+	}
+}
+
+func Test_addVersion(t *testing.T) {
+	version.GitCommit = "sha-test"
+	version.Version = "version.tag"
+
+	stdOut := test.CaptureStdout(func() {
+		rootCmd.SetArgs([]string{"version"})
+		rootCmd.Execute()
+	})
+
+	if found, err := regexp.MatchString(`(?m:Commit: sha-test)`, stdOut); err != nil || !found {
+		t.Fatalf("Output is not as expected:\n%s", stdOut)
+	}
+
+	if found, err := regexp.MatchString(`(?m:Version: version.tag)`, stdOut); err != nil || !found {
+		t.Fatalf("Output is not as expected:\n%s", stdOut)
+	}
+}
+
+func Test_addVersion_short_version(t *testing.T) {
+	version.Version = "version.tag"
+
+	stdOut := test.CaptureStdout(func() {
+		rootCmd.SetArgs([]string{"version", "--short-version"})
+		rootCmd.Execute()
+	})
+
+	if found, err := regexp.MatchString("^version\\.tag", stdOut); err != nil || !found {
+		t.Fatalf("Output is not as expected:\n%s", stdOut)
+	}
+}

cmd/version_test.go

@@ -0,0 +1,24 @@
+package test
+
+import (
+	"bytes"
+	"io"
+	"os"
+)
+
+func CaptureStdout(f func()) string {
+	stdOut := os.Stdout
+	r, w, _ := os.Pipe()
+	defer r.Close()
+	os.Stdout = w
+
+	f()
+
+	w.Close()
+	os.Stdout = stdOut
+
+	var b bytes.Buffer
+	io.Copy(&b, r)
+
+	return b.String()
+}