vbvictor · vbvictor · Mar 22, 2025 · Mar 22, 2025 · Mar 22, 2025
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,7 @@ go.work.sum
 dev_data
 test_data
 plots
+tmp
 
 # Test results
 testdata/charts

diff --git a/grit/cmd/flag/flags.go b/grit/cmd/flag/flags.go
@@ -68,9 +68,9 @@ const (
 	LongSince        = "since"
 	LongUntil        = "until"
 	LongFormat       = "format"
-	LongEngine       = "engine"
+	LongEngine       = "complexity-engine"
 	LongRunCoverage  = "run-tests"
-	LongFileCoverage = "coverage"
+	LongFileCoverage = "coverage-file"
 
 	// Flag shortcuts.
 	ShortTop          = "t"

diff --git a/grit/cmd/report/report.go b/grit/cmd/report/report.go
@@ -2,6 +2,7 @@ package report
 
 import (
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
 	"time"
@@ -19,6 +20,7 @@ var (
 	top          int
 	since        string
 	until        string
+	outputFormat string
 )
 
 var churnOpts = &git.ChurnOptions{
@@ -104,7 +106,7 @@ var ReportCmd = &cobra.Command{
 		fileScores = report.SortAndLimit(report.CalculateScores(fileScores, reportOpts), top)
 		flag.LogIfVerbose("Got %d file scores\n", len(fileScores))
 
-		return report.PrintStats(fileScores, os.Stdout, reportOpts)
+		return printReport(fileScores, os.Stdout, &reportOpts, outputFormat)
 	},
 }
 
@@ -130,4 +132,18 @@ func init() {
 
 	// Report specific flags
 	flag.PerfectCoverageFlag(flags, &reportOpts.PerfectCoverage)
+	flag.OutputFormatFlag(flags, &outputFormat)
+}
+
+func printReport(results []*report.FileScore, out io.Writer, opts *report.Options, format string) error {
+	switch format {
+	case flag.CSV:
+		report.PrintCSV(results, out, opts)
+	case flag.Tabular:
+		report.PrintTabular(results, out, opts)
+	default:
+		return fmt.Errorf("unsupported output format: %s", format)
+	}
+
+	return nil
 }
diff --git a/pkg/report/print.go b/pkg/report/print.go
@@ -1,17 +1,14 @@
 package report
 
 import (
+	"encoding/csv"
 	"fmt"
 	"io"
 
 	"github.com/bndr/gotabulate"
 )
 
-func PrintStats(results []*FileScore, out io.Writer, opts Options) error {
-	return printTabular(results, out, opts)
-}
-
-func printTabular(results []*FileScore, out io.Writer, opts Options) error {
+func PrintTabular(results []*FileScore, out io.Writer, opts *Options) {
 	fmt.Fprintf(out, "\nCode health analysis results (top %d):\n", opts.Top)
 
 	data := make([][]any, len(results))
@@ -30,8 +27,30 @@ func printTabular(results []*FileScore, out io.Writer, opts Options) error {
 	table.SetAlign("left")
 
 	if _, err := io.WriteString(out, table.Render("grid")); err != nil {
-		return fmt.Errorf("failed to write grid: %w", err)
+		return
 	}
+}
+
+func PrintCSV(results []*FileScore, out io.Writer, _ *Options) {
+	writer := csv.NewWriter(out)
+	defer writer.Flush()
 
-	return nil
+	// Write headers
+	if err := writer.Write([]string{"FILEPATH", "SCORE", "CHURN", "COMPLEXITY", "COVERAGE"}); err != nil {
+		return
+	}
+
+	// Write data
+	for _, result := range results {
+		record := []string{
+			result.File,
+			fmt.Sprintf("%.2f", result.Score),
+			fmt.Sprintf("%.2f", result.Churn),
+			fmt.Sprintf("%.2f", result.Complexity),
+			fmt.Sprintf("%.2f", result.Coverage),
+		}
+		if err := writer.Write(record); err != nil {
+			return
+		}
+	}
 }
diff --git a/pkg/report/print_test.go b/pkg/report/print_test.go
@@ -71,14 +71,78 @@ func TestPrintTabular(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			var buf bytes.Buffer
 
-			err := printTabular(tc.input, &buf, Options{})
-			require.NoError(t, err)
+			PrintTabular(tc.input, &buf, &Options{})
 
 			output := buf.String()
 			for _, exp := range tc.expected {
-				if !strings.Contains(output, exp) {
-					t.Errorf("Expected output to contain %q, but it didn't.\nGot: %s", exp, output)
-				}
+				require.Contains(t, output, exp,
+					"Expected output to contain %q, but it didn't.\nGot: %s", exp, output)
+			}
+		})
+	}
+}
+
+func TestPrintCSV(t *testing.T) {
+	testCases := []struct {
+		name     string
+		input    []*FileScore
+		expected []string
+	}{
+		{
+			name: "single file score",
+			input: []*FileScore{
+				{
+					File:       "main.go",
+					Coverage:   75.5,
+					Complexity: 4.2,
+					Churn:      100,
+					Score:      42.5,
+				},
+			},
+			expected: []string{
+				"FILEPATH,SCORE,CHURN,COMPLEXITY,COVERAGE",
+				"main.go,42.50,100.00,4.20,75.50",
+			},
+		},
+		{
+			name: "multiple files score",
+			input: []*FileScore{
+				{
+					File:       "path/to/foo.go",
+					Coverage:   90.0,
+					Complexity: 2.5,
+					Churn:      50,
+					Score:      20.5,
+				},
+				{
+					File:       "bar.go",
+					Coverage:   60.5,
+					Complexity: 6.0,
+					Churn:      150,
+					Score:      85.2,
+				},
+			},
+			expected: []string{
+				"FILEPATH,SCORE,CHURN,COMPLEXITY,COVERAGE",
+				"path/to/foo.go,20.50,50.00,2.50,90.00",
+				"bar.go,85.20,150.00,6.00,60.50",
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			var buf bytes.Buffer
+
+			PrintCSV(tc.input, &buf, &Options{})
+
+			output := buf.String()
+			lines := strings.Split(output, "\n")
+
+			require.Equal(t, len(tc.expected), len(lines)-1) // -1 for trailing newline
+
+			for i, exp := range tc.expected {
+				require.Equal(t, exp, lines[i])
 			}
 		})
 	}

diff --git a/test/gritrepo_test.go b/test/gritrepo_test.go
@@ -91,3 +91,13 @@ func TestGritBasicFunctionality(t *testing.T) {
 
 	RunGritTests(t, tests)
 }
+
+/*
+func newGritReportValidator(expectedOutputs ...string) OutputValidator {
+	return func(t *testing.T, stdout, _ string) bool {
+		t.Helper()
+
+		return false
+	}
+}
+*/