Merge pull request #10 from hidapple/version-print-commit-no

update: print git commit number by version option

Makefile

@@ -1,6 +1,6 @@
 COMMIT = $$(git describe --always)
 
-BUILD_FLAGS = -ldflags "-X main.Commit=\"$(COMMIT)\""
+BUILD_FLAGS = -ldflags "-X main.Commit=$(COMMIT)"
 
 test:
 	@echo "===> Running tests..."
@@ -13,7 +13,11 @@ build:
 cross-build:
 	@echo "===> Building for cross platform..."
 	@rm -rf ./dist
-	@gox -os="linux darwin windows" -arch="386 amd64" -output "dist/isbn-gen_{{.OS}}_{{.Arch}}"
+	@gox\
+		-os="linux darwin windows"\
+		-arch="386 amd64"\
+		-ldflags="$(COMMIT)"\
+		-output "dist/isbn-gen_{{.OS}}_{{.Arch}}"
 
 install:
 	@echo "===> Installing isbn-gen in $(GOPATH)/bin directory..."

cli.go

@@ -44,7 +44,7 @@ func (cli *CLI) Run(args []string) int {
 
 	// Show version
 	if version {
-		fmt.Fprintf(cli.errStream, "%s version %s\n", Name, Version)
+		fmt.Fprintf(cli.errStream, "%s version %s (%s)\n", Name, Version, Commit)
 		return ExitCodeOK
 	}
 

cli_test.go

@@ -17,7 +17,7 @@ func TestRun_versionFlag(t *testing.T) {
 		t.Fatalf("Expected exit code is %d but was %d", ExitCodeOK, status)
 	}
 
-	expected := fmt.Sprintf("isbn-gen version %s", Version)
+	expected := fmt.Sprintf("isbn-gen version %s (%s)", Version, Commit)
 	if !strings.Contains(errStream.String(), expected) {
 		t.Fatalf("Expected output contain %q but was %q", expected, errStream.String())
 	}