build: version/commit/date

Author: nalgeon

Makefile

@@ -1,8 +1,6 @@
-BUILD_TAG := $(shell git describe --tags --exact-match 2> /dev/null || git rev-parse --short HEAD)
-
 .PHONY: build
 build:
-	@go build -ldflags "-X main.version=$(BUILD_TAG)" -o howto
+	@go build -o howto
 
 .PHONY: test
 test:

howto.go

@@ -21,7 +21,8 @@ func howto(out io.Writer, ask ai.AskFunc, args []string, history *History) error
 	case "-h", "--help":
 		printUsage(out)
 	case "-v", "--version":
-		printVersion(out, version, ai.Conf, history)
+		ver := versionString()
+		printVersion(out, ver, ai.Conf, history)
 	case "-run":
 		err = runCommand(out, history)
 	default:
@@ -109,3 +110,13 @@ func execCommand(command string) (string, error) {
 
 	return strings.TrimSpace(outb.String()), nil
 }
+
+func versionString() string {
+	var ver string
+	if version == "dev" {
+		ver = commit
+	} else {
+		ver = version
+	}
+	return ver + " (" + date + ")"
+}

howto_test.go

@@ -37,7 +37,7 @@ func Test_howto(t *testing.T) {
 		if err != nil {
 			t.Fatalf("Unexpected error: %v", err)
 		}
-		if !strings.Contains(out.String(), bold("howto")+" "+version) {
+		if !strings.Contains(out.String(), bold("howto")+" head (now)") {
 			t.Errorf("Expected version string, got %q", out.String())
 		}
 	})

main.go

@@ -9,7 +9,11 @@ import (
 	"github.com/nalgeon/howto/ai"
 )
 
-var version string = "latest"
+var (
+	version = "dev"
+	commit  = "head"
+	date    = "now"
+)
 
 func main() {
 	history, err := LoadHistory()