fix issues raised in the review

Author: almas1992

contracts/packages/manager.go contracts/packages/setup.go

@@ -6,12 +6,12 @@ import (
 )
 
 type FileModifier interface {
-	Apply(dir string) error
+	Apply() error
 }
 
-type Manager interface {
-	Install(dir string) error
-	Uninstall(dir string) error
+type Setup interface {
+	Install() error
+	Uninstall() error
 }
 
 type GoNodeMatcher interface {

foundation/console/package_install_command.go

@@ -62,11 +62,8 @@ func (r *PackageInstallCommand) Handle(ctx console.Context) error {
 	}
 
 	// handle package version
-	pkg, version, ok := strings.Cut(pkg, "@")
-	manager := pkg + "/manager"
-	if ok {
-		pkg = pkg + "@" + version
-	}
+	pkgPath, _, _ := strings.Cut(pkg, "@")
+	setup := pkgPath + "/setup"
 
 	// get package
 	var output []byte
@@ -87,7 +84,7 @@ func (r *PackageInstallCommand) Handle(ctx console.Context) error {
 	}
 
 	// install package
-	install := exec.Command("go", "run", manager, "install")
+	install := exec.Command("go", "run", setup, "install")
 	if err = ctx.Spinner(fmt.Sprintf("> @%s", strings.Join(install.Args, " ")), console.SpinnerOption{
 		Action: func() error {
 			output, err = install.CombinedOutput()

foundation/console/package_make_command.go

@@ -31,12 +31,6 @@ func (r *PackageMakeCommand) Extend() command.Extend {
 	return command.Extend{
 		Category: "make",
 		Flags: []command.Flag{
-			&command.BoolFlag{
-				Name:               "manager",
-				Aliases:            []string{"m"},
-				Usage:              "Create a package manager",
-				DisableDefaultText: true,
-			},
 			&command.StringFlag{
 				Name:    "root",
 				Aliases: []string{"r"},
@@ -84,10 +78,7 @@ func (r *PackageMakeCommand) Handle(ctx console.Context) error {
 		filepath.Join("config", packageName+".go"):    packageMakeCommandStubs.Config,
 		filepath.Join("contracts", packageName+".go"): packageMakeCommandStubs.Contracts,
 		filepath.Join("facades", packageName+".go"):   packageMakeCommandStubs.Facades,
-	}
-
-	if ctx.OptionBool("manager") {
-		files[filepath.Join("manager", "manager.go")] = packageMakeCommandStubs.Manager
+		filepath.Join("setup", "setup.go"):            packageMakeCommandStubs.Setup,
 	}
 
 	for path, content := range files {

foundation/console/package_make_command_stubs.go

@@ -123,54 +123,36 @@ func DummyCamelName() contracts.DummyCamelName {
 	return content
 }
 
-func (r PackageMakeCommandStubs) Manager() string {
+func (r PackageMakeCommandStubs) Setup() string {
 	content := `package main
 
 import (
 	"os"
-	"path"
 	"path/filepath"
 	"runtime/debug"
-    "strings"
+	"strings"
 
 	pkgcontracts "github.com/goravel/framework/contracts/packages"
 	"github.com/goravel/framework/packages"
 	"github.com/goravel/framework/support/color"
+	"github.com/goravel/framework/support/path"
 )
 
-var (
-	module string
-	dir    string
-	force  bool
-)
-
-func init() {
-	for i, arg := range os.Args {
-		if arg == "--force" || arg == "-f" {
-			force = true
-		}
-
-		if (arg == "--dir" || arg == "-d") && len(os.Args) > i+1 {
-			dir = os.Args[i+1]
-		}
-	}
-
-	if info, ok := debug.ReadBuildInfo(); ok && strings.HasSuffix(info.Path, "manager") {
-		module = path.Dir(info.Path)
+func main() {
+	info, ok := debug.ReadBuildInfo()
+	if !ok || !strings.HasSuffix(info.Path, "setup") {
+		color.Errorln("Package module name is empty, please run command with module name.")
+		return
 	}
+	module := filepath.Dir(info.Path)
+	force := len(os.Args) == 2 && (os.Args[1] == "--force" || os.Args[1] == "-f")
 
-	if dir == "" {
-		dir, _ = os.Getwd()
-	}
-}
-
-func main() {
-	var pkg = packages.Manager{
-		ContinueOnError: force,
+	var pkg = &packages.Setup{
+		Force: force,
 		Module:          module,
 		OnInstall: []pkgcontracts.FileModifier{
 			packages.ModifyGoFile{
-				File: filepath.Join("config", "app.go"),
+				File: path.Config("app.go"),
 				Modifiers: []pkgcontracts.GoNodeModifier{
 					packages.AddImportSpec(module),
 					packages.AddProviderSpec(
@@ -181,7 +163,7 @@ func main() {
 		},
 		OnUninstall: []pkgcontracts.FileModifier{
 			packages.ModifyGoFile{
-				File: filepath.Join("config", "app.go"),
+				File: path.Config("app.go"),
 				Modifiers: []pkgcontracts.GoNodeModifier{
 					packages.RemoveImportSpec(module),
 					packages.RemoveProviderSpec("&DummyName.ServiceProvider{}"),
@@ -190,30 +172,29 @@ func main() {
 		},
 	}
 
-    if module == "" {
-		color.Errorln("Package module name is empty, please run command with module name.")
-		return
+	if len(os.Args) > 1 {
+		execute(pkg, os.Args[1])
 	}
+}
 
-	if len(os.Args) > 1 && os.Args[1] == "install" {
-		err := pkg.Install(dir)
-		if err != nil {
-			color.Errorln(err)
-			return
-		}
-		color.Successf("Package %s installed successfully\n", module)
+func execute(pkg pkgcontracts.Setup, command string) {
+	var err error
+	switch command {
+	case "install":
+		err = pkg.Install()
+	case "uninstall":
+		err = pkg.Uninstall()
+	default:
+		return
 	}
 
-	if len(os.Args) > 1 && os.Args[1] == "uninstall" {
-		err := pkg.Uninstall(dir)
-		if err != nil {
-			color.Errorln(err)
-			return
-		}
-		color.Successf("Package %s uninstalled successfully\n", module)
+	if err != nil {
+		color.Errorln(err)
+		return
 	}
-}
 
+	color.Successf("Package %sed successfully\n", command)
+}
 `
 	content = strings.ReplaceAll(content, "DummyName", r.name)
 

foundation/console/package_make_command_test.go

@@ -42,12 +42,7 @@ func (s *PackageMakeCommandTestSuite) TestExtend() {
 
 	if len(got.Flags) > 0 {
 		s.Run("should have correctly configured StringFlag", func() {
-			managerFlag, ok := got.Flags[0].(*command.BoolFlag)
-			if !ok {
-				s.Fail("First flag is not BoolFlag (got type: %T)", got.Flags[0])
-			}
-
-			rootFlag, ok := got.Flags[1].(*command.StringFlag)
+			flag, ok := got.Flags[0].(*command.StringFlag)
 			if !ok {
 				s.Fail("First flag is not StringFlag (got type: %T)", got.Flags[0])
 			}
@@ -57,13 +52,10 @@ func (s *PackageMakeCommandTestSuite) TestExtend() {
 				got      interface{}
 				expected interface{}
 			}{
-				{"Name", rootFlag.Name, "root"},
-				{"Aliases", rootFlag.Aliases, []string{"r"}},
-				{"Usage", rootFlag.Usage, "The root path of package, default: packages"},
-				{"Value", rootFlag.Value, "packages"},
-				{"Name", managerFlag.Name, "manager"},
-				{"Aliases", managerFlag.Aliases, []string{"m"}},
-				{"Usage", managerFlag.Usage, "Create a package manager"},
+				{"Name", flag.Name, "root"},
+				{"Aliases", flag.Aliases, []string{"r"}},
+				{"Usage", flag.Usage, "The root path of package, default: packages"},
+				{"Value", flag.Value, "packages"},
 			}
 
 			for _, tc := range testCases {
@@ -101,32 +93,10 @@ func (s *PackageMakeCommandTestSuite) TestHandle() {
 			},
 		},
 		{
-			name: "name is sms and use default root(hasn't manager)",
-			setup: func() {
-				mockContext.EXPECT().Argument(0).Return("sms").Once()
-				mockContext.EXPECT().Option("root").Return("packages").Once()
-				mockContext.EXPECT().OptionBool("manager").Return(false).Once()
-				mockContext.EXPECT().Success("Package created successfully: packages/sms").Once()
-			},
-			assert: func() {
-				s.NoError(NewPackageMakeCommand().Handle(mockContext))
-				s.True(file.Exists("packages/sms/README.md"))
-				s.True(file.Exists("packages/sms/service_provider.go"))
-				s.True(file.Exists("packages/sms/sms.go"))
-				s.True(file.Exists("packages/sms/config/sms.go"))
-				s.True(file.Exists("packages/sms/contracts/sms.go"))
-				s.True(file.Exists("packages/sms/facades/sms.go"))
-				s.True(file.Contain("packages/sms/facades/sms.go", "goravel/packages/sms"))
-				s.True(file.Contain("packages/sms/facades/sms.go", "goravel/packages/sms/contracts"))
-				s.NoError(file.Remove("packages"))
-			},
-		},
-		{
-			name: "name is sms and use default root(has manager)",
+			name: "name is sms and use default root",
 			setup: func() {
 				mockContext.EXPECT().Argument(0).Return("sms").Once()
 				mockContext.EXPECT().Option("root").Return("packages").Once()
-				mockContext.EXPECT().OptionBool("manager").Return(true).Once()
 				mockContext.EXPECT().Success("Package created successfully: packages/sms").Once()
 			},
 			assert: func() {
@@ -139,7 +109,7 @@ func (s *PackageMakeCommandTestSuite) TestHandle() {
 				s.True(file.Exists("packages/sms/facades/sms.go"))
 				s.True(file.Contain("packages/sms/facades/sms.go", "goravel/packages/sms"))
 				s.True(file.Contain("packages/sms/facades/sms.go", "goravel/packages/sms/contracts"))
-				s.True(file.Exists("packages/sms/manager/manager.go"))
+				s.True(file.Exists("packages/sms/setup/setup.go"))
 				s.NoError(file.Remove("packages"))
 			},
 		},
@@ -148,7 +118,6 @@ func (s *PackageMakeCommandTestSuite) TestHandle() {
 			setup: func() {
 				mockContext.EXPECT().Argument(0).Return("github.com/goravel/sms-aws").Once()
 				mockContext.EXPECT().Option("root").Return("package").Once()
-				mockContext.EXPECT().OptionBool("manager").Return(false).Once()
 				mockContext.EXPECT().Success("Package created successfully: package/github_com_goravel_sms_aws").Once()
 			},
 			assert: func() {
@@ -159,6 +128,7 @@ func (s *PackageMakeCommandTestSuite) TestHandle() {
 				s.True(file.Exists("package/github_com_goravel_sms_aws/config/github_com_goravel_sms_aws.go"))
 				s.True(file.Exists("package/github_com_goravel_sms_aws/contracts/github_com_goravel_sms_aws.go"))
 				s.True(file.Exists("package/github_com_goravel_sms_aws/facades/github_com_goravel_sms_aws.go"))
+				s.True(file.Exists("package/github_com_goravel_sms_aws/setup/setup.go"))
 				s.NoError(file.Remove("package"))
 			},
 		},

foundation/console/package_uninstall_command.go

@@ -68,12 +68,12 @@ func (r *PackageUninstallCommand) Handle(ctx console.Context) error {
 		}
 	}
 
-	pkg, _, _ = strings.Cut(pkg, "@")
-	manager := pkg + "/manager"
+	pkgPath, _, _ := strings.Cut(pkg, "@")
+	setup := pkgPath + "/setup"
 
 	// uninstall package
 	var output []byte
-	uninstall := exec.Command("go", "run", manager, "uninstall")
+	uninstall := exec.Command("go", "run", setup, "uninstall")
 	if ctx.OptionBool("force") {
 		uninstall.Args = append(uninstall.Args, "--force")
 	}