Skip to content

Introduce new version sub command (issue #49) #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andreaangiolillo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Introduce new version sub command (issue #49) #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ XC_ARCH="amd64"
XC_PARALLEL="2"
BIN="bin"
SRC=$(shell find . -name "*.go")

GIT_SHA?=$(shell git rev-parse HEAD)
VERSION?=$(shell git describe --always --tags | cut -d "v" -f 2)
LINKER_FLAGS="-s -w -X github.com/spf13/cobra-cli/cmd.Version=${VERSION} -X github.com/spf13/cobra-cli/cmd.GitCommit=${GIT_SHA}"
ifeq (, $(shell which golangci-lint))
$(warning "could not find golangci-lint in $(PATH), run: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh")
endif
Expand All @@ -27,6 +29,7 @@ build: install_deps
-os=$(XC_OS) \
-arch=$(XC_ARCH) \
-parallel=$(XC_PARALLEL) \
-ldflags=$(LINKER_FLAGS) \
-output=$(BIN)/{{.Dir}}_{{.OS}}_{{.Arch}} \
;

Expand Down
29 changes: 27 additions & 2 deletions cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,32 @@ import (
"errors"
"fmt"
"os"
"runtime"

"github.com/spf13/cobra"
"github.com/spf13/viper"
)

const verTemplate = `cobra-cli version: %s
git version: %s
Go version: %s
os: %s
arch: %s
compiler: %s
`

var (
Version string
GitCommit string

// Used for flags.
cfgFile string
userLicense string

rootCmd = &cobra.Command{
Use: "cobra-cli",
Short: "A generator for Cobra based Applications",
Use: "cobra-cli",
Version: Version,
Short: "A generator for Cobra based Applications",
Long: `Cobra is a CLI library for Go that empowers applications.
This application is a tool to generate the needed files
to quickly create a Cobra application.`,
Expand All @@ -55,6 +68,8 @@ func init() {

rootCmd.AddCommand(addCmd)
rootCmd.AddCommand(initCmd)

rootCmd.SetVersionTemplate(formattedVersion())
}

func initConfig() {
Expand Down Expand Up @@ -87,3 +102,13 @@ func initConfig() {
fmt.Fprintln(os.Stderr, "Using config file:", viper.ConfigFileUsed())
}
}

func formattedVersion() string {
return fmt.Sprintf(verTemplate,
Version,
GitCommit,
runtime.Version(),
runtime.GOOS,
runtime.GOARCH,
runtime.Compiler)
}