Naively ported to Swift 2.0

Cartfile

@@ -1 +1 @@
-github "antitypical/Result" ~> 0.4
+github "antitypical/Result" ~> 0.5

Cartfile.private

@@ -1,3 +1,3 @@
-github "Quick/Quick" ~> 0.3
-github "Quick/Nimble" ~> 0.4
+github "Quick/Quick" ~> 0.4
+github "Quick/Nimble" ~> 2
 github "jspahrsummers/xcconfigs" ~> 0.8

Cartfile.resolved

@@ -1,5 +1,4 @@
-github "robrix/Box" "1.2.1"
-github "Quick/Nimble" "v0.4.2"
-github "Quick/Quick" "v0.3.1"
-github "jspahrsummers/xcconfigs" "0.8"
-github "antitypical/Result" "0.4"
+github "Quick/Nimble" "v2.0.0-rc.1"
+github "Quick/Quick" "v0.4.0"
+github "antitypical/Result" "0.5"
+github "jspahrsummers/xcconfigs" "0.8.1"

Commandant.xcodeproj/project.pbxproj

@@ -16,7 +16,6 @@
 		D00CCE2B1A20748500109F8C /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = D00CCE2A1A20748500109F8C /* Errors.swift */; };
 		D00CCE2D1A2075ED00109F8C /* ArgumentParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = D00CCE2C1A2075ED00109F8C /* ArgumentParser.swift */; };
 		D00CCE2F1A2075F700109F8C /* Option.swift in Sources */ = {isa = PBXBuildFile; fileRef = D00CCE2E1A2075F700109F8C /* Option.swift */; };
-		D02130991AF87D6E00B9EC20 /* Box.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D02130971AF87D6E00B9EC20 /* Box.framework */; };
 		D021309A1AF87D6E00B9EC20 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D02130981AF87D6E00B9EC20 /* Result.framework */; };
 		D0BF14FB1A4C8957003147BC /* HelpCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BF14FA1A4C8957003147BC /* HelpCommand.swift */; };
 		D8169D871ACB942D00923FB0 /* Switch.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8169D861ACB942D00923FB0 /* Switch.swift */; };
