Merge pull request #7 from bestseller-ecom/regexp

Adds new clone structure

Author: felipem1210

.gitignore

@@ -1 +1,54 @@
-testing*/
+testing*/
+
+# Created by https://www.toptal.com/developers/gitignore/api/macos,linux
+# Edit at https://www.toptal.com/developers/gitignore?templates=macos,linux
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### macOS Patch ###
+# iCloud generated files
+*.icloud
+
+# End of https://www.toptal.com/developers/gitignore/api/macos,linux

cmd/add.go

@@ -27,10 +27,9 @@ var addCmd = &cobra.Command{
 	Short: "Add all content in each repository",
 	Long:  `Add all content to each repository, equivalent to make git add -A.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		json_file, _ := cmd.Flags().GetString("repo-info-json-file")
-		myRepos := githelper.MyRepos{}
-		repoNames := myRepos.GithubGetRepoNames(json_file)
-		githelper.GitAdd(repoNames)
+		target, _ := cmd.Flags().GetString("target")
+		repoNames := githelper.ListDirectories(target)
+		githelper.GitAdd(target, repoNames)
 	},
 }
 

cmd/checkout.go

@@ -28,10 +28,9 @@ var checkoutCmd = &cobra.Command{
 	Long:  `Checkout to a specific branch, you need to pass branch name`,
 	Run: func(cmd *cobra.Command, args []string) {
 		branch, _ := cmd.Flags().GetString("branch")
-		json_file, _ := cmd.Flags().GetString("repo-info-json-file")
-		myRepos := githelper.MyRepos{}
-		repoNames := myRepos.GithubGetRepoNames(json_file)
-		githelper.GitCheckout(repoNames, branch)
+		target, _ := cmd.Flags().GetString("target")
+		repoNames := githelper.ListDirectories(target)
+		githelper.GitCheckout(target, repoNames, branch)
 	},
 }
 

cmd/clone.go

@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 package cmd
 
 import (
-	"errors"
-	"os"
-
 	"github.com/fatih/color"
 	"github.com/felipem1210/git-helper/githelper"
 	"github.com/spf13/cobra"
@@ -36,27 +33,28 @@ var cloneCmd = &cobra.Command{
 		provider, _ := cmd.Flags().GetString("provider")
 		json_file, _ := cmd.Flags().GetString("repo-info-json-file")
 		org, _ := cmd.Flags().GetString("org")
+		regex, _ := cmd.Flags().GetString("regexp")
+		target, _ := cmd.Flags().GetString("target")
+		auth, _ := cmd.Flags().GetString("auth")
 		if provider == "github" && json_file != "" {
 			myRepos := githelper.MyRepos{}
-			repoNames = myRepos.GithubGetRepoNames(json_file)
-			repoUrls = myRepos.GithubGetCloneUrls(json_file)
-			if _, err := os.Stat(json_file); errors.Is(err, os.ErrNotExist) {
-				myRepos = myRepos.GetGithubRepositoriesInfo(org)
-				err := githelper.WriteReposToJson(myRepos, json_file)
-				if err != nil {
-					githelper.CheckIfError(err)
-				} else {
-					color.Green("The json file %s with repo info was written sucessfully", json_file)
-				}
-			}
+			myRepos = myRepos.GetGithubRepositoriesInfo(org)
+			err := githelper.WriteReposToJson(myRepos, json_file)
+			githelper.CheckIfError(err)
+			color.Green("The json file %s with repo info was written sucessfully", json_file)
+			repoNames = myRepos.GithubGetRepoNames(json_file, regex)
+			repoUrls = myRepos.GithubGetGitUrls(json_file, regex, auth)
 		}
-		githelper.GitClone(repoNames, repoUrls)
+		githelper.GitClone(target, auth, repoNames, repoUrls)
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(cloneCmd)
-	cloneCmd.PersistentFlags().StringP("provider", "p", "", "A provider to choose, options: gitub, gitlab")
-	cloneCmd.MarkPersistentFlagRequired("provider")
+	cloneCmd.PersistentFlags().StringP("provider", "p", "github", "A provider to choose, options: gitub, gitlab")
+	//cloneCmd.MarkPersistentFlagRequired("provider")
 	cloneCmd.PersistentFlags().StringP("org", "o", "", "The github Organization to work with")
+	cloneCmd.PersistentFlags().StringP("regexp", "r", "", "Regexp to apply to repositories clone process, to clone based on it")
+	cloneCmd.PersistentFlags().StringP("auth", "a", "ssh", "Select if you want to clone using HTTPS or SSH.")
+	cloneCmd.PersistentFlags().String("repo-info-json-file", "repos_info.json", "The name of the json file with info of the repos of the Github Org. It is read for each git local actions.")
 }

cmd/commit.go

@@ -28,10 +28,9 @@ var commitCmd = &cobra.Command{
 	Long:  `Create a commit to each repository.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		message, _ := cmd.Flags().GetString("message")
-		json_file, _ := cmd.Flags().GetString("repo-info-json-file")
-		myRepos := githelper.MyRepos{}
-		repoNames := myRepos.GithubGetRepoNames(json_file)
-		githelper.GitCommit(repoNames, message)
+		target, _ := cmd.Flags().GetString("target")
+		repoNames := githelper.ListDirectories(target)
+		githelper.GitCommit(target, repoNames, message)
 	},
 }
 

