Merge pull request #37 from Carthage/rac4-alpha3

Update RAC to 4.0-alpha.3

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7
+osx_image: xcode7.1
 xcode_workspace: ReactiveTask.xcworkspace
 xcode_scheme: ReactiveTask
 script: script/cibuild

Cartfile

@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.2"
+github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.3"

Cartfile.private

@@ -1,3 +1,3 @@
-github "Quick/Quick" ~> 0.7
-github "Quick/Nimble" ~> 2.0
+github "Quick/Quick" ~> 0.8
+github "Quick/Nimble" ~> 3.0
 github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"

Cartfile.resolved

@@ -1,5 +1,5 @@
-github "Quick/Nimble" "v2.0.0"
-github "Quick/Quick" "v0.7.0"
-github "antitypical/Result" "0.6.0-beta.3"
+github "Quick/Nimble" "v3.0.0"
+github "Quick/Quick" "v0.8.0"
+github "antitypical/Result" "0.6.0-beta.5"
 github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"
-github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.2"
+github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.3"

ReactiveTask/Task.swift

@@ -127,7 +127,7 @@ private final class Pipe {
 				} else if error == ECANCELED {
 					observer.sendInterrupted()
 				} else {
-					observer.sendError(.POSIXError(error))
+					observer.sendFailed(.POSIXError(error))
 				}
 
 				close(self.readFD)
@@ -143,7 +143,7 @@ private final class Pipe {
 				if error == ECANCELED {
 					observer.sendInterrupted()
 				} else if error != 0 {
-					observer.sendError(.POSIXError(error))
+					observer.sendFailed(.POSIXError(error))
 				}
 
 				if done {
@@ -174,7 +174,7 @@ private final class Pipe {
 				} else if error == ECANCELED {
 					observer.sendInterrupted()
 				} else {
-					observer.sendError(.POSIXError(error))
+					observer.sendFailed(.POSIXError(error))
 				}
 
 				close(self.writeFD)
@@ -191,7 +191,7 @@ private final class Pipe {
 						if error == ECANCELED {
 							observer.sendInterrupted()
 						} else if error != 0 {
-							observer.sendError(.POSIXError(error))
+							observer.sendFailed(.POSIXError(error))
 						}
 					}
 				}, completed: {
@@ -252,14 +252,12 @@ private func aggregateDataReadFromPipe(pipe: Pipe) -> SignalProducer<ReadData, R
 				} else {
 					buffer = data
 				}
-			}, error: { error in
-				observer.sendError(error)
-			}, completed: {
+			}, failed: observer.sendFailed
+			, completed: {
 				observer.sendNext(.aggregated(buffer))
 				observer.sendCompleted()
-			}, interrupted: {
-				observer.sendInterrupted()
-			}))
+			}, interrupted: observer.sendInterrupted
+			))
 		}
 	}
 }
@@ -426,7 +424,7 @@ public func launchTask(taskDescription: TaskDescription) -> SignalProducer<TaskE
 				})
 
 			case let .Failure(error):
-				observer.sendError(error)
+				observer.sendFailed(error)
 				return
 			}
 		}
@@ -451,14 +449,12 @@ public func launchTask(taskDescription: TaskDescription) -> SignalProducer<TaskE
 							case let .Aggregated(data):
 								stdoutAggregatedObserver.sendNext(data)
 							}
-						}, error: { error in
-							observer.sendError(error)
-							stdoutAggregatedObserver.sendError(error)
-						}, completed: {
-							stdoutAggregatedObserver.sendCompleted()
-						}, interrupted: {
-							stdoutAggregatedObserver.sendInterrupted()
-						}))
+						}, failed: { error in
+							observer.sendFailed(error)
+							stdoutAggregatedObserver.sendFailed(error)
+						}, completed: stdoutAggregatedObserver.sendCompleted
+						, interrupted: stdoutAggregatedObserver.sendInterrupted
+						))
 					}
 
 					stderrProducer.startWithSignal { signal, signalDisposable in
@@ -472,14 +468,12 @@ public func launchTask(taskDescription: TaskDescription) -> SignalProducer<TaskE
 							case let .Aggregated(data):
 								stderrAggregatedObserver.sendNext(data)
 							}
-						}, error: { error in
-							observer.sendError(error)
-							stderrAggregatedObserver.sendError(error)
-						}, completed: {
-							stderrAggregatedObserver.sendCompleted()
-						}, interrupted: {
-							stderrAggregatedObserver.sendInterrupted()
-						}))
+						}, failed: { error in
+							observer.sendFailed(error)
+							stderrAggregatedObserver.sendFailed(error)
+						}, completed: stderrAggregatedObserver.sendCompleted
+						, interrupted: stderrAggregatedObserver.sendInterrupted
+						))
 					}
 
 					task.standardOutput = stdoutPipe.writeHandle