From 8840171407a17a6237e193fde3d6a3cc8aee1c4e Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Fri, 7 Sep 2018 01:07:38 +0300
Subject: write_rockspec, init: rename --lua-version to --lua-versions

Fixes conflict between the use of --lua-version in write_rockspec
to list supported Lua versions in a rockspec (now renamed
to --lua-versions) and the general --lua-version flag used to
select a Lua interpreter.
---
 src/luarocks/cmd/init.lua           | 2 +-
 src/luarocks/cmd/write_rockspec.lua | 6 +++---
 src/luarocks/util.lua               | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/luarocks/cmd/init.lua b/src/luarocks/cmd/init.lua
index a9511316..0138c056 100644
--- a/src/luarocks/cmd/init.lua
+++ b/src/luarocks/cmd/init.lua
@@ -19,7 +19,7 @@ init.help = [[
 --summary="<txt>"        A short one-line description summary.
 --detailed="<txt>"       A longer description string.
 --homepage=<url>         Project homepage.
---lua-version=<ver>      Supported Lua versions. Accepted values are "5.1", "5.2",
+--lua-versions=<ver>     Supported Lua versions. Accepted values are "5.1", "5.2",
                          "5.3", "5.1,5.2", "5.2,5.3", or "5.1,5.2,5.3".
 --rockspec-format=<ver>  Rockspec format version, such as "1.0" or "1.1".
 --lib=<lib>[,<lib>]      A comma-separated list of libraries that C files need to
diff --git a/src/luarocks/cmd/write_rockspec.lua b/src/luarocks/cmd/write_rockspec.lua
index 701b079e..4a8a997e 100644
--- a/src/luarocks/cmd/write_rockspec.lua
+++ b/src/luarocks/cmd/write_rockspec.lua
@@ -33,7 +33,7 @@ rockspec, and is not guaranteed to be complete or correct.
 --summary="<txt>"        A short one-line description summary.
 --detailed="<txt>"       A longer description string.
 --homepage=<url>         Project homepage.
---lua-version=<ver>      Supported Lua versions.  Accepted values are: "5.1", "5.2",
+--lua-versions=<ver>     Supported Lua versions.  Accepted values are: "5.1", "5.2",
                          "5.3", "5.4", "5.1,5.2", "5.2,5.3", "5.3,5.4", "5.1,5.2,5.3",
                          "5.2,5.3,5.4", or "5.1,5.2,5.3,5.4"
 --rockspec-format=<ver>  Rockspec format version, such as "1.0" or "1.1".
@@ -283,7 +283,7 @@ function write_rockspec.command(flags, name, version, url_or_dir)
          license = flags["license"] or "*** please specify a license ***",
       },
       dependencies = {
-         lua_version_dep[flags["lua-version"]],
+         lua_version_dep[flags["lua-versions"]],
       },
       build = {},
    })
@@ -291,7 +291,7 @@ function write_rockspec.command(flags, name, version, url_or_dir)
    rockspec.source.protocol = protocol
    
    if not next(rockspec.dependencies) then
-      util.warning("Please specify supported Lua version with --lua-version=<ver>. "..util.see_help("write_rockspec"))
+      util.warning("Please specify supported Lua versions with --lua-versions=<ver>. "..util.see_help("write_rockspec"))
    end
    
    local local_dir = url_or_dir
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index e65128da..4be7d71e 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -117,6 +117,7 @@ local supported_flags = {
    ["lr-path"] = true,
    ["lua-dir"] = "<path>",
    ["lua-version"] = "<vers>",
+   ["lua-versions"] = "<versions>",
    ["lua-ver"] = true,
    ["lua-incdir"] = true,
    ["lua-libdir"] = true,
-- 
cgit v1.2.3-55-g6feb