Merge pull request #35 from Carthage/swift2

mdiep · mdiep · commit b03f5b7add77 · 2015-10-03T09:58:01.000-04:00
Swift 2 redux
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,12 @@
 # Xcode
 #
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
 build/
+DerivedData
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -10,12 +16,16 @@ build/
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
+
+## Other
 *.xccheckout
 *.moved-aside
-DerivedData
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
 *.hmap
 *.ipa
-*.xcuserstate
 
 # CocoaPods
 #
@@ -24,3 +34,10 @@ DerivedData
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
 #
 # Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
diff --git a/.gitmodules b/.gitmodules
@@ -10,9 +10,6 @@
 [submodule "Carthage.checkout/ReactiveCocoa"]
 	path = Carthage/Checkouts/ReactiveCocoa
 	url = https://github.com/ReactiveCocoa/ReactiveCocoa.git
-[submodule "Carthage/Checkouts/Box"]
-	path = Carthage/Checkouts/Box
-	url = https://github.com/robrix/Box.git
 [submodule "Carthage/Checkouts/Result"]
 	path = Carthage/Checkouts/Result
 	url = https://github.com/antitypical/Result.git
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode6.4
+osx_image: xcode7
 xcode_workspace: ReactiveTask.xcworkspace
 xcode_scheme: ReactiveTask
 script: script/cibuild
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa" ~> 3.0
+github "ReactiveCocoa/ReactiveCocoa" "v4.0-alpha.1"
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
-github "Quick/Quick" ~> 0.3
-github "Quick/Nimble" ~> 0.4
-github "jspahrsummers/xcconfigs" ~> 0.8
+github "Quick/Quick" "4c19d1257813c44df9c3c56b296b2b11ca40d4a9"
+github "Quick/Nimble" "v2.0.0-rc.3"
+github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,6 +1,5 @@
-github "robrix/Box" "1.2.2"
-github "Quick/Nimble" "v0.4.2"
-github "Quick/Quick" "v0.3.1"
-github "jspahrsummers/xcconfigs" "0.8.1"
-github "antitypical/Result" "0.4.4"
-github "ReactiveCocoa/ReactiveCocoa" "v3.0.0"
+github "Quick/Nimble" "v2.0.0-rc.3"
+github "Quick/Quick" "4c19d1257813c44df9c3c56b296b2b11ca40d4a9"
+github "antitypical/Result" "76f9a972ed61ff872b731460bc610c8acbfae58c"
+github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"
+github "ReactiveCocoa/ReactiveCocoa" "v4.0-alpha.1"
diff --git a/Carthage/Checkouts/Box b/Carthage/Checkouts/Box
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit 8927113f877f32c8a01b41b746c4ac261b42c48e
+Subproject commit e239824d84105de9e13b815006bc36e938cdd030
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
@@ -1 +1 @@
-Subproject commit 8bf96f708924d728dab5f0cf7543b6f1b896a209
+Subproject commit 4c19d1257813c44df9c3c56b296b2b11ca40d4a9
diff --git a/Carthage/Checkouts/ReactiveCocoa b/Carthage/Checkouts/ReactiveCocoa
@@ -1 +1 @@
-Subproject commit e16f47cf9cb568136ebd81430b24af274c3c27c7
+Subproject commit 8ebff4f192ad11dfc62c55e8151c235d005f390b
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
@@ -1 +1 @@
-Subproject commit 81b189645babd30c6f70ed3f82a83988a467fb02
+Subproject commit 76f9a972ed61ff872b731460bc610c8acbfae58c
diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs
@@ -1 +1 @@
-Subproject commit 99624a6af366c015b678a1135e4c558776a59be6
+Subproject commit ec5753493605deed7358dec5f9260f503d3ed650
diff --git a/ReactiveTask.xcodeproj/project.pbxproj b/ReactiveTask.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		D021308E1AF87B4600B9EC20 /* Box.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D021308D1AF87B4600B9EC20 /* Box.framework */; };
+		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 +31,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		D021308D1AF87B4600B9EC20 /* Box.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Box.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		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>"; };
@@ -71,7 +71,6 @@
 			files = (
 				D02130921AF87B6500B9EC20 /* Result.framework in Frameworks */,
 				D0BFEA921A2D1F1A00E23194 /* ReactiveCocoa.framework in Frameworks */,
-				D021308E1AF87B4600B9EC20 /* Box.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -114,6 +113,7 @@
 			children = (
 				D0BFEA5D1A2D1E5E00E23194 /* ReactiveTask.h */,
 				D0BFEAA31A2D216600E23194 /* Errors.swift */,
+				CD0E57091BBD2A31009BB2AE /* Extensions.swift */,
 				D0BFEA9F1A2D212000E23194 /* Task.swift */,
 				D0BFEA5B1A2D1E5E00E23194 /* Supporting Files */,
 			);
