Refactor code to use Result and Box

Author: jspahrsummers

Commandant/ArgumentParser.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import LlamaKit
+import Result
 
 /// Represents an argument passed on the command line.
 private enum RawArgument: Equatable {
@@ -131,13 +131,13 @@ public final class ArgumentParser {
 					}
 				}
 
-				return failure(missingArgumentError("--\(key)"))
+				return .failure(missingArgumentError("--\(key)"))
 			} else {
 				rawArguments.append(arg)
 			}
 		}
 
-		return success(foundValue)
+		return .success(foundValue)
 	}
 
 	/// Returns the next positional argument that hasn't yet been returned, or

Commandant/Command.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import LlamaKit
+import Result
 
 /// Represents a subcommand that can be executed with its own set of arguments.
 public protocol CommandType {
@@ -120,12 +120,12 @@ extension CommandRegistry {
 			exit(EXIT_SUCCESS)
 
 		case let .Some(.Failure(error)):
-			switch error.unbox {
+			switch error.value {
 			case let .UsageError(description):
 				fputs(description + "\n", stderr)
 
 			case let .CommandError(error):
-				errorHandler(error.unbox)
+				errorHandler(error.value)
 			}
 
 			exit(EXIT_FAILURE)

Commandant/Errors.swift

@@ -7,7 +7,8 @@
 //
 
 import Foundation
-import LlamaKit
+import Box
+import Result
 
 /// Possible errors that can originate from Commandant.
 ///

Commandant/HelpCommand.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import LlamaKit
+import Result
 
 /// A basic implementation of a `help` command, using information available in a
 /// `CommandRegistry`.
@@ -56,7 +56,7 @@ public struct HelpCommand<ClientError>: CommandType {
 					println("   \(formattedVerb)   \(command.function)")
 				}
 
-				return success(())
+				return .success(())
 			}
 	}
 }

Commandant/Option.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import LlamaKit
+import Result
 
 /// Represents a record of options for a command, which can be parsed from
 /// a list of command-line arguments.
@@ -167,17 +167,17 @@ public func <*> <T, U, ClientError>(f: T -> U, value: Result<T, CommandantError<
 public func <*> <T, U, ClientError>(f: Result<(T -> U), CommandantError<ClientError>>, value: Result<T, CommandantError<ClientError>>) -> Result<U, CommandantError<ClientError>> {
 	switch (f, value) {
 	case let (.Failure(left), .Failure(right)):
-		return failure(combineUsageErrors(left.unbox, right.unbox))
+		return .failure(combineUsageErrors(left.value, right.value))
 
 	case let (.Failure(left), .Success):
-		return failure(left.unbox)
+		return .failure(left.value)
 
 	case let (.Success, .Failure(right)):
-		return failure(right.unbox)
+		return .failure(right.value)
 
 	case let (.Success(f), .Success(value)):
-		let newValue = f.unbox(value.unbox)
-		return success(newValue)
+		let newValue = f.value(value.value)
+		return .success(newValue)
 	}
 }
 
@@ -192,12 +192,12 @@ public func <| <T: ArgumentType, ClientError>(mode: CommandMode, option: Option<
 		if let key = option.key {
 			switch arguments.consumeValueForKey(key) {
 			case let .Success(value):
-				stringValue = value.unbox
+				stringValue = value.value
 
 			case let .Failure(error):
-				switch error.unbox {
+				switch error.value {
 				case let .UsageError(description):
-					return failure(.UsageError(description: description))
+					return .failure(.UsageError(description: description))
 
 				case .CommandError:
 					fatalError("CommandError should be impossible when parameterized over NoError")
@@ -209,18 +209,18 @@ public func <| <T: ArgumentType, ClientError>(mode: CommandMode, option: Option<
 
 		if let stringValue = stringValue {
 			if let value = T.fromString(stringValue) {
-				return success(value)
+				return .success(value)
 			}
 
-			return failure(option.invalidUsageError(stringValue))
+			return .failure(option.invalidUsageError(stringValue))
 		} else if let defaultValue = option.defaultValue {
-			return success(defaultValue)
+			return .success(defaultValue)
 		} else {
-			return failure(missingArgumentError(option.description))
+			return .failure(missingArgumentError(option.description))
 		}
 
 	case .Usage:
-		return failure(informativeUsageError(option))
+		return .failure(informativeUsageError(option))
 	}
 }
 
@@ -234,14 +234,14 @@ public func <| <ClientError>(mode: CommandMode, option: Option<Bool>) -> Result<
 	switch mode {
 	case let .Arguments(arguments):
 		if let value = arguments.consumeBooleanKey(option.key!) {
-			return success(value)
+			return .success(value)
 		} else if let defaultValue = option.defaultValue {
-			return success(defaultValue)
+			return .success(defaultValue)
 		} else {
-			return failure(missingArgumentError(option.description))
+			return .failure(missingArgumentError(option.description))
 		}
 
 	case .Usage:
-		return failure(informativeUsageError(option))
+		return .failure(informativeUsageError(option))
 	}
 }

Commandant/Switch.swift

@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Carthage. All rights reserved.
 //
 
-import LlamaKit
+import Result
 
 /// Describes a parameterless command line flag that defaults to false and can only
 /// be switched on. Canonical examples include `--force` and `--recurse`.
@@ -56,9 +56,9 @@ public func <| <ClientError> (mode: CommandMode, option: Switch) -> Result<Bool,
 		if let flag = option.flag {
 			enabled = arguments.consumeBooleanFlag(flag)
 		}
-		return success(enabled)
+		return .success(enabled)
 
 	case .Usage:
-		return failure(informativeUsageError(option.description, option.usage))
+		return .failure(informativeUsageError(option.description, option.usage))
 	}
 }

CommandantTests/OptionSpec.swift

@@ -8,9 +8,9 @@
 
 import Commandant
 import Foundation
-import LlamaKit
 import Nimble
 import Quick
+import Result
 
 enum NoError {}
 
@@ -22,11 +22,11 @@ class OptionsTypeSpec: QuickSpec {
 			}
 
 			it("should fail if a required argument is missing") {
-				expect(tryArguments().isSuccess).to(beFalsy())
+				expect(tryArguments().value).to(beNil())
 			}
 
 			it("should fail if an option is missing a value") {
-				expect(tryArguments("required", "--intValue").isSuccess).to(beFalsy())
+				expect(tryArguments("required", "--intValue").value).to(beNil())
 			}
 
 			it("should succeed without optional arguments") {