@@ -74,7 +73,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D02130991AF87D6E00B9EC20 /* Box.framework in Frameworks */,
 				D021309A1AF87D6E00B9EC20 /* Result.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -294,7 +292,8 @@
 		D00CCDD01A20717400109F8C /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				LastSwiftUpdateCheck = 0700;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = Carthage;
 				TargetAttributes = {
 					D00CCDD81A20717400109F8C = {
@@ -378,7 +377,10 @@
 			baseConfigurationReference = D00CCDFA1A20719500109F8C /* Debug.xcconfig */;
 			buildSettings = {
 				CURRENT_PROJECT_VERSION = 1;
+				ENABLE_TESTABILITY = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				ONLY_ACTIVE_ARCH = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -389,6 +391,7 @@
 			baseConfigurationReference = D00CCDFC1A20719500109F8C /* Release.xcconfig */;
 			buildSettings = {
 				CURRENT_PROJECT_VERSION = 1;
+				GCC_NO_COMMON_BLOCKS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -406,6 +409,7 @@
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Commandant/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
@@ -422,6 +426,7 @@
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Commandant/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -435,6 +440,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = CommandantTests/Info.plist;
+				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -448,6 +454,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = CommandantTests/Info.plist;
+				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -457,6 +464,7 @@
 			baseConfigurationReference = D00CCDFB1A20719500109F8C /* Profile.xcconfig */;
 			buildSettings = {
 				CURRENT_PROJECT_VERSION = 1;
+				GCC_NO_COMMON_BLOCKS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -474,6 +482,7 @@
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Commandant/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Profile;
@@ -487,6 +496,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = CommandantTests/Info.plist;
+				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Profile;
@@ -496,6 +506,7 @@
 			baseConfigurationReference = D00CCDFD1A20719500109F8C /* Test.xcconfig */;
 			buildSettings = {
 				CURRENT_PROJECT_VERSION = 1;
+				GCC_NO_COMMON_BLOCKS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -513,6 +524,7 @@
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Commandant/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
@@ -527,6 +539,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = CommandantTests/Info.plist;
+				PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Test;

Commandant.xcodeproj/xcshareddata/xcschemes/Commandant.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -62,6 +62,8 @@
             ReferencedContainer = "container:Commandant.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -71,6 +73,7 @@
       buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference

Commandant/ArgumentParser.swift

@@ -38,7 +38,7 @@ private func ==(lhs: RawArgument, rhs: RawArgument) -> Bool {
 	}
 }
 
-extension RawArgument: Printable {
+extension RawArgument: CustomStringConvertible {
 	private var description: String {
 		switch self {
 		case let .Key(key):
@@ -68,8 +68,8 @@ public final class ArgumentParser {
 		rawArguments.extend(options.map { arg in
 			if arg.hasPrefix("-") {
 				// Do we have `--{key}` or `-{flags}`.
-				var opt = dropFirst(arg)
-				return opt.hasPrefix("-") ? .Key(dropFirst(opt)) : .Flag(Set(opt))
+				let opt = dropFirst(arg.characters)
+				return String(opt).hasPrefix("-") ? .Key(String(dropFirst(opt))) : .Flag(Set(opt))
 			} else {
 				return .Value(arg)
 			}
@@ -78,7 +78,7 @@ public final class ArgumentParser {
 		// Remaining arguments are all positional parameters.
 		if params.count == 2 {
 			let positional = params.last!
-			rawArguments.extend(positional.map { .Value($0) })
+			rawArguments.extend(Array(positional.map { .Value($0) }))
 		}
 	}
 
@@ -169,7 +169,7 @@ public final class ArgumentParser {
 	/// Returns whether the given flag was specified and removes it from the
 	/// list of arguments remaining.
 	internal func consumeBooleanFlag(flag: Character) -> Bool {
-		for (index, arg) in enumerate(rawArguments) {
+		for (index, arg) in rawArguments.enumerate() {
 			switch arg {
 			case var .Flag(flags) where flags.contains(flag):
 				flags.remove(flag)

Commandant/Command.swift

@@ -59,7 +59,7 @@ public final class CommandRegistry<ClientError> {
 
 	/// All available commands.
 	public var commands: [CommandOf<ClientError>] {
-		return sorted(commandsByVerb.values) { return $0.verb < $1.verb }
+		return commandsByVerb.values.sort { return $0.verb < $1.verb }
 	}
 
 	public init() {}
@@ -101,7 +101,7 @@ extension CommandRegistry {
 	/// If a matching command could not be found or a usage error occurred,
 	/// a helpful error message will be written to `stderr`, then the process
 	/// will exit with a failure error code.
-	@noreturn public func main(#defaultVerb: String, errorHandler: ClientError -> ()) {
+	@noreturn public func main(defaultVerb defaultVerb: String, errorHandler: ClientError -> ()) {
 		var arguments = Process.arguments
 		assert(arguments.count >= 1)
 
@@ -120,12 +120,12 @@ extension CommandRegistry {
 			exit(EXIT_SUCCESS)
 
 		case let .Some(.Failure(error)):
-			switch error.value {
+			switch error {
 			case let .UsageError(description):
 				fputs(description + "\n", stderr)
 
 			case let .CommandError(error):
-				errorHandler(error.value)
+				errorHandler(error)
 			}
 
 			exit(EXIT_FAILURE)

Commandant/Errors.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import Box
 import Result
 
 /// Possible errors that can originate from Commandant.
@@ -19,17 +18,17 @@ public enum CommandantError<ClientError> {
 	case UsageError(description: String)
 
 	/// An error occurred while running a command.
-	case CommandError(Box<ClientError>)
+	case CommandError(ClientError)
 }
 
-extension CommandantError: Printable {
+extension CommandantError: CustomStringConvertible {
 	public var description: String {
 		switch self {
 		case let .UsageError(description):
 			return description
 
 		case let .CommandError(error):
-			return toString(error)
+			return String(error)
 		}
 	}
 }
@@ -49,7 +48,7 @@ internal func missingArgumentError<ClientError>(argumentName: String) -> Command
 internal func informativeUsageError<ClientError>(keyValueExample: String, usage: String) -> CommandantError<ClientError> {
 	let lines = usage.componentsSeparatedByCharactersInSet(NSCharacterSet.newlineCharacterSet())
 
-	return .UsageError(description: reduce(lines, keyValueExample) { previous, value in
+	return .UsageError(description: lines.reduce(keyValueExample) { previous, value in
 		return previous + "\n\t" + value
 	})
 }
@@ -58,9 +57,9 @@ internal func informativeUsageError<ClientError>(keyValueExample: String, usage:
 /// example of key (and value, if applicable) usage.
 internal func informativeUsageError<T, ClientError>(keyValueExample: String, option: Option<T>) -> CommandantError<ClientError> {
 	if option.defaultValue != nil {
-		return informativeUsageError("[\(keyValueExample)]", option.usage)
+		return informativeUsageError("[\(keyValueExample)]", usage: option.usage)
 	} else {
-		return informativeUsageError(keyValueExample, option.usage)
+		return informativeUsageError(keyValueExample, usage: option.usage)
 	}
 }
 
@@ -83,7 +82,7 @@ internal func informativeUsageError<T: ArgumentType, ClientError>(option: Option
 		example += valueExample
 	}
 
-	return informativeUsageError(example, option)
+	return informativeUsageError(example, option: option)
 }
 
 /// Constructs an error that describes how to use the given boolean option.
@@ -93,9 +92,9 @@ internal func informativeUsageError<ClientError>(option: Option<Bool>) -> Comman
 	let key = option.key!
 
 	if let defaultValue = option.defaultValue {
-		return informativeUsageError((defaultValue ? "--no-\(key)" : "--\(key)"), option)
+		return informativeUsageError((defaultValue ? "--no-\(key)" : "--\(key)"), option: option)
 	} else {
-		return informativeUsageError("--(no-)\(key)", option)
+		return informativeUsageError("--(no-)\(key)", option: option)
 	}
 }
 

Commandant/HelpCommand.swift

@@ -35,25 +35,24 @@ public struct HelpCommand<ClientError>: CommandType {
 			.flatMap { options in
 				if let verb = options.verb {
 					if let command = self.registry[verb] {
-						println(command.function)
-						println()
+						print(command.function + "\n")
 						return command.run(.Usage)
 					} else {
 						fputs("Unrecognized command: '\(verb)'\n", stderr)
 					}
 				}
 
-				println("Available commands:\n")
+				print("Available commands:\n")
 
-				let maxVerbLength = maxElement(self.registry.commands.map { count($0.verb) })
+				let maxVerbLength = self.registry.commands.map { $0.verb.characters.count }.maxElement() ?? 0
 
 				for command in self.registry.commands {
-					let padding = Repeat<Character>(count: maxVerbLength - count(command.verb), repeatedValue: " ")
+					let padding = Repeat<Character>(count: maxVerbLength - command.verb.characters.count, repeatedValue: " ")
 
 					var formattedVerb = command.verb
 					formattedVerb.extend(padding)
 
-					println("   \(formattedVerb)   \(command.function)")
+					print("   \(formattedVerb)   \(command.function)")
 				}
 
 				return .success(())

Commandant/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.carthage.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>