Merge pull request #22 from Carthage/swift-1.2

Swift 1.2b3

Author: Rob Rix

.travis.yml

@@ -1 +1 @@
-github "LlamaKit/LlamaKit" == 0.5
+github "LlamaKit/LlamaKit" == 0.6

Cartfile

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

Cartfile.private

@@ -1,4 +1,4 @@
-github "LlamaKit/LlamaKit" "v0.5.0"
-github "Quick/Nimble" "v0.3.0"
-github "Quick/Quick" "v0.2.2"
+github "LlamaKit/LlamaKit" "v0.6.0"
+github "Quick/Nimble" "6a679cbf20da3fe570c26296b3029dd168b72c00"
+github "Quick/Quick" "155f858bce082373fc60d0c0a63415bf336c676b"
 github "jspahrsummers/xcconfigs" "0.7.2"

Cartfile.resolved

@@ -45,10 +45,10 @@ public struct HelpCommand: CommandType {
 
 				println("Available commands:\n")
 
-				let maxVerbLength = maxElement(self.registry.commands.map { countElements($0.verb) })
+				let maxVerbLength = maxElement(self.registry.commands.map { count($0.verb) })
 
 				for command in self.registry.commands {
-					let padding = Repeat<Character>(count: maxVerbLength - countElements(command.verb), repeatedValue: " ")
+					let padding = Repeat<Character>(count: maxVerbLength - count(command.verb), repeatedValue: " ")
 
 					var formattedVerb = command.verb
 					formattedVerb.extend(padding)
@@ -63,6 +63,10 @@ public struct HelpCommand: CommandType {
 
 private struct HelpOptions: OptionsType {
 	let verb: String?
+	
+	init(verb: String?) {
+		self.verb = verb
+	}
 
 	static func create(verb: String) -> HelpOptions {
 		return self(verb: (verb == "" ? nil : verb))

Carthage/Checkouts/LlamaKit

@@ -38,7 +38,7 @@ public protocol OptionsType {
 	///
 	/// Returns the parsed options, or an `InvalidArgument` error containing
 	/// usage information.
-	class func evaluate(m: CommandMode) -> Result<Self, CommandantError>
+	static func evaluate(m: CommandMode) -> Result<Self, CommandantError>
 }
 
 /// Describes an option that can be provided on the command line.
@@ -93,10 +93,10 @@ extension Option: Printable {
 /// Represents a value that can be converted from a command-line argument.
 public protocol ArgumentType {
 	/// A human-readable name for this type.
-	class var name: String { get }
+	static var name: String { get }
 
 	/// Attempts to parse a value from the given command-line argument.
-	class func fromString(string: String) -> Self?
+	static func fromString(string: String) -> Self?
 }
 
 extension Int: ArgumentType {