[Basic] Use OutputByteStream for SimpleProgressBar

Author: aciidgh

Sources/Basic/TerminalController.swift

@@ -132,30 +132,28 @@ public protocol ProgressBarProtocol {
 }
 
 // Simple ProgressBar which shows the update text in new lines.
-public final class SimpleProgressBar<Target: OutputStream>: ProgressBarProtocol {
+public final class SimpleProgressBar: ProgressBarProtocol {
     private let header: String
     private var isClear: Bool
-    private var stream: UnsafeMutablePointer<Target>
+    private var stream: OutputByteStream
 
-    init(stream: UnsafeMutablePointer<Target>, header: String) {
+    init(stream: OutputByteStream, header: String) {
         self.stream = stream 
         self.header = header
         self.isClear = true
     }
 
-    private func write(_ string: String) {
-        stream.pointee.write(string)
-    }
-
     public func update(percent: Int, text: String) {
         if isClear {
-            write(header)
-            write("\n")
+            stream <<< header
+            stream <<< "\n"
+            try? stream.flush()
             isClear = false
         }
 
-        write("\(percent)%: " + text)
-        write("\n")
+        stream <<< "\(percent)%: " + text
+        stream <<< "\n"
+        try? stream.flush()
     }
 
     public func complete() {
@@ -207,8 +205,8 @@ public final class ProgressBar: ProgressBarProtocol {
 }
 
 /// Creates colored or simple progress bar based on output stream provided stream.
-public func createProgressBar<Target: OutputStream>(forStream stream: UnsafeMutablePointer<Target>, header: String) -> ProgressBarProtocol {
-    if let stdStream = stream.pointee as? LocalFileOutputByteStream, let term = TerminalController(stream: stdStream) {
+public func createProgressBar(forStream stream: OutputByteStream, header: String) -> ProgressBarProtocol {
+    if let stdStream = stream as? LocalFileOutputByteStream, let term = TerminalController(stream: stdStream) {
         return ProgressBar(term: term, header: header)
     }
     return SimpleProgressBar(stream: stream, header: header)

Tests/Basic/TerminalControllerTests.swift

@@ -84,15 +84,15 @@ final class TerminalControllerTests: XCTestCase {
         }
 
         // Test progress bar when writing to a non tty stream.
-        var outStream = ""
-        var bar = createProgressBar(forStream: &outStream, header: "test")
-        XCTAssertTrue(bar is SimpleProgressBar<String>)
+        let outStream = OutputByteStream()
+        var bar = createProgressBar(forStream: outStream, header: "test")
+        XCTAssertTrue(bar is SimpleProgressBar)
 
         runProgressBar(bar)
-        XCTAssertEqual(outStream, "test\n0%: 0\n1%: 1\n2%: 2\n3%: 3\n4%: 4\n5%: 5\n")
+        XCTAssertEqual(outStream.bytes.asString, "test\n0%: 0\n1%: 1\n2%: 2\n3%: 3\n4%: 4\n5%: 5\n")
 
         // Test progress bar when writing a tty stream.
-        bar = createProgressBar(forStream: &pty.outStream, header: "TestHeader")
+        bar = createProgressBar(forStream: pty.outStream, header: "TestHeader")
         XCTAssertTrue(bar is ProgressBar)
 
         var output = ""