cmd/createBranch.go

@@ -28,10 +28,9 @@ var createBranchCmd = &cobra.Command{
 	Long:  `Create a branch locally and checkout into that branch for each repository.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		branch, _ := cmd.Flags().GetString("branch")
-		json_file, _ := cmd.Flags().GetString("repo-info-json-file")
-		myRepos := githelper.MyRepos{}
-		repoNames := myRepos.GithubGetRepoNames(json_file)
-		githelper.GitCreateBranch(repoNames, branch)
+		target, _ := cmd.Flags().GetString("target")
+		repoNames := githelper.ListDirectories(target)
+		githelper.GitCreateBranch(target, repoNames, branch)
 	},
 }
 

cmd/fetch.go

@@ -27,10 +27,9 @@ var fetchCmd = &cobra.Command{
 	Short: "Do a git fetch of all branches on each repo",
 	Long:  `Do a git fetch of all branches on each repo. Equivalent to do: git fetch --all.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		json_file, _ := cmd.Flags().GetString("repo-info-json-file")
-		myRepos := githelper.MyRepos{}
-		repoNames := myRepos.GithubGetRepoNames(json_file)
-		githelper.GitFetch(repoNames)
+		target, _ := cmd.Flags().GetString("target")
+		repoNames := githelper.ListDirectories(target)
+		githelper.GitFetch(target, repoNames)
 	},
 }
 

cmd/pr.go

