Merge pull request #3 from hellofresh/feature/improvements

Added Improvements

Author: italolelis

.github.sample.toml

@@ -20,7 +20,7 @@ LogLevel="debug"
     # Defines the github token
     Token=""
 
-    # Defines permission specifies the permission to grant the user on this repository.
+    # Defines permission specifies the permission to grant the team on this repository.
 	# Possible values are:
 	#     pull - team members can pull, but not push to or administer this repository
 	#     push - team members can pull and push, but not administer this repository
@@ -30,6 +30,12 @@ LogLevel="debug"
         {ID=1234, Permission='pull'},
     ]
 
+    # Defines permission specifies the permission to grant the user on this repository.
+    Collaborators=[
+        #Example
+        {Username="example", Permission='push'},
+    ]
+
     # Adds a set of labels when creating the repo
     Labels=[
         {Name='custom', Color='ad974f'}, 

Gopkg.lock

@@ -35,3 +35,7 @@
 [[constraint]]
   name = "gopkg.in/src-d/go-git.v4"
   revision = "f9879dd043f84936a1f8acb8a53b74332a7ae135"
+
+[[constraint]]
+  name = "github.com/fatih/color"
+  version = "1.5.0"

Gopkg.toml

@@ -21,12 +21,19 @@ After you have *github-cli* up and running we can create our first repository.
 First of all we have to create a configuration file that will customize how our repositories will be created. You can have a look on our [example](.github.sample.toml).
 This file can be placed on the same folder as your binary is, or in your home directory and it should be named `.github.toml` (You can also use it as `yaml` or `json`).
 
+## Usage
+
+```
+github-cli [command] [--flags]
+``` 
+
 ### Commands
 
 | Command                  | Description                          |
 |--------------------------|--------------------------------------|
-| `github-cli create-repo` | Creates a new github repository      |
-| `github-cli create-test` | Creates a new hellofresh hiring test |
+| `github-cli create repo [--flags]` | Creates a new github repository      |
+| `github-cli create test [--flags]` | Creates a new hellofresh hiring test |
+| `github-cli unseat [--flags]`      | Removes external collaborators from repositories |
 
 ## Contributing
 

README.md

@@ -1,87 +1,125 @@
 package cmd
 
 import (
-	"errors"
-	"os"
-
-	"github.com/deiwin/interact"
+	"github.com/fatih/color"
 	"github.com/hellofresh/github-cli/pkg/pullapprove"
 	"github.com/hellofresh/github-cli/pkg/repo"
-	log "github.com/sirupsen/logrus"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
 type (
 	// CreateRepoFlags are the flags for the create repository command
 	CreateRepoFlags struct {
+		Name                 string
+		Description          string
+		Org                  string
 		Private              bool
 		HasPullApprove       bool
 		HasTeams             bool
+		HasCollaborators     bool
 		HasLabels            bool
 		HasDefaultLabels     bool
 		HasWebhooks          bool
 		HasBranchProtections bool
 	}
 )
 
-var (
-	createRepoFlags CreateRepoFlags
-	checkNotEmpty   = func(input string) error {
-		// note that the inputs provided to these checks are already trimmed
-		if input == "" {
-			return errors.New("input should not be empty")
-		}
-		return nil
-	}
-)
+var createRepoFlags CreateRepoFlags
+
+func init() {
+	repoCmd.AddCommand(createRepoCmd)
+
+	createRepoCmd.Flags().StringVarP(&createRepoFlags.Name, "name", "n", "", "The name of the repository")
+	createRepoCmd.Flags().StringVarP(&createRepoFlags.Description, "description", "d", "", "The repository's description")
+	createRepoCmd.Flags().StringVarP(&createRepoFlags.Org, "organization", "o", "", "Github's organization")
+	createRepoCmd.Flags().BoolVar(&createRepoFlags.Private, "private", true, "Is the repository private?")
+	createRepoCmd.Flags().BoolVar(&createRepoFlags.HasPullApprove, "add-pullapprove", true, "Enables pull approve")
+	createRepoCmd.Flags().BoolVar(&createRepoFlags.HasTeams, "add-teams", true, "Enable teams")
+	createRepoCmd.Flags().BoolVar(&createRepoFlags.HasLabels, "add-labels", true, "Enable labels")
+	createRepoCmd.Flags().BoolVar(&createRepoFlags.HasDefaultLabels, "add-default-labels", true, "Removes the default github labels")
+	createRepoCmd.Flags().BoolVar(&createRepoFlags.HasWebhooks, "add-webhooks", true, "Enables webhooks configurations")
+	createRepoCmd.Flags().BoolVar(&createRepoFlags.HasBranchProtections, "add-branch-protections", true, "Enables branch protections")
+}
 
 // RunCreateRepo runs the command to create a new repository
 func RunCreateRepo(cmd *cobra.Command, args []string) {
 	var err error
 
-	actor := interact.NewActor(os.Stdin, os.Stdout)
-	repoName, err := actor.Prompt("Please enter the repository name", checkNotEmpty)
-	if err != nil {
-		log.Fatal(err)
-	}
+	name := createRepoFlags.Name
+	checkEmpty(name, "Please provide a repository name")
+
+	description := createRepoFlags.Description
 
-	org, err := actor.PromptOptional("Please enter the org name", globalConfig.Github.Organization, checkNotEmpty)
-	if err != nil {
-		log.Fatal(err)
+	org := createRepoFlags.Org
+	if org == "" {
+		org = globalConfig.Github.Organization
 	}
+	checkEmpty(org, "Please provide an organization")
 
-	opts := &repo.HelloFreshRepoOpt{
-		Name:    repoName,
-		Org:     org,
-		Private: createRepoFlags.Private,
-		PullApprove: &repo.PullApproveRule{
-			Enabled:             createRepoFlags.HasPullApprove,
+	opts := &repo.GithubRepoOpts{
+		PullApprove: &repo.PullApproveOpts{
 			Filename:            globalConfig.PullApprove.Filename,
 			ProtectedBranchName: globalConfig.PullApprove.ProtectedBranchName,
 			Client:              pullapprove.New(globalConfig.PullApprove.Token),
 		},
-		Labels: &repo.LabelsRule{
-			Enabled:             createRepoFlags.HasLabels,
+		Labels: &repo.LabelsOpts{
 			RemoveDefaultLabels: globalConfig.Github.RemoveDefaultLabels,
 			Labels:              globalConfig.Github.Labels,
 		},
-		Teams: &repo.TeamsRule{
-			Enabled: createRepoFlags.HasTeams,
-			Teams:   globalConfig.Github.Teams,
+		Teams: &repo.TeamsOpts{
+			Teams: globalConfig.Github.Teams,
 		},
-		Webhooks: &repo.WebhooksRule{
-			Enabled:  createRepoFlags.HasWebhooks,
+		Webhooks: &repo.WebhooksOpts{
 			Webhooks: globalConfig.Github.Webhooks,
 		},
-		BranchProtections: &repo.BranchProtectionsRule{
-			Enabled:     createRepoFlags.HasBranchProtections,
+		BranchProtections: &repo.BranchProtectionsOpts{
 			Protections: globalConfig.Github.Protections,
 		},
 	}
 
 	creator := repo.NewGithub(githubClient)
-	err = creator.Create(opts)
-	if err != nil {
-		log.WithError(err).Fatal("Could not create github repo")
+
+	color.White("Creating repository...")
+	err = creator.CreateRepo(name, description, org, createRepoFlags.Private)
+	checkEmpty(errors.Wrap(err, "could not create repository"), "")
+
+	if createRepoFlags.HasPullApprove {
+		color.White("Adding pull approve...")
+		err = creator.AddPullApprove(name, org, opts.PullApprove)
+		checkEmpty(errors.Wrap(err, "could not add pull approve"), "")
 	}
+
+	if createRepoFlags.HasTeams {
+		color.White("Adding teams to repository...")
+		err = creator.AddTeamsToRepo(name, org, opts.Teams)
+		checkEmpty(errors.Wrap(err, "could add teams to repository"), "")
+	}
+
+	if createRepoFlags.HasCollaborators {
+		color.White("Adding collaborators to repository...")
+		err = creator.AddCollaborators(name, org, opts.Collaborators)
+		checkEmpty(errors.Wrap(err, "could not add collaborators to repository"), "")
+	}
+
+	if createRepoFlags.HasLabels {
+		color.White("Adding labels to repository...")
+		err = creator.AddLabelsToRepo(name, org, opts.Labels)
+		checkEmpty(errors.Wrap(err, "could add labels to repository"), "")
+	}
+
+	if createRepoFlags.HasWebhooks {
+		color.White("Adding webhooks to repository...")
+		err = creator.AddWebhooksToRepo(name, org, opts.Webhooks)
+		checkEmpty(errors.Wrap(err, "could add webhooks to repository"), "")
+	}
+
+	if createRepoFlags.HasBranchProtections {
+		color.White("Adding branch protections to repository...")
+		err = creator.AddBranchProtections(name, org, opts.BranchProtections)
+		checkEmpty(errors.Wrap(err, "could add branch protections to repository"), "")
+	}
+
+	color.Green("Repository created!")
+	checkEmpty(err, "Could not create github repo")
 }