Show Version in header and add wander --version command (#36)

.goreleaser.yaml

@@ -14,6 +14,7 @@ builds:
   - binary: wander
     env:
       - CGO_ENABLED=0
+    ldflags: -s -w -X github.com/robinovitch61/wander/cmd.Version=v{{ .Version }} -X github.com/robinovitch61/wander/cmd.CommitSHA={{ .Commit }}
     goos:
       - darwin
       - freebsd
@@ -63,4 +64,3 @@ brews:
       email: [email protected]
     install: |
       bin.install "wander"
-

cmd/root.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/robinovitch61/wander/internal/dev"
-	"github.com/robinovitch61/wander/internal/tui/components/app"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"os"
@@ -15,6 +14,8 @@ type arg struct {
 }
 
 var (
+	version, sha string
+
 	// Used for flags.
 	cfgFile string
 
@@ -34,10 +35,11 @@ view jobs, allocations, tasks, logs, and more, all from the terminal
 in a productivity-focused UI.`
 
 	rootCmd = &cobra.Command{
-		Use:   "wander",
-		Short: "A terminal application for Nomad by HashiCorp",
-		Long:  description,
-		Run:   mainEntrypoint,
+		Use:     "wander",
+		Short:   "A terminal application for Nomad by HashiCorp",
+		Long:    description,
+		Run:     mainEntrypoint,
+		Version: getVersion(),
 	}
 )
 
@@ -91,7 +93,7 @@ func initConfig() {
 func mainEntrypoint(cmd *cobra.Command, args []string) {
 	nomadAddr := retrieveAssertExists(cmd, addrArg.cliLong, addrArg.config)
 	nomadToken := retrieveAssertExists(cmd, tokenArg.cliLong, tokenArg.config)
-	program := tea.NewProgram(app.InitialModel(nomadAddr, nomadToken), tea.WithAltScreen())
+	program := tea.NewProgram(initialModel(nomadAddr, nomadToken), tea.WithAltScreen())
 
 	dev.Debug("~STARTING UP~")
 	if err := program.Start(); err != nil {

cmd/serve.go

@@ -7,7 +7,6 @@ import (
 	"github.com/charmbracelet/wish"
 	bm "github.com/charmbracelet/wish/bubbletea"
 	"github.com/gliderlabs/ssh"
-	"github.com/robinovitch61/wander/internal/tui/components/app"
 	"github.com/spf13/cobra"
 	"log"
 	"os"
@@ -85,6 +84,6 @@ func generateTeaHandler(cmd *cobra.Command) func(ssh.Session) (tea.Model, []tea.
 		if sshCommands := s.Command(); len(sshCommands) == 1 {
 			nomadToken = strings.TrimSpace(sshCommands[0])
 		}
-		return app.InitialModel(nomadAddr, nomadToken), []tea.ProgramOption{tea.WithAltScreen()}
+		return initialModel(nomadAddr, nomadToken), []tea.ProgramOption{tea.WithAltScreen()}
 	}
 }

cmd/util.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/charmbracelet/wish"
 	"github.com/gliderlabs/ssh"
+	"github.com/robinovitch61/wander/internal/tui/components/app"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"log"
@@ -12,6 +13,16 @@ import (
 	"time"
 )
 
+var (
+	// Version contains the application version number. It's set via ldflags
+	// in the .goreleaser.yaml file when building
+	Version = ""
+
+	// CommitSHA contains the SHA of the commit that this application was built
+	// against. It's set via ldflags in the .goreleaser.yaml file when building
+	CommitSHA = ""
+)
+
 func retrieveAssertExists(cmd *cobra.Command, short, long string) string {
 	val := cmd.Flag(short).Value.String()
 	if val == "" {
@@ -40,3 +51,11 @@ func CustomLoggingMiddleware() wish.Middleware {
 		}
 	}
 }
+
+func initialModel(addr, token string) app.Model {
+	return app.InitialModel(Version, CommitSHA, addr, token)
+}
+
+func getVersion() string {
+	return Version
+}

internal/tui/components/app/app.go

@@ -34,9 +34,9 @@ type Model struct {
 	err           error
 }
 
-func InitialModel(url, token string) Model {
+func InitialModel(version, sha, url, token string) Model {
 	firstPage := nomad.JobsPage
-	initialHeader := header.New(constants.LogoString, url, "")
+	initialHeader := header.New(constants.LogoString, url, getVersionString(version, sha), "")
 
 	return Model{
 		nomadUrl:    url,
@@ -276,3 +276,10 @@ func (m Model) currentPageViewportSaving() bool {
 func (m Model) getFilterPrefix(page nomad.Page) string {
 	return page.GetFilterPrefix(m.jobID, m.taskName, m.allocID)
 }
+
+func getVersionString(v, s string) string {
+	if v == "" {
+		return "built from source"
+	}
+	return fmt.Sprintf("%s (%s)", v, s[:7])
+}

internal/tui/components/header/header.go

@@ -1,34 +1,23 @@
 package header
 
 import (
-	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/robinovitch61/wander/internal/tui/style"
 	"strings"
 )
 
 type Model struct {
-	logo     string
-	nomadUrl string
-	KeyHelp  string
+	logo, nomadUrl, version, KeyHelp string
 }
 
-func New(logo string, nomadUrl, keyHelp string) (m Model) {
-	return Model{logo: logo, nomadUrl: nomadUrl, KeyHelp: keyHelp}
-}
-
-func (m Model) Init() tea.Cmd {
-	return nil
-}
-
-func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
-	return m, nil
+func New(logo string, nomadUrl, version, keyHelp string) (m Model) {
+	return Model{logo: logo, nomadUrl: nomadUrl, version: version, KeyHelp: keyHelp}
 }
 
 func (m Model) View() string {
 	logo := style.Logo.Render(m.logo)
 	clusterUrl := style.ClusterUrl.Render(m.nomadUrl)
-	left := style.Header.Render(lipgloss.JoinVertical(lipgloss.Center, logo, clusterUrl))
+	left := style.Header.Render(lipgloss.JoinVertical(lipgloss.Center, logo, clusterUrl, m.version))
 	styledKeyHelp := style.KeyHelp.Render(m.KeyHelp)
 	return lipgloss.JoinHorizontal(lipgloss.Center, left, styledKeyHelp)
 }