Fix version (#90)

Author: mbilski

cmd/oauth2.go

@@ -27,7 +27,7 @@ type OAuth2Cmd struct {
 	*cobra.Command
 }
 
-func NewOAuth2Cmd() (cmd *OAuth2Cmd) {
+func NewOAuth2Cmd(version, commit, date string) (cmd *OAuth2Cmd) {
 	var cconfig oauth2.ClientConfig
 
 	cmd = &OAuth2Cmd{
@@ -40,7 +40,7 @@ func NewOAuth2Cmd() (cmd *OAuth2Cmd) {
 
 	cmd.Command.Run = cmd.Run(&cconfig)
 
-	cmd.AddCommand(versionCmd)
+	cmd.AddCommand(NewVersionCmd(version, commit, date))
 	cmd.AddCommand(docsCmd)
 
 	cmd.PersistentFlags().StringVar(&cconfig.RedirectURL, "redirect-url", "http://localhost:9876/callback", "client redirect url")

cmd/oauth2_test.go

@@ -42,7 +42,7 @@ func (tc *CommandTestCase) Test() func(*testing.T) {
 			}
 		}
 
-		cmd := NewOAuth2Cmd()
+		cmd := NewOAuth2Cmd("master", "none", "unknown")
 		cmd.SetArgs(tc.args)
 		err := cmd.Execute()
 
@@ -62,7 +62,7 @@ func (tc *CommandTestCase) GetDeps(t *testing.T) map[string]string {
 		output := bytes.Buffer{}
 		result := map[string]interface{}{}
 
-		cmd := NewOAuth2Cmd()
+		cmd := NewOAuth2Cmd("master", "none", "unknown")
 		cmd.SetArgs(dep.args)
 		cmd.SetOut(&output)
 		err := cmd.Execute()

cmd/version.go

@@ -1,20 +1,15 @@
 package cmd
 
 import (
-	"fmt"
-	"runtime/debug"
-
 	"github.com/spf13/cobra"
 )
 
-var versionCmd = &cobra.Command{
-	Use:   "version",
-	Short: "Display version",
-	Run: func(cmd *cobra.Command, args []string) {
-		if info, ok := debug.ReadBuildInfo(); ok && info.Main.Sum != "" {
-			fmt.Println(info)
-		} else {
-			fmt.Println("unknown")
-		}
-	},
+func NewVersionCmd(version, commit, date string) *cobra.Command {
+	return &cobra.Command{
+		Use:   "version",
+		Short: "Display version",
+		Run: func(cmd *cobra.Command, args []string) {
+			cmd.Printf("oauth2c version %s (commit %s, built at %s)\n", version, commit, date)
+		},
+	}
 }

main.go

@@ -10,6 +10,12 @@ import (
 	"github.com/pterm/pterm"
 )
 
+var (
+	version = "master"
+	commit  = "none"
+	date    = "unknown"
+)
+
 func init() {
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, syscall.SIGINT, syscall.SIGTERM)
@@ -22,7 +28,7 @@ func init() {
 }
 
 func main() {
-	if err := cmd.NewOAuth2Cmd().Execute(); err != nil {
+	if err := cmd.NewOAuth2Cmd(version, commit, date).Execute(); err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}