swift-testing

README.md

@@ -103,8 +103,8 @@ By analogy with Shell, you can make other wrappers over the `ProcessCommand`
 Using simctl, you can search for iPhone 12, turn it on and launch the application.
 
 ```swift
-let xcrun = XCRun()
-let simulator = xcrun.simctl
+let xcrun = XCRun.current
+let simulator = try await xcrun.simctl
 
 let list = try await simulator.list(.devices, "iPhone 12", available: true).json.decode()
 let devices = list.devices.flatMap { $0.value }

Sources/XSTooling/ProcessCommand.swift

@@ -104,7 +104,7 @@ public struct ProcessCommand: Hashable, Sendable {
         process.executableURL = executableURL
         process.currentDirectoryURL = currentDirectoryURL
         process.arguments = arguments
-        if let environment = environment {
+        if let environment {
             process.environment = environment
         }
         if let standardOutput {
@@ -189,7 +189,6 @@ extension Process {
                 self.terminate() // crash if not running
             }
         }
-        try Task.checkCancellation()
     }
 }
 
@@ -198,10 +197,10 @@ extension Process {
 extension FileHandle {
     fileprivate func stream() -> AsyncStream<Data> {
         AsyncStream<Data> { continuation in
+            continuation.onTermination = { [weak self] _ in
+                self?.readabilityHandler = nil // stop
+            }
             self.readabilityHandler = { fileHandle in
-                continuation.onTermination = { _ in
-                    fileHandle.readabilityHandler = nil // stop
-                }
                 let data = fileHandle.availableData
                 if data.isEmpty {
                     fileHandle.readabilityHandler = nil // stop

Sources/XSTooling/Shell.swift

@@ -30,20 +30,6 @@ public struct Shell: Equatable, Sendable {
         self.arguments = arguments
     }
 
-    // MARK: - Options
-
-    public var verbose: Shell { option("--verbose") }
-
-    public var login: Shell { option("--login") }
-
-    private func option(_ value: String) -> Shell {
-        var shell = self
-        shell.arguments.append(value)
-        return shell
-    }
-
-    // MARK: - Commands
-
     /// Show version information for this instance of bash on the standard output and exit successfully.
     public var version: ProcessCommand {
         ProcessCommand(path: path, arguments: arguments).appending(argument: "--version")