commands: refactor to avoid globals

1 files changed, 27 insertions, 30 deletions

diff --git a/commands/comment.go b/commands/comment.go
index 4be39a84..82e7d9f6 100644
--- a/commands/comment.go
+++ b/commands/comment.go
@@ -1,20 +1,34 @@
 package commands
 
 import (
-	"fmt"
-
-	"github.com/MichaelMure/go-term-text"
+	text "github.com/MichaelMure/go-term-text"
 	"github.com/spf13/cobra"
 
-	"github.com/MichaelMure/git-bug/bug"
 	"github.com/MichaelMure/git-bug/cache"
 	"github.com/MichaelMure/git-bug/commands/select"
 	"github.com/MichaelMure/git-bug/util/colors"
 	"github.com/MichaelMure/git-bug/util/interrupt"
 )
 
-func runComment(cmd *cobra.Command, args []string) error {
-	backend, err := cache.NewRepoCache(repo)
+func newCommentCommand() *cobra.Command {
+	env := newEnv()
+
+	cmd := &cobra.Command{
+		Use:     "comment [<id>]",
+		Short:   "Display or add comments to a bug.",
+		PreRunE: loadRepo(env),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return runComment(env, args)
+		},
+	}
+
+	cmd.AddCommand(newCommentAddCommand())
+
+	return cmd
+}
+
+func runComment(env *Env, args []string) error {
+	backend, err := cache.NewRepoCache(env.repo)
 	if err != nil {
 		return err
 	}
@@ -28,33 +42,16 @@ func runComment(cmd *cobra.Command, args []string) error {
 
 	snap := b.Snapshot()
 
-	commentsTextOutput(snap.Comments)
-
-	return nil
-}
-
-func commentsTextOutput(comments []bug.Comment) {
-	for i, comment := range comments {
+	for i, comment := range snap.Comments {
 		if i != 0 {
-			fmt.Println()
+			env.out.Println()
 		}
 
-		fmt.Printf("Author: %s\n", colors.Magenta(comment.Author.DisplayName()))
-		fmt.Printf("Id: %s\n", colors.Cyan(comment.Id().Human()))
-		fmt.Printf("Date: %s\n\n", comment.FormatTime())
-		fmt.Println(text.LeftPadLines(comment.Message, 4))
+		env.out.Printf("Author: %s\n", colors.Magenta(comment.Author.DisplayName()))
+		env.out.Printf("Id: %s\n", colors.Cyan(comment.Id().Human()))
+		env.out.Printf("Date: %s\n\n", comment.FormatTime())
+		env.out.Println(text.LeftPadLines(comment.Message, 4))
 	}
-}
 
-var commentCmd = &cobra.Command{
-	Use:     "comment [<id>]",
-	Short:   "Display or add comments to a bug.",
-	PreRunE: loadRepo,
-	RunE:    runComment,
-}
-
-func init() {
-	RootCmd.AddCommand(commentCmd)
-
-	commentCmd.Flags().SortFlags = false
+	return nil
 }