fixed small issues

Author: franciscoovazevedo

cmd/analyze.go

@@ -263,21 +263,28 @@ func getToolName(toolName string, version string) string {
 func runToolByTooName(toolName string, workDirectory string, pathsToCheck []string, autoFix bool, outputFile string, outputFormat string, tool *plugins.ToolInfo, runtime *plugins.RuntimeInfo) error {
 	switch toolName {
 	case "eslint":
-		return tools.RunEslint(workDirectory, tool.InstallDir, runtime.Binaries[tool.Runtime], pathsToCheck, autoFix, outputFile, outputFormat)
+		binaryPath := runtime.Binaries[tool.Runtime]
+		return tools.RunEslint(workDirectory, tool.InstallDir, binaryPath, pathsToCheck, autoFix, outputFile, outputFormat)
 	case "trivy":
-		return tools.RunTrivy(workDirectory, tool.Binaries[tool.Runtime], pathsToCheck, outputFile, outputFormat)
+		binaryPath := tool.Binaries[toolName]
+		return tools.RunTrivy(workDirectory, binaryPath, pathsToCheck, outputFile, outputFormat)
 	case "pmd":
-		return tools.RunPmd(workDirectory, tool.Binaries[tool.Runtime], pathsToCheck, outputFile, outputFormat, config.Config)
+		binaryPath := tool.Binaries[toolName]
+		return tools.RunPmd(workDirectory, binaryPath, pathsToCheck, outputFile, outputFormat, config.Config)
 	case "pylint":
-		return tools.RunPylint(workDirectory, tool.Binaries[tool.Runtime], pathsToCheck, outputFile, outputFormat)
+		binaryPath := tool.Binaries[tool.Runtime]
+		return tools.RunPylint(workDirectory, binaryPath, pathsToCheck, outputFile, outputFormat)
 	case "dartanalyzer":
-		return tools.RunDartAnalyzer(workDirectory, tool.InstallDir, tool.Binaries[tool.Runtime], pathsToCheck, outputFile, outputFormat)
+		binaryPath := tool.Binaries[tool.Runtime]
+		return tools.RunDartAnalyzer(workDirectory, tool.InstallDir, binaryPath, pathsToCheck, outputFile, outputFormat)
 	case "semgrep":
-		return tools.RunSemgrep(workDirectory, tool.Binaries[tool.Runtime], pathsToCheck, outputFile, outputFormat)
+		binaryPath := tool.Binaries[toolName]
+		return tools.RunSemgrep(workDirectory, binaryPath, pathsToCheck, outputFile, outputFormat)
 	case "lizard":
-		return lizard.RunLizard(workDirectory, tool.Binaries[tool.Runtime], pathsToCheck, outputFile, outputFormat)
-	case "enigma":
-		return tools.RunEnigma(workDirectory, tool.InstallDir, tool.Binaries[tool.Runtime], pathsToCheck, outputFile, outputFormat)
+		binaryPath := tool.Binaries[tool.Runtime]
+		return lizard.RunLizard(workDirectory, binaryPath, pathsToCheck, outputFile, outputFormat)
+	case "codacy-enigma-cli":
+		return tools.RunEnigma(workDirectory, tool.InstallDir, tool.Binaries["codacy-enigma-cli"], pathsToCheck, outputFile, outputFormat)
 	case "revive":
 		return reviveTool.RunRevive(workDirectory, tool.Binaries["revive"], pathsToCheck, outputFile, outputFormat)
 	}
@@ -286,7 +293,12 @@ func runToolByTooName(toolName string, workDirectory string, pathsToCheck []stri
 
 func genericRunTool(toolName string, workDirectory string, pathsToCheck []string, autoFix bool, outputFile string, outputFormat string) error {
 	tool := config.Config.Tools()[toolName]
-	isToolInstalled := config.Config.IsToolInstalled(toolName, tool)
+	var isToolInstalled bool
+	if tool == nil {
+		isToolInstalled = false
+	} else {
+		isToolInstalled = config.Config.IsToolInstalled(toolName, tool)
+	}
 	var isRuntimeInstalled bool
 
 	var runtime *plugins.RuntimeInfo

config/runtimes-installer.go

@@ -76,9 +76,15 @@ func InstallRuntime(name string, runtimeInfo *plugins.RuntimeInfo) error {
 
 // downloadAndExtractRuntime downloads and extracts a runtime
 func downloadAndExtractRuntime(runtimeInfo *plugins.RuntimeInfo) error {
+	// Ensure the runtimes directory exists
+	runtimesDir := Config.RuntimesDirectory()
+	if err := os.MkdirAll(runtimesDir, utils.DefaultDirPerms); err != nil {
+		return fmt.Errorf("failed to create runtimes directory: %w", err)
+	}
+
 	// Create a file name for the downloaded archive
 	fileName := filepath.Base(runtimeInfo.DownloadURL)
-	downloadPath := filepath.Join(Config.RuntimesDirectory(), fileName)
+	downloadPath := filepath.Join(runtimesDir, fileName)
 
 	// Check if the file already exists
 	_, err := os.Stat(downloadPath)
@@ -90,7 +96,7 @@ func downloadAndExtractRuntime(runtimeInfo *plugins.RuntimeInfo) error {
 			"downloadURL":  runtimeInfo.DownloadURL,
 			"downloadPath": downloadPath,
 		})
-		downloadPath, err = utils.DownloadFile(runtimeInfo.DownloadURL, Config.RuntimesDirectory())
+		downloadPath, err = utils.DownloadFile(runtimeInfo.DownloadURL, runtimesDir)
 		if err != nil {
 			return fmt.Errorf("failed to download runtime: %w", err)
 		}
@@ -116,13 +122,13 @@ func downloadAndExtractRuntime(runtimeInfo *plugins.RuntimeInfo) error {
 		"runtime":          runtimeInfo.Name,
 		"version":          runtimeInfo.Version,
 		"fileName":         fileName,
-		"extractDirectory": Config.RuntimesDirectory(),
+		"extractDirectory": runtimesDir,
 	})
 
 	if strings.HasSuffix(fileName, ".zip") {
-		err = utils.ExtractZip(file.Name(), Config.RuntimesDirectory())
+		err = utils.ExtractZip(file.Name(), runtimesDir)
 	} else {
-		err = utils.ExtractTarGz(file, Config.RuntimesDirectory())
+		err = utils.ExtractTarGz(file, runtimesDir)
 	}
 
 	if err != nil {

tools/pmdRunner.go

@@ -28,6 +28,20 @@ import (
 func RunPmd(repositoryToAnalyseDirectory string, pmdBinary string, pathsToCheck []string, outputFile string, outputFormat string, config config.ConfigType) error {
 	var cmd *exec.Cmd
 
+	// Debug: Log the binary path being used
+	logger.Debug("PMD binary path", logrus.Fields{
+		"pmdBinary": pmdBinary,
+	})
+
+	// Check if the binary exists
+	if _, err := os.Stat(pmdBinary); err != nil {
+		logger.Error("PMD binary not found", logrus.Fields{
+			"pmdBinary": pmdBinary,
+			"error":     err,
+		})
+		return fmt.Errorf("PMD binary not found at %s: %w", pmdBinary, err)
+	}
+
 	// Get tool info to check version
 	toolInfo := config.Tools()["pmd"]
 	if toolInfo == nil {