Merge pull request #27 from gomicro/custom-release-branch

Allow setting base branch from config file

Author: dan9186

cmd/org/create.go

@@ -61,7 +61,7 @@ func orgCreateFunc(cmd *cobra.Command, args []string) {
 		owner = repo.GetOwner().GetLogin()
 		appendStr = fmt.Sprintf("\nCurrent Repo: %v/%v", owner, name)
 
-		url, err := repositories.Process(ctx, client, repo, dryRun)
+		url, err := repositories.Process(ctx, client, repo, base, dryRun)
 		if err != nil {
 			if strings.HasPrefix(err.Error(), "get branch: ") || strings.HasPrefix(err.Error(), "no commits") {
 				bar.Incr()

cmd/org/org.go

@@ -12,6 +12,7 @@ import (
 )
 
 var (
+	base   string
 	dryRun bool
 	client *github.Client
 )
@@ -24,12 +25,22 @@ var OrgCmd = &cobra.Command{
 }
 
 func setupCommand(cmd *cobra.Command, args []string) {
-	var err error
-	client, err = config.GetClient()
+	c, err := config.ParseFromFile()
 	if err != nil {
 		fmt.Printf("Error: %v", err.Error())
 		os.Exit(1)
 	}
 
+	client, err = c.GetClient()
+	if err != nil {
+		fmt.Printf("Error: %v", err.Error())
+		os.Exit(1)
+	}
+
+	base = "release"
+	if c.ReleaseBranch != "" {
+		base = c.ReleaseBranch
+	}
+
 	dryRun = viper.GetBool("dryRun")
 }

cmd/org/release.go

@@ -36,7 +36,7 @@ func orgReleaseFunc(cmd *cobra.Command, args []string) {
 		return
 	}
 
-	releases, err := repositories.GetReleases(ctx, client, repos)
+	releases, err := repositories.GetReleases(ctx, client, repos, base)
 	if err != nil {
 		fmt.Printf("releases: %v\n", err.Error())
 		os.Exit(1)

cmd/user/create.go

@@ -61,7 +61,7 @@ func userCreateFunc(cmd *cobra.Command, args []string) {
 		owner = repo.GetOwner().GetLogin()
 		appendStr = fmt.Sprintf("\nCurrent Repo: %v/%v", owner, name)
 
-		url, err := repositories.Process(ctx, client, repo, dryRun)
+		url, err := repositories.Process(ctx, client, repo, base, dryRun)
 		if err != nil {
 			if strings.HasPrefix(err.Error(), "get branch: ") || strings.HasPrefix(err.Error(), "no commits") {
 				bar.Incr()

cmd/user/release.go

@@ -36,7 +36,7 @@ func userReleaseFunc(cmd *cobra.Command, args []string) {
 		return
 	}
 
-	releases, err := repositories.GetReleases(ctx, client, repos)
+	releases, err := repositories.GetReleases(ctx, client, repos, base)
 	if err != nil {
 		fmt.Printf("releases: %v\n", err.Error())
 		os.Exit(1)

cmd/user/user.go

@@ -12,6 +12,7 @@ import (
 )
 
 var (
+	base   string
 	dryRun bool
 	client *github.Client
 )
@@ -25,12 +26,22 @@ var UserCmd = &cobra.Command{
 }
 
 func setupCommand(cmd *cobra.Command, args []string) {
-	var err error
-	client, err = config.GetClient()
+	c, err := config.ParseFromFile()
 	if err != nil {
 		fmt.Printf("Error: %v", err.Error())
 		os.Exit(1)
 	}
 
+	client, err = c.GetClient()
+	if err != nil {
+		fmt.Printf("Error: %v", err.Error())
+		os.Exit(1)
+	}
+
+	base = "release"
+	if c.ReleaseBranch != "" {
+		base = c.ReleaseBranch
+	}
+
 	dryRun = viper.GetBool("dryRun")
 }

config/client.go

@@ -11,7 +11,7 @@ import (
 	"golang.org/x/oauth2"
 )
 
-func GetClient() (*github.Client, error) {
+func (c *Config) GetClient() (*github.Client, error) {
 	pool := trust.New()
 
 	certs, err := pool.CACerts()
@@ -25,17 +25,12 @@ func GetClient() (*github.Client, error) {
 		},
 	}
 
-	config, err := ParseFromFile()
-	if err != nil {
-		return nil, err
-	}
-
 	clientCtx := context.Background()
 	clientCtx = context.WithValue(clientCtx, oauth2.HTTPClient, httpClient)
 
 	ts := oauth2.StaticTokenSource(
 		&oauth2.Token{
-			AccessToken: config.Github.Token,
+			AccessToken: c.Github.Token,
 		},
 	)
 

config/file.go

@@ -15,7 +15,8 @@ const (
 
 // Config represents the config file for train
 type Config struct {
-	Github Host `yaml:"github.com"`
+	ReleaseBranch string `yaml:"release_branck"`
+	Github        Host   `yaml:"github.com"`
 }
 
 // Host represents a single host that train has a configuration for

repositories/process.go

@@ -14,11 +14,10 @@ Release PR created with ` + "`train`"
 
 // Process takes a github client, context for the client, and a repo to process.
 // It returns the resulting pull request URL or an error if any are encountered.
-func Process(ctx context.Context, client *github.Client, repo *github.Repository, dryRun bool) (string, error) {
+func Process(ctx context.Context, client *github.Client, repo *github.Repository, base string, dryRun bool) (string, error) {
 	name := repo.GetName()
 	owner := repo.GetOwner().GetLogin()
 	head := repo.GetDefaultBranch()
-	base := "release"
 
 	_, _, err := client.Repositories.GetBranch(ctx, owner, name, base)
 	if err != nil {

repositories/releases.go

@@ -11,7 +11,7 @@ import (
 
 // GetReleases takes a context, github client, and respos to iterate and collects
 // release pull requests for the repos.
-func GetReleases(ctx context.Context, client *github.Client, repos []*github.Repository) ([]*github.PullRequest, error) {
+func GetReleases(ctx context.Context, client *github.Client, repos []*github.Repository, base string) ([]*github.PullRequest, error) {
 	var releases []*github.PullRequest
 
 	count := len(repos)
@@ -34,7 +34,6 @@ func GetReleases(ctx context.Context, client *github.Client, repos []*github.Rep
 		name = repo.GetName()
 		appendStr = fmt.Sprintf("\nCurrent Repo: %v/%v", owner, name)
 		head := repo.GetDefaultBranch()
-		base := "release"
 
 		opts := &github.PullRequestListOptions{
 			Head: head,