Merge pull request #9 from Carthage/upgrade-dependencies

Upgrade dependencies

Author: Rob Rix

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "Carthage.checkout/LlamaKit"]
 	path = Carthage/Checkouts/LlamaKit
-	url = https://github.com/Carthage/LlamaKit.git
+	url = https://github.com/LlamaKit/LlamaKit.git
 [submodule "Carthage.checkout/Nimble"]
 	path = Carthage/Checkouts/Nimble
 	url = https://github.com/Quick/Nimble.git

Cartfile

@@ -1,2 +1,2 @@
 github "ReactiveCocoa/ReactiveCocoa" "swift-development"
-github "Carthage/LlamaKit" == 0.1.1
+github "LlamaKit/LlamaKit" == 0.5

Cartfile.private

@@ -1,3 +1,3 @@
-github "Quick/Quick" == 0.2.0
-github "Quick/Nimble"
+github "Quick/Quick" ~> 0.2
+github "Quick/Nimble" ~> 0.3
 github "jspahrsummers/xcconfigs" >= 0.6

Cartfile.resolved

@@ -1,5 +1,5 @@
-github "Carthage/LlamaKit" "carthage-0.1.1"
-github "Quick/Nimble" "v0.2.0"
-github "Quick/Quick" "v0.2.0"
-github "jspahrsummers/xcconfigs" "0.7"
-github "ReactiveCocoa/ReactiveCocoa" "e94a432e6c47e03f47cb263225ceccffe9b7bea6"
+github "LlamaKit/LlamaKit" "v0.5.0"
+github "Quick/Nimble" "v0.3.0"
+github "Quick/Quick" "v0.2.2"
+github "jspahrsummers/xcconfigs" "0.7.2"
+github "ReactiveCocoa/ReactiveCocoa" "240140c14d023cdb49f4ddf9622c3131619b2197"

Carthage/Checkouts/LlamaKit

@@ -7,20 +7,44 @@
 //
 
 import Foundation
+import ReactiveCocoa
 
-/// Possible error codes within `ReactiveTaskErrorDomain`.
-public enum ReactiveTaskError: Int {
-	/// The domain for all errors originating within ReactiveTask.
-	public static let domain: NSString = "org.carthage.ReactiveTask"
+/// An error originating from ReactiveTask.
+public enum ReactiveTaskError {
+	/// A shell task exited unsuccessfully.
+	case ShellTaskFailed(exitCode: Int32, standardError: String?)
 
-	/// In a user info dictionary, associated with the exit code from a child
-	/// process.
-	public static let exitCodeKey: NSString = "ReactiveTaskErrorExitCode"
+	/// An error was returned from a POSIX API.
+	case POSIXError(Int32)
+}
 
-	/// In a user info dictionary, associated with any accumulated stderr
-	/// string.
-	public static let standardErrorKey: NSString = "ReactiveTaskErrorStandardError"
+extension ReactiveTaskError: ErrorType {
+	public var nsError: NSError {
+		switch self {
+		case let .POSIXError(code):
+			return NSError(domain: NSPOSIXErrorDomain, code: Int(code), userInfo: nil)
 
-	/// A shell task exited unsuccessfully.
-	case ShellTaskFailed
+		default:
+			return NSError(domain: "org.carthage.ReactiveTask", code: 0, userInfo: [
+				NSLocalizedDescriptionKey: self.description
+			])
+		}
+	}
+}
+
+extension ReactiveTaskError: Printable {
+	public var description: String {
+		switch self {
+		case let .ShellTaskFailed(exitCode, standardError):
+			var description = "A shell task failed with exit code \(exitCode)"
+			if let standardError = standardError {
+				description += ":\n\(standardError)"
+			}
+
+			return description
+
+		case let .POSIXError:
+			return nsError.description
+		}
+	}
 }