@@ -123,7 +123,6 @@
 		D0BFEA5B1A2D1E5E00E23194 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				D021308D1AF87B4600B9EC20 /* Box.framework */,
 				D02130911AF87B6500B9EC20 /* Result.framework */,
 				D0BFEA901A2D1F1A00E23194 /* ReactiveCocoa.framework */,
 				D0BFEA5C1A2D1E5E00E23194 /* Info.plist */,
@@ -272,6 +271,7 @@
 		D0BFEA4F1A2D1E5E00E23194 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0630;
 				ORGANIZATIONNAME = Carthage;
 				TargetAttributes = {
@@ -324,6 +324,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				D0BFEAA41A2D216600E23194 /* Errors.swift in Sources */,
+				CD0E570A1BBD2A31009BB2AE /* Extensions.swift in Sources */,
 				D0BFEAA01A2D212000E23194 /* Task.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/ReactiveTask.xcworkspace/contents.xcworkspacedata b/ReactiveTask.xcworkspace/contents.xcworkspacedata
diff --git a/ReactiveTask/Errors.swift b/ReactiveTask/Errors.swift
@@ -10,29 +10,15 @@ import Foundation
 import ReactiveCocoa
 
 /// An error originating from ReactiveTask.
-public enum ReactiveTaskError {
+public enum ReactiveTaskError: ErrorType {
 	/// A shell task exited unsuccessfully.
 	case ShellTaskFailed(exitCode: Int32, standardError: String?)
 
 	/// An error was returned from a POSIX API.
 	case POSIXError(Int32)
 }
 
-extension ReactiveTaskError: ErrorType {
-	public var nsError: NSError {
-		switch self {
-		case let .POSIXError(code):
-			return NSError(domain: NSPOSIXErrorDomain, code: Int(code), userInfo: nil)
-
-		default:
-			return NSError(domain: "org.carthage.ReactiveTask", code: 0, userInfo: [
-				NSLocalizedDescriptionKey: self.description
-			])
-		}
-	}
-}
-
-extension ReactiveTaskError: Printable {
+extension ReactiveTaskError: CustomStringConvertible {
 	public var description: String {
 		switch self {
 		case let .ShellTaskFailed(exitCode, standardError):
@@ -43,8 +29,8 @@ extension ReactiveTaskError: Printable {
 
 			return description
 
-		case let .POSIXError:
-			return nsError.description
+		case let .POSIXError(code):
+			return NSError(domain: NSPOSIXErrorDomain, code: Int(code), userInfo: nil).description
 		}
 	}
 }
diff --git a/ReactiveTask/Extensions.swift b/ReactiveTask/Extensions.swift
@@ -0,0 +1,51 @@
+//
+//  Extensions.swift
+//  ReactiveTask
+//
+//  Created by Syo Ikeda on 10/1/15.
+//  Copyright © 2015 Carthage. All rights reserved.
+//
+
+import ReactiveCocoa
+
+extension Signal {
+
+	/// Bring back the `observe` overload. The `observeNext` or pattern matching
+	/// on `observe(Event)` is still annoying in practice and more verbose. This is
+	/// also likely to change in a later RAC 4 alpha.
+	internal func observe(next next: (T -> ())? = nil, error: (E -> ())? = nil, completed: (() -> ())? = nil, interrupted: (() -> ())? = nil) -> Disposable? {
+		return self.observe { (event: Event<T, E>) in
+			switch event {
+			case let .Next(value):
+				next?(value)
+			case let .Error(err):
+				error?(err)
+			case .Completed:
+				completed?()
+			case .Interrupted:
+				interrupted?()
+			}
+		}
+	}
+}
+
+extension SignalProducer {
+
+	/// Bring back the `start` overload. The `startNext` or pattern matching
+	/// on `start(Event)` is annoying in practice and more verbose. This is also
+	/// likely to change in a later RAC 4 alpha.
+	internal func start(next next: (T -> ())? = nil, error: (E -> ())? = nil, completed: (() -> ())? = nil, interrupted: (() -> ())? = nil) -> Disposable? {
+		return self.start { (event: Event<T, E>) in
+			switch event {
+			case let .Next(value):
+				next?(value)
+			case let .Error(err):
+				error?(err)
+			case .Completed:
+				completed?()
+			case .Interrupted:
+				interrupted?()
+			}
+		}
+	}
+}
diff --git a/ReactiveTask/Task.swift b/ReactiveTask/Task.swift
diff --git a/ReactiveTaskTests/TaskSpec.swift b/ReactiveTaskTests/TaskSpec.swift

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "ReactiveCocoa/ReactiveCocoa" ~> 3.0`
	`1`	`+github "ReactiveCocoa/ReactiveCocoa" "v4.0-alpha.1"`