Fixed nesting of subcommands.

apparata · Sep 30, 2019 · 3621d5a · 3621d5a
1 parent 7d326df
commit 3621d5a
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 3 deletions.
diff --git a/Sources/CLIKit/Command Line/Command.swift b/Sources/CLIKit/Command Line/Command.swift
@@ -208,7 +208,11 @@ internal class InternalNamedCommands: InternalCommands, Commands {
         parentCommands = parents
         internalCommands = []
         internalCommands = originalCommands.namedCommands.map {
-            InternalNamedCommand(name: $0.name, command: $0.command, parents: parents + [name])
+            if let subcommands = $0.command as? Commands {
+                return InternalNamedCommands(name: $0.name, commands: subcommands, parents: parents + [name])
+            } else {
+                return InternalNamedCommand(name: $0.name, command: $0.command, parents: parents + [name])
+            }
         }
     }
 

diff --git a/Tests/CLIKitTests/CLIKitTests.swift b/Tests/CLIKitTests/CLIKitTests.swift
@@ -45,7 +45,7 @@ final class CLIKitTests: XCTestCase {
 
         XCTAssertNoThrow(try runCommand())
     }
-    
+
     func testUnrecognizedCommand() {
 
         func runCommand() throws {
@@ -121,7 +121,32 @@ final class CLIKitTests: XCTestCase {
 
         XCTAssertNoThrow(try runCommand())
     }
-
+
+    func testNestedCommands() {
+
+        func runCommand() throws {
+            let parser = CommandLineParser()
+
+            let arguments: [String] = [
+                "bot",
+                "branch",
+                "list"
+            ]
+
+            let parsedCommand = try parser.parseArguments(arguments, command: BotCommands(), expectedRootCommand: "bot")
+            try parsedCommand.run()
+        }
+
+        do {
+            try runCommand()
+        } catch {
+            print(error.localizedDescription)
+            XCTAssertTrue(false, error.localizedDescription)
+        }
+
+        XCTAssertTrue(true)
+    }
+
     func testCommandBuildBot() {
 
         func runCommand() throws {
@@ -141,6 +166,7 @@ final class CLIKitTests: XCTestCase {
             try runCommand()
         } catch {
             print(error.localizedDescription)
+            XCTAssertTrue(false)
         }
 
         XCTAssertTrue(true)
@@ -167,6 +193,7 @@ final class CLIKitTests: XCTestCase {
         ("testOptionalInput", testOptionalInput),
         ("testOptionalInput2", testOptionalInput2),
         ("testCommandBuildBot", testCommandBuildBot),
+        ("testNestedCommands", testNestedCommands),
         ("testMainframeCommand", testMainframeCommand),
     ]
 }
diff --git a/Tests/CLIKitTests/Helpers/BotCommand.swift b/Tests/CLIKitTests/Helpers/BotCommand.swift
@@ -20,9 +20,30 @@ class BuildCommand: Command {
     }
 }
 
+class ListBranchesCommand: Command {
+
+    let description = "List branches"
+
+    var action: ((ListBranchesCommand) -> Void)?
+
+    func run() {
+        print("Requested a branch list")
+        action?(self)
+    }
+}
+
+
+class BranchCommand: Commands {
+
+    let description = "Branch commands"
+
+    let list = ListBranchesCommand()
+}
+
 class BotCommands: Commands {
 
     let description = "BuildBot commands"
 
     let build = BuildCommand()
+    let branch = BranchCommand()
 }