Use Commander* to generate the variadic-ish commands

*Commander now depends on Commander 💥

Author: kylef

Commander.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		2714C5591BB5403400E0EB6A /* Commands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2714C5581BB5403300E0EB6A /* Commands.swift */; settings = {ASSET_TAGS = (); }; };
 		2720BDED1BB348BC00C09984 /* ArgumentDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2720BDEC1BB348BC00C09984 /* ArgumentDescription.swift */; settings = {ASSET_TAGS = (); }; };
 		2768A2241BACC38C00F994EE /* Commander.h in Headers */ = {isa = PBXBuildFile; fileRef = 2768A2231BACC38C00F994EE /* Commander.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2768A22B1BACC38C00F994EE /* Commander.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2768A2201BACC38C00F994EE /* Commander.framework */; settings = {ASSET_TAGS = (); }; };
@@ -34,6 +35,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		2714C5581BB5403300E0EB6A /* Commands.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Commands.swift; sourceTree = "<group>"; };
 		2720BDEC1BB348BC00C09984 /* ArgumentDescription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArgumentDescription.swift; sourceTree = "<group>"; };
 		27593EE51BB335590018278E /* UniversalFramework_Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = UniversalFramework_Base.xcconfig; sourceTree = "<group>"; };
 		27593EE61BB335590018278E /* UniversalFramework_Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = UniversalFramework_Framework.xcconfig; sourceTree = "<group>"; };
@@ -115,6 +117,7 @@
 				2720BDEC1BB348BC00C09984 /* ArgumentDescription.swift */,
 				279256A91BB3226E00E66B9E /* CommandType.swift */,
 				279256AB1BB322FA00E66B9E /* Command.swift */,
+				2714C5581BB5403300E0EB6A /* Commands.swift */,
 				279256B31BB3260D00E66B9E /* Group.swift */,
 				2768A2251BACC38C00F994EE /* Info.plist */,
 			);
@@ -245,6 +248,7 @@
 			files = (
 				2768A23B1BACC3B600F994EE /* ArgumentParser.swift in Sources */,
 				2720BDED1BB348BC00C09984 /* ArgumentDescription.swift in Sources */,
+				2714C5591BB5403400E0EB6A /* Commands.swift in Sources */,
 				279256AA1BB3226E00E66B9E /* CommandType.swift in Sources */,
 				279256AC1BB322FA00E66B9E /* Command.swift in Sources */,
 				279256B61BB32A8E00E66B9E /* ArgumentConvertible.swift in Sources */,

Commander/ArgumentDescription.swift

@@ -234,72 +234,3 @@ class Help : ErrorType, CustomStringConvertible {
     return output.joinWithSeparator("\n")
   }
 }
