New approach to define the version

2 files changed, 40 insertions, 34 deletions

diff --git a/Makefile b/Makefile
index a58b0f68..b5aca82a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
 all: build
 
+GIT_COMMIT:=$(shell git rev-parse --short HEAD)
+GIT_LAST_TAG:=$(shell git describe --dirty --tags)
+GIT_EXACT_TAG:=$(shell git name-rev --name-only --tags HEAD)
 UNAME_S := $(shell uname -s)
 XARGS:=xargs -r
 ifeq ($(UNAME_S),Darwin)
@@ -7,27 +10,30 @@ ifeq ($(UNAME_S),Darwin)
 endif
 
 COMMANDS_PATH:=github.com/MichaelMure/git-bug/commands
+LDFLAGS:=-X ${COMMANDS_PATH}.GitCommit=${GIT_COMMIT} \
+	-X ${COMMANDS_PATH}.GitLastTag=${GIT_LAST_TAG} \
+	-X ${COMMANDS_PATH}.GitExactTag=${GIT_EXACT_TAG}
 
 .PHONY: build
 build:
 	go generate
-	go build .
+	go build -ldflags "$(LDFLAGS)" .
 
 # produce a build debugger friendly
 .PHONY: debug-build
 debug-build:
 	go generate
-	go build -gcflags=all="-N -l" .
+	go build -ldflags "$(LDFLAGS)" -gcflags=all="-N -l" .
 
 .PHONY: install
 install:
 	go generate
-	go install .
+	go install -ldflags "$(LDFLAGS)" .
 
 .PHONY: releases
 releases:
 	go generate
-	go run github.com/mitchellh/gox@v1.0.1 -osarch '!darwin/386' -output "dist/{{.Dir}}_{{.OS}}_{{.Arch}}"
+	go run github.com/mitchellh/gox@v1.0.1 -ldflags "$(LDFLAGS)" -osarch '!darwin/386' -output "dist/{{.Dir}}_{{.OS}}_{{.Arch}}"
 
 secure: secure-practices secure-vulnerabilities
 
@@ -56,7 +62,7 @@ pack-webui:
 # produce a build that will fetch the web UI from the filesystem instead of from the binary
 .PHONY: debug-webui
 debug-webui:
-	go build -tags=debugwebui
+	go build -ldflags "$(LDFLAGS)" -tags=debugwebui
 
 .PHONY: clean-local-bugs
 clean-local-bugs:
diff --git a/commands/root.go b/commands/root.go
index 09f1bac4..0767c701 100644
--- a/commands/root.go
+++ b/commands/root.go
@@ -4,16 +4,14 @@ package commands
 import (
 	"fmt"
 	"os"
-	"os/exec"
 	"runtime/debug"
-	"strings"
 
 	"github.com/spf13/cobra"
 
-	"github.com/MichaelMure/git-bug/commands/bridge"
-	"github.com/MichaelMure/git-bug/commands/bug"
+	bridgecmd "github.com/MichaelMure/git-bug/commands/bridge"
+	bugcmd "github.com/MichaelMure/git-bug/commands/bug"
 	"github.com/MichaelMure/git-bug/commands/execenv"
-	"github.com/MichaelMure/git-bug/commands/user"
+	usercmd "github.com/MichaelMure/git-bug/commands/user"
 )
 
 // These variables are initialized externally during the build. See the Makefile.
@@ -34,16 +32,30 @@ the same git remote you are already using to collaborate with other people.
 `,
 
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
-			GitLastTag, GitExactTag, GitCommit = getTagsAndCommit()
-
 			root := cmd.Root()
 
 			if GitExactTag == "undefined" {
 				GitExactTag = ""
 			}
+
+			// release version
 			root.Version = GitLastTag
+
+			// dev version
 			if GitExactTag == "" {
-				root.Version = fmt.Sprintf("%s-dev-%.10s", root.Version, GitCommit)
+				if root.Version != "" {
+					// if we have a tag, append the commit hash
+					root.Version = fmt.Sprintf("%s-dev-%.10s", root.Version, GitCommit)
+				} else {
+					// if we don't have a tag, try to read
+					// commit and dirty state from the build info
+					commit, dirty := getCommitAndDirty()
+					root.Version = fmt.Sprintf("dev-%.10s", commit)
+
+					if dirty != "" {
+						root.Version = fmt.Sprintf("%s-dirty", root.Version)
+					}
+				}
 			}
 		},
 
@@ -96,8 +108,8 @@ func Execute() {
 	}
 }
 
-func getTagsAndCommit() (tag, exacttag, commit string) {
-	var t, e, c string
+func getCommitAndDirty() (commit, dirty string) {
+	var d, c string
 
 	info, ok := debug.ReadBuildInfo()
 
@@ -105,30 +117,18 @@ func getTagsAndCommit() (tag, exacttag, commit string) {
 		fmt.Println("could not get commit")
 	}
 
+	// get the commit and
+	// modified status (that is the flag for repository dirty or not)
 	for _, kv := range info.Settings {
 		switch kv.Key {
 		case "vcs.revision":
 			c = kv.Value
+		case "vcs.modified":
+			if kv.Value == "true" {
+				d = "dirty"
+			}
 		}
 	}
 
-	cmd := exec.Command("git", "describe", "--tags", "--abbrev=0")
-	stdout, err := cmd.Output()
-
-	if err != nil {
-		fmt.Printf("could not get last tag: %v\n", err.Error())
-	}
-
-	t = strings.TrimSuffix(string(stdout), "\n")
-
-	cmd = exec.Command("git", "name-rev", "--name-only", "--tags", "HEAD")
-	stdout, err = cmd.Output()
-
-	if err != nil {
-		fmt.Printf("could not get exact tag: %v\n", err.Error())
-	}
-
-	e = strings.TrimSuffix(string(stdout), "\n")
-
-	return t, e, c
+	return c, d
 }