4 files changed, 106 insertions, 24 deletions

diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua
index 96d7cb11..9cc34c42 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/command_line.lua
@@ -64,6 +64,9 @@ function command_line.run_command(...)
    end
    local nonflags = { util.parse_flags(unpack(args)) }
    local flags = table.remove(nonflags, 1)
+   if flags.ERROR then
+      die(flags.ERROR.." See --help.")
+   end
    
    if flags["from"] then flags["server"] = flags["from"] end
    if flags["only-from"] then flags["only-server"] = flags["only-from"] end
@@ -126,16 +129,10 @@ function command_line.run_command(...)
    end
    
    if flags["branch"] then
-     if flags["branch"] == true or flags["branch"] == "" then
-       die("Argument error: use --branch=<branch-name>")
-     end
      cfg.branch = flags["branch"]
    end
    
    if flags["tree"] then
-      if flags["tree"] == true or flags["tree"] == "" then
-         die("Argument error: use --tree=<path>")
-      end
       local named = false
       for _, tree in ipairs(cfg.rocks_trees) do
          if type(tree) == "table" and flags["tree"] == tree.name then
@@ -178,17 +175,11 @@ function command_line.run_command(...)
    cfg.variables.SCRIPTS_DIR = cfg.deploy_bin_dir
 
    if flags["server"] then
-      if flags["server"] == true then
-         die("Argument error: use --server=<url>")
-      end
       local protocol, path = dir.split_url(flags["server"])
       table.insert(cfg.rocks_servers, 1, protocol.."://"..path)
    end
    
    if flags["only-server"] then
-      if flags["only-server"] == true then
-         die("Argument error: use --only-server=<url>")
-      end
       cfg.rocks_servers = { flags["only-server"] }
    end
 
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index 40af35bd..6319ae14 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -63,6 +63,63 @@ function util.matchquote(s)
    return (s:gsub("[?%-+*%[%].%%()$^]","%%%1"))
 end
 
+local supported_flags = {
+   ["all"] = true,
+   ["api-key"] = "<key>",
+   ["append"] = true,
+   ["arch"] = "<arch>",
+   ["bin"] = true,
+   ["binary"] = true,
+   ["branch"] = "<branch-name>",
+   ["debug"] = true,
+   ["deps"] = true,
+   ["deps-mode"] = "<mode>",
+   ["detailed"] = "\"<text>\"",
+   ["extensions"] = true,
+   ["force"] = true,
+   ["from"] = "<server>",
+   ["help"] = true,
+   ["home"] = true,
+   ["homepage"] = true,
+   ["keep"] = true,
+   ["lib"] = true,
+   ["license"] = "\"<text>\"",
+   ["list"] = true,
+   ["local"] = true,
+   ["local-tree"] = true,
+   ["lr-bin"] = true,
+   ["lr-cpath"] = true,
+   ["lr-path"] = true,
+   ["lua-version"] = "<vers>",
+   ["modules"] = true,
+   ["mversion"] = true,
+   ["no-refresh"] = true,
+   ["nodeps"] = true,
+   ["old-versions"] = true,
+   ["only-from"] = "<server>",
+   ["only-server"] = "<server>",
+   ["only-sources"] = "<url>",
+   ["only-sources-from"] = "<url>",
+   ["outdated"] = true,
+   ["output"] = "<file>",
+   ["pack-binary-rock"] = true,
+   ["porcelain"] = true,
+   ["quick"] = true,
+   ["rock-dir"] = true,
+   ["rock-tree"] = true,
+   ["rockspec"] = true,
+   ["server"] = "<server>",
+   ["skip-pack"] = true,
+   ["source"] = true,
+   ["summary"] = "\"<text>\"",
+   ["tag"] = "<tag>",
+   ["timeout"] = "<seconds>",
+   ["to"] = "<path>",
+   ["tree"] = "<path>",
+   ["verbose"] = true,
+   ["version"] = true,
+}
+
 --- Extract flags from an arguments list.
 -- Given string arguments, extract flag arguments into a flags set.
 -- For example, given "foo", "--tux=beep", "--bla", "bar", "--baz",
