* Bump Carthage dependencies.

* Reimplement flatMapTaskEvents and ignoreTaskData as protocol extensions.
* Update tests to use protocol extension dot-method syntax.

Author: mattprowse

Cartfile.resolved

@@ -1,5 +1,5 @@
 github "Quick/Nimble" "a804949542eb2f299b823ffb36936aec54fe0db6"
 github "Quick/Quick" "e3c802be6c55710b39dba73caab9f234932c2ed7"
-github "antitypical/Result" "0.5"
+github "antitypical/Result" "932ac1aabf6d881ead74c4e6911d1271e95d2859"
 github "jspahrsummers/xcconfigs" "0.8.1"
-github "ReactiveCocoa/ReactiveCocoa" "fc54992143255e085371e1bb2e638931e19680e0"
+github "ReactiveCocoa/ReactiveCocoa" "f40b21368a19c31afb043cf35baa72f78718f43c"

Carthage/Checkouts/ReactiveCocoa

@@ -101,9 +101,9 @@ private final class Pipe {
 	class func create(queue: dispatch_queue_t, _ group: dispatch_group_t) -> Result<Pipe, ReactiveTaskError> {
 		var fildes: [Int32] = [ 0, 0 ]
 		if pipe(&fildes) == 0 {
-			return .success(self.init(readFD: fildes[0], writeFD: fildes[1], queue: queue, group: group))
+			return .Success(self.init(readFD: fildes[0], writeFD: fildes[1], queue: queue, group: group))
 		} else {
-			return .failure(.POSIXError(errno))
+			return .Failure(.POSIXError(errno))
 		}
 	}
 
@@ -264,9 +264,23 @@ private func aggregateDataReadFromPipe(pipe: Pipe) -> SignalProducer<ReadData, R
 	}
 }
 
+public protocol TaskEventType {
+	/// The type of values being sent on the signal.
+	typealias T
+
+	/// The resulting value, if the event is `Success`.
+	var value: T? { get }
+	
+	/// Maps over the value embedded in a `Success` event.
+	func map<U>(@noescape transform: T -> U) -> TaskEvent<U>
+	
+	/// Convenience operator for mapping TaskEvents to SignalProducers.
+	func producerMap<U, Error>(@noescape transform: T -> SignalProducer<U, Error>) -> SignalProducer<TaskEvent<U>, Error>
+}
+
 /// Represents events that can occur during the execution of a task that is
 /// expected to terminate with a result of type T (upon success).
-public enum TaskEvent<T> {
+public enum TaskEvent<T>: TaskEventType {
 	/// Some data arrived from the task on `stdout`.
 	case StandardOutput(NSData)
 
@@ -352,23 +366,33 @@ extension TaskEvent: CustomStringConvertible {
 	}
 }
 
-/// Maps the values inside a stream of TaskEvents into new SignalProducers.
-public func flatMapTaskEvents<T, U, Error>(strategy: FlattenStrategy, transform: T -> SignalProducer<U, Error>) -> SignalProducer<TaskEvent<T>, Error> -> SignalProducer<TaskEvent<U>, Error> {
-	return { producer in
-		return producer.flatMap(strategy) { taskEvent in
+extension SignalProducer where T: TaskEventType {
+	
+	/// Maps the values inside a stream of TaskEvents into new SignalProducers.
+	public func flatMapTaskEvents<U>(strategy: FlattenStrategy, transform: T.T -> SignalProducer<U, E>) -> SignalProducer<TaskEvent<U>, E> {
+		return self.flatMap(strategy) { taskEvent in
 			return taskEvent.producerMap(transform)
 		}
 	}
+	
+	public func ignoreTaskData() -> SignalProducer<T.T, E> {
+		return lift { $0.ignoreTaskData() }
+	}
+
+	
 }
 
-/// Ignores incremental standard output and standard error data from the given
-/// task, sending only a single value with the final, aggregated result.
-public func ignoreTaskData<T, Error>(signal: Signal<TaskEvent<T>, Error>) -> Signal<T, Error> {
-	return signal
-		.map { event in
-			return event.value.map { $0 }
-		}
-		.ignoreNil()
+extension Signal where T: TaskEventType {
+	/// Ignores incremental standard output and standard error data from the given
+	/// task, sending only a single value with the final, aggregated result.
+	public func ignoreTaskData() -> Signal<T.T, E> {
+		return self
+			.map { event in
+				return event.value
+			}
+			.ignoreNil()
+	}
+	
 }
 
 /// Launches a new shell task, using the parameters from `taskDescription`.

Carthage/Checkouts/Result

@@ -17,7 +17,7 @@ class TaskSpec: QuickSpec {
 	override func spec() {
 		it("should launch a task that writes to stdout") {
 			let result = launchTask(TaskDescription(launchPath: "/bin/echo", arguments: [ "foobar" ]))
-				|> reduce(NSMutableData()) { aggregated, event in
+				.reduce(NSMutableData()) { aggregated, event in
 					switch event {
 					case let .StandardOutput(data):
 						aggregated.appendData(data)
@@ -28,7 +28,7 @@ class TaskSpec: QuickSpec {
 
 					return aggregated
 				}
-				|> single
+				.single()
 
 			expect(result).notTo(beNil())
 			if let data = result?.value {
@@ -38,7 +38,7 @@ class TaskSpec: QuickSpec {
 
 		it("should launch a task that writes to stderr") {
 			let result = launchTask(TaskDescription(launchPath: "/usr/bin/stat", arguments: [ "not-a-real-file" ]))
-				|> reduce(NSMutableData()) { aggregated, event in
+				.reduce(NSMutableData()) { aggregated, event in
 					switch event {
 					case let .StandardError(data):
 						aggregated.appendData(data)
@@ -49,7 +49,7 @@ class TaskSpec: QuickSpec {
 
 					return aggregated
 				}
-				|> single
+				.single()
 
 			expect(result).notTo(beNil())
 			if let data = result?.value {
@@ -62,9 +62,9 @@ class TaskSpec: QuickSpec {
 			let data = strings.map { $0.dataUsingEncoding(NSUTF8StringEncoding)! }
 
 			let result = launchTask(TaskDescription(launchPath: "/usr/bin/sort", standardInput: SignalProducer(values: data)))
-				|> map { event in event.value }
-				|> ignoreNil
-				|> single
+				.map { event in event.value }
+				.ignoreNil()
+				.single()
 
 			expect(result).notTo(beNil())
 			if let data = result?.value {