Merge pull request #36 from Carthage/rac4-with-pinned-result

mdiep · mdiep · commit 30160d1db79c · 2015-10-22T20:34:07.000-04:00
Update RAC 4 to alpha 2
diff --git a/.gitmodules b/.gitmodules
@@ -1,15 +1,15 @@
-[submodule "Carthage.checkout/Nimble"]
+[submodule "Carthage/Checkouts/Nimble"]
 	path = Carthage/Checkouts/Nimble
 	url = https://github.com/Quick/Nimble.git
-[submodule "Carthage.checkout/Quick"]
+[submodule "Carthage/Checkouts/Quick"]
 	path = Carthage/Checkouts/Quick
 	url = https://github.com/Quick/Quick.git
-[submodule "Carthage.checkout/xcconfigs"]
+[submodule "Carthage/Checkouts/Result"]
+	path = Carthage/Checkouts/Result
+	url = https://github.com/antitypical/Result.git
+[submodule "Carthage/Checkouts/xcconfigs"]
 	path = Carthage/Checkouts/xcconfigs
 	url = https://github.com/jspahrsummers/xcconfigs.git
-[submodule "Carthage.checkout/ReactiveCocoa"]
+[submodule "Carthage/Checkouts/ReactiveCocoa"]
 	path = Carthage/Checkouts/ReactiveCocoa
 	url = https://github.com/ReactiveCocoa/ReactiveCocoa.git
-[submodule "Carthage/Checkouts/Result"]
-	path = Carthage/Checkouts/Result
-	url = https://github.com/antitypical/Result.git
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" "v4.0-alpha.1"
+github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.2"
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
-github "Quick/Quick" "4c19d1257813c44df9c3c56b296b2b11ca40d4a9"
-github "Quick/Nimble" "v2.0.0-rc.3"
+github "Quick/Quick" ~> 0.7
+github "Quick/Nimble" ~> 2.0
 github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "Quick/Nimble" "v2.0.0-rc.3"
-github "Quick/Quick" "4c19d1257813c44df9c3c56b296b2b11ca40d4a9"
-github "antitypical/Result" "76f9a972ed61ff872b731460bc610c8acbfae58c"
+github "Quick/Nimble" "v2.0.0"
+github "Quick/Quick" "v0.7.0"
+github "antitypical/Result" "0.6.0-beta.3"
 github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"
-github "ReactiveCocoa/ReactiveCocoa" "v4.0-alpha.1"
+github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.2"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit e239824d84105de9e13b815006bc36e938cdd030
+Subproject commit 20a3f3b4e63cc8d97c92c4164bf36f2a2c9a6e1b
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
@@ -1 +1 @@
-Subproject commit 4c19d1257813c44df9c3c56b296b2b11ca40d4a9
+Subproject commit 7d0b8c21357839a8c5228863b77faecf709254a9
diff --git a/Carthage/Checkouts/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa
@@ -1 +1 @@
-Subproject commit 8ebff4f192ad11dfc62c55e8151c235d005f390b
+Subproject commit ff52a3ea246b459c6b0a956f1ec6e67e7b333f38
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
@@ -1 +1 @@
-Subproject commit 76f9a972ed61ff872b731460bc610c8acbfae58c
+Subproject commit 918d63b99b76d424c299c8b5efea7dc3e8d286fc
diff --git a/ReactiveTask.xcodeproj/project.pbxproj b/ReactiveTask.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		CD0E570A1BBD2A31009BB2AE /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD0E57091BBD2A31009BB2AE /* Extensions.swift */; settings = {ASSET_TAGS = (); }; };
 		D02130921AF87B6500B9EC20 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D02130911AF87B6500B9EC20 /* Result.framework */; };
 		D0BFEA5E1A2D1E5E00E23194 /* ReactiveTask.h in Headers */ = {isa = PBXBuildFile; fileRef = D0BFEA5D1A2D1E5E00E23194 /* ReactiveTask.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D0BFEA641A2D1E5E00E23194 /* ReactiveTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0BFEA581A2D1E5E00E23194 /* ReactiveTask.framework */; };
@@ -31,7 +30,6 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		CD0E57091BBD2A31009BB2AE /* Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
 		D02130911AF87B6500B9EC20 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Result.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D0BFEA581A2D1E5E00E23194 /* ReactiveTask.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ReactiveTask.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D0BFEA5C1A2D1E5E00E23194 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -113,7 +111,6 @@
 			children = (
 				D0BFEA5D1A2D1E5E00E23194 /* ReactiveTask.h */,
 				D0BFEAA31A2D216600E23194 /* Errors.swift */,
