[Tarantool-patches] [PATCH LUAROCKS v2 2/2] Add the tarantool options black list. Update help
Leonid
lvasiliev at tarantool.org
Tue Nov 19 11:52:27 MSK 2019
---
src/luarocks/cmd/help.lua | 15 +++++++++------
src/luarocks/util.lua | 14 ++++++++++++++
2 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/luarocks/cmd/help.lua b/src/luarocks/cmd/help.lua
index dcc9e35..1db914a 100644
--- a/src/luarocks/cmd/help.lua
+++ b/src/luarocks/cmd/help.lua
@@ -12,6 +12,10 @@ local dir = require("luarocks.dir")
local program = util.this_program("luarocks")
+if program:find("tarantoolctl") then
+ program = program.." rocks"
+end
+
help.help_summary = "Help on commands. Type '"..program.." help <command>' for more."
help.help_arguments = "[<command>]"
@@ -20,7 +24,11 @@ help.help = [[
]]
local function print_banner()
- util.printout("\nLuaRocks "..cfg.program_version..", the Lua package manager")
+ if program:find("tarantoolctl") then
+ util.printout("\nTarantoolctl rocks, the Lua package manager based on LuaRocks "..cfg.program_version)
+ else
+ util.printout("\nLuaRocks "..cfg.program_version..", the Lua package manager")
+ end
end
local function print_section(section)
@@ -62,12 +70,7 @@ function help.command(description, commands, command)
(overrides any entries in the config file)
--only-sources=<url> Restrict downloads to paths matching the
given URL.
- --lua-dir=<prefix> Which Lua installation to use.
- --lua-version=<ver> Which Lua version to use.
--tree=<tree> Which tree to operate on.
- --local Use the tree in the user's home directory.
- To enable it, see ']]..program..[[ help path'.
- --global Use the system tree when `local_by_default` is `true`.
--verbose Display verbose output of commands executed.
--timeout=<seconds> Timeout on network operations, in seconds.
0 means no timeout (wait forever).
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index fadc93f..660d140 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -171,6 +171,14 @@ local supported_flags = {
["version"] = true,
}
+-- The tarantool unsupported arguments list.
+local tarantool_black_list = {
+ ["global"] = true,
+ ["local"] = true,
+ ["lua-version"] = true,
+ ["lua-dir"] = 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",
@@ -189,6 +197,9 @@ function util.parse_flags(...)
elseif state == "initial" and flag then
local var,val = flag:match("([a-z_%-]*)=(.*)")
if val then
+ if tarantool_black_list[var] then
+ return { ERROR = "Invalid argument: flag --"..var.." does not supported by tarantoolctl roks." }
+ end
local vartype = supported_flags[var]
if type(vartype) == "string" then
if val == "" and vartype:sub(1,1) ~= '"' then
@@ -204,6 +215,9 @@ function util.parse_flags(...)
end
else
local var = flag
+ if tarantool_black_list[var] then
+ return { ERROR = "Invalid argument: flag --"..var.." does not supported by tarantoolctl roks." }
+ end
local vartype = supported_flags[var]
if type(vartype) == "string" then
i = i + 1
--
2.17.1
More information about the Tarantool-patches
mailing list