boss modernize

.goreleaser.yaml

@@ -11,7 +11,6 @@ builds:
     goos:
       - linux
       - windows
-      - darwin
     ldflags:
       - github.com/hashload/boss/internal/version.metadata={{.Version}}
       - github.com/hashload/boss/internal/version.gitCommit={{.Commit}}

.pre-commit-config.yaml

@@ -19,6 +19,4 @@ repos:
       rev: v1.64.5
       hooks:
           - id: golangci-lint-config-verify
-            entry: go tool golangci-lint config verify
           - id: golangci-lint-full
-            entry: go tool golangci-lint run --fix

.vscode/launch.json

@@ -9,9 +9,12 @@
             "type": "go",
             "request": "launch",
             "mode": "auto",
+            "console": "integratedTerminal",
             "program": "${workspaceFolder}",
             "cwd": "${workspaceFolder}/test_dir",
-            "args": ["install", "jhonson"],
+            // "args": ["install", "jhonson"],
+            "args": ["install", "https://github.com/ModernDelphiWorks/fluent4d.git"],
+            // "args": ["upgrade"],
         }
     ]
 }

app.go

@@ -7,6 +7,6 @@ import (
 
 func main() {
 	if err := cmd.Execute(); err != nil {
-		msg.Die(err.Error())
+		msg.Fatal(err.Error())
 	}
 }

cmd/config/config.go

@@ -12,5 +12,4 @@ func RegisterConfigCommand(root *cobra.Command) {
 
 	root.AddCommand(configCmd)
 	delphiCmd(configCmd)
-	registryGitCmd(configCmd)
 }

cmd/config/delphi.go

@@ -16,10 +16,6 @@ func delphiCmd(root *cobra.Command) {
 		Use:   "delphi",
 		Short: "Configure Delphi version",
 		Long:  `Configure Delphi version to compile modules`,
-		Run: func(cmd *cobra.Command, _ []string) {
-			msg.Info("Running in path %s", env.GlobalConfiguration().DelphiPath)
-			_ = cmd.Usage()
-		},
 	}
 
 	list := &cobra.Command{
@@ -40,6 +36,20 @@ func delphiCmd(root *cobra.Command) {
 		},
 	}
 
+	current := &cobra.Command{
+		Use:   "current",
+		Short: "Show current Delphi version",
+		Long:  `Show current Delphi version to compile modules`,
+		Run: func(_ *cobra.Command, _ []string) {
+			config := env.GlobalConfiguration()
+			if config.DelphiPath == "" {
+				msg.Warn("No Delphi version set")
+				return
+			}
+			msg.Info("Current Delphi version: %s", config.DelphiPath)
+		},
+	}
+
 	use := &cobra.Command{
 		Use:   "use [path]",
 		Short: "Use Delphi version",
@@ -75,4 +85,5 @@ func delphiCmd(root *cobra.Command) {
 
 	delphiCmd.AddCommand(list)
 	delphiCmd.AddCommand(use)
+	delphiCmd.AddCommand(current)
 }

cmd/config/purgeCache.go

@@ -11,14 +11,19 @@ func RegisterCmd(cmd *cobra.Command) {
 		Short: "Configure cache",
 	}
 
+	cleanAll := false
+
 	rmCacheCmd := &cobra.Command{
-		Use:   "rm",
-		Short: "Remove cache",
+		Use:     "clean",
+		Aliases: []string{"rm"},
+		Short:   "Clean cache based on TTL and usage",
 		RunE: func(_ *cobra.Command, _ []string) error {
-			return gc.RunGC(true)
+			return gc.CleanupCache(true, cleanAll)
 		},
 	}
 
+	rmCacheCmd.Flags().BoolVarP(&cleanAll, "all", "a", false, "clean all cache")
+
 	purgeCacheCmd.AddCommand(rmCacheCmd)
 
 	cmd.AddCommand(purgeCacheCmd)

cmd/dependencies.go

@@ -57,9 +57,9 @@ func printDependencies(showVersion bool) {
 	pkg, err := models.LoadPackage(false)
 	if err != nil {
 		if os.IsNotExist(err) {
-			msg.Die("boss.json not exists in " + env.GetCurrentDir())
+			msg.Fatal("boss.json not exists in " + env.GetCurrentDir())
 		} else {
-			msg.Die("Fail on open dependencies file: %s", err)
+			msg.Fatal("Fail on open dependencies file: %s", err)
 		}
 	}
 
@@ -83,7 +83,9 @@ func printDeps(dep *models.Dependency,
 	}
 
 	for _, dep := range deps {
-		pkgModule, err := models.LoadPackageOther(filepath.Join(env.GetModulesDir(), dep.Name(), consts.FilePackage))
+		pkgModule, err := models.LoadPackageFromFile(
+			filepath.Join(env.GetModulesDir(), dep.Name(), consts.FilePackage),
+		)
 		if err != nil {
 			printSingleDependency(&dep, lock, localTree, showVersion)
 		} else {

cmd/init.go

@@ -41,7 +41,7 @@ func doInitialization(quiet bool) {
 
 	packageData, err := models.LoadPackage(true)
 	if err != nil && !os.IsNotExist(err) {
-		msg.Die("Fail on open dependencies file: %s", err)
+		msg.Fatal("Fail on open dependencies file: %s", err)
 	}
 
 	rxp := regexp.MustCompile(`^.+\` + string(filepath.Separator) + `([^\\]+)$`)

cmd/login.go

@@ -48,7 +48,14 @@ func loginCmdRegister(root *cobra.Command) {
 	root.AddCommand(logoutCmd)
 }
 
-func login(removeLogin bool, useSSH bool, privateKey string, userName string, password string, args []string) {
+func login(
+	removeLogin bool,
+	useSSH bool,
+	privateKey string,
+	userName string,
+	password string,
+	args []string,
+) {
 	configuration := env.GlobalConfiguration()
 
 	if removeLogin {
@@ -65,7 +72,7 @@ func login(removeLogin bool, useSSH bool, privateKey string, userName string, pa
 	} else {
 		repo = getParamOrDef("Url to login (ex: github.com)", "")
 		if repo == "" {
-			msg.Die("Empty is not valid!!")
+			msg.Fatal("Empty is not valid!!")
 		}
 		auth = configuration.Auth[repo]
 	}
@@ -111,15 +118,15 @@ func setAuthInteractively(auth *env.Auth) {
 func getPass(description string) string {
 	pass, err := pterm.DefaultInteractiveTextInput.WithMask("•").Show(description)
 	if err != nil {
-		msg.Die("Error on get pass: %s", err)
+		msg.Fatal("Error on get pass: %s", err)
 	}
 	return pass
 }
 
 func getSSHKeyPath() string {
 	usr, err := user.Current()
 	if err != nil {
-		msg.Die(err.Error())
+		msg.Fatal(err.Error())
 	}
 	return filepath.Join(usr.HomeDir, ".ssh", "id_rsa")
 }

cmd/root.go

@@ -56,7 +56,7 @@ func Execute() error {
 	dependenciesCmdRegister(root)
 	versionCmdRegister(root)
 
-	if err := gc.RunGC(false); err != nil {
+	if err := gc.CleanupCache(false, false); err != nil {
 		return err
 	}
 

cmd/run.go

@@ -1,19 +1,60 @@
 package cmd
 
 import (
+	"strings"
+
+	"github.com/hashload/boss/pkg/models"
 	"github.com/hashload/boss/pkg/scripts"
 	"github.com/spf13/cobra"
 )
 
 func runCmdRegister(root *cobra.Command) {
 	var runScript = &cobra.Command{
-		Use:   "run",
-		Short: "Run cmd script",
-		Long:  `Run cmd script`,
+		Use:               "run",
+		Short:             "Run cmd script",
+		Long:              `Run cmd script`,
+		Args:              cobra.MinimumNArgs(1),
+		ValidArgsFunction: validScripts,
 		Run: func(_ *cobra.Command, args []string) {
 			scripts.Run(args)
 		},
 	}
 
 	root.AddCommand(runScript)
 }
+
+func validScripts(
+	_ *cobra.Command,
+	args []string,
+	_ string,
+) ([]string, cobra.ShellCompDirective) {
+	packageData, err := models.LoadPackage(false)
+	if err != nil {
+		return nil, cobra.ShellCompDirectiveNoFileComp
+	}
+
+	if packageData.Scripts == nil {
+		return nil, cobra.ShellCompDirectiveNoFileComp
+	}
+
+	var scripts []string
+	for script := range packageData.Scripts {
+		scripts = append(scripts, script)
+	}
+
+	if len(args) == 0 {
+		return scripts, cobra.ShellCompDirectiveDefault
+	}
+
+	if len(args) == 1 {
+		var completions []string
+		for _, script := range scripts {
+			if script != args[0] && strings.HasPrefix(script, args[0]) {
+				completions = append(completions, script)
+			}
+		}
+		return completions, cobra.ShellCompDirectiveNoFileComp
+	}
+
+	return scripts, cobra.ShellCompDirectiveNoFileComp
+}

cmd/upgrade.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"github.com/hashload/boss/internal/upgrade"
+	"github.com/hashload/boss/pkg/msg"
 	"github.com/spf13/cobra"
 )
 
@@ -16,8 +17,10 @@ func upgradeCmdRegister(root *cobra.Command) {
 
   Upgrade boss with pre-release:
   boss upgrade --dev`,
-		RunE: func(_ *cobra.Command, _ []string) error {
-			return upgrade.BossUpgrade(preRelease)
+		Run: func(_ *cobra.Command, _ []string) {
+			if err := upgrade.BossUpgrade(preRelease); err != nil {
+				msg.Fatal("Failed to upgrade boss: %s", err)
+			}
 		},
 	}