Merge branch 'main' into nate/fix-tests

Author: sestinj

build.js

@@ -1,70 +1,70 @@
 #!/usr/bin/env node
 
-const { execSync } = require('child_process');
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
+const { execSync } = require("child_process");
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
 
 // Define target platforms and architectures
 const targets = [
-  { platform: 'darwin', arch: 'amd64', goarch: 'amd64' },
-  { platform: 'darwin', arch: 'arm64', goarch: 'arm64' },
-  { platform: 'linux', arch: 'x64', goarch: 'amd64' },
-  { platform: 'linux', arch: 'arm64', goarch: 'arm64' },
-  { platform: 'win32', arch: 'x64', goarch: 'amd64' }
+  { platform: "darwin", arch: "amd64", goarch: "amd64" },
+  { platform: "darwin", arch: "arm64", goarch: "arm64" },
+  { platform: "linux", arch: "x64", goarch: "amd64" },
+  { platform: "linux", arch: "arm64", goarch: "arm64" },
+  { platform: "win32", arch: "x64", goarch: "amd64" },
 ];
 
 // Get package version from package.json
-const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+const packageJson = JSON.parse(fs.readFileSync("package.json", "utf8"));
 const version = packageJson.version;
 
 // Create bin directory if it doesn't exist
-if (!fs.existsSync('bin')) {
-  fs.mkdirSync('bin');
+if (!fs.existsSync("bin")) {
+  fs.mkdirSync("bin");
 }
 
 // Build for each target
 for (const target of targets) {
   const { platform, arch, goarch } = target;
-  
+
   // Set binary name based on platform
-  const binaryName = platform === 'win32' ? 'rules-cli.exe' : 'rules-cli';
-  
+  const binaryName = platform === "win32" ? "rules-cli.exe" : "rules-cli";
+
   // Create output directory
-  const outputDir = path.join('bin', `${platform}-${arch}`);
+  const outputDir = path.join("bin", `${platform}-${arch}`);
   if (!fs.existsSync(outputDir)) {
     fs.mkdirSync(outputDir, { recursive: true });
   }
-  
+
   const outputPath = path.join(outputDir, binaryName);
-  
+
   // Set environment variables for cross-compilation
   const env = {
     ...process.env,
-    GOOS: platform === 'win32' ? 'windows' : platform,
+    GOOS: platform === "win32" ? "windows" : platform,
     GOARCH: goarch,
-    CGO_ENABLED: '0'
+    CGO_ENABLED: "0",
   };
-  
+
   console.log(`Building for ${platform}-${arch}...`);
-  
+
   try {
     // Build the binary with version info
     execSync(
-      `go build -ldflags="-s -w -X main.Version=${version}" -o ${outputPath}`,
-      { env, stdio: 'inherit' }
+      `go build -ldflags="-s -w -X main.Version=${version} -X rules-cli/internal/utils.Version=${version}" -o ${outputPath}`,
+      { env, stdio: "inherit" }
     );
-    
+
     console.log(`Built ${outputPath}`);
-    
+
     // Make binary executable (not needed for Windows)
-    if (platform !== 'win32') {
-      fs.chmodSync(outputPath, '755');
+    if (platform !== "win32") {
+      fs.chmodSync(outputPath, "755");
     }
   } catch (error) {
     console.error(`Failed to build for ${platform}-${arch}: ${error.message}`);
     process.exit(1);
   }
 }
 
-console.log('Build completed successfully!');
+console.log("Build completed successfully!");

cmd/add.go

@@ -10,6 +10,7 @@ import (
 	"rules-cli/internal/registry"
 	"rules-cli/internal/ruleset"
 
+	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 )
 
@@ -91,7 +92,7 @@ func loadOrCreateRuleSet(rulesJSONPath string) (*ruleset.RuleSet, error) {
 
 		// Create a default ruleset
 		rs := ruleset.DefaultRuleSet(filepath.Base(filepath.Dir(rulesJSONPath)))
-		fmt.Println("Creating new rules.json file with default structure")
+		color.Cyan("Creating new rules.json file with default structure")
 		return rs, nil
 	} else if err != nil {
 		return nil, fmt.Errorf("failed to check rules.json file: %w", err)
@@ -109,9 +110,9 @@ func loadOrCreateRuleSet(rulesJSONPath string) (*ruleset.RuleSet, error) {
 // downloadRule downloads a rule from the registry
 func downloadRule(client *registry.Client, ruleName, ruleVersion, rulesDir string) error {
 	if strings.HasPrefix(ruleName, "gh:") {
-		fmt.Printf("Downloading rules from GitHub repository '%s' (src/ directory)...\n", ruleName[3:])
+		color.Cyan("Downloading rules from GitHub repository '%s' (src/ directory)...", ruleName[3:])
 	} else {
-		fmt.Printf("Downloading rule '%s' (version %s) from registry API...\n", ruleName, ruleVersion)
+		color.Cyan("Downloading rule '%s' (version %s) from registry API...", ruleName, ruleVersion)
 	}
 
 	return client.DownloadRule(ruleName, ruleVersion, rulesDir)
@@ -157,7 +158,7 @@ func runAddCommand(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("failed to save ruleset: %w", err)
 	}
 
-	fmt.Printf("Rule '%s' (version %s) added successfully\n", ruleName, ruleVersion)
+	color.Green("Rule '%s' (version %s) added successfully", ruleName, ruleVersion)
 
 	// Print format suggestion at the very end if applicable
 	if formatSuggestion != "" {

cmd/create.go

@@ -6,9 +6,11 @@ import (
 	"os"
 	"strings"
 
+	"rules-cli/internal/ruleset"
+
+	"github.com/fatih/color"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
-	"rules-cli/internal/ruleset"
 )
 
 var (
@@ -81,7 +83,7 @@ This command does not modify the rules.json file.`,
 		if len(args) > 1 {
 			rule.Body = args[1]
 		} else {
-			fmt.Println("Enter rule body (press Ctrl+D on a new line when done):")
+			color.Cyan("Enter rule body (press Ctrl+D on a new line when done):")
 			scanner := bufio.NewScanner(os.Stdin)
 			var bodyLines []string
 			for scanner.Scan() {
@@ -98,7 +100,7 @@ This command does not modify the rules.json file.`,
 			return fmt.Errorf("failed to create rule: %w", err)
 		}
 
-		fmt.Printf("Rule '%s' created successfully\n", ruleName)
+		color.Green("Rule '%s' created successfully", ruleName)
 		return nil
 	},
 }

cmd/init.go

@@ -7,6 +7,7 @@ import (
 
 	"rules-cli/internal/formats"
 
+	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 )
 
@@ -18,7 +19,7 @@ var initCmd = &cobra.Command{
 This creates the necessary directory structure and an empty rules.json file.`,
 	Example: `  rules init`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		fmt.Printf("Initializing rules with format: %s\n", format)
+		color.Cyan("Initializing rules with format: %s", format)
 
 		// Check if rules.json doesn't exist
 		rulesJSONPath, err := formats.GetRulesJSONPath(format)
@@ -31,16 +32,16 @@ This creates the necessary directory structure and an empty rules.json file.`,
 			formatFolders, err := formats.FindRulesFormats()
 			if err == nil && len(formatFolders) > 0 {
 				// Suggest rendering to the user
-				fmt.Printf("Found existing rules folder(s): %s\n", strings.Join(formatFolders, ", "))
-				fmt.Printf("Consider running 'rules render %s' to initialize rules.json from existing rules\n", formatFolders[0])
+				color.Yellow("Found existing rules folder(s): %s", strings.Join(formatFolders, ", "))
+				color.Yellow("Consider running 'rules render %s' to initialize rules.json from existing rules", formatFolders[0])
 			}
 		}
 
 		if err := formats.InitializeFormat(format); err != nil {
 			return fmt.Errorf("initialization failed: %w", err)
 		}
 
-		fmt.Printf("Rules initialized successfully. Format: %s\n", format)
+		color.Green("Rules initialized successfully. Format: %s", format)
 		return nil
 	},
 }

cmd/install.go

@@ -10,6 +10,7 @@ import (
 	"rules-cli/internal/registry"
 	"rules-cli/internal/ruleset"
 
+	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 )
 
@@ -62,7 +63,7 @@ This ensures the rules directory matches exactly what's defined in rules.json.`,
 
 			// Create a default ruleset
 			rs = ruleset.DefaultRuleSet(filepath.Base(filepath.Dir(rulesJSONPath)))
-			fmt.Println("Creating new rules.json file with default structure")
+			color.Cyan("Creating new rules.json file with default structure")
 
 			// Save the new ruleset
 			if err := rs.SaveRuleSet(rulesJSONPath); err != nil {
@@ -82,20 +83,20 @@ This ensures the rules directory matches exactly what's defined in rules.json.`,
 		if _, err := os.Stat(rulesDir); err == nil {
 			// Directory exists, check if we should clean it
 			if !forceInstall {
-				fmt.Printf("This will remove all existing rules in '%s' and reinstall them from rules.json.\n", rulesDir)
+				color.Yellow("This will remove all existing rules in '%s' and reinstall them from rules.json.", rulesDir)
 				fmt.Print("Continue? (y/N): ")
 
 				var response string
 				fmt.Scanln(&response)
 
 				if strings.ToLower(response) != "y" {
-					fmt.Println("Installation cancelled.")
+					color.Yellow("Installation cancelled.")
 					return nil
 				}
 			}
 
 			// Remove all files and directories in the rules directory
-			fmt.Printf("Removing existing rules from '%s'...\n", rulesDir)
+			color.Cyan("Removing existing rules from '%s'...", rulesDir)
 			if err := removeContents(rulesDir); err != nil {
 				return fmt.Errorf("failed to clean rules directory: %w", err)
 			}
@@ -112,9 +113,9 @@ This ensures the rules directory matches exactly what's defined in rules.json.`,
 		client := registry.NewClient(cfg.RegistryURL)
 
 		// Install each rule from rules.json
-		fmt.Println("Installing rules from rules.json...")
+		color.Cyan("Installing rules from rules.json...")
 		if len(rs.Rules) == 0 {
-			fmt.Println("No rules found in rules.json.")
+			color.Yellow("No rules found in rules.json.")
 
 			// Print format suggestion at the very end if applicable
 			if formatSuggestion != "" {
@@ -128,18 +129,18 @@ This ensures the rules directory matches exactly what's defined in rules.json.`,
 		errorCount := 0
 
 		for ruleName, ruleVersion := range rs.Rules {
-			fmt.Printf("Installing rule '%s' (version: %s)...\n", ruleName, ruleVersion)
+			color.Cyan("Installing rule '%s' (version: %s)...", ruleName, ruleVersion)
 
 			if err := client.DownloadRule(ruleName, ruleVersion, rulesDir); err != nil {
-				fmt.Printf("Error installing rule '%s': %v\n", ruleName, err)
+				color.Red("Error installing rule '%s': %v", ruleName, err)
 				errorCount++
 			} else {
 				successCount++
 			}
 		}
 
 		// Print summary
-		fmt.Printf("\nInstallation complete: %d rules installed, %d failed\n", successCount, errorCount)
+		color.Green("\nInstallation complete: %d rules installed, %d failed", successCount, errorCount)
 
 		// Print format suggestion at the very end if applicable
 		if formatSuggestion != "" {

cmd/login.go

@@ -3,9 +3,10 @@ package cmd
 import (
 	"fmt"
 
+	"rules-cli/internal/auth"
+
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
-	"rules-cli/internal/auth"
 )
 
 // loginCmd represents the login command
@@ -17,7 +18,7 @@ var loginCmd = &cobra.Command{
 		fmt.Println("Starting login process...")
 
 		// Call the login function from the auth package
-		authConfig, err := auth.Login(false)
+		authConfig, err := auth.Login()
 		if err != nil {
 			color.Red("Login failed: %v", err)
 			return

cmd/logout.go

@@ -1,8 +1,10 @@
 package cmd
 
 import (
-	"github.com/spf13/cobra"
 	"rules-cli/internal/auth"
+
+	"github.com/fatih/color"
+	"github.com/spf13/cobra"
 )
 
 // logoutCmd represents the logout command
@@ -11,6 +13,7 @@ var logoutCmd = &cobra.Command{
 	Short: "Log out from the registry service",
 	Long:  `Logs the user out by removing stored authentication information.`,
 	Run: func(cmd *cobra.Command, args []string) {
+		color.Cyan("Logging out...")
 		// Call the logout function from the auth package
 		auth.Logout()
 	},

cmd/publish.go

@@ -10,6 +10,7 @@ import (
 	"rules-cli/internal/auth"
 	"rules-cli/internal/registry"
 
+	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 )
 
@@ -86,14 +87,14 @@ func runPublishCommand(cmd *cobra.Command, args []string) error {
 	client.SetAuthToken(authConfig.AccessToken)
 
 	// Publish the rule
-	fmt.Printf("Publishing rule to %s/%s with visibility: %s\n", ownerSlug, ruleSlug, visibility)
+	color.Cyan("Publishing rule to %s/%s with visibility: %s", ownerSlug, ruleSlug, visibility)
 	err = client.PublishRule(ownerSlug, ruleSlug, string(content), visibility)
 	if err != nil {
 		return fmt.Errorf("failed to publish rule: %w", err)
 	}
 
 	ruleFileName := filepath.Base(ruleFilePath)
-	fmt.Printf("Successfully published rule '%s' to %s/%s\n", ruleFileName, ownerSlug, ruleSlug)
+	color.Green("Successfully published rule '%s' to %s/%s", ruleFileName, ownerSlug, ruleSlug)
 	return nil
 }
 

cmd/remove.go

@@ -6,9 +6,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/spf13/cobra"
 	"rules-cli/internal/formats"
 	"rules-cli/internal/ruleset"
+
+	"github.com/fatih/color"
+	"github.com/spf13/cobra"
 )
 
 var (
@@ -66,22 +68,22 @@ For GitHub repositories, use the same gh: prefix as when adding.`,
 
 			// Check if we should prompt for confirmation
 			if !forceFlag {
-				fmt.Printf("This will remove rule '%s' (version %s) and delete its files. Continue? [y/N]: ", ruleName, version)
+				color.Yellow("This will remove rule '%s' (version %s) and delete its files. Continue? [y/N]: ", ruleName, version)
 				var response string
 				fmt.Scanln(&response)
 
 				if !strings.EqualFold(response, "y") && !strings.EqualFold(response, "yes") {
-					fmt.Println("Operation cancelled")
+					color.Yellow("Operation cancelled")
 					return nil
 				}
 			}
 
 			// Delete rule directory and files
 			if err := os.RemoveAll(ruleDir); err != nil {
-				fmt.Printf("Warning: Failed to delete rule files: %v\n", err)
+				color.Red("Warning: Failed to delete rule files: %v", err)
 				// Continue anyway to remove from rules.json
 			} else {
-				fmt.Printf("Deleted rule files from %s\n", ruleDir)
+				color.Cyan("Deleted rule files from %s", ruleDir)
 			}
 		}
 
@@ -91,7 +93,7 @@ For GitHub repositories, use the same gh: prefix as when adding.`,
 			return fmt.Errorf("failed to save ruleset: %w", err)
 		}
 
-		fmt.Printf("Rule '%s' (version %s) removed successfully\n", ruleName, version)
+		color.Green("Rule '%s' (version %s) removed successfully", ruleName, version)
 		return nil
 	},
 }