-				CD0E57091BBD2A31009BB2AE /* Extensions.swift */,
 				D0BFEA9F1A2D212000E23194 /* Task.swift */,
 				D0BFEA5B1A2D1E5E00E23194 /* Supporting Files */,
 			);
@@ -324,7 +321,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				D0BFEAA41A2D216600E23194 /* Errors.swift in Sources */,
-				CD0E570A1BBD2A31009BB2AE /* Extensions.swift in Sources */,
 				D0BFEAA01A2D212000E23194 /* Task.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/ReactiveTask/Extensions.swift b/ReactiveTask/Extensions.swift
diff --git a/ReactiveTask/Task.swift b/ReactiveTask/Task.swift
@@ -123,11 +123,11 @@ private final class Pipe {
 			dispatch_group_enter(self.group)
 			let channel = dispatch_io_create(DISPATCH_IO_STREAM, self.readFD, self.queue) { error in
 				if error == 0 {
-					sendCompleted(observer)
+					observer.sendCompleted()
 				} else if error == ECANCELED {
-					sendInterrupted(observer)
+					observer.sendInterrupted()
 				} else {
-					sendError(observer, .POSIXError(error))
+					observer.sendError(.POSIXError(error))
 				}
 
 				close(self.readFD)
@@ -137,13 +137,13 @@ private final class Pipe {
 			dispatch_io_set_low_water(channel, 1)
 			dispatch_io_read(channel, 0, Int.max, self.queue) { (done, data, error) in
 				if let data = data {
-					sendNext(observer, data)
+					observer.sendNext(data)
 				}
 
 				if error == ECANCELED {
-					sendInterrupted(observer)
+					observer.sendInterrupted()
 				} else if error != 0 {
-					sendError(observer, .POSIXError(error))
+					observer.sendError(.POSIXError(error))
 				}
 
 				if done {
@@ -170,11 +170,11 @@ private final class Pipe {
 			dispatch_group_enter(self.group)
 			let channel = dispatch_io_create(DISPATCH_IO_STREAM, self.writeFD, self.queue) { error in
 				if error == 0 {
-					sendCompleted(observer)
+					observer.sendCompleted()
 				} else if error == ECANCELED {
-					sendInterrupted(observer)
+					observer.sendInterrupted()
 				} else {
-					sendError(observer, .POSIXError(error))
+					observer.sendError(.POSIXError(error))
 				}
 
 				close(self.writeFD)
@@ -184,21 +184,21 @@ private final class Pipe {
 			producer.startWithSignal { signal, producerDisposable in
 				disposable.addDisposable(producerDisposable)
 
-				signal.observe(next: { data in
+				signal.observe(Observer(next: { data in
 					let dispatchData = dispatch_data_create(data.bytes, data.length, self.queue, nil)
 
 					dispatch_io_write(channel, 0, dispatchData, self.queue) { (done, data, error) in
 						if error == ECANCELED {
-							sendInterrupted(observer)
+							observer.sendInterrupted()
 						} else if error != 0 {
-							sendError(observer, .POSIXError(error))
+							observer.sendError(.POSIXError(error))
 						}
 					}
 				}, completed: {
 					dispatch_io_close(channel, 0)
 				}, interrupted: {
-					sendInterrupted(observer)
-				})
+					observer.sendInterrupted()
+				}))
 			}
 
 			disposable.addDisposable {
@@ -244,22 +244,22 @@ private func aggregateDataReadFromPipe(pipe: Pipe) -> SignalProducer<ReadData, R
 		readProducer.startWithSignal { signal, signalDisposable in
 			disposable.addDisposable(signalDisposable)
 
-			signal.observe(next: { data in
-				sendNext(observer, .chunk(data))
+			signal.observe(Observer(next: { data in
+				observer.sendNext(.chunk(data))
 
 				if let existingBuffer = buffer {
 					buffer = dispatch_data_create_concat(existingBuffer, data)
 				} else {
 					buffer = data
 				}
 			}, error: { error in
-				sendError(observer, error)
+				observer.sendError(error)
 			}, completed: {
-				sendNext(observer, .aggregated(buffer))
-				sendCompleted(observer)
+				observer.sendNext(.aggregated(buffer))
+				observer.sendCompleted()
 			}, interrupted: {
-				sendInterrupted(observer)
-			})
+				observer.sendInterrupted()
+			}))
 		}
 	}
 }
@@ -366,25 +366,25 @@ extension TaskEvent: CustomStringConvertible {
 	}
 }
 
-extension SignalProducer where T: TaskEventType {
+extension SignalProducer where Value: 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> {
+	public func flatMapTaskEvents<U>(strategy: FlattenStrategy, transform: Value.T -> SignalProducer<U, Error>) -> SignalProducer<TaskEvent<U>, Error> {
 		return self.flatMap(strategy) { taskEvent in
 			return taskEvent.producerMap(transform)
 		}
 	}
 	
 	/// 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() -> SignalProducer<T.T, E> {
+	public func ignoreTaskData() -> SignalProducer<Value.T, Error> {
 		return lift { $0.ignoreTaskData() }
 	}
 }
 
-extension Signal where T: TaskEventType {
+extension Signal where Value: 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> {
+	public func ignoreTaskData() -> Signal<Value.T, Error> {
 		return self
 			.map { event in
 				return event.value
@@ -426,7 +426,7 @@ public func launchTask(taskDescription: TaskDescription) -> SignalProducer<TaskE
 				})
 
 			case let .Failure(error):
-				sendError(observer, error)
+				observer.sendError(error)
 				return
 			}
 		}
@@ -437,49 +437,49 @@ public func launchTask(taskDescription: TaskDescription) -> SignalProducer<TaskE
 				let stderrProducer = aggregateDataReadFromPipe(stderrPipe)
 
 				return SignalProducer { observer, disposable in
-					let (stdoutAggregated, stdoutAggregatedSink) = SignalProducer<NSData, ReactiveTaskError>.buffer(1)
-					let (stderrAggregated, stderrAggregatedSink) = SignalProducer<NSData, ReactiveTaskError>.buffer(1)
+					let (stdoutAggregated, stdoutAggregatedObserver) = SignalProducer<NSData, ReactiveTaskError>.buffer(1)
+					let (stderrAggregated, stderrAggregatedObserver) = SignalProducer<NSData, ReactiveTaskError>.buffer(1)
 
 					stdoutProducer.startWithSignal { signal, signalDisposable in
 						disposable += signalDisposable
 
-						signal.observe(next: { readData in
+						signal.observe(Observer(next: { readData in
 							switch readData {
 							case let .Chunk(data):
-								sendNext(observer, .StandardOutput(data))
+								observer.sendNext(.StandardOutput(data))
 
 							case let .Aggregated(data):
-								sendNext(stdoutAggregatedSink, data)
+								stdoutAggregatedObserver.sendNext(data)
 							}
 						}, error: { error in
-							sendError(observer, error)
-							sendError(stdoutAggregatedSink, error)
+							observer.sendError(error)
+							stdoutAggregatedObserver.sendError(error)
 						}, completed: {
-							sendCompleted(stdoutAggregatedSink)
+							stdoutAggregatedObserver.sendCompleted()
 						}, interrupted: {
-							sendInterrupted(stdoutAggregatedSink)
-						})
+							stdoutAggregatedObserver.sendInterrupted()
+						}))
 					}
 
 					stderrProducer.startWithSignal { signal, signalDisposable in
 						disposable += signalDisposable
 
-						signal.observe(next: { readData in
+						signal.observe(Observer(next: { readData in
 							switch readData {
 							case let .Chunk(data):
-								sendNext(observer, .StandardError(data))
+								observer.sendNext(.StandardError(data))
 
 							case let .Aggregated(data):
-								sendNext(stderrAggregatedSink, data)
+								stderrAggregatedObserver.sendNext(data)
 							}
 						}, error: { error in
-							sendError(observer, error)
-							sendError(stderrAggregatedSink, error)
+							observer.sendError(error)
+							stderrAggregatedObserver.sendError(error)
 						}, completed: {
-							sendCompleted(stderrAggregatedSink)
+							stderrAggregatedObserver.sendCompleted()
 						}, interrupted: {
-							sendInterrupted(stderrAggregatedSink)
-						})
+							stderrAggregatedObserver.sendInterrupted()
+						}))
 					}
 
 					task.standardOutput = stdoutPipe.writeHandle
@@ -500,7 +500,7 @@ public func launchTask(taskDescription: TaskDescription) -> SignalProducer<TaskE
 							// through stderr.
 							disposable += stdoutAggregated
 								.then(stderrAggregated)
-								.flatMap(.Concat) { data in
+								.flatMap(.Concat) { data -> SignalProducer<TaskEvent<NSData>, ReactiveTaskError> in
 									let errorString = (data.length > 0 ? NSString(data: data, encoding: NSUTF8StringEncoding) as? String : nil)
 									return SignalProducer(error: .ShellTaskFailed(exitCode: terminationStatus, standardError: errorString))
 								}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "ReactiveCocoa/ReactiveCocoa" "v4.0-alpha.1"`
	`1`	`+github "ReactiveCocoa/ReactiveCocoa" "v4.0.0-alpha.2"`