fix: UI text wrapping

internal/ui/ui.go

@@ -37,12 +37,15 @@ func ClearStatus() {
 	fmt.Print("\r")
 }
 
-func Block() error {
+func Block(malwarePackages ...*analyzer.PackageVersionAnalysisResult) error {
 	StopSpinner()
 
 	fmt.Println()
 	fmt.Println(Colors.Red("❌ Malicious package blocked!"))
 
+	printMaliciousPackagesList(malwarePackages)
+
+	fmt.Println()
 	os.Exit(1)
 
 	return nil
@@ -63,22 +66,7 @@ func GetConfirmationOnMalware(malwarePackages []*analyzer.PackageVersionAnalysis
 	fmt.Println()
 	fmt.Println(Colors.Red(fmt.Sprintf("🚨 Suspicious package(s) detected: %d", len(malwarePackages))))
 
-	for _, mp := range malwarePackages {
-		fmt.Println()
-		fmt.Println("⚠️ ", Colors.Red(fmt.Sprintf("%s@%s", mp.PackageVersion.GetPackage().GetName(),
-			mp.PackageVersion.GetVersion())))
-
-		if verbosityLevel == VerbosityLevelVerbose {
-			fmt.Println(Colors.Yellow(termWidthFormatText(mp.Summary, 60)))
-
-			if mp.ReferenceURL != "" {
-				fmt.Println()
-				fmt.Println(Colors.Yellow(fmt.Sprintf("Reference: %s", mp.ReferenceURL)))
-			}
-
-			fmt.Println()
-		}
-	}
+	printMaliciousPackagesList(malwarePackages)
 
 	fmt.Println()
 	fmt.Print(Colors.Yellow("Do you want to continue with the installation? (y/N) "))
@@ -108,14 +96,44 @@ func Fatalf(msg string, args ...interface{}) {
 	os.Exit(1)
 }
 
+func printMaliciousPackagesList(malwarePackages []*analyzer.PackageVersionAnalysisResult) {
+	for _, mp := range malwarePackages {
+		fmt.Println()
+		fmt.Println("⚠️ ", Colors.Red(fmt.Sprintf("%s@%s", mp.PackageVersion.GetPackage().GetName(),
+			mp.PackageVersion.GetVersion())))
+
+		if verbosityLevel == VerbosityLevelVerbose {
+			fmt.Println(Colors.Yellow(termWidthFormatText(mp.Summary, 80)))
+
+			if mp.ReferenceURL != "" {
+				fmt.Println()
+				fmt.Println(Colors.Yellow(fmt.Sprintf("Reference: %s", mp.ReferenceURL)))
+			}
+		}
+	}
+}
+
 // Format the string to be maximum maxWidth. Use newlines to wrap the text.
 func termWidthFormatText(text string, maxWidth int) string {
+	// Replace all newlines with spaces so that we can split the text into words
+	// This is to ensure that we don't split the text at the newlines
+	text = strings.ReplaceAll(text, "\n", " ")
+
 	words := strings.Split(text, " ")
 	lines := []string{}
 	currentLine := ""
 
-	for _, word := range words {
-		if len(currentLine)+len(word) > maxWidth {
+	for i, word := range words {
+		// Skip empty words that might result from multiple spaces
+		if word == "" {
+			continue
+		}
+
+		if i == 0 {
+			// First word doesn't need a leading space
+			currentLine = word
+		} else if len(currentLine)+len(word)+1 > maxWidth {
+			// +1 for the space we would add
 			lines = append(lines, currentLine)
 			currentLine = word
 		} else {
@@ -123,5 +141,10 @@ func termWidthFormatText(text string, maxWidth int) string {
 		}
 	}
 
+	// Don't forget to add the last line
+	if currentLine != "" {
+		lines = append(lines, currentLine)
+	}
+
 	return strings.Join(lines, "\n")
 }

internal/ui/ui_test.go

@@ -0,0 +1,79 @@
+package ui
+
+import (
+	"testing"
+)
+
+// TestTermWidthFormatText is exported for testing
+func TestTermWidthFormatTextFunc(t *testing.T) {
+	tests := []struct {
+		name     string
+		text     string
+		maxWidth int
+		expected string
+	}{
+		{
+			name:     "empty string",
+			text:     "",
+			maxWidth: 10,
+			expected: "",
+		},
+		{
+			name:     "single word less than max width",
+			text:     "hello",
+			maxWidth: 10,
+			expected: "hello",
+		},
+		{
+			name:     "single word longer than max width",
+			text:     "supercalifragilisticexpialidocious",
+			maxWidth: 10,
+			expected: "supercalifragilisticexpialidocious",
+		},
+		{
+			name:     "multiple words on single line",
+			text:     "hello world",
+			maxWidth: 20,
+			expected: "hello world",
+		},
+		{
+			name:     "multiple words wrapped to multiple lines",
+			text:     "The quick brown fox jumps over the lazy dog",
+			maxWidth: 20,
+			expected: "The quick brown fox\njumps over the lazy\ndog",
+		},
+		{
+			name:     "text with existing newlines",
+			text:     "hello\nworld",
+			maxWidth: 20,
+			expected: "hello world",
+		},
+		{
+			name:     "text with multiple spaces",
+			text:     "hello  world   test",
+			maxWidth: 20,
+			expected: "hello world test",
+		},
+		{
+			name:     "very small max width",
+			text:     "hello world",
+			maxWidth: 3,
+			expected: "hello\nworld",
+		},
+		{
+			name:     "large max width",
+			text:     "The quick brown fox jumps over the lazy dog",
+			maxWidth: 100,
+			expected: "The quick brown fox jumps over the lazy dog",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := termWidthFormatText(tt.text, tt.maxWidth)
+			if result != tt.expected {
+				t.Errorf("termWidthFormatText() = %q, want %q", result, tt.expected)
+			}
+		})
+	}
+}