From 2d0faa258dbb229b2d31af6288f3c38aa44879c7 Mon Sep 17 00:00:00 2001
From: mpeterv <petjamelnik@yandex.ru>
Date: Sat, 8 Mar 2014 16:04:40 +0400
Subject: [PATCH] Argname can be an array

---
 spec/usage_spec.lua | 14 ++++++++++++++
 src/argparse.lua    | 39 ++++++++++++++++++++++++++++-----------
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/spec/usage_spec.lua b/spec/usage_spec.lua
index 3bb2b07..c4faa1b 100644
--- a/spec/usage_spec.lua
+++ b/spec/usage_spec.lua
@@ -143,5 +143,19 @@ describe("tests related to usage message generation", function()
             parser:get_usage()
          )
       end)
+
+      it("uses array of argnames provided by user", function()
+         local parser = Parser "foo"
+            :add_help(false)
+         parser:option "--pair"
+            :args(2)
+            :count "*"
+            :argname{"<key>", "<value>"}
+
+         assert.equal(
+            [=[Usage: foo [--pair <key> <value>]]=],
+            parser:get_usage()
+         )
+      end)
    end)
 end)
diff --git a/src/argparse.lua b/src/argparse.lua
index ca3873c..d6022ba 100644
--- a/src/argparse.lua
+++ b/src/argparse.lua
@@ -122,6 +122,14 @@ do -- Create classes with setters
       end
    end
 
+   local function argname(self, value)
+      if type(value) ~= "string" then
+         if type(value) ~= "table" then
+            error(("bad field 'argname' (string or table expected, got %s)"):format(type(value)))
+         end
+      end
+   end
+
    local function add_help(self, param)
       if self._has_help then
          table.remove(self._options)
@@ -191,7 +199,7 @@ do -- Create classes with setters
       default = typecheck.string "default",
       defmode = typecheck.string "defmode",
       convert = convert,
-      argname = typecheck.string "argname"
+      argname = argname
    })
 
    Option = add_setters(Argument:extends {
@@ -211,28 +219,27 @@ do -- Create classes with setters
       convert = convert,
       overwrite = typecheck.boolean "overwrite",
       action = typecheck["function"] "action",
-      argname = typecheck.string "argname"
+      argname = argname
    })
 end
 
 function Argument:_get_argument_list()
-   local argname = self:_get_argname()
    local buf = {}
-   local required_argname = argname
-
-   if self._default and self._defmode:find "a" then
-      required_argname = "[" .. argname .. "]"
-   end
-
    local i = 1
 
    while i <= math.min(self._minargs, 3) do
-      table.insert(buf, required_argname)
+      local argname = self:_get_argname_i(i)
+
+      if self._default and self._defmode:find "a" then
+         argname = "[" .. argname .. "]"
+      end
+
+      table.insert(buf, argname)
       i = i+1
    end
 
    while i <= math.min(self._maxargs, 3) do
-      table.insert(buf, "[" .. argname .. "]")
+      table.insert(buf, "[" .. self:_get_argname_i(i) .. "]")
       i = i+1
 
       if self._maxargs == math.huge then
@@ -279,6 +286,16 @@ function Argument:_get_type()
    end
 end
 
+function Argument:_get_argname_i(i)
+   local argname = self:_get_argname()
+
+   if type(argname) == "table" then
+      return argname[i]
+   else
+      return argname
+   end
+end
+
 function Argument:_get_argname()
    return self._argname or ("<"..self._name..">")
 end