-
-
-public func command<A : ArgumentDescriptor>(descriptor:A, closure:((A.ValueType) -> ())) -> CommandType {
-  return AnonymousCommand { parser in
-    if parser.hasOption("help") {
-      throw Help([BoxedArgumentDescriptor(value: descriptor)])
-    }
-
-    closure(try descriptor.parse(parser))
-  }
-}
-
-public func command<A:ArgumentDescriptor, B:ArgumentDescriptor>(descriptorA:A, _ descriptorB:B, closure:((A.ValueType, B.ValueType) -> ())) -> CommandType {
-  return AnonymousCommand { parser in
-    if parser.hasOption("help") {
-      throw Help([
-        BoxedArgumentDescriptor(value: descriptorA),
-        BoxedArgumentDescriptor(value: descriptorB),
-      ])
-    }
-
-    closure(try descriptorA.parse(parser), try descriptorB.parse(parser))
-  }
-}
-
-public func command<A:ArgumentDescriptor, B:ArgumentDescriptor, C:ArgumentDescriptor>(descriptorA:A, _ descriptorB:B, _ descriptorC:C, closure:((A.ValueType, B.ValueType, C.ValueType) -> ())) -> CommandType {
-  return AnonymousCommand { parser in
-    if parser.hasOption("help") {
-      throw Help([
-        BoxedArgumentDescriptor(value: descriptorA),
-        BoxedArgumentDescriptor(value: descriptorB),
-        BoxedArgumentDescriptor(value: descriptorC),
-      ])
-    }
-
-    closure(try descriptorA.parse(parser), try descriptorB.parse(parser), try descriptorC.parse(parser))
-  }
-}
-
-public func command<A:ArgumentDescriptor, B:ArgumentDescriptor, C:ArgumentDescriptor, D:ArgumentDescriptor>(a:A, _ b:B, _ c:C, _ d:D, closure:((A.ValueType, B.ValueType, C.ValueType, D.ValueType) -> ())) -> CommandType {
-  return AnonymousCommand { parser in
-    if parser.hasOption("help") {
-      throw Help([
-        BoxedArgumentDescriptor(value: a),
-        BoxedArgumentDescriptor(value: b),
-        BoxedArgumentDescriptor(value: c),
-        BoxedArgumentDescriptor(value: d),
-      ])
-    }
-
-    closure(try a.parse(parser), try b.parse(parser), try c.parse(parser), try d.parse(parser))
-  }
-}
-
-public func command<A:ArgumentDescriptor, B:ArgumentDescriptor, C:ArgumentDescriptor, D:ArgumentDescriptor, E:ArgumentDescriptor>(a:A, _ b:B, _ c:C, _ d:D, _ e:E, closure:((A.ValueType, B.ValueType, C.ValueType, D.ValueType, E.ValueType) -> ())) -> CommandType {
-  return AnonymousCommand { parser in
-    if parser.hasOption("help") {
-      throw Help([
-        BoxedArgumentDescriptor(value: a),
-        BoxedArgumentDescriptor(value: b),
-        BoxedArgumentDescriptor(value: c),
-        BoxedArgumentDescriptor(value: d),
-        BoxedArgumentDescriptor(value: e),
-      ])
-    }
-
-    closure(try a.parse(parser), try b.parse(parser), try c.parse(parser), try d.parse(parser), try e.parse(parser))
-  }
-}

Commander/Command.swift

@@ -21,38 +21,3 @@ public func command(closure:() -> ()) -> CommandType {
     closure()
   }
 }
-
-/// Create a command which takes one argument using a closure
-public func command<A:ArgumentConvertible>(closure:A -> ()) -> CommandType {
-  return AnonymousCommand { parser in
-    closure(try A(parser: parser))
-  }
-}
-
-/// Create a command which takes two arguments using a closure
-public func command<A:ArgumentConvertible, B:ArgumentConvertible>(closure:(A, B) -> ()) -> CommandType {
-  return AnonymousCommand { parser in
-    closure(try A(parser: parser), try B(parser: parser))
-  }
-}
-
-/// Create a command which takes three arguments using a closure
-public func command<A:ArgumentConvertible, B:ArgumentConvertible, C:ArgumentConvertible>(closure:(A, B, C) -> ()) -> CommandType {
-  return AnonymousCommand { parser in
-    closure(try A(parser: parser), try B(parser: parser), try C(parser: parser))
-  }
-}
-
-/// Create a command which takes four arguments using a closure
-public func command<A:ArgumentConvertible, B:ArgumentConvertible, C:ArgumentConvertible, D:ArgumentConvertible>(closure:(A, B, C, D) -> ()) -> CommandType {
-  return AnonymousCommand { parser in
-    closure(try A(parser: parser), try B(parser: parser), try C(parser: parser), try D(parser: parser))
-  }
-}
-
-/// Create a command which takes five arguments using a closure
-public func command<A:ArgumentConvertible, B:ArgumentConvertible, C:ArgumentConvertible, D:ArgumentConvertible, E:ArgumentConvertible>(closure:(A, B, C, D, E) -> ()) -> CommandType {
-  return AnonymousCommand { parser in
-    closure(try A(parser: parser), try B(parser: parser), try C(parser: parser), try D(parser: parser), try E(parser: parser))
-  }
-}