update code for go1.18

Author: gesquive

Dockerfile

@@ -0,0 +1,16 @@
+FROM gesquive/go-builder:latest AS builder
+
+ENV APP=git-user
+
+# This requires that `make release-snapshot` be called first
+COPY dist/ /dist/
+RUN copy-release
+RUN chmod +x /app/git-user
+
+# =============================================================================
+FROM gesquive/docker-base:latest
+LABEL maintainer="Gus Esquivel <gesquive@gmail.com>"
+
+COPY --from=builder /app/${APP} /app/
+
+ENTRYPOINT ["/app/git-user"]

cmd/list.go

@@ -1,15 +1,16 @@
 package cmd
 
 import (
+"path/filepath"
+
 "github.com/gesquive/cli"
 "github.com/gesquive/git-user/git"
 "github.com/spf13/cobra"
-"path/filepath"
 )
 
 var listCmd = &cobra.Command{
 Use: "list",
-Aliases: []string{"l"},
+Aliases: []string{"l", "ls"},
 Short: "List all saved profiles",
 Long: `List all of the saved user profiles found in your config.`,
 Run: listRun,

cmd/rem.go

@@ -17,7 +17,7 @@ var remCmd = &cobra.Command{
 
 func init() {
 RootCmd.AddCommand(remCmd)
-remCmd.PersistentFlags().BoolVarP(&global, "global", "G", false,
+remCmd.PersistentFlags().BoolVarP(&useGlobal, "global", "G", false,
 "Remove the profile from the global config")
 }
 
@@ -31,7 +31,7 @@ func remRun(cmd *cobra.Command, args []string) {
 os.Exit(3)
 }
 
-if global {
+if useGlobal {
 cli.Debug("Removing global user")
 git.RemoveGlobalUser()
 cli.Info("Removed user info from the global config")

cmd/root.go

@@ -3,40 +3,48 @@ package cmd
 import (
 "fmt"
 "os"
+"runtime"
 
 "github.com/gesquive/cli"
 "github.com/gesquive/git-user/git"
 "github.com/gesquive/git-user/user"
 "github.com/spf13/cobra"
 )
 
+// current build info
+var (
+BuildVersion = "v0.1.0-dev"
+BuildCommit = ""
+BuildDate = ""
+)
+
 var userProfileConfig *git.UserProfileConfig
 var gitRepo *git.Repo
 var gitPath string
 var cfgFilePath string
 var projectPath string
-var displayVersion string
 var appName string
 
 var logDebug bool
 var showVersion bool
 
-var global bool
+var useGlobal bool
 
 // RootCmd represents the base command when called without any subcommands
 var RootCmd = &cobra.Command{
-Use: "git-user",
-Short: "Allows you to save multiple user profiles and set them as git project defaults",
-Long: `git-user lets you quickly switch between multiple git user profiles`,
-Run: listRun,
+Use: "git-user",
+Short: "Allows you to save multiple user profiles and set them as git project defaults",
+Long: `git-user lets you quickly switch between multiple git user profiles`,
+PersistentPreRun: persistentPreRun,
+Run: listRun,
+Hidden: true,
 }
 
 // Execute adds all child commands to the root command sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
-func Execute(version string) {
-displayVersion = version
-RootCmd.SetHelpTemplate(fmt.Sprintf("%s\nVersion:\n github.com/gesquive/%s\n",
-RootCmd.HelpTemplate(), displayVersion))
+func Execute() {
+RootCmd.SetHelpTemplate(helpTemplate())
+RootCmd.SetUsageTemplate(usageTemplate())
 if err := RootCmd.Execute(); err != nil {
 fmt.Println(err)
 os.Exit(-1)
@@ -56,22 +64,22 @@ func init() {
 user.ShortenHomeDir(defaultProjectPath), "The project to get/set the user")
 RootCmd.PersistentFlags().StringVarP(&gitPath, "git-path", "g", "git",
 "The git executable to use")
+
+RootCmd.PersistentFlags().BoolVarP(&showVersion, "version", "v", false,
+"Show the version and exit")
 RootCmd.PersistentFlags().BoolVarP(&logDebug, "debug", "D", false,
 "Write debug messages to console")
-RootCmd.PersistentFlags().BoolVarP(&showVersion, "version", "V", false,
-"Show the version and exit")
-
 RootCmd.PersistentFlags().MarkHidden("debug")
+
+// TODO: activate viper for ENV vars
+// viper.SetEnvPrefix("git-user")
+// viper.AutomaticEnv()
 }
 
 func initConfig() {
 if logDebug {
 cli.SetPrintLevel(cli.LevelDebug)
 }
-if showVersion {
-cli.Info(displayVersion)
-os.Exit(0)
-}
 cli.Debug("Running with debug turned on")
 
 appName = os.Args[0]
@@ -94,8 +102,8 @@ func initConfig() {
 cli.Debug("gitPath=%s", gitPath)
 cli.Debug("gitVersion=%s", gitVersion)
 
-cfgFilePath = user.ExpandHomeDir(cfgFilePath)
-projectPath = user.ExpandHomeDir(projectPath)
+cfgFilePath = os.ExpandEnv(user.ExpandHomeDir(cfgFilePath))
+projectPath = os.ExpandEnv(user.ExpandHomeDir(projectPath))
 cli.Debug("configPath='%s'", cfgFilePath)
 cli.Debug("projectPath='%s'", projectPath)
 var err error
@@ -107,3 +115,52 @@ func initConfig() {
 cli.Debug("profileConfigPath=%s", userProfileConfig.Path())
 gitRepo = git.NewGitRepo(projectPath)
 }
+
+func persistentPreRun(cmd *cobra.Command, args []string) {
+if showVersion {
+fmt.Printf("github.com/gesquive/git-user\n")
+fmt.Printf(" Version: %s\n", BuildVersion)
+if len(BuildCommit) > 6 {
+fmt.Printf(" Git Commit: %s\n", BuildCommit[:7])
+}
+if BuildDate != "" {
+fmt.Printf(" Build Date: %s\n", BuildDate)
+}
+fmt.Printf(" Go Version: %s\n", runtime.Version())
+fmt.Printf(" OS/Arch: %s/%s\n", runtime.GOOS, runtime.GOARCH)
+os.Exit(0)
+}
+if logDebug {
+cli.SetPrintLevel(cli.LevelDebug)
+}
+}
+
+func helpTemplate() string {
+return fmt.Sprintf("%s\nVersion:\n github.com/gesquive/git-user %s\n",
+RootCmd.HelpTemplate(), BuildVersion)
+}
+
+func usageTemplate() string {
+return `Usage:{{if .Runnable}}
+ {{.UseLine}}{{end}}{{if gt (len .Aliases) 0}}
+Aliases:
+ {{.NameAndAliases}}{{end}}{{if .HasExample}}
+ 
+Examples:
+ {{.Example}}{{end}}{{if .HasAvailableSubCommands}}
+ 
+Available Commands:{{range .Commands}}{{if (or .IsAvailableCommand (eq .Name "help"))}}
+ {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{end}}{{if .HasAvailableLocalFlags}}
+ 
+Flags:
+{{.LocalFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}{{if .HasAvailableInheritedFlags}}
+ 
+Global Flags:
+{{.InheritedFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}{{if .HasHelpSubCommands}}
+ 
+Additional help topics:{{range .Commands}}{{if .IsAdditionalHelpTopicCommand}}
+ {{rpad .CommandPath .CommandPathPadding}} {{.Short}}{{end}}{{end}}{{end}}{{if .HasAvailableSubCommands}}
+ 
+Use "{{.CommandPath}} [command] --help" for more information about a command.{{end}}
+`
+}

cmd/set.go

@@ -1,10 +1,11 @@
 package cmd
 
 import (
+"os"
+
 "github.com/gesquive/cli"
 "github.com/gesquive/git-user/git"
 "github.com/spf13/cobra"
-"os"
 )
 
 // setCmd represents the set command
@@ -19,7 +20,7 @@ var setCmd = &cobra.Command{
 
 func init() {
 RootCmd.AddCommand(setCmd)
-setCmd.PersistentFlags().BoolVarP(&global, "global", "G", false,
+setCmd.PersistentFlags().BoolVarP(&useGlobal, "global", "G", false,
 "Apply the profile to the global config")
 
 }
@@ -37,7 +38,7 @@ func setRun(cmd *cobra.Command, args []string) {
 cli.Info("You can add the profile with:")
 cli.Info(" '%s add %s NAME EMAIL'", appName, name)
 } else {
-if global {
+if useGlobal {
 git.SetGlobalUser(profile.User, profile.Email)
 cli.Info("The global user has been set to '%s <%s>'",
 profile.User, profile.Email)

git/repo.go

@@ -4,7 +4,7 @@ import "path/filepath"
 import "strings"
 import "github.com/codeskyblue/go-sh"
 
-// Repo allows you to exectue actions on a specific git project
+// Repo allows you to execute actions on a specific git project
 type Repo struct {
 path string
 }

main.go

@@ -1,14 +1,16 @@
 package main
 
-import "fmt"
 import "github.com/gesquive/git-user/cmd"
 
-var version = "v2.0.5"
-var dirty = ""
+var (
+buildVersion = "v2.0.5-dev"
+buildCommit = ""
+buildDate = ""
+)
 
 func main() {
-displayVersion := fmt.Sprintf("git-user %s%s",
-version,
-dirty)
-cmd.Execute(displayVersion)
+cmd.BuildVersion = buildVersion
+cmd.BuildCommit = buildCommit
+cmd.BuildDate = buildDate
+cmd.Execute()
 }

user/user.go

@@ -1,7 +1,9 @@
 package user
 
-import "strings"
-import "os/user"
+import (
+"os/user"
+"strings"
+)
 
 // ExpandHomeDir expands ~ in a path to the users home directory
 func ExpandHomeDir(path string) (expandedPath string) {