Merge pull request #141 from gofiber/copilot/fix-137-2

Author: ReneWerner87

README.md

@@ -22,7 +22,7 @@ go install github.com/gofiber/cli/fiber@latest
 
 Learn more on [gofiber.io](https://gofiber.io)
 
-CLI version v0.0.x
+CLI version detected using Go build info
 
 ### Options
 

cmd/root.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"fmt"
 	"os"
-	"os/exec"
+	"runtime/debug"
 	"strings"
 	"time"
 
@@ -19,53 +19,43 @@ const (
 
 var version string // dynamically determined version
 
-// getVersion returns the current version, detected dynamically from git tags
-// Falls back to commit hash if git tag detection fails
+// getVersion returns the current version using build info
+// Falls back to VCS info if available, then to "unknown"
 func getVersion() string {
 	if version != "" {
 		return version
 	}
 
-	// Try to get version from git describe
-	if gitVersion := getVersionFromGit(); gitVersion != "" {
-		version = gitVersion
+	buildInfo, ok := debug.ReadBuildInfo()
+	if !ok {
+		version = unknownVersion
 		return version
 	}
 
-	// Fall back to commit hash
-	version = getCommitHash()
-	return version
-}
-
-// getVersionFromGit attempts to get the version using git describe --tags
-func getVersionFromGit() string {
-	cmd := exec.Command("git", "describe", "--tags", "--exact-match", "HEAD")
-	output, err := cmd.Output()
-	if err != nil {
-		// If exact match fails, try getting the latest tag
-		cmd = exec.Command("git", "describe", "--tags", "--abbrev=0")
-		output, err = cmd.Output()
-		if err != nil {
-			return ""
-		}
+	// First try to get version from module version (when built with go install)
+	if buildInfo.Main.Version != "" && buildInfo.Main.Version != "(devel)" {
+		version = strings.TrimPrefix(buildInfo.Main.Version, "v")
+		return version
 	}
 
-	gitVersion := strings.TrimSpace(string(output))
-	// Remove 'v' prefix if present
-	gitVersion = strings.TrimPrefix(gitVersion, "v")
-
-	return gitVersion
-}
-
-// getCommitHash returns the short commit hash of the current HEAD
-func getCommitHash() string {
-	cmd := exec.Command("git", "rev-parse", "--short", "HEAD")
-	output, err := cmd.Output()
-	if err != nil {
-		return unknownVersion
+	// Fallback to VCS info if available
+	for _, setting := range buildInfo.Settings {
+		switch setting.Key {
+		case "vcs.tag":
+			if setting.Value != "" {
+				version = strings.TrimPrefix(setting.Value, "v")
+				return version
+			}
+		case "vcs.revision":
+			if setting.Value != "" && len(setting.Value) >= 7 {
+				version = setting.Value[:7] // short commit hash
+				return version
+			}
+		}
 	}
 
-	return strings.TrimSpace(string(output))
+	version = unknownVersion
+	return version
 }
 
 var rc = rootConfig{

cmd/root_test.go

@@ -5,8 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"os"
-	"strings"
 	"testing"
 	"time"
 
@@ -163,64 +161,21 @@ func Test_GetVersion(t *testing.T) {
 	assert.Equal(t, v, v2)
 }
 
-func Test_GetVersionFromGit(t *testing.T) {
-	// This test will depend on the git environment
-	// It should either return a version or empty string
-	gitVersion := getVersionFromGit()
-
-	// If we have git and are in a git repo, should return something
-	// If not, should return empty string - both are valid
-	if gitVersion != "" {
-		// If we get a version, it should not start with 'v'
-		assert.False(t, strings.HasPrefix(gitVersion, "v"))
-		// Should be a valid semantic version format
-		assert.NotEmpty(t, gitVersion)
-	}
-}
-
-func Test_GetCommitHash(t *testing.T) {
-	// Test that getCommitHash returns a valid commit hash
-	commitHash := getCommitHash()
-
-	// Should not be empty unless we're not in a git repo
-	if commitHash != unknownVersion {
-		// Should be a valid git commit hash (hex characters)
-		assert.Regexp(t, `^[a-f0-9]+$`, commitHash)
-		// Short hash is typically 7 characters, but can vary
-		assert.Greater(t, len(commitHash), 4)
-		assert.LessOrEqual(t, len(commitHash), 40) // Full hash is 40 chars max
-	}
-}
-
 func Test_GetVersionFallback(t *testing.T) {
-	// Test that even if git detection fails, we get commit hash
+	// Test that the new runtime/debug.ReadBuildInfo() approach works
 	// Reset version cache
 	version = ""
-
-	// Change to a directory without git to test fallback
-	oldWd, err := os.Getwd()
-	require.NoError(t, err)
 	defer func() {
-		err := os.Chdir(oldWd)
-		require.NoError(t, err)
 		version = "" // Reset for other tests
 	}()
 
-	// Use cross-platform temporary directory
-	tempDir := os.TempDir()
-	err = os.Chdir(tempDir)
-	require.NoError(t, err)
-
 	v := getVersion()
-	// Should fall back to "unknown" only if even commit hash fails
-	// In most cases it should return a commit hash
+	// With runtime/debug.ReadBuildInfo(), the result depends on how the test is built
+	// It could be module version, VCS tag, VCS revision, or "unknown"
 	assert.NotEqual(t, "", v)
-	if v == unknownVersion {
-		// This means both git tag detection and commit hash detection failed
-		// which is acceptable in non-git environments
-		assert.Equal(t, unknownVersion, v)
-	} else {
-		// Should be a commit hash - typically 7 characters
-		assert.Regexp(t, `^[a-f0-9]+$`, v)
-	}
+
+	// Test that caching works
+	version = "cached-version"
+	v2 := getVersion()
+	assert.Equal(t, "cached-version", v2)
 }