Fix test failure

Author: antham

cmd/create.go

@@ -35,7 +35,3 @@ func newCreateCmd(workspaceManager workspaceManager) *cobra.Command {
 		},
 	}
 }
-
-func init() {
-	rootCmd.AddCommand(newCreateCmd(newWorkspaceManager()))
-}

cmd/dependencies.go

@@ -39,9 +39,3 @@ func newEditCmd(workspaceManager workspaceManager) *cobra.Command {
 		},
 	}
 }
-
-func init() {
-	rootCmd.AddCommand(
-		newEditCmd(newWorkspaceManager()),
-	)
-}

cmd/edit.go

@@ -45,7 +45,3 @@ func newListCmd(workspaceManager workspaceManager) *cobra.Command {
 		},
 	}
 }
-
-func init() {
-	rootCmd.AddCommand(newListCmd(newWorkspaceManager()))
-}

cmd/list.go

@@ -7,8 +7,8 @@ import (
 
 var env string
 
-func newloadCmd(workspaceManager workspaceManager) *cobra.Command {
-	return &cobra.Command{
+func newLoadCmd(workspaceManager workspaceManager) *cobra.Command {
+	loadCmd := &cobra.Command{
 		Use:     "load workspace",
 		Aliases: []string{"l"},
 		Short:   "Load a workspace",
@@ -29,10 +29,6 @@ func newloadCmd(workspaceManager workspaceManager) *cobra.Command {
 			return workspaceManager.Load(args[0], env)
 		},
 	}
-}
-
-func init() {
-	loadCmd := newloadCmd(newWorkspaceManager())
 	loadCmd.Flags().StringVarP(&env, "env", "e", "", "Environment to use (e.g. prod)")
-	rootCmd.AddCommand(loadCmd)
+	return loadCmd
 }

cmd/load.go

@@ -27,7 +27,3 @@ func newRemoveCmd(workspaceManager workspaceManager) *cobra.Command {
 		},
 	}
 }
-
-func init() {
-	rootCmd.AddCommand(newRemoveCmd(newWorkspaceManager()))
-}

cmd/remove.go

@@ -1,26 +1,58 @@
 package cmd
 
 import (
+	"log"
 	"os"
 
+	"github.com/antham/wo/workspace"
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 )
 
-// rootCmd represents the base command when called without any subcommands
-var rootCmd = &cobra.Command{
-	Use:   "wo",
-	Short: "Manage workspace in shell",
+func newRootCmd() *cobra.Command {
+	rootCmd := &cobra.Command{
+		Use:   "wo",
+		Short: "Manage workspace in shell",
+	}
+	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+	w, err := newWorkspaceManager()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	rootCmd.AddCommand(newCreateCmd(w))
+	rootCmd.AddCommand(newEditCmd(w))
+	rootCmd.AddCommand(newListCmd(w))
+	rootCmd.AddCommand(newLoadCmd(w))
+	rootCmd.AddCommand(newRemoveCmd(w))
+	rootCmd.AddCommand(newRunCmd(w))
+	rootCmd.AddCommand(newShowCmd(w))
+	rootCmd.AddCommand(newVersionCmd())
+	return rootCmd
+}
+
+func newWorkspaceManager() (workspaceManager, error) {
+	viper.AutomaticEnv()
+	options := []func(*workspace.WorkspaceManager){
+		workspace.WithEditor(viper.GetString("EDITOR"), viper.GetString("VISUAL")),
+		workspace.WithShellPath(viper.GetString("SHELL")),
+	}
+	viper.SetEnvPrefix("WO")
+	if viper.IsSet("CONFIG_PATH") {
+		options = append(options, workspace.WithConfigPath(viper.GetString("CONFIG_PATH")))
+	}
+	wksManager, err := workspace.NewWorkspaceManager(options...)
+	if err != nil {
+		return nil, err
+	}
+	return wksManager, nil
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
-	err := rootCmd.Execute()
+	err := newRootCmd().Execute()
 	if err != nil {
 		os.Exit(1)
 	}
 }
-
-func init() {
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
-}

cmd/root.go

@@ -9,7 +9,7 @@ import (
 )
 
 func newRunCmd(workspaceManager workspaceManager) *cobra.Command {
-	return &cobra.Command{
+	runCmd := &cobra.Command{
 		Use:     "run workspace function [function-args]...",
 		Aliases: []string{"r"},
 		Short:   "Run a function in a given workspace",
@@ -40,10 +40,6 @@ func newRunCmd(workspaceManager workspaceManager) *cobra.Command {
 			return nil
 		},
 	}
-}
-
-func init() {
-	runCmd := newRunCmd(newWorkspaceManager())
 	runCmd.Flags().StringVarP(&env, "env", "e", "", "Environment to use (e.g. prod)")
-	rootCmd.AddCommand(runCmd)
+	return runCmd
 }

cmd/run.go

@@ -91,7 +91,3 @@ func newShowCmd(workspaceManager workspaceManager) *cobra.Command {
 		},
 	}
 }
-
-func init() {
-	rootCmd.AddCommand(newShowCmd(newWorkspaceManager()))
-}

cmd/show.go

@@ -8,15 +8,12 @@ import (
 
 var appVersion = "dev"
 
-// versionCmd represents the version command
-var versionCmd = &cobra.Command{
-	Use:   "version",
-	Short: "Version",
-	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println(appVersion)
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(versionCmd)
+func newVersionCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "version",
+		Short: "Version",
+		Run: func(cmd *cobra.Command, args []string) {
+			fmt.Println(appVersion)
+		},
+	}
 }