improved Runner

1 files changed, 33 insertions, 6 deletions

diff --git a/Sources/phbar/Models/Runner.swift b/Sources/phbar/Models/Runner.swift
index 2466e26..be4dbff 100644
--- a/Sources/phbar/Models/Runner.swift
+++ b/Sources/phbar/Models/Runner.swift
@@ -4,6 +4,13 @@ import Foundation
 ///
 /// Blocking — always call from a background context (e.g. `Task.detached`).
 enum Runner {
+	/// Run a command and returns stdout as an array of separated lines.
+	/// - Parameters:
+	///   - command: The command to run.
+	///   - env: An optional dictionary of strings to merge into
+	///          the process environment.
+	///
+	/// - Returns: An array of the text lines printed to stdout.
 	static func run(_ command: String, env: [String: String] = [:]) -> [String] {
 		let process = Process()
 		process.executableURL = URL(fileURLWithPath: "/bin/sh")
@@ -18,20 +25,24 @@ enum Runner {
 		process.standardOutput = stdout
 		process.standardError = stderr
 
-		guard let _ = try? process.run() else {
-			return ["(error)"]
+		guard (try? process.run()) != nil else {
+			return ["ERROR"]
 		}
 
 		let data = stdout.fileHandleForReading.readDataToEndOfFile()
 		let errData = stderr.fileHandleForReading.readDataToEndOfFile()
 		process.waitUntilExit()
 
-		if process.terminationStatus != 0 {
-			let reason = String(data: errData, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines)
-			FileHandle.standardError.write("phbar: `\(command)` failed: \(reason ?? "exit \(process.terminationStatus)")\n".data(using: .utf8)!)
+		guard process.terminationStatus == 0 else {
+			write(errData, to: .standardError)
+			return ["ERROR"]
 		}
 
-		return parse(String(data: data, encoding: .utf8) ?? "")
+		guard let string = String(data: data, encoding: .utf8) else {
+			return [""]
+		}
+
+		return parse(string)
 	}
 
 	/// Split output into lines. A single trailing newline
@@ -42,4 +53,20 @@ enum Runner {
 		if lines.last == "" { lines.removeLast() }
 		return lines
 	}
+
+	/// Write data to the provided handle.
+	/// - Parameters:
+	///   - data: The data to write.
+	///   - handle: The handle to which data should be written.
+	static func write(_ data: Data, to handle: FileHandle) {
+		handle.write(data)
+	}
+
+	/// Write string to the provided handle.
+	/// - Parameters:
+	///   - string: The string to write.
+	///   - handle: The handle to which data should be written.
+	static func write(_ string: String, to handle: FileHandle) {
+		write(Data(string.utf8), to: handle)
+	}
 }