Merge pull request #67 from Carthage/fix-stderr-output

[TaskEvent] Fix standard error handling
Carthage · Jul 17, 2016 · dd8e927 · dd8e927
2 parents 44dcde2 + 2c66aa8
commit dd8e927
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/ReactiveTask/Task.swift b/ReactiveTask/Task.swift
@@ -451,15 +451,15 @@ public func launchTask(task: Task, standardInput: SignalProducer<NSData, NoError
 				}
 
 				return SignalProducer { observer, disposable in
-					func startAggregating(producer: Pipe.ReadProducer) -> Pipe.ReadProducer {
+					func startAggregating(producer: Pipe.ReadProducer, chunk: (NSData) -> TaskEvent<NSData>) -> Pipe.ReadProducer {
 						let aggregated = MutableProperty<Aggregation?>(nil)
 
 						producer.startWithSignal { signal, signalDisposable in
 							disposable += signalDisposable
 
 							let aggregate = NSMutableData()
 							signal.observe(Observer(next: { data in
-								observer.sendNext(.StandardOutput(data))
+								observer.sendNext(chunk(data))
 								aggregate.appendData(data)
 							}, failed: { error in
 								observer.sendFailed(error)
@@ -476,8 +476,8 @@ public func launchTask(task: Task, standardInput: SignalProducer<NSData, NoError
 							.flatMap(.Concat) { $0.producer }
 					}
 
-					let stdoutAggregated = startAggregating(stdoutProducer)
-					let stderrAggregated = startAggregating(stderrProducer)
+					let stdoutAggregated = startAggregating(stdoutProducer, chunk: TaskEvent.StandardOutput)
+					let stderrAggregated = startAggregating(stderrProducer, chunk: TaskEvent.StandardError)
 
 					rawTask.standardOutput = stdoutPipe.writeHandle
 					rawTask.standardError = stderrPipe.writeHandle

diff --git a/ReactiveTaskTests/TaskSpec.swift b/ReactiveTaskTests/TaskSpec.swift
@@ -50,8 +50,9 @@ class TaskSpec: QuickSpec {
 		}
 
 		it("should launch a task that writes to stderr") {
+			let aggregated = NSMutableData()
 			let result = launchTask(Task("/usr/bin/stat", arguments: [ "not-a-real-file" ]))
-				.reduce(NSMutableData()) { aggregated, event in
+				.reduce(aggregated) { aggregated, event in
 					if case let .StandardError(data) = event {
 						aggregated.appendData(data)
 					}
@@ -61,9 +62,8 @@ class TaskSpec: QuickSpec {
 				.single()
 
 			expect(result).notTo(beNil())
-			if let data = result?.value {
-				expect(NSString(data: data, encoding: NSUTF8StringEncoding)).to(equal("stat: not-a-real-file: stat: No such file or directory\n"))
-			}
+			expect(result?.error).notTo(beNil())
+			expect(NSString(data: aggregated, encoding: NSUTF8StringEncoding)).to(equal("stat: not-a-real-file: stat: No such file or directory\n"))
 		}
 
 		it("should launch a task with standard input") {