update step interface

cmd/command/define.go

@@ -17,15 +17,10 @@ var defineCmd = &cobra.Command{
 
 		runner := core.NewStepRunner(
 			core.NewDBClientMaker(),
-			core.NewCommandDefiner(shimsDir),
+			core.NewCommandDefiner(shimsDir, simpleCmdFlag.name, simpleCmdFlag.version, simpleCmdFlag.location, false),
 		)
 
-		utils.ExitWithError(runner.Run(utils.SetIntoContext(cmd.Context(), map[define.ContextKey]interface{}{
-			define.ContextKeyName:           simpleCmdFlag.name,
-			define.ContextKeyVersion:        simpleCmdFlag.version,
-			define.ContextKeyLocation:       simpleCmdFlag.location,
-			define.ContextKeyCommandManaged: false,
-		})), "install failed")
+		utils.ExitWithError(runner.Run(cmd.Context()), "install failed")
 
 		define.Logger.Info("defined command", map[string]interface{}{
 			"name":     simpleCmdFlag.name,

cmd/command/install.go

@@ -17,17 +17,12 @@ var installCmd = &cobra.Command{
 
 		runner := core.NewStepRunner(
 			core.NewDBClientMaker(),
+			core.NewCommandDefiner(shimsDir, simpleCmdFlag.name, simpleCmdFlag.version, simpleCmdFlag.location, true),
 			core.NewDownloader(),
 			core.NewBinariesInstaller(shimsDir),
-			core.NewCommandDefiner(shimsDir),
 		)
 
-		utils.ExitWithError(runner.Run(utils.SetIntoContext(cmd.Context(), map[define.ContextKey]interface{}{
-			define.ContextKeyName:           simpleCmdFlag.name,
-			define.ContextKeyVersion:        simpleCmdFlag.version,
-			define.ContextKeyLocation:       simpleCmdFlag.location,
-			define.ContextKeyCommandManaged: true,
-		})), "install failed")
+		utils.ExitWithError(runner.Run(cmd.Context()), "install failed")
 
 		define.Logger.Info("installed command", map[string]interface{}{
 			"name":     simpleCmdFlag.name,

cmd/command/list.go

@@ -6,7 +6,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/mrlyc/cmdr/core"
-	"github.com/mrlyc/cmdr/define"
 	"github.com/mrlyc/cmdr/utils"
 )
 
@@ -28,11 +27,7 @@ var listCmd = &cobra.Command{
 			core.NewCommandPrinter(os.Stdout),
 		)
 
-		utils.ExitWithError(runner.Run(utils.SetIntoContext(cmd.Context(), map[define.ContextKey]interface{}{
-			define.ContextKeyName:     simpleCmdFlag.name,
-			define.ContextKeyVersion:  simpleCmdFlag.version,
-			define.ContextKeyLocation: simpleCmdFlag.location,
-		})), "list failed")
+		utils.ExitWithError(runner.Run(cmd.Context()), "list failed")
 	},
 }
 

cmd/command/uninstall.go

@@ -22,15 +22,11 @@ var uninstallCmd = &cobra.Command{
 			core.NewBinariesUninstaller(),
 		)
 
-		utils.ExitWithError(runner.Run(utils.SetIntoContext(cmd.Context(), map[define.ContextKey]interface{}{
-			define.ContextKeyName:    simpleCmdFlag.name,
-			define.ContextKeyVersion: simpleCmdFlag.version,
-		})), "list failed")
+		utils.ExitWithError(runner.Run(cmd.Context()), "list failed")
 
 		define.Logger.Info("uninstalled command", map[string]interface{}{
-			"name":     simpleCmdFlag.name,
-			"version":  simpleCmdFlag.version,
-			"location": simpleCmdFlag.location,
+			"name":    simpleCmdFlag.name,
+			"version": simpleCmdFlag.version,
 		})
 	},
 }

cmd/command/unset.go

@@ -15,12 +15,11 @@ var unsetCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		runner := core.NewStepRunner(
 			core.NewDBClientMaker(),
+			core.NewNamedCommandsQuerier(simpleCmdFlag.name),
 			core.NewCommandDeactivator(),
 		)
 
-		utils.ExitWithError(runner.Run(utils.SetIntoContext(cmd.Context(), map[define.ContextKey]interface{}{
-			define.ContextKeyName: simpleCmdFlag.name,
-		})), "deactivate failed")
+		utils.ExitWithError(runner.Run(cmd.Context()), "deactivate failed")
 
 		define.Logger.Info("unset command", map[string]interface{}{
 			"name": simpleCmdFlag.name,

cmd/command/use.go

@@ -23,11 +23,7 @@ var useCmd = &cobra.Command{
 			core.NewCommandActivator(),
 		)
 
-		utils.ExitWithError(runner.Run(utils.SetIntoContext(cmd.Context(), map[define.ContextKey]interface{}{
-			define.ContextKeyName:     simpleCmdFlag.name,
-			define.ContextKeyVersion:  simpleCmdFlag.version,
-			define.ContextKeyLocation: simpleCmdFlag.location,
-		})), "activate failed")
+		utils.ExitWithError(runner.Run(cmd.Context()), "activate failed")
 
 		define.Logger.Info("used command", map[string]interface{}{
 			"name":    simpleCmdFlag.name,

cmd/doctor.go

@@ -5,7 +5,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/mrlyc/cmdr/core"
-	"github.com/mrlyc/cmdr/define"
 	"github.com/mrlyc/cmdr/model"
 	"github.com/mrlyc/cmdr/utils"
 )
@@ -38,10 +37,7 @@ var doctorCmd = &cobra.Command{
 			core.NewBinariesActivator(binDir),
 		)
 
-		utils.ExitWithError(runner.Run(utils.SetIntoContext(cmd.Context(), map[define.ContextKey]interface{}{
-			define.ContextKeyName:           define.Name,
-			define.ContextKeyCommandManaged: true,
-		})), "doctor failed")
+		utils.ExitWithError(runner.Run(cmd.Context()), "doctor failed")
 	},
 }
 

cmd/setup.go

@@ -38,9 +38,8 @@ var setupCmd = &cobra.Command{
 
 		if !setupCmdFlag.skipInstall && !setupCmdFlag.upgrade {
 			runner.Add(
-				core.NewStepLoggerWithFields("installing command", define.ContextKeyName, define.ContextKeyVersion),
+				core.NewCommandDefiner(shimsDir, define.Name, define.Version, cmdrLocation, true),
 				core.NewBinariesInstaller(shimsDir),
-				core.NewCommandDefiner(shimsDir),
 			)
 		}
 
@@ -51,12 +50,7 @@ var setupCmd = &cobra.Command{
 			)
 		}
 
-		utils.ExitWithError(runner.Run(utils.SetIntoContext(cmd.Context(), map[define.ContextKey]interface{}{
-			define.ContextKeyName:           define.Name,
-			define.ContextKeyVersion:        define.Version,
-			define.ContextKeyLocation:       cmdrLocation,
-			define.ContextKeyCommandManaged: true,
-		})), "setup failed")
+		utils.ExitWithError(runner.Run(cmd.Context()), "setup failed")
 	},
 }
 