@@ -71,19 +128,53 @@ end
 function util.parse_flags(...)
    local args = {...}
    local flags = {}
-   for i = #args, 1, -1 do
+   local i = 1
+   local out = {}
+   local ignore_flags = false
+   while i <= #args do
       local flag = args[i]:match("^%-%-(.*)")
-      if flag then
+      if flag == "--" then
+         ignore_flags = true
+      end
+      if flag and not ignore_flags then
          local var,val = flag:match("([a-z_%-]*)=(.*)")
          if val then
-            flags[var] = val
+            local vartype = supported_flags[var]
+            if type(vartype) == "string" then
+               flags[var] = val
+            else
+               if vartype then
+                  return { ERROR = "Invalid argument: flag --"..var.." does not take an parameter." }
+               else
+                  return { ERROR = "Invalid argument: unknown flag --"..var.."." }
+               end
+            end
          else
-            flags[flag] = true
+            local var = flag
+            local vartype = supported_flags[var]
+            if type(vartype) == "string" then
+               i = i + 1
+               local val = args[i]
+               if not val then
+                  return { ERROR = "Invalid argument: flag --"..var.."="..vartype.." expects a parameter." }
+               end
+               if val:match("^%-%-.*") then
+                  return { ERROR = "Invalid argument: flag --"..var.."="..vartype.." expects a parameter (if you really want to pass "..val.." as an argument to --"..var..", use --"..var.."="..val..")." }
+               else
+                  flags[var] = val
+               end
+            elseif vartype == true then
+               flags[var] = true
+            else
+               return { ERROR = "Invalid argument: unknown flag --"..var.."." }
+            end
          end
-         table.remove(args, i)
+      else
+         table.insert(out, args[i])
       end
+      i = i + 1
    end
-   return flags, unpack(args)
+   return flags, unpack(out)
 end
 
 --- Build a sequence of flags for forwarding from one command to
diff --git a/src/luarocks/write_rockspec.lua b/src/luarocks/write_rockspec.lua
index 5b129ab0..fb3a120e 100644
--- a/src/luarocks/write_rockspec.lua
+++ b/src/luarocks/write_rockspec.lua
@@ -209,10 +209,6 @@ function write_rockspec.run(...)
    elseif not url_or_dir then
       url_or_dir = version
    end
-
-   if flags["tag"] == true then
-      return nil, "Incorrect usage: --tag requires an argument. "..util.see_help("write_rockspec")
-   end
    
    if flags["tag"] then
       if not version then
diff --git a/test/testing.sh b/test/testing.sh
index becaa14f..1c411a98 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -319,10 +319,14 @@ need_luasocket() { need luasocket $verrev_luasocket; }
 
 test_version() { $luarocks --version; }
 
-fail_arg_server() { $luarocks --server; }
-fail_arg_only_server() { $luarocks --only-server; }
 fail_unknown_command() { $luarocks unknown_command; }
 
+fail_arg_boolean_parameter() { $luarocks --porcelain=invalid; }
+fail_arg_boolean_unknown() { $luarocks --invalid-flag; }
+fail_arg_string_no_parameter() { $luarocks --server; }
+fail_arg_string_followed_by_flag() { $luarocks --server --porcelain; }
+fail_arg_string_unknown() { $luarocks --invalid-flag=abc; }
+
 test_empty_list() { $luarocks list; }
 
 fail_bad_sysconfig() { local err=0; local scdir="$testing_lrprefix/etc/luarocks/"; mkdir -p "$scdir"; local sysconfig="$scdir/config.lua"; echo "aoeui" > "$sysconfig"; echo $sysconfig; $luarocks list; err=$?; rm "$sysconfig"; return "$err"; }