Merge pull request #41 from gnodet/fix-tool-manager-singleton

Author: gnodet

.github/workflows/deploy-website.yml

@@ -38,7 +38,7 @@ jobs:
         echo "SITE_URL=$SITE_URL" >> $GITHUB_ENV
         echo "SITE_PATH=$SITE_PATH" >> $GITHUB_ENV
         echo "GITHUB_REPOSITORY=$GITHUB_REPOSITORY SITE_DIR=$SITE_DIR SITE_URL=$SITE_URL SITE_PATH=$SITE_PATH"
-        QUARKUS_ROQ_GENERATOR_BATCH=true ./mvx website build \
+        QUARKUS_ROQ_GENERATOR_BATCH=true ./mvx website-build \
             -Dquarkus.http.root-path=$SITE_PATH \
             -Dsite.url=$SITE_URL
     

.mvx/config.json5

@@ -44,8 +44,7 @@
 
     build: {
       description: "Build mvx binary with platform-optimized settings",
-      script: "go build -o mvx-dev . && echo 'Installing global development binary...' && mkdir -p ~/.mvx/dev && cp mvx-dev ~/.mvx/dev/mvx && chmod +x ~/.mvx/dev/mvx && echo '✅ Global development binary installed at ~/.mvx/dev/mvx' && echo '   All projects using mvxVersion=dev will now use this binary automatically'",
-      override: true
+      script: "go build -o mvx-dev . && echo 'Installing global development binary...' && mkdir -p ~/.mvx/dev && cp mvx-dev ~/.mvx/dev/mvx && chmod +x ~/.mvx/dev/mvx && echo '✅ Global development binary installed at ~/.mvx/dev/mvx' && echo '   All projects using mvxVersion=dev will now use this binary automatically'"
     },
 
     fmt: {
@@ -60,25 +59,22 @@
 
     test: {
       description: "Run all tests",
-      script: "go test -v ./...",
-      override: true
+      script: "go test -v ./..."
     },
 
     "test-integration": {
       description: "Run integration tests",
       script: "cd test && go test -v -timeout=5m ./..."
     },
 
-    "website build": {
+    "website-build": {
       description: "Build the website using ROQ",
-      script: "cd website && QUARKUS_ROQ_GENERATOR_BATCH=true mvn clean package quarkus:run -DskipTests --no-transfer-progress",
-      override: true
+      script: "cd website && QUARKUS_ROQ_GENERATOR_BATCH=true mvn clean package quarkus:run -DskipTests --no-transfer-progress"
     },
 
-    "website serve": {
+    "website-serve": {
       description: "Serve the website using ROQ dev mode",
-      script: "cd website && mvn quarkus:dev -Dquarkus.http.port=8081 --no-transfer-progress",
-      override: true
+      script: "cd website && mvn quarkus:dev -Dquarkus.http.port=8081 --no-transfer-progress"
     },
 
     "build-all": {
@@ -93,8 +89,7 @@
 
     clean: {
       description: "Clean build artifacts",
-      script: "rm -f mvx-dev && rm -rf dist/ && rm -f ~/.mvx/dev/mvx && echo '🧹 Cleaned local and global dev binaries'",
-      override: true
+      script: "rm -f mvx-dev && rm -rf dist/ && rm -f ~/.mvx/dev/mvx && echo '🧹 Cleaned local and global dev binaries'"
     },
 
     changelog: {

.mvx/mvx.properties

@@ -13,3 +13,4 @@ mvxVersion=0.8.0
 # Checksum validation (future feature)
 # mvxChecksumUrl=https://github.com/gnodet/mvx/releases/download/v{version}/checksums.txt
 # mvxValidateChecksum=true
+

cmd/build.go

@@ -114,10 +114,7 @@ Examples:
 		if err != nil {
 			return err
 		}
-		mvnExe := filepath.Join(bin, "mvn")
-		if isWindows() {
-			mvnExe += ".cmd"
-		}
+		mvnExe := filepath.Join(bin, mvnTool.GetBinaryName())
 
 		c := exec.Command(mvnExe, mavenArgs...)
 		c.Dir = projectRoot

cmd/mvn.go

@@ -92,8 +92,6 @@ func init() {
 	// Add subcommands
 	rootCmd.AddCommand(versionCmd)
 	rootCmd.AddCommand(setupCmd)
-	rootCmd.AddCommand(buildCmd)
-	rootCmd.AddCommand(testCmd)
 	rootCmd.AddCommand(initCmd)
 	rootCmd.AddCommand(updateBootstrapCmd)
 }
@@ -247,17 +245,13 @@ func setupGlobalEnvironment(cfg *config.Config, manager *tools.Manager) error {
 		resolvedConfig := toolConfig
 		resolvedConfig.Version = resolvedVersion
 
-		// Check if tool is installed
-		if tool.IsInstalled(resolvedVersion, resolvedConfig) {
-			binPath, err := tool.GetPath(resolvedVersion, resolvedConfig)
-			if err != nil {
-				printVerbose("Skipping tool %s: failed to get bin path: %v", toolName, err)
-				continue
-			}
+		// Try to get tool path - if successful, tool is installed and we can add it to PATH
+		binPath, err := tool.GetPath(resolvedVersion, resolvedConfig)
+		if err != nil {
+			printVerbose("Tool %s version %s is not installed or path unavailable, skipping PATH setup: %v", toolName, resolvedVersion, err)
+		} else {
 			printVerbose("Adding %s bin path to global PATH: %s", toolName, binPath)
 			pathDirs = append(pathDirs, binPath)
-		} else {
-			printVerbose("Tool %s version %s is not installed, skipping PATH setup", toolName, resolvedVersion)
 		}
 	}
 
@@ -353,8 +347,9 @@ func addCustomCommands() error {
 
 	// Add each custom command as a top-level command
 	for cmdName, cmdConfig := range cfg.Commands {
-		// Skip built-in commands unless they have override flag
-		if isBuiltinCommand(cmdName) && !cmdConfig.Override {
+		// Skip commands with spaces (they're subcommands, handled by their parent command)
+		if strings.Contains(cmdName, " ") {
+			printVerbose("Skipping custom command with space: %s (handled by parent command)", cmdName)
 			continue
 		}
 
@@ -469,21 +464,3 @@ Examples:
 		},
 	}
 }
-
-// isBuiltinCommand checks if a command name is a built-in mvx command
-func isBuiltinCommand(commandName string) bool {
-	builtinCommands := map[string]bool{
-		"build":            true,
-		"test":             true,
-		"setup":            true,
-		"init":             true,
-		"tools":            true,
-		"version":          true,
-		"help":             true,
-		"completion":       true,
-		"info":             true,
-		"update-bootstrap": true,
-		"run":              true, // Don't override the run command itself
-	}
-	return builtinCommands[commandName]
-}

cmd/root.go

@@ -142,11 +142,6 @@ func runCustomCommand(commandName string, args []string) error {
 	// Create executor
 	exec := executor.NewExecutor(cfg, manager, projectRoot)
 
-	// Validate command exists and requirements are met
-	if err := exec.ValidateCommand(commandName); err != nil {
-		return err
-	}
-
-	// Execute command
+	// Execute command (tools are auto-installed via EnsureTool)
 	return exec.ExecuteCommand(commandName, args)
 }