cmd/upgrade.go

@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"os"
+
 	"github.com/spf13/cobra"
 
 	"github.com/mrlyc/cmdr/core"
@@ -24,6 +26,8 @@ var upgradeCmd = &cobra.Command{
 		runner := core.NewStepRunner()
 		shimsDir := core.GetShimsDir()
 		binDir := core.GetBinDir()
+		cmdrLocation, err := os.Executable()
+		utils.CheckError(err)
 
 		if !upgradeCmdFlag.skipSetup {
 			runArgs := []string{"setup", "--upgrade"}
@@ -33,33 +37,26 @@ var upgradeCmd = &cobra.Command{
 
 		runner.Add(
 			core.NewDBClientMaker(),
+			core.NewCommandDefiner(shimsDir, define.Name, define.Version, cmdrLocation, true),
 			core.NewReleaseSearcher(upgradeCmdFlag.release, upgradeCmdFlag.asset),
 			core.NewDownloader(),
 			core.NewBinariesInstaller(shimsDir),
-			core.NewCommandDefiner(shimsDir),
 		)
 
 		if !upgradeCmdFlag.keep {
 			runner.Add(
 				core.NewCommandDeactivator(),
 				core.NewBinariesActivator(binDir),
 				core.NewCommandActivator(),
-				core.NewContextValueSetter(map[define.ContextKey]interface{}{
-					define.ContextKeyVersion: define.Version,
-				}),
 				core.NewSimpleCommandsQuerier(
 					define.Name, define.Version,
 				),
-				core.NewStepLoggerWithFields("uninstalling cmdr", define.ContextKeyVersion),
 				core.NewCommandUndefiner(),
 				core.NewBinariesUninstaller(),
 			)
 		}
 
-		utils.ExitWithError(runner.Run(utils.SetIntoContext(cmd.Context(), map[define.ContextKey]interface{}{
-			define.ContextKeyName:           define.Name,
-			define.ContextKeyCommandManaged: true,
-		})), "upgrade failed")
+		utils.ExitWithError(runner.Run(cmd.Context()), "upgrade failed")
 
 		logger.Info("upgraded command", map[string]interface{}{
 			"name": define.Name,

core/bianry_test.go

@@ -203,5 +203,6 @@ var _ = Describe("Bianry", func() {
 				afero.Exists(define.FS, filepath.Join(binDir, command2.Name)),
 			).To(BeTrue())
 		})
+
 	})
 })

core/binary.go

@@ -165,7 +165,7 @@ func (s *BinariesActivator) activateBinary(name, location string) error {
 	binPath := filepath.Join(s.binDir, name)
 	s.cleanUpBinary(binPath)
 
-	linker := define.GetSymbolLinker()
+	linker := utils.GetSymbolLinker()
 	err := linker.SymlinkIfPossible(location, binPath)
 	if err != nil {
 		return errors.Wrapf(err, "create symbol link failed")