From b48a27523556ef9a858631be24ca925ca99f7825 Mon Sep 17 00:00:00 2001
From: Michael Carlberg <c@rlberg.se>
Date: Fri, 13 Jan 2017 04:47:25 +0100
Subject: [PATCH] feat(command_line): Properly handle positional args

---
 include/components/command_line.hpp |  5 +++++
 src/components/command_line.cpp     | 28 +++++++++++++++++++++++++---
 src/main.cpp                        |  4 ++--
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/include/components/command_line.hpp b/include/components/command_line.hpp
index 8a1db054..a572a0f7 100644
--- a/include/components/command_line.hpp
+++ b/include/components/command_line.hpp
@@ -15,6 +15,7 @@ namespace command_line {
   using choices = vector<string>;
   using options = vector<option>;
   using values = std::map<string, string>;
+  using posargs = vector<string>;
 
   // class definition : option {{{
 
@@ -49,8 +50,11 @@ namespace command_line {
     void process_input(const vector<string>& values);
 
     bool has(const string& option) const;
+    bool has(size_t index) const;
     string get(string opt) const;
+    string get(size_t index) const;
     bool compare(string opt, const string& val) const;
+    bool compare(size_t index, const string& val) const;
 
    protected:
     auto is_short(const string& option, const string& opt_short) const;
@@ -64,6 +68,7 @@ namespace command_line {
     string m_synopsis{};
     const options m_opts;
     values m_optvalues{};
+    posargs m_posargs{};
     bool m_skipnext{false};
   };
 
diff --git a/src/components/command_line.cpp b/src/components/command_line.cpp
index 1a753d0e..2b80c041 100644
--- a/src/components/command_line.cpp
+++ b/src/components/command_line.cpp
@@ -83,7 +83,14 @@ namespace command_line {
   }
 
   /**
-   * Gets the value defined for given option
+   * Test if a positional argument is defined at given index
+   */
+  bool parser::has(size_t index) const {
+    return m_posargs.size() > index;
+  }
+
+  /**
+   * Get the value defined for given option
    */
   string parser::get(string opt) const {
     if (has(forward<string>(opt))) {
@@ -92,6 +99,13 @@ namespace command_line {
     return "";
   }
 
+  /**
+   * Get the positional argument at given index
+   */
+  string parser::get(size_t index) const {
+    return index < m_posargs.size() ? m_posargs[index] : "";
+  }
+
   /**
    * Compare option value with given string
    */
@@ -99,6 +113,13 @@ namespace command_line {
     return get(move(opt)) == val;
   }
 
+  /**
+   * Compare positional argument at given index with given string
+   */
+  bool parser::compare(size_t index, const string& val) const {
+    return get(index) == val;
+  }
+
   /**
    * Compare option with its short version
    */
@@ -166,12 +187,13 @@ namespace command_line {
           m_skipnext = (value == input_next);
           m_optvalues.insert(make_pair(opt.flag_long.substr(2), value));
         }
-
         return;
       }
     }
 
-    if (input.compare(0, 1, "-") == 0) {
+    if (input[0] != '-') {
+      m_posargs.emplace_back(input);
+    } else {
       throw argument_error("Unrecognized option " + input);
     }
   }
diff --git a/src/main.cpp b/src/main.cpp
index c2d7b56c..88896eb4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -61,7 +61,7 @@ int main(int argc, char** argv) {
     } else if (cli->has("version")) {
       print_build_info(version_details(args));
       return EXIT_SUCCESS;
-    } else if (args.empty() || args[0][0] == '-') {
+    } else if (!cli->has(0)) {
       cli->usage();
       return EXIT_FAILURE;
     }
@@ -95,7 +95,7 @@ int main(int argc, char** argv) {
       throw application_error("Define configuration using --config=PATH");
     }
 
-    config::make_type conf{config::make(move(confpath), args[0])};
+    config::make_type conf{config::make(move(confpath), cli->get(0))};
 
     //==================================================
     // Dump requested data