Merge pull request #12 from gomicro/pull-tags

move pull dir to be flag based with default and add tags

Author: dan9186

client/repos_checkout.go

@@ -15,7 +15,7 @@ var (
 	ErrUnstagedChanges = errors.New("unstanged changes")
 )
 
-func (c *Client) CheckoutRepos(ctx context.Context, dirs []string, args []string) error {
+func (c *Client) CheckoutRepos(ctx context.Context, dirs []string, args ...string) error {
 	count := len(dirs)
 	args = append([]string{"checkout"}, args...)
 

client/repos_pull.go

@@ -9,8 +9,9 @@ import (
 	"github.com/gosuri/uiprogress"
 )
 
-func (c *Client) PullRepos(ctx context.Context, dirs []string) error {
+func (c *Client) PullRepos(ctx context.Context, dirs []string, args ...string) error {
 	count := len(dirs)
+	args = append([]string{"pull"}, args...)
 
 	currRepo := ""
 	bar := uiprogress.AddBar(count).
@@ -26,9 +27,10 @@ func (c *Client) PullRepos(ctx context.Context, dirs []string) error {
 	for _, dir := range dirs {
 		currRepo = fmt.Sprintf("\nCurrent Repo: %v", dir)
 
-		cmd := exec.CommandContext(ctx, "git", "pull")
+		cmd := exec.CommandContext(ctx, "git", args...)
 
 		buf := bytes.Buffer{}
+
 		cmd.Stdout = &buf
 
 		cmd.Dir = dir

cmd/checkout.go

@@ -8,8 +8,12 @@ import (
 	"github.com/spf13/cobra"
 )
 
+func init() {
+	checkoutCmd.Flags().StringVarP(&dir, "dir", "d", ".", "directory to checkout repos from")
+}
+
 var checkoutCmd = &cobra.Command{
-	Use:              "checkout [branch] (dir)",
+	Use:              "checkout [branch]",
 	Short:            "checkout the desired branch",
 	Long:             `checkout the desired branch`,
 	Args:             cobra.RangeArgs(1, 2),
@@ -20,11 +24,6 @@ var checkoutCmd = &cobra.Command{
 func checkoutFunc(cmd *cobra.Command, args []string) error {
 	ctx := context.Background()
 
-	dir := "."
-	if len(args) > 1 {
-		dir = args[1]
-	}
-
 	uiprogress.Start()
 	defer uiprogress.Stop()
 
@@ -34,7 +33,7 @@ func checkoutFunc(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("get dirs: %w", err)
 	}
 
-	err = clt.CheckoutRepos(ctx, repoDirs, args)
+	err = clt.CheckoutRepos(ctx, repoDirs, args...)
 	if err != nil {
 		cmd.SilenceUsage = true
 		return fmt.Errorf("checkout repos: %w", err)

cmd/pull.go

@@ -8,23 +8,27 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var (
+	dir  string
+	tags bool
+)
+
+func init() {
+	pullCmd.Flags().StringVarP(&dir, "dir", "d", ".", "directory to pull repos from")
+	pullCmd.Flags().BoolVar(&tags, "tags", false, "pull tags")
+}
+
 var pullCmd = &cobra.Command{
-	Use:              "pull [dir]",
+	Use:              "pull",
 	Short:            "Pull all repos in a directory",
 	Long:             `Pull all repos in a directory.`,
-	Args:             cobra.MaximumNArgs(1),
 	PersistentPreRun: setupClient,
 	RunE:             pullFunc,
 }
 
 func pullFunc(cmd *cobra.Command, args []string) error {
 	ctx := context.Background()
 
-	dir := "."
-	if len(args) > 0 {
-		dir = args[0]
-	}
-
 	uiprogress.Start()
 	defer uiprogress.Stop()
 
@@ -34,7 +38,11 @@ func pullFunc(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("get dirs: %w", err)
 	}
 
-	err = clt.PullRepos(ctx, repoDirs)
+	if tags {
+		args = append(args, "--tags")
+	}
+
+	err = clt.PullRepos(ctx, repoDirs, args...)
 	if err != nil {
 		cmd.SilenceUsage = true
 		return fmt.Errorf("pull repos: %w", err)