@@ -35,20 +35,18 @@ var prCmd = &cobra.Command{
 		create, _ := cmd.Flags().GetBool("create")
 		update, _ := cmd.Flags().GetBool("update")
 		merge, _ := cmd.Flags().GetBool("merge")
+		target, _ := cmd.Flags().GetString("target")
 
 		repos := githelper.MyRepos{}
-		repoNames := repos.GithubGetRepoNames(repos_json_file)
+		repoNames := githelper.ListDirectories(target)
 		org := repos.GithubGetOrg(repos_json_file)
 
 		myPrs := githelper.MyPrs{}
 		if create {
 			myPrs = myPrs.GithubCreatePr(org, repoNames, new_pr_json_file, reviewers)
 			err := githelper.WritePrsToJson(myPrs, pr_info_json_file)
-			if err != nil {
-				githelper.CheckIfError(err)
-			} else {
-				color.Green("The json file %s with pr info was written sucessfully", pr_info_json_file)
-			}
+			githelper.CheckIfError(err)
+			color.Green("The json file %s with pr info was written sucessfully", pr_info_json_file)
 		} else if update {
 			myPrs.GithubEditPr(org, repoNames, pr_info_json_file)
 		} else if merge {

cmd/pull.go

@@ -27,10 +27,9 @@ var pullCmd = &cobra.Command{
 	Short: "Pull changes of a branch from remote",
 	Long:  `Pull changes of a branch from remote. It will make the pull of current branch`,
 	Run: func(cmd *cobra.Command, args []string) {
-		json_file, _ := cmd.Flags().GetString("repo-info-json-file")
-		myRepos := githelper.MyRepos{}
-		repoNames := myRepos.GithubGetRepoNames(json_file)
-		githelper.GitPull(repoNames)
+		target, _ := cmd.Flags().GetString("target")
+		repoNames := githelper.ListDirectories(target)
+		githelper.GitPull(target, repoNames)
 	},
 }
 

cmd/push.go

@@ -27,10 +27,9 @@ var pushCmd = &cobra.Command{
 	Short: "Push changes of a branch to remote",
 	Long:  `Push changes of a branch from remote. It will make the Push of current branch.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		json_file, _ := cmd.Flags().GetString("repo-info-json-file")
-		myRepos := githelper.MyRepos{}
-		repoNames := myRepos.GithubGetRepoNames(json_file)
-		githelper.GitPush(repoNames)
+		target, _ := cmd.Flags().GetString("target")
+		repoNames := githelper.ListDirectories(target)
+		githelper.GitPush(target, repoNames)
 	},
 }
 

cmd/rebase.go

@@ -32,10 +32,9 @@ If you have conflicts you can pass the argument with "continue" or "abort" optio
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println("rebase called")
 		base_branch, _ := cmd.Flags().GetString("base-branch")
-		json_file, _ := cmd.Flags().GetString("repo-info-json-file")
-		myRepos := githelper.MyRepos{}
-		repoNames := myRepos.GithubGetRepoNames(json_file)
-		githelper.GitRebase(repoNames, base_branch)
+		target, _ := cmd.Flags().GetString("target")
+		repoNames := githelper.ListDirectories(target)
+		githelper.GitRebase(target, repoNames, base_branch)
 	},
 }
 

cmd/repository.go

@@ -42,4 +42,5 @@ func init() {
 	repoCmd.PersistentFlags().StringP("provider", "p", "", "A provider to choose, options: gitub, gitlab")
 	repoCmd.MarkPersistentFlagRequired("provider")
 	repoCmd.PersistentFlags().BoolP("create", "c", false, "Create the repositories from repo-info-json-file")
+	repoCmd.PersistentFlags().String("repo-info-json-file", "repos_info.json", "The name of the json file with info of the repos of the Github Org. It is read for each git local actions.")
 }

cmd/reset.go

@@ -27,10 +27,9 @@ var resetCmd = &cobra.Command{
 	Short: "Hard Reset to HEAD in all repositories",
 	Long:  `Hard Reset to HEAD in all repositories.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		json_file, _ := cmd.Flags().GetString("repo-info-json-file")
-		myRepos := githelper.MyRepos{}
-		repoNames := myRepos.GithubGetRepoNames(json_file)
-		githelper.GitReset(repoNames)
+		target, _ := cmd.Flags().GetString("target")
+		repoNames := githelper.ListDirectories(target)
+		githelper.GitReset(target, repoNames)
 	},
 }
 

cmd/root.go

@@ -57,5 +57,5 @@ func init() {
 	// Cobra also supports local flags, which will only run
 	// when this action is called directly.
 	cobra.OnInitialize(githelper.ValidateEnv)
-	rootCmd.PersistentFlags().String("repo-info-json-file", "repos_info.json", "The name of the json file with info of the repos of the Github Org or Gitlab Group. It is read for each git local actions.")
+	rootCmd.PersistentFlags().StringP("target", "t", "", "Target directory inside your working directory where git actions will be executed. If not set actions will be done on WORKING_DIR")
 }

cmd/status.go

@@ -27,10 +27,9 @@ var statusCmd = &cobra.Command{
 	Short: "Print the working tree status of each repository",
 	Long:  `Print the working tree status of each repository. Equivalent to do git status`,
 	Run: func(cmd *cobra.Command, args []string) {
-		json_file, _ := cmd.Flags().GetString("repo-info-json-file")
-		myRepos := githelper.MyRepos{}
-		repoNames := myRepos.GithubGetRepoNames(json_file)
-		githelper.GitStatus(repoNames)
+		target, _ := cmd.Flags().GetString("target")
+		repoNames := githelper.ListDirectories(target)
+		githelper.GitStatus(target, repoNames)
 	},
 }