Add version command

Author: eikendev

Makefile

@@ -1,20 +1,36 @@
+OUT_DIR := ./out
+
+PBCLI_BUILD_VERSION ?= $(shell git describe --tags)
+ifeq ($(PBCLI_BUILD_VERSION),)
+	_ := $(error Cannot determine build version)
+endif
+
+BUILD_VERSION_FLAG := github.com/pushbits/cli/internal/buildconfig.Version=$(PBCLI_BUILD_VERSION)
+
 .PHONY: build
 build:
-	mkdir -p ./out
-	go build -ldflags="-w -s" -o ./out/pbcli ./cmd/pbcli
+	mkdir -p $(OUT_DIR)
+	go build -ldflags "-w -s -X $(BUILD_VERSION_FLAG)" -o $(OUT_DIR)/pbcli ./cmd/pbcli
+
+.PHONY: clean
+clean:
+	rm -rf $(OUT_DIR)
 
 .PHONY: test
 test:
-	stdout=$$(gofmt -l . 2>&1); \
-	if [ "$$stdout" ]; then \
-		exit 1; \
-	fi
+	stdout=$$(gofumpt -l . 2>&1); if [ "$$stdout" ]; then exit 1; fi
 	go vet ./...
-	gocyclo -over 10 $(shell find . -iname '*.go' -type f)
+	gocyclo -over 10 $(shell find . -type f -iname '*.go')
 	staticcheck ./...
 	go test -v -cover ./...
+	@printf '\n%s\n' "> Test successful"
 
 .PHONY: setup
 setup:
 	go install github.com/fzipp/gocyclo/cmd/gocyclo@latest
 	go install honnef.co/go/tools/cmd/staticcheck@latest
+	go install mvdan.cc/gofumpt@latest
+
+.PHONY: fmt
+fmt:
+	gofumpt -l -w .

cmd/pbcli/main.go

@@ -6,19 +6,21 @@ import (
 	"github.com/jessevdk/go-flags"
 
 	"github.com/pushbits/cli/internal/application"
+	"github.com/pushbits/cli/internal/commands"
 	"github.com/pushbits/cli/internal/settings"
 	"github.com/pushbits/cli/internal/ui"
 	"github.com/pushbits/cli/internal/user"
 )
 
-type commands struct {
+type options struct {
 	settings.Settings
-	Application application.Command `command:"application" alias:"a" description:"Configure applications"`
-	User        user.Command        `command:"user" alias:"u" description:"Configure users"`
+	Application application.Command     `command:"application" alias:"a" description:"Configure applications"`
+	User        user.Command            `command:"user" alias:"u" description:"Configure users"`
+	Version     commands.VersionCommand `command:"version" alias:"v" description:"Print the program version"`
 }
 
 var (
-	cmds   commands
+	cmds   options
 	parser = flags.NewParser(&cmds, flags.Default)
 )
 
@@ -28,7 +30,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	s := settings.Settings{
+	s := &settings.Settings{
 		URL:      cmds.URL,
 		Username: cmds.Username,
 	}

internal/application/create.go

@@ -24,7 +24,7 @@ func (c *createCommand) Execute(args []string) error {
 	return nil
 }
 
-func (c *createCommand) Run(s settings.Settings, password string) {
+func (c *createCommand) Run(s *settings.Settings, password string) {
 	data := map[string]interface{}{
 		"name":                 c.Arguments.Name,
 		"strict_compatibility": c.StrictCompatibility,

internal/application/delete.go

@@ -24,7 +24,7 @@ func (c *deleteCommand) Execute(args []string) error {
 	return nil
 }
 
-func (c *deleteCommand) Run(s settings.Settings, password string) {
+func (c *deleteCommand) Run(s *settings.Settings, password string) {
 	populatedEndpoint := fmt.Sprintf(deleteEndpoint, c.Arguments.ID)
 
 	resp, err := api.Delete(s.URL, populatedEndpoint, s.Username, password)

internal/application/list.go

@@ -20,7 +20,7 @@ func (c *listCommand) Execute(args []string) error {
 	return nil
 }
 
-func (c *listCommand) Run(s settings.Settings, password string) {
+func (c *listCommand) Run(s *settings.Settings, password string) {
 	resp, err := api.Get(s.URL, listEndpoint, s.Username, password)
 	if err != nil {
 		log.Fatal(err)

internal/application/show.go

@@ -24,7 +24,7 @@ func (c *showCommand) Execute(args []string) error {
 	return nil
 }
 
-func (c *showCommand) Run(s settings.Settings, password string) {
+func (c *showCommand) Run(s *settings.Settings, password string) {
 	populatedEndpoint := fmt.Sprintf(showEndpoint, c.Arguments.ID)
 
 	resp, err := api.Get(s.URL, populatedEndpoint, s.Username, password)

internal/application/update.go

@@ -27,7 +27,7 @@ func (c *updateCommand) Execute(args []string) error {
 	return nil
 }
 
-func (c *updateCommand) Run(s settings.Settings, password string) {
+func (c *updateCommand) Run(s *settings.Settings, password string) {
 	if !c.RefreshToken && c.StrictCompatibility {
 		log.Fatal("Can only enforce compatibility when refreshing the token of the application")
 	}

internal/buildconfig/buildconfig.go

@@ -0,0 +1,3 @@
+package buildconfig
+
+var Version string

internal/commands/version.go

@@ -0,0 +1,19 @@
+package commands
+
+import (
+	"fmt"
+
+	"github.com/pushbits/cli/internal/buildconfig"
+	"github.com/pushbits/cli/internal/settings"
+)
+
+type VersionCommand struct{}
+
+func (c *VersionCommand) Execute(args []string) error {
+	settings.Runner = c
+	return nil
+}
+
+func (c *VersionCommand) Run(s *settings.Settings, password string) {
+	fmt.Printf("pbcli %s\n", buildconfig.Version)
+}

internal/settings/mod.go

@@ -8,7 +8,7 @@ type Settings struct {
 
 // Runnable defines an interface for subcommands that take the global settings and a password.
 type Runnable interface {
-	Run(Settings, string)
+	Run(*Settings, string)
 }
 
 // Runner is the subcommand to run after all arguments were parsed.