wip

Author: raptorxcz

Package.swift

@@ -12,12 +12,14 @@ let package = Package(
         .package(url: "https://github.com/Swinject/Swinject.git", from: "2.8.1"),
         .package(url: "https://github.com/Swinject/SwinjectAutoregistration", from: "2.8.1"),
         .package(url: "https://github.com/jakeheis/SwiftCLI", exact: "6.0.3"),
+        .package(url: "https://github.com/raptorxcz/xcbeautify", revision: "1bd38b6a64bb447c264fbdfc1b453bf8065b8ec6"),
     ],
     targets: [
         .target(name: "SwiftTools", dependencies: [
             "Swinject",
             "SwinjectAutoregistration",
             "SwiftCLI",
+            .product(name: "XcbeautifyLib", package: "xcbeautify"),
         ]),
         .testTarget(
             name: "SwiftToolsTests",

Sources/SwiftTools/Build/Domain/BuildInteractor.swift

@@ -47,7 +47,7 @@ final class BuildInteractorImpl: BuildInteractor {
 
     func test(with arguments: TestArguments) throws {
         let arguments = try makeArguments(from: arguments)
-        try shellService.execute(arguments: arguments)
+        try shellService.executeWithXCBeautify(arguments: arguments)
     }
 
     func testWithLog(with arguments: TestArguments) throws -> String {

Sources/SwiftTools/Common/Shell/Platform/ShellService.swift

@@ -6,10 +6,12 @@
 //
 
 import SwiftCLI
+import XcbeautifyLib
 
 public protocol ShellService {
     func execute(arguments: [String]) throws
     func executeWithResult(arguments: [String]) throws -> String
+    func executeWithXCBeautify(arguments: [String]) throws
 }
 
 final class ShellServiceImpl: ShellService {
@@ -58,4 +60,34 @@ final class ShellServiceImpl: ShellService {
             return captureStream
         }
     }
+
+    @discardableResult func executeWithXCBeautify(arguments: [String]) throws {
+        let printStream = WriteStream.stdout
+        let parser = XcbeautifyLib.Parser(
+            colored: true,
+            renderer: .terminal,
+            preserveUnbeautifiedLines: true,
+            additionalLines: { nil }
+        )
+        let outputStream = makeBeautifyStream(outputStream: printStream, parser: parser)
+
+        let command = arguments.joined(separator: " ")
+        let task = Task(executable: "/bin/bash", arguments: ["-c", command], stdout: outputStream)
+        printService.printVerbose("shell command: '\(command)'")
+        let exitCode = task.runSync()
+
+        guard exitCode == 0 else {
+            throw ToolsError(description: "shell command: '\(command)' failed with error")
+        }
+    }
+
+    private func makeBeautifyStream(outputStream: WritableStream, parser: XcbeautifyLib.Parser) -> ProcessingStream {
+        return LineStream { line in
+            if let formatted = parser.parse(line: line) {
+                outputStream.write(formatted)
+            } else {
+                outputStream.write(line)
+            }
+        }
+    }
 }