Package subcommand code

cmd/root.go

@@ -12,28 +12,27 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
+	"gitea.libretechconsulting.com/rmcguire/git-project-manager/cmd/util"
 	"gitea.libretechconsulting.com/rmcguire/git-project-manager/internal/config"
 )
 
-var (
-	conf config.Config
-	plog *pterm.Logger
-)
-
 var rootCmd = &cobra.Command{
 	Use:              "git-project-manager",
 	Aliases:          []string{"gpm"},
 	Short:            "Find and use Git projects locally",
-	Long:             rootCmdLong,
+	Long:             util.RootCmdLong,
 	PersistentPreRun: initRootCmd,
 }
 
-var configExemptCommands = regexp.MustCompile(`^(doc|conf)`)
+var (
+	utils                *util.Utils
+	configExemptCommands = regexp.MustCompile(`^(doc|conf)`)
+)
 
 // Hook traversal is enabled, so this will be run for all
 // sub-commands regardless of their registered pre-hooks
 func initRootCmd(cmd *cobra.Command, args []string) {
-	initProjectPath(cmd, args)
+	utils.InitProjectPath(cmd, args)
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.
@@ -42,6 +41,9 @@ func Execute() {
 	ctx, cncl := signal.NotifyContext(context.Background(), os.Kill, os.Interrupt)
 	defer cncl()
 
+	// Store provided util.Utils in context
+	ctx = util.AddToCtx(ctx, utils)
+
 	err := rootCmd.ExecuteContext(ctx)
 	if err != nil {
 		pterm.Error.Printfln("%s", pterm.LightYellow("Command failed, "+err.Error()))
@@ -51,73 +53,79 @@ func Execute() {
 
 func init() {
 	cobra.EnableTraverseRunHooks = true
-	cobra.OnInitialize(initConfig)
+
+	utils = &util.Utils{}
+	cobra.OnInitialize(getInitConfigFunc(utils))
 
 	// Global flags
-	rootCmd.PersistentFlags().String(FlagConfig, "",
-		"config file (default is "+defConfigPath+")")
-	rootCmd.PersistentFlags().String(FlagPath, "",
+	rootCmd.PersistentFlags().String(util.FlagConfig, "",
+		"config file (default is "+util.DefConfigPath+")")
+	rootCmd.PersistentFlags().String(util.FlagPath, "",
 		"Sets a path for local clones of projects")
-	rootCmd.PersistentFlags().String(FlagLogLevel, defLogLevel,
+	rootCmd.PersistentFlags().String(util.FlagLogLevel, util.DefLogLevel,
 		"Default log level -- info, warn, error, debug")
-	rootCmd.PersistentFlags().StringSlice(FlagRemote, []string{},
+	rootCmd.PersistentFlags().StringSlice(util.FlagRemote, []string{},
 		"Specify remotes by host for any sub-command. Provide multiple times or comma delimited.")
 
 	// Flag autocompletion
-	rootCmd.RegisterFlagCompletionFunc(FlagLogLevel, validLogLevelsFunc)
-	rootCmd.RegisterFlagCompletionFunc(FlagRemote, validRemotesFunc)
+	rootCmd.RegisterFlagCompletionFunc(util.FlagLogLevel, util.ValidLogLevelsFunc)
+	rootCmd.RegisterFlagCompletionFunc(util.FlagRemote, utils.ValidRemotesFunc)
 
 	viper.BindPFlags(rootCmd.PersistentFlags())
 }
 
 // initConfig reads in config file and ENV variables if set.
-func initConfig() {
-	cfgFile := viper.GetString(FlagConfig)
-	if cfgFile != "" {
-		// Use config file from the flag.
-		viper.SetConfigFile(cfgFile)
-	} else {
-		// Find home directory.
-		home, err := os.UserHomeDir()
-		cobra.CheckErr(err)
+func getInitConfigFunc(utils *util.Utils) func() {
+	return func() {
+		cfgFile := viper.GetString(util.FlagConfig)
+		if cfgFile != "" {
+			// Use config file from the flag.
+			viper.SetConfigFile(cfgFile)
+		} else {
+			// Find home directory.
+			home, err := os.UserHomeDir()
+			cobra.CheckErr(err)
 
-		// Search config in home directory with name ".git-project-manager" (without extension).
-		configPath := filepath.Join(home, ".config")
-		viper.AddConfigPath(configPath)
-		viper.SetConfigType("yaml")
-		viper.SetConfigName(getConfigName(configPath))
+			// Search config in home directory with name ".git-project-manager" (without extension).
+			configPath := filepath.Join(home, ".config")
+			viper.AddConfigPath(configPath)
+			viper.SetConfigType("yaml")
+			viper.SetConfigName(util.GetConfigName(configPath))
+		}
+
+		viper.AutomaticEnv()
+		viper.ReadInConfig()
+
+		// Configure pretty logger
+		plog := pterm.DefaultLogger.
+			WithLevel(getPtermLogLevel(viper.GetString(util.FlagLogLevel))).
+			WithWriter(os.Stderr)
+		if plog.Level == pterm.LogLevelDebug {
+			pterm.EnableDebugMessages()
+		}
+		utils.SetLogger(plog)
+
+		// Load into struct to not be so darn pythonic, retrieving
+		// settings by untyped string "name"
+		conf := new(config.Config)
+		if err := viper.Unmarshal(&conf); err != nil {
+			plog.Error("Failed loading config", plog.Args("err", err))
+		}
+
+		if len(os.Args) > 0 && configExemptCommands.Match([]byte(os.Args[1])) {
+			plog.Debug("Permitting missing config for config sub-command")
+			return
+		} else if conf.ProjectPath == "" {
+			plog.Fatal("Minimal configuration missing, must have projectPath", plog.Args(
+				"do",
+				"Try running `git-project-manager config default > "+util.DefConfigPath,
+			))
+		}
+
+		checkConfigPerms(viper.ConfigFileUsed()) // Abort on world-readable config
+
+		utils.Logger().Debug("Configuration loaded", plog.Args("conf", conf))
 	}
-
-	viper.AutomaticEnv()
-	viper.ReadInConfig()
-
-	// Configure pretty logger
-	plog = pterm.DefaultLogger.
-		WithLevel(getPtermLogLevel(viper.GetString(FlagLogLevel))).
-		WithWriter(os.Stderr)
-	if plog.Level == pterm.LogLevelDebug {
-		pterm.EnableDebugMessages()
-	}
-
-	// Load into struct to not be so darn pythonic, retrieving
-	// settings by untyped string "name"
-	if err := viper.Unmarshal(&conf); err != nil {
-		plog.Error("Failed loading config", plog.Args("err", err))
-	}
-
-	if len(os.Args) > 0 && configExemptCommands.Match([]byte(os.Args[1])) {
-		plog.Debug("Permitting missing config for config sub-command")
-		return
-	} else if conf.ProjectPath == "" {
-		plog.Fatal("Minimal configuration missing, must have projectPath", plog.Args(
-			"do",
-			"Try running `git-project-manager config default > "+defConfigPath,
-		))
-	}
-
-	checkConfigPerms(viper.ConfigFileUsed()) // Abort on world-readable config
-
-	plog.Debug("Configuration loaded", plog.Args("conf", conf))
 }
 
 func getPtermLogLevel(level string) pterm.LogLevel {
@@ -141,12 +149,12 @@ func getPtermLogLevel(level string) pterm.LogLevel {
 func checkConfigPerms(file string) {
 	stat, err := os.Stat(file)
 	if err != nil {
-		plog.Error("Failure reading configuration", plog.Args("err", err))
+		utils.Logger().Error("Failure reading configuration", utils.Logger().Args("err", err))
 		return
 	}
 	if stat.Mode().Perm()&0o004 == 0o004 {
-		plog.Error("Configuration is world-readable. Recomment 0400.",
-			plog.Args("mode", stat.Mode().String()))
+		utils.Logger().Error("Configuration is world-readable. Recomment 0400.",
+			utils.Logger().Args("mode", stat.Mode().String()))
 		os.Exit(1)
 	}
 }