Merge pull request #15 from katyukha/dev-unparsed-args

Save unparsed (rest) args on result

Author: robik

.gitignore

@@ -12,4 +12,6 @@ commandr-test-*
 *.obj
 *.lst
 /commandr
-source/app.d
+source/app.d
+libcommandr.a
+*.sw[npo]

source/commandr/args.d

@@ -62,6 +62,7 @@ public class ProgramArgs {
         int[string] _flags;
         string[][string] _options;
         string[][string] _args;
+        string[] _args_rest;
         ProgramArgs _parent;
         ProgramArgs _command;
     }
@@ -222,6 +223,27 @@ public class ProgramArgs {
     /// ditto
     alias args = argAll;
 
+    /**
+     * Rest (unparsed) arguments.
+     *
+     * Useful, if you need to access unparsed arguments,
+     * usually supplied after '--'.
+     *
+     * Returns:
+     *   array of arguments that were not handled by parser
+     *
+     * Examples:
+     * ---
+     * auto args = ["my-command", "--opt", "arg", "--", "other-arg", "o-arg"];
+     * auto res = parse(args);
+     *
+     * // Not we can access unparsed args as res.argsRest
+     * assert(res.argsRest == ["other-arg", "o-arg"])
+     * ---
+     */
+    public string[] argsRest() {
+        return _args_rest;
+    }
 
     /**
      * Gets subcommand arguments.

source/commandr/parser.d

@@ -189,6 +189,9 @@ private ProgramArgs parseArgs(
         }
     }
 
+    if (args.length > 0)
+        result._args_rest = args.dup;
+
     if (result.flag("help")) {
         program.printHelp(helpConfig);
         exit(0);
@@ -527,6 +530,7 @@ unittest {
                 .defaultValue("reee"))
             .parseArgs(args);
     assert(a.args("test") == ["reee"]);
+    assert(a.argsRest == ["bar"]);
     assert(args == ["bar"]);
 }
 
@@ -576,6 +580,7 @@ unittest {
     assert(a.args("test") == ["cccc"]);
     assert(a.command !is null);
     assert(a.command.name == "a");
+    assert(a.command.argsRest == ["c"]);
     assert(args == ["c"]);
 
     assertThrown!InvalidArgumentsException(