[Group] Add command convinience methods

Author: kylef

Commander/Command.swift

@@ -18,7 +18,7 @@ public func command(closure:() -> ()) -> CommandType {
   }
 }
 
-/// Create a command which takes the argument parser using a closure
+/// Create a command which takes one argument using a closure
 public func command<A : ArgumentConvertible>(closure:A -> ()) -> CommandType {
   return AnonymousCommand { parser in
     if let argument = A(parser: parser) {

Commander/Group.swift

@@ -6,7 +6,7 @@ public class Group : CommandType {
   public init() {}
 
   /// Add a named sub-command to the group
-  public func addCommand(name:String, command:CommandType) {
+  public func addCommand(name:String, _ command:CommandType) {
     commands[name] = command
   }
 
@@ -25,4 +25,19 @@ extension Group {
     self.init()
     closure(self)
   }
+
+  /// Add a sub-group using a closure
+  public func group(name:String, closure:Group -> ()) {
+    addCommand(name, Group(closure: closure))
+  }
+
+  /// Add a command using a closure
+  public func command(name:String, closure:() -> ()) {
+    addCommand(name, AnonymousCommand { parser in closure() })
+  }
+
+  /// Add a command which takes one argument using a closure
+  public func command<A : ArgumentConvertible>(name:String, closure:A -> ()) {
+    addCommand(name, Commander.command(closure))
+  }
 }

CommanderTests/GroupTests.swift

@@ -7,7 +7,7 @@ class GroupTests : XCTestCase {
     var didRunHelpCommand = false
 
     let group = Group()
-    group.addCommand("help", command: command {
+    group.addCommand("help", command {
       didRunHelpCommand = true
     })
 
@@ -26,7 +26,7 @@ class GroupTests : XCTestCase {
     var didRunHelpCommand = false
 
     let group = Group {
-      $0.addCommand("help", command: command {
+      $0.addCommand("help", command {
         didRunHelpCommand = true
       })
     }
@@ -37,4 +37,42 @@ class GroupTests : XCTestCase {
     group.run(["help"])
     XCTAssertTrue(didRunHelpCommand)
   }
+
+  func testSubGroup() {
+    var didRun = false
+
+    Group {
+      $0.group("group") {
+        $0.command("test") {
+          didRun = true
+        }
+      }
+    }.run(["group", "test"])
+
+    XCTAssertTrue(didRun)
+  }
+
+  func testSubCommand() {
+    var didRun = false
+
+    Group {
+      $0.command("test") {
+        didRun = true
+      }
+      }.run(["test"])
+
+    XCTAssertTrue(didRun)
+  }
+
+  func testSubCommandWithArgument() {
+    var givenName:String? = nil
+
+    Group {
+      $0.command("test") { (name:String) in
+        givenName = name
+      }
+    }.run(["test", "kyle"])
+
+    XCTAssertEqual(givenName, "kyle")
+  }
 }