Handle logs that have multiple lines

tuist · Feb 21, 2025 · a786eb1 · a786eb1
1 parent 59d552d
commit a786eb1
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 8 deletions.
diff --git a/Sources/Noora/Components/CollapsibleStep.swift b/Sources/Noora/Components/CollapsibleStep.swift
@@ -64,13 +64,16 @@ struct CollapsibleStep {
 
     func runInteractive() async throws {
         renderInteractiveLines(lines: [])
-        var lines: [TerminalText] = []
+        var lines: [String] = []
         do {
-            try await task { line in
-                lines.append(line)
-                if lines.count > visibleLines {
-                    lines.removeFirst()
+            try await task { logs in
+                for logLine in logs.formatted(theme: theme, terminal: terminal).split(separator: "\n") {
+                    lines.append(String(logLine))
+                    if lines.count > visibleLines {
+                        lines.removeFirst()
+                    }
                 }
+
                 renderInteractiveLines(lines: lines)
             }
         } catch {
@@ -114,11 +117,11 @@ struct CollapsibleStep {
         }
     }
 
-    private func renderInteractiveLines(lines: [TerminalText]) {
+    private func renderInteractiveLines(lines: [String]) {
         var content = "◉ \(title.formatted(theme: theme, terminal: terminal))".hexIfColoredTerminal(theme.primary, terminal)
             .boldIfColoredTerminal(terminal)
-        for (index, line) in lines.enumerated() {
-            content.append("\n  \(line.formatted(theme: theme, terminal: terminal))")
+        for line in lines {
+            content.append("\n  \(line)")
         }
         renderer.render(content, standardPipeline: standardPipelines.output)
     }

diff --git a/Tests/NooraTests/Components/CollapsibleStepTests.swift b/Tests/NooraTests/Components/CollapsibleStepTests.swift
@@ -57,6 +57,42 @@ struct CollapsibleStepTests {
         """)
     }
 
+    @Test func run_whenInteractive_andLogsAreMultiline() async throws {
+        // Given
+        let terminal = MockTerminal(isInteractive: true, isColored: false)
+        let subject = CollapsibleStep(
+            title: "Authentication",
+            successMessage: "Authenticated",
+            errorMessage: "Authentication failed",
+            visibleLines: 3,
+            task: { log in
+                // Multiline
+                log("Redirecting to the browser\nPress CTRL+C to interrupt the process")
+            },
+            theme: .test(),
+            terminal: terminal,
+            renderer: renderer,
+            standardPipelines: StandardPipelines()
+        )
+
+        // When
+        try await subject.run()
+
+        // Then
+        var renders = Array(renderer.renders.reversed())
+        #expect(renders.popLast() == """
+        ◉ Authentication
+        """)
+        #expect(renders.popLast() == """
+        ◉ Authentication
+          Redirecting to the browser
+          Press CTRL+C to interrupt the process
+        """)
+        #expect(renders.popLast() == """
+        ✔︎ Authenticated 
+        """)
+    }
+
     @Test func run_whenNonInteractive() async throws {
         // Given
         let terminal = MockTerminal(isInteractive: false, isColored: false)