♻️ improved error handling for the CLI

internal/cli/add.go

@@ -1,9 +1,8 @@
 package cli
 
 import (
-	"log"
-
 	"github.com/spf13/cobra"
+	"github.com/xarunoba/ccoco/pkg/ccoco"
 )
 
 func init() {
@@ -13,14 +12,23 @@ func init() {
 var addCmd = &cobra.Command{
 	Use:     "add [file1 file2 ...]",
 	Aliases: []string{"a"},
-	Short:   "Add file to config",
+	Short:   "Add file/s to config",
 	Long: `Adds file/s to config.
-This will add file/s to the ccoco.config.json for ccoco to generate.
+This will add file/s to the ` + app.ConfigFile().Name + ` for ccoco to generate.
 `,
 	Args: cobra.MinimumNArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		instance, err := ccoco.New()
+		if err != nil {
+			return err
+		}
+		app = instance
+		return nil
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := app.AddToFiles(args); err != nil {
-			log.Fatalf("Error adding files: %v", err)
+			return err
 		}
+		return nil
 	},
 }

internal/cli/generate.go

@@ -1,9 +1,8 @@
 package cli
 
 import (
-	"log"
-
 	"github.com/spf13/cobra"
+	"github.com/xarunoba/ccoco/pkg/ccoco"
 )
 
 func init() {
@@ -18,9 +17,18 @@ var generateCmd = &cobra.Command{
 This will populate the branch configs folder based on the existing branches.
 	`,
 	Args: cobra.NoArgs,
-	Run: func(cmd *cobra.Command, args []string) {
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		instance, err := ccoco.New()
+		if err != nil {
+			return err
+		}
+		app = instance
+		return nil
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := app.GenerateConfigs(); err != nil {
-			log.Fatalf("Error generating configs: %v", err)
+			return err
 		}
+		return nil
 	},
 }

internal/cli/githook.go

@@ -1,8 +1,6 @@
 package cli
 
 import (
-	"log"
-
 	"github.com/spf13/cobra"
 	"github.com/xarunoba/ccoco/pkg/ccoco"
 )
@@ -19,11 +17,20 @@ var githookCmd = &cobra.Command{
 	Long: `Injects ccoco to git hooks without depending on a git hook manager.
 This will add a post-checkout hook to automatically change config on checkout.
 	`,
-	Run: func(cmd *cobra.Command, args []string) {
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		instance, err := ccoco.New()
+		if err != nil {
+			return err
+		}
+		app = instance
+		return nil
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := app.AddToGitHooks(ccoco.AddToGitHooksOptions{
 			SkipExecution: skipGitHookExecute,
 		}); err != nil {
-			log.Fatalf("Error adding to git hooks: %v", err)
+			return err
 		}
+		return nil
 	},
 }

internal/cli/init.go

@@ -1,8 +1,6 @@
 package cli
 
 import (
-	"log"
-
 	"github.com/spf13/cobra"
 	"github.com/xarunoba/ccoco/pkg/ccoco"
 )
@@ -17,17 +15,26 @@ func init() {
 var initCmd = &cobra.Command{
 	Use:     "init",
 	Aliases: []string{"i"},
-	Short:   "Initialize config file",
-	Long:    `Initialize config file.`,
-	Run: func(cmd *cobra.Command, args []string) {
+	Short:   "Initialize ccoco",
+	Long:    `Initialize ccoco in the current git repository.`,
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		instance, err := ccoco.New()
+		if err != nil {
+			return err
+		}
+		app = instance
+		return nil
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := app.Init(ccoco.InitOptions{
 			AddToGitIgnore: addToGitIgnore,
 			AddToGitHooks:  injectCcocoToGitHooks,
 			AddToGitHooksOptions: ccoco.AddToGitHooksOptions{
 				SkipExecution: skipGitHookExecute,
 			},
 		}); err != nil {
-			log.Fatalf("Error initializing ccoco: %v", err)
+			return err
 		}
+		return nil
 	},
 }

internal/cli/remove.go

@@ -1,9 +1,8 @@
 package cli
 
 import (
-	"log"
-
 	"github.com/spf13/cobra"
+	"github.com/xarunoba/ccoco/pkg/ccoco"
 )
 
 func init() {
@@ -13,12 +12,22 @@ func init() {
 var removeCmd = &cobra.Command{
 	Use:     "remove",
 	Aliases: []string{"rm"},
-	Short:   "Remove config files",
-	Long:    `Remove config files`,
-	Args:    cobra.MinimumNArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
+	Short:   "Remove files to config",
+	Long: `Remove files to config.
+This will remove file/s from the ` + app.ConfigFile().Name + ` for ccoco to generate.`,
+	Args: cobra.MinimumNArgs(1),
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		instance, err := ccoco.New()
+		if err != nil {
+			return err
+		}
+		app = instance
+		return nil
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := app.RemoveFromFiles(args); err != nil {
-			log.Fatalf("Error removing files: %v", err)
+			return err
 		}
+		return nil
 	},
 }

internal/cli/root.go

@@ -11,25 +11,17 @@ import (
 
 var app *ccoco.Ccoco
 
-func init() {
-	instance, err := ccoco.New()
-	if err != nil {
-		log.Fatalf("Error initializing ccoco: %v", err)
-	}
-
-	app = instance
-}
-
 var cli = &cobra.Command{
 	Use:   filepath.Base(os.Args[0]),
 	Short: "Change config on checkout",
 	Long: `ccoco changes your config files based on your current branch.
 Integrate with git hooks to automatically change config on checkout.`,
-	Run: func(cmd *cobra.Command, args []string) {
+	RunE: func(cmd *cobra.Command, args []string) error {
 		err := cmd.Help()
 		if err != nil {
-			log.Fatalf("Error executing ccoco: %v", err)
+			return err
 		}
+		return nil
 	},
 }
 

internal/cli/run.go

@@ -1,8 +1,6 @@
 package cli
 
 import (
-	"log"
-
 	"github.com/spf13/cobra"
 	"github.com/xarunoba/ccoco/pkg/ccoco"
 )
@@ -17,9 +15,18 @@ var runCmd = &cobra.Command{
 	Short:   "Run ccoco",
 	Long: `Run ccoco. 
 This will change config files based on your current branch.`,
-	Run: func(cmd *cobra.Command, args []string) {
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		instance, err := ccoco.New()
+		if err != nil {
+			return err
+		}
+		app = instance
+		return nil
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
 		if err := app.Run(ccoco.RunOptions{}); err != nil {
-			log.Fatalf("Error running ccoco: %v", err)
+			return err
 		}
+		return nil
 	},
 }