Outsource current branch detection

Author: Tobias Meinhardt

pkg/cli/cmd/close.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"github.com/meinto/glow"
 	l "github.com/meinto/glow/logging"
 	"github.com/meinto/glow/pkg/cli/cmd/internal/command"
 	"github.com/meinto/glow/pkg/cli/cmd/internal/util"
@@ -28,16 +27,7 @@ func SetupCloseCommand(parent command.Service) command.Service {
 				Short: "close a branch",
 			},
 			Run: func(cmd command.Service, args []string) {
-				var currentBranch glow.Branch
-				if RootCmdOptions.CI {
-					cb, err := cmd.GitProvider().GetCIBranch()
-					util.ExitOnError(err)
-					currentBranch = cb
-				} else {
-					cb, _, _, err := cmd.GitClient().CurrentBranch()
-					util.ExitOnError(err)
-					currentBranch = cb
-				}
+				currentBranch := cmd.CurrentBranch(RootCmdOptions.CI)
 
 				err := cmd.GitProvider().Close(currentBranch)
 				if !util.MergeRequestFlags.Gracefully {

pkg/cli/cmd/internal/command/command.go

@@ -3,6 +3,7 @@ package command
 import (
 	"reflect"
 
+	"github.com/meinto/glow"
 	"github.com/meinto/glow/git"
 	"github.com/meinto/glow/gitprovider"
 	"github.com/meinto/glow/pkg"
@@ -29,6 +30,8 @@ type Service interface {
 
 	Patch() Service
 	PatchRun(fieldName string, run func(cmd Service, args []string))
+
+	CurrentBranch(ci bool) glow.Branch
 }
 
 func Setup(cmd Service, parent Service) Service {
@@ -134,3 +137,15 @@ func (c *Command) PatchRun(fieldName string, run func(cmd Service, args []string
 func (c *Command) Add(cmd Service) {
 	c.Command.AddCommand(cmd.Cmd())
 }
+
+func (c *Command) CurrentBranch(ci bool) glow.Branch {
+	if ci {
+		cb, err := c.GitProvider().GetCIBranch()
+		util.ExitOnError(err)
+		return cb
+	} else {
+		cb, _, _, err := c.GitClient().CurrentBranch()
+		util.ExitOnError(err)
+		return cb
+	}
+}

pkg/cli/cmd/publish.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"github.com/meinto/glow"
 	l "github.com/meinto/glow/logging"
 	"github.com/meinto/glow/pkg/cli/cmd/internal/command"
 	"github.com/meinto/glow/pkg/cli/cmd/internal/util"
@@ -28,16 +27,7 @@ func SetupPublishCommand(parent command.Service) command.Service {
 				Short: "publish a release branch",
 			},
 			Run: func(cmd command.Service, args []string) {
-				var currentBranch glow.Branch
-				if RootCmdOptions.CI {
-					cb, err := cmd.GitProvider().GetCIBranch()
-					util.ExitOnError(err)
-					currentBranch = cb
-				} else {
-					cb, _, _, err := cmd.GitClient().CurrentBranch()
-					util.ExitOnError(err)
-					currentBranch = cb
-				}
+				currentBranch := cmd.CurrentBranch(RootCmdOptions.CI)
 
 				err := cmd.GitProvider().Publish(currentBranch)
 				if !util.MergeRequestFlags.Gracefully {

pkg/cli/cmd/push.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"github.com/meinto/glow"
 	"github.com/meinto/glow/pkg/cli/cmd/internal/command"
 	"github.com/meinto/glow/pkg/cli/cmd/internal/util"
 	"github.com/spf13/cobra"
@@ -34,17 +33,7 @@ func SetupPushCommand(parent command.Service) command.Service {
 				Short: "push changes",
 			},
 			Run: func(cmd command.Service, args []string) {
-
-				var currentBranch glow.Branch
-				if RootCmdOptions.CI {
-					cb, err := cmd.GitProvider().GetCIBranch()
-					util.ExitOnError(err)
-					currentBranch = cb
-				} else {
-					cb, _, _, err := cmd.GitClient().CurrentBranch()
-					util.ExitOnError(err)
-					currentBranch = cb
-				}
+				currentBranch := cmd.CurrentBranch(RootCmdOptions.CI)
 
 				if pushCmdOptions.AddAll {
 					util.ExitOnError(cmd.GitClient().AddAll())