commands: refactor to avoid globals

1 files changed, 20 insertions, 15 deletions

diff --git a/commands/termui.go b/commands/termui.go
index 2cdc3507..174d60ec 100644
--- a/commands/termui.go
+++ b/commands/termui.go
@@ -1,14 +1,31 @@
 package commands
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/MichaelMure/git-bug/cache"
 	"github.com/MichaelMure/git-bug/termui"
 	"github.com/MichaelMure/git-bug/util/interrupt"
-	"github.com/spf13/cobra"
 )
 
-func runTermUI(cmd *cobra.Command, args []string) error {
-	backend, err := cache.NewRepoCache(repo)
+func newTermUICommand() *cobra.Command {
+	env := newEnv()
+
+	cmd := &cobra.Command{
+		Use:     "termui",
+		Aliases: []string{"tui"},
+		Short:   "Launch the terminal UI.",
+		PreRunE: loadRepoEnsureUser(env),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return runTermUI(env)
+		},
+	}
+
+	return cmd
+}
+
+func runTermUI(env *Env) error {
+	backend, err := cache.NewRepoCache(env.repo)
 	if err != nil {
 		return err
 	}
@@ -17,15 +34,3 @@ func runTermUI(cmd *cobra.Command, args []string) error {
 
 	return termui.Run(backend)
 }
-
-var termUICmd = &cobra.Command{
-	Use:     "termui",
-	Aliases: []string{"tui"},
-	Short:   "Launch the terminal UI.",
-	PreRunE: loadRepoEnsureUser,
-	RunE:    runTermUI,
-}
-
-func init() {
-	RootCmd.AddCommand(termUICmd)
-}