- v2.7.6

  - Upgrade go-helper to v1.1.8
  - Fix config logic
  - Fix debug logic
  - Fix receiver name

Author: J-Siu

README.md

@@ -5,7 +5,6 @@ Command line tool for easy mass configuration of git remotes, and working with G
 ### Table Of Content
 <!-- TOC -->
 
-- [Table Of Content](#table-of-content)
 - [Highlight](#highlight)
   - [Push multiple repository](#push-multiple-repository)
   - [Set Archived](#set-archived)
@@ -387,6 +386,11 @@ https://github.com/J-Siu/go-mygit/releases
   - Consolidate repo*Func() to repoDo()
 - v2.7.5
   - Fix Github workflow
+- v2.7.6
+  - Upgrade go-helper to v1.1.8
+  - Fix config logic
+  - Fix debug logic
+  - Fix receiver name
 
 ### License
 

cmd/root.go

@@ -37,6 +37,8 @@ var rootCmd = &cobra.Command{
 	Short:   `Git and Repo automation made easy.`,
 	Version: lib.Version,
 	PersistentPreRun: func(cmd *cobra.Command, args []string) {
+		helper.Debug = lib.Flag.Debug
+		helper.ReportDebug(&lib.Flag, "Flag", false, false)
 		lib.Conf.Init()
 		lib.Conf.MergeRemotes()
 	},
@@ -54,33 +56,22 @@ func Execute() {
 func init() {
 	cobra.OnInitialize(initConfig)
 	rootCmd.PersistentFlags().BoolVarP(&lib.Flag.Debug, "debug", "d", false, "Enable debug")
-	rootCmd.PersistentFlags().BoolVarP(&lib.Flag.NoSkip, "no-skip", "", false, "Don't skip empty output")
 	rootCmd.PersistentFlags().BoolVarP(&lib.Flag.NoParallel, "no-parallel", "", false, "Don't process in parallel")
+	rootCmd.PersistentFlags().BoolVarP(&lib.Flag.NoSkip, "no-skip", "", false, "Don't skip empty output")
 	rootCmd.PersistentFlags().BoolVarP(&lib.Flag.NoTitle, "no-title", "", false, "Don't print title for most output")
 	rootCmd.PersistentFlags().StringArrayVarP(&lib.Flag.Groups, "group", "g", nil, "Specify group")
 	rootCmd.PersistentFlags().StringArrayVarP(&lib.Flag.Remotes, "remote", "r", nil, "Specify remotes")
-	rootCmd.PersistentFlags().StringVar(&lib.Conf.File, "config", "", "config file (default is $HOME/.go-mygit.json)")
+	rootCmd.PersistentFlags().StringVarP(&lib.Conf.FileConf, "config", "", lib.DefaultConfFile, "Config file")
 }
 
 // initConfig reads in config file and ENV variables if set.
 func initConfig() {
-	if lib.Conf.File != "" {
-		// Use config file from the flag.
-		viper.SetConfigFile(lib.Conf.File)
-	} else {
-		// Find home directory.
-		home, err := os.UserHomeDir()
-		cobra.CheckErr(err)
-
-		// Search config in home directory with name ".go-mygit" (without extension).
-		viper.AddConfigPath(home)
-		viper.SetConfigType("json")
-		viper.SetConfigName(".go-mygit")
+	viper.SetConfigType("json")
+	if lib.Conf.FileConf == "" {
+		lib.Conf.FileConf = lib.DefaultConfFile
 	}
-
+	viper.SetConfigFile(helper.TildeEnvExpand(lib.Conf.FileConf))
 	viper.AutomaticEnv() // read in environment variables that match
-
-	// If a config file is found, read it in.
 	if err := viper.ReadInConfig(); err != nil {
 		helper.Report(err.Error(), "", true, true)
 		os.Exit(1)

cmd/rootPush.go

@@ -97,5 +97,4 @@ func init() {
 	rootCmd.AddCommand(rootPushCmd)
 	rootPushCmd.Flags().BoolVarP(&lib.Flag.PushAll, "all", "a", false, "Push all branches")
 	rootPushCmd.Flags().BoolVarP(&lib.Flag.PushTag, "tags", "t", false, "Push with tags")
-	// rootPushCmd.MarkFlagsMutuallyExclusive("all","tags")
 }

go.mod

@@ -4,7 +4,7 @@ go 1.24.5
 
 require (
 	github.com/J-Siu/go-gitapi v1.6.0
-	github.com/J-Siu/go-helper v1.1.7
+	github.com/J-Siu/go-helper v1.1.8
 	github.com/savaki/jq v0.0.0-20161209013833-0e6baecebbf8
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/viper v1.15.0

go.sum

@@ -40,8 +40,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/J-Siu/go-gitapi v1.6.0 h1:isHmvr961CGiDwonbeiE8u8JhpVNTFeXjAayni05iXo=
 github.com/J-Siu/go-gitapi v1.6.0/go.mod h1:ZAIYbQvsXvxTqiCD39nIbXV/j7bd+1pK3U2YNBJ+eXc=
-github.com/J-Siu/go-helper v1.1.7 h1:8POi+Lqkhs90fu0yMKC2qcnWMbN/woLbJvP9NrA6YMk=
-github.com/J-Siu/go-helper v1.1.7/go.mod h1:PkBVY3EdVhAPE29H1Mx+nz1j01ymxy91VZV7VwHlsbA=
+github.com/J-Siu/go-helper v1.1.8 h1:cF92obqG6QTKkNYA06luuURCHHn99dR6pDEzak6fQ4c=
+github.com/J-Siu/go-helper v1.1.8/go.mod h1:PkBVY3EdVhAPE29H1Mx+nz1j01ymxy91VZV7VwHlsbA=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=

lib/conf.go

@@ -31,55 +31,54 @@ import (
 )
 
 /*
-File, Group, MergeRemotes are filled in at runtime
+- File, Group, MergeRemotes are filled in at runtime
 
-Remotes, Secrets are read from config file by viper
+- Remotes, Secrets are read from config file by viper
 */
 type TypeConf struct {
-	File          string      `json:"-"`
+	FileConf      string      `json:"-"`
 	Groups        Groups      `json:"-"`
 	Remotes       Remotes     `json:"remotes"`
 	Secrets       ConfSecrets `json:"secrets"`
 	MergedRemotes Remotes     `json:"-"`
 }
 
 // Fill in conf struct from viper and extract all groups from `Remotes`
-func (self *TypeConf) Init() {
-	helper.Debug = Flag.Debug
-	self.File = viper.ConfigFileUsed()
-	viper.Unmarshal(&self)
+func (conf *TypeConf) Init() {
+	viper.Unmarshal(&conf)
+	prefix := "TypeConf.Init"
+	helper.ReportDebug(conf.FileConf, prefix+":Config file", false, true)
 	// Fill in ConfGroup
-	for _, r := range self.Remotes {
-		self.Groups.Add(&r.Group)
+	for _, r := range conf.Remotes {
+		conf.Groups.Add(&r.Group)
 	}
-	helper.ReportDebug(&Conf.File, "", true, true)
-	helper.ReportDebug(&Flag, "Flag", true, false)
+	helper.ReportDebug(conf, prefix, false, true)
 }
 
 // Calculate remotes base on flag
-func (self *TypeConf) MergeRemotes() {
+func (conf *TypeConf) MergeRemotes() {
 	// Merge remote from flag "group"
 	for _, g := range Flag.Groups {
 		group := &g
-		if self.Groups.Has(group) {
-			self.MergedRemotes.AddArray(self.Remotes.GetByGroup(group))
+		if conf.Groups.Has(group) {
+			conf.MergedRemotes.AddArray(conf.Remotes.GetByGroup(group))
 		} else {
 			log.Fatal("Group not in config: " + g)
 			os.Exit(1)
 		}
 	}
 	// Merge remote from flag "remote"
 	for _, r := range Flag.Remotes {
-		if self.Remotes.Has(&r) {
-			self.MergedRemotes.Add(self.Remotes.GetByName(&r))
+		if conf.Remotes.Has(&r) {
+			conf.MergedRemotes.Add(conf.Remotes.GetByName(&r))
 		} else {
 			log.Fatal("Remote not in config: " + r)
 			os.Exit(1)
 		}
 	}
 	// If no remote is specified from command line, use all remotes in config
-	if len(self.MergedRemotes) == 0 {
-		self.MergedRemotes = append(self.MergedRemotes, self.Remotes...)
+	if len(conf.MergedRemotes) == 0 {
+		conf.MergedRemotes = append(conf.MergedRemotes, conf.Remotes...)
 	}
 	helper.ReportDebug(&Conf.MergedRemotes, "Merged Remote", true, false)
 }

lib/global.go

@@ -36,5 +36,6 @@ var (
 )
 
 const (
-	Version = "v2.7.5"
+	DefaultConfFile = "~/.go-mygit.json"
+	Version         = "v2.7.6"
 )