better flag&option handling, slightly optimized patternMatcher

Author: ahoehne

c2mConfig/c2mConfig.go

@@ -29,15 +29,16 @@ func InitializeConfigFromFlags() (*Config, error) {
 	inputFolder := flag.String("input", "", "Input folder to scan")
 	outputMarkdown := flag.String("output", "", "Output Markdown file")
 	languages := flag.String("languages", "", "Comma-separated list of allowed languages (empty = use defaults)")
-	ignorePatterns := flag.String("ignore", "", "Comma-separated list of files and/or search patterns to ignore")
+	var ignorePatterns string
+	flag.StringVar(&ignorePatterns, "ignore", defaultIgnoredPatterns, "Comma-separated list of files and/or search patterns to ignore")
 	maxFileSize := flag.Int64("max-file-size", defaultMaxFileSize, "Maximum file size in bytes to process")
 	help := flag.Bool("help", false, "Show help")
 	v := flag.Bool("version", false, "Show version information")
 
 	flag.StringVar(inputFolder, "i", "", "Input folder to scan (shorthand)")
 	flag.StringVar(outputMarkdown, "o", "", "Output Markdown file (shorthand)")
 	flag.StringVar(languages, "l", "", "languages (shorthand)")
-	flag.StringVar(ignorePatterns, "I", defaultIgnoredPatterns, "ignore patterns (shorthand)")
+	flag.StringVar(&ignorePatterns, "I", defaultIgnoredPatterns, "ignore patterns (shorthand)")
 	flag.Int64Var(maxFileSize, "m", defaultMaxFileSize, "max file size (shorthand)")
 	flag.BoolVar(help, "h", false, "help (shorthand)")
 	flag.BoolVar(v, "v", false, "version (shorthand)")
@@ -47,10 +48,14 @@ func InitializeConfigFromFlags() (*Config, error) {
 	allowedLanguages := language.ParseLanguages(*languages)
 
 	var ignorePatternsList []string
-	if *ignorePatterns == "" {
-		ignorePatternsList = []string{*outputMarkdown}
-	} else {
-		ignorePatternsList = append(strings.Split(*ignorePatterns, ","), *outputMarkdown)
+	for _, p := range strings.Split(ignorePatterns, ",") {
+		trimmed := strings.TrimSpace(p)
+		if trimmed != "" {
+			ignorePatternsList = append(ignorePatternsList, trimmed)
+		}
+	}
+	if *outputMarkdown != "" {
+		ignorePatternsList = append(ignorePatternsList, *outputMarkdown)
 	}
 
 	if allowedLanguages[".css"] || allowedLanguages[".scss"] {

c2mConfig/c2mConfig_test.go

@@ -1,12 +1,113 @@
 package c2mConfig
 
 import (
+	"flag"
 	"os"
 	"path/filepath"
 	"reflect"
+	"strings"
 	"testing"
 )
 
+func TestInitializeConfigFromFlags(t *testing.T) {
+	t.Run("default ignore patterns present when no flags passed", func(t *testing.T) {
+		flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
+		origArgs := os.Args
+		defer func() { os.Args = origArgs }()
+
+		tempDir := t.TempDir()
+		origDir, _ := os.Getwd()
+		os.Chdir(tempDir)
+		defer os.Chdir(origDir)
+
+		os.Args = []string{"cmd", "-i", tempDir}
+		config, err := InitializeConfigFromFlags()
+		if err != nil {
+			t.Fatalf("InitializeConfigFromFlags() error: %v", err)
+		}
+
+		defaults := strings.Split(defaultIgnoredPatterns, ",")
+		for _, d := range defaults {
+			found := false
+			for _, p := range config.IgnorePatterns {
+				if p == d {
+					found = true
+					break
+				}
+			}
+			if !found {
+				t.Errorf("expected default ignore pattern %q in %v", d, config.IgnorePatterns)
+			}
+		}
+	})
+
+	t.Run("explicit ignore overrides defaults", func(t *testing.T) {
+		flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
+		origArgs := os.Args
+		defer func() { os.Args = origArgs }()
+
+		tempDir := t.TempDir()
+		origDir, _ := os.Getwd()
+		os.Chdir(tempDir)
+		defer os.Chdir(origDir)
+
+		os.Args = []string{"cmd", "-i", tempDir, "--ignore", "custom.txt,other.log"}
+		config, err := InitializeConfigFromFlags()
+		if err != nil {
+			t.Fatalf("InitializeConfigFromFlags() error: %v", err)
+		}
+
+		for _, expected := range []string{"custom.txt", "other.log"} {
+			found := false
+			for _, p := range config.IgnorePatterns {
+				if p == expected {
+					found = true
+					break
+				}
+			}
+			if !found {
+				t.Errorf("expected ignore pattern %q in %v", expected, config.IgnorePatterns)
+			}
+		}
+
+		for _, d := range strings.Split(defaultIgnoredPatterns, ",") {
+			for _, p := range config.IgnorePatterns {
+				if p == d {
+					t.Errorf("default pattern %q should not be present when --ignore is explicit, got %v", d, config.IgnorePatterns)
+				}
+			}
+		}
+	})
+
+	t.Run("output file added to ignore patterns", func(t *testing.T) {
+		flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
+		origArgs := os.Args
+		defer func() { os.Args = origArgs }()
+
+		tempDir := t.TempDir()
+		origDir, _ := os.Getwd()
+		os.Chdir(tempDir)
+		defer os.Chdir(origDir)
+
+		os.Args = []string{"cmd", "-i", tempDir, "-o", "output.md"}
+		config, err := InitializeConfigFromFlags()
+		if err != nil {
+			t.Fatalf("InitializeConfigFromFlags() error: %v", err)
+		}
+
+		found := false
+		for _, p := range config.IgnorePatterns {
+			if p == "output.md" {
+				found = true
+				break
+			}
+		}
+		if !found {
+			t.Errorf("expected output file 'output.md' in ignore patterns %v", config.IgnorePatterns)
+		}
+	})
+}
+
 func TestIsConfigValid(t *testing.T) {
 	tests := []struct {
 		name   string

patternMatcher/patternMatcher.go

@@ -25,7 +25,7 @@ func CompilePatterns(patterns []string) []CompiledPattern {
 
 		cp := CompiledPattern{original: pattern}
 
-		if strings.HasPrefix(pattern, "/") && strings.HasSuffix(pattern, "/") {
+		if strings.HasPrefix(pattern, "/") && !strings.Contains(pattern, "*") {
 			cp.isSlashPrefix = true
 			cp.prefix = strings.TrimPrefix(pattern, "/")
 		} else if strings.HasSuffix(pattern, "/") {
@@ -51,8 +51,15 @@ func IsPathIgnored(path string, patterns []CompiledPattern) bool {
 			return true
 		}
 
-		if pattern.isSlashPrefix && strings.HasPrefix(path, pattern.prefix) {
-			return true
+		if pattern.isSlashPrefix {
+			withSlash := pattern.prefix
+			if !strings.HasSuffix(withSlash, "/") {
+				withSlash += "/"
+			}
+			if strings.HasPrefix(path, withSlash) ||
+			path == strings.TrimSuffix(withSlash, "/") {
+				return true
+			}
 		}
 
 		if pattern.isDirPrefix && strings.HasPrefix(path, pattern.prefix) {

patternMatcher/patternMatcher_test.go

@@ -35,6 +35,10 @@ func TestPathPatternMatching(t *testing.T) {
 		{"slash prefix nested match", "example/nested/file.txt", "/example/", true},
 		{"slash prefix mismatch", "example.txt", "/example/", false},
 		{"slash prefix other dir", "other/file.txt", "/example/", false},
+		{"slash prefix no trailing slash file", "vendor/file.go", "/vendor", true},
+		{"slash prefix no trailing slash nested", "vendor/pkg/lib.go", "/vendor", true},
+		{"slash prefix no trailing slash exact", "vendor", "/vendor", true},
+		{"slash prefix no trailing slash mismatch", "src/vendor/file.go", "/vendor", false},
 	}
 
 	for _, tt := range tests {
@@ -74,7 +78,7 @@ func TestPathIgnoring(t *testing.T) {
 }
 
 func TestSlashPrefixPatterns(t *testing.T) {
-	patterns := CompilePatterns([]string{"/vendor/", "/node_modules/"})
+	patterns := CompilePatterns([]string{"/vendor/", "/node_modules/", "/build"})
 	tests := []struct {
 		name string
 		path string
@@ -84,6 +88,9 @@ func TestSlashPrefixPatterns(t *testing.T) {
 		{"node_modules root", "node_modules/lib/index.js", true},
 		{"nested vendor allowed", "src/vendor/file.go", false},
 		{"other directory", "src/main.go", false},
+		{"build no trailing slash", "build/output.js", true},
+		{"build exact", "build", true},
+		{"nested build allowed", "src/build/output.js", false},
 	}
 
 	for _, tt := range tests {
@@ -96,10 +103,10 @@ func TestSlashPrefixPatterns(t *testing.T) {
 }
 
 func TestCompiledPatterns(t *testing.T) {
-	patterns := CompilePatterns([]string{"*.txt", "ignore/", "temp/*.log", "**.min.css", "/vendor/"})
+	patterns := CompilePatterns([]string{"*.txt", "ignore/", "temp/*.log", "**.min.css", "/vendor/", "/build"})
 
-	if len(patterns) != 5 {
-		t.Errorf("Expected 5 compiled patterns, got %d", len(patterns))
+	if len(patterns) != 6 {
+		t.Errorf("Expected 6 compiled patterns, got %d", len(patterns))
 	}
 
 	for _, p := range patterns {
@@ -127,6 +134,13 @@ func TestCompiledPatterns(t *testing.T) {
 			if p.prefix != "vendor/" {
 				t.Errorf("/vendor/ prefix should be 'vendor/', got %q", p.prefix)
 			}
+		case "/build":
+			if !p.isSlashPrefix {
+				t.Error("/build should be marked as slash prefix")
+			}
+			if p.prefix != "build" {
+				t.Errorf("/build prefix should be 'build', got %q", p.prefix)
+			}
 		}
 	}
 }