update for fixing the issues from codebeat.

clone/clone.go

@@ -50,16 +50,20 @@ DoClone performs `git clone` command and register the cloned repositories to RRH
 */
 func (clone *CloneCommand) DoClone(db *common.Database, arguments []string) (int, []error) {
 	if len(arguments) == 1 {
-		var err = clone.DoCloneARepository(db, arguments[0])
+		var err = clone.doCloneARepository(db, arguments[0])
 		if err != nil {
 			return 0, []error{err}
 		}
 		return 1, []error{}
 	}
+	return clone.doCloneRepositories(db, arguments)
+}
+
+func (clone *CloneCommand) doCloneRepositories(db *common.Database, arguments []string) (int, []error) {
 	var errorlist = []error{}
 	var count = 0
 	for _, url := range arguments {
-		var increment, err = clone.DoCloneEachRepository(db, url)
+		var increment, err = clone.doCloneEachRepository(db, url)
 		if err != nil {
 			errorlist = append(errorlist, err)
 			if db.Config.GetValue(common.RrhOnError) == common.FailImmediately {
@@ -81,10 +85,10 @@ func (clone *CloneCommand) relateTo(db *common.Database, groupID string, repoID
 }
 
 /*
-DoCloneEachRepository performes `git clone` for each repository.
+doCloneEachRepository performes `git clone` for each repository.
 This function is called repeatedly.
 */
-func (clone *CloneCommand) DoCloneEachRepository(db *common.Database, URL string) (int, error) {
+func (clone *CloneCommand) doCloneEachRepository(db *common.Database, URL string) (int, error) {
 	var count int
 	var id = findID(URL)
 	var path = filepath.Join(clone.Options.dest, id)
@@ -101,7 +105,7 @@ func (clone *CloneCommand) DoCloneEachRepository(db *common.Database, URL string
 /*
 DoCloneARepository clones a repository from given URL.
 */
-func (clone *CloneCommand) DoCloneARepository(db *common.Database, URL string) error {
+func (clone *CloneCommand) doCloneARepository(db *common.Database, URL string) error {
 	var id, path string
 
 	if clone.isExistDir(clone.Options.dest) {

clone/clone_cmd.go

@@ -103,7 +103,7 @@ func printResult(count int, dest string, group string) {
 	}
 }
 
-func (clone *CloneCommand) parse(args []string, config *common.Config) ([]string, error) {
+func (clone *CloneCommand) buildFlagSets(config *common.Config) (*flag.FlagSet, *cloneOptions) {
 	var defaultGroup = config.GetDefaultValue(common.RrhDefaultGroupName)
 	var options = cloneOptions{defaultGroup, ".", false}
 	flags := flag.NewFlagSet("clone", flag.ContinueOnError)
@@ -114,11 +114,15 @@ func (clone *CloneCommand) parse(args []string, config *common.Config) ([]string
 	flags.StringVar(&options.dest, "dest", ".", "destination")
 	flags.BoolVar(&options.verbose, "v", false, "verbose mode")
 	flags.BoolVar(&options.verbose, "verbose", false, "verbose mode")
+	return flags, &options
+}
 
+func (clone *CloneCommand) parse(args []string, config *common.Config) ([]string, error) {
+	var flags, options = clone.buildFlagSets(config)
 	if err := flags.Parse(args); err != nil {
 		return nil, err
 	}
-	clone.Options = &options
+	clone.Options = options
 
 	return flags.Args(), nil
 }

group/group.go

@@ -55,10 +55,11 @@ func (grc *groupRemoveCommand) removeGroupsImpl(db *common.Database, groupName s
 
 func (grc *groupRemoveCommand) removeGroups(db *common.Database) error {
 	for _, groupName := range grc.Options.args {
-		if db.HasGroup(groupName) && grc.Inquiry(groupName) {
-			if err := grc.removeGroupsImpl(db, groupName); err != nil {
-				return err
-			}
+		if !db.HasGroup(groupName) || !grc.Inquiry(groupName) {
+			return nil
+		}
+		if err := grc.removeGroupsImpl(db, groupName); err != nil {
+			return err
 		}
 	}
 	return nil

group/group_cmd.go

@@ -234,7 +234,7 @@ func (grc *groupRemoveCommand) Inquiry(groupName string) bool {
 	return common.IsInputYes(fmt.Sprintf("%s: remove group? [yN]", groupName))
 }
 
-func (grc *groupRemoveCommand) parse(args []string) (*removeOptions, error) {
+func (grc *groupRemoveCommand) buildFlagSet() (*flag.FlagSet, *removeOptions) {
 	var opt = removeOptions{}
 	flags := flag.NewFlagSet("rm", flag.ContinueOnError)
 	flags.Usage = func() { fmt.Println(grc.Help()) }
@@ -244,15 +244,20 @@ func (grc *groupRemoveCommand) parse(args []string) (*removeOptions, error) {
 	flags.BoolVar(&opt.inquiry, "inquiry", false, "inquiry mode")
 	flags.BoolVar(&opt.verbose, "verbose", false, "verbose mode")
 	flags.BoolVar(&opt.force, "force", false, "force remove")
+	return flags, &opt
+}
+
+func (grc *groupRemoveCommand) parse(args []string) (*removeOptions, error) {
+	var flags, opt = grc.buildFlagSet()
 	if err := flags.Parse(args); err != nil {
 		return nil, err
 	}
 	opt.args = flags.Args()
 	if len(opt.args) == 0 {
 		return nil, fmt.Errorf("no arguments are specified")
 	}
-	grc.Options = &opt
-	return &opt, nil
+	grc.Options = opt
+	return opt, nil
 }
 
 /*
@@ -311,7 +316,7 @@ func (guc *groupUpdateCommand) Run(args []string) int {
 	return 0
 }
 
-func (guc *groupUpdateCommand) parse(args []string) (*updateOptions, error) {
+func (guc *groupUpdateCommand) buildFlagSet() (*flag.FlagSet, *updateOptions) {
 	var opt = updateOptions{}
 	flags := flag.NewFlagSet("update", flag.ContinueOnError)
 	flags.Usage = func() { fmt.Println(guc.Help()) }
@@ -321,7 +326,11 @@ func (guc *groupUpdateCommand) parse(args []string) (*updateOptions, error) {
 	flags.StringVar(&opt.desc, "desc", "", "specify the description")
 	flags.StringVar(&opt.omitList, "omit-list", "false", "set the omit list flag. ")
 	flags.StringVar(&opt.omitList, "o", "false", "set the omit list flag. ")
+	return flags, &opt
+}
 
+func (guc *groupUpdateCommand) parse(args []string) (*updateOptions, error) {
+	var flags, opt = guc.buildFlagSet()
 	if err := flags.Parse(args); err != nil {
 		return nil, err
 	}
@@ -333,7 +342,7 @@ func (guc *groupUpdateCommand) parse(args []string) (*updateOptions, error) {
 		return nil, fmt.Errorf("could not accept multiple arguments")
 	}
 	opt.target = arguments[0]
-	return &opt, nil
+	return opt, nil
 }
 
 /*

remove/remove_cmd.go

@@ -35,6 +35,24 @@ func (options *removeOptions) printIfVerbose(message string) {
 	}
 }
 
+func (rm *RemoveCommand) perform(db *common.Database) int {
+	var result = 0
+	for _, target := range rm.Options.args {
+		var err = rm.executeRemove(db, target)
+		if err != nil {
+			fmt.Println(err.Error())
+			result = 3
+		}
+	}
+	if result == 0 {
+		if db.Config.IsSet(common.RrhAutoDeleteGroup) {
+			db.Prune()
+		}
+		db.StoreAndClose()
+	}
+	return result
+}
+
 /*
 Run performs the command.
 */
@@ -50,26 +68,10 @@ func (rm *RemoveCommand) Run(args []string) int {
 		fmt.Println(err1.Error())
 		return 2
 	}
-
-	var result = 0
-	for _, target := range rm.Options.args {
-		var err = rm.executeRemove(db, target)
-		if err != nil {
-			fmt.Println(err.Error())
-			result = 3
-		}
-	}
-	if result == 0 {
-		if config.IsSet(common.RrhAutoDeleteGroup) {
-			db.Prune()
-		}
-		db.StoreAndClose()
-	}
-
-	return result
+	return rm.perform(db)
 }
 
-func (rm *RemoveCommand) parse(args []string) (*removeOptions, error) {
+func (rm *RemoveCommand) buildFlagSet() (*flag.FlagSet, *removeOptions) {
 	var options = removeOptions{false, false, false, []string{}}
 	flags := flag.NewFlagSet("rm", flag.ContinueOnError)
 	flags.Usage = func() { fmt.Println(rm.Help()) }
@@ -79,12 +81,16 @@ func (rm *RemoveCommand) parse(args []string) (*removeOptions, error) {
 	flags.BoolVar(&options.inquiry, "inquiry", false, "inquiry flag")
 	flags.BoolVar(&options.verbose, "verbose", false, "verbose flag")
 	flags.BoolVar(&options.recursive, "recursive", false, "recursive flag")
+	return flags, &options
+}
 
+func (rm *RemoveCommand) parse(args []string) (*removeOptions, error) {
+	var flags, options = rm.buildFlagSet()
 	if err := flags.Parse(args); err != nil {
 		return nil, err
 	}
 	options.args = flags.Args()
-	return &options, nil
+	return options, nil
 }
 
 /*

status/status_cmd.go

@@ -134,7 +134,7 @@ func (status *StatusCommand) Run(args []string) int {
 	return errorFlag
 }
 
-func (status *StatusCommand) parse(args []string, config *common.Config) (*statusOptions, error) {
+func (status *StatusCommand) buildFlagSet() (*flag.FlagSet, *statusOptions) {
 	var options = statusOptions{false, false, false, []string{}}
 	flags := flag.NewFlagSet("status", flag.ExitOnError)
 	flags.Usage = func() { fmt.Println(status.Help()) }
@@ -144,15 +144,20 @@ func (status *StatusCommand) parse(args []string, config *common.Config) (*statu
 	flags.BoolVar(&options.remote, "remote", false, "remote branch status")
 	flags.BoolVar(&options.branch, "b", false, "local branch status")
 	flags.BoolVar(&options.branch, "branch", false, "local branch status")
+	return flags, &options
+}
+
+func (status *StatusCommand) parse(args []string, config *common.Config) (*statusOptions, error) {
+	var flags, options = status.buildFlagSet()
 	if err := flags.Parse(args); err != nil {
 		return nil, err
 	}
 	options.args = flags.Args()
 	if len(options.args) == 0 {
 		options.args = []string{config.GetValue(common.RrhDefaultGroupName)}
 	}
-	status.Options = &options
-	return &options, nil
+	status.Options = options
+	return options, nil
 }
 
 /*