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.

4 files changed, 10 insertions, 9 deletions

diff --git a/spec/write_rockspec_spec.lua b/spec/write_rockspec_spec.lua
index 1fb53547..35870775 100644
--- a/spec/write_rockspec_spec.lua
+++ b/spec/write_rockspec_spec.lua
@@ -56,14 +56,14 @@ describe("LuaRocks write_rockspec tests #integration", function()
       
       it("runs with format flag", function()
          finally(function() os.remove("testrock-dev-1.rockspec") end)
-         assert.is_true(run.luarocks_bool("write_rockspec git://localhost/testrock --rockspec-format=1.1 --lua-version=5.1,5.2"))
+         assert.is_true(run.luarocks_bool("write_rockspec git://localhost/testrock --rockspec-format=1.1 --lua-versions=5.1,5.2"))
          assert.is.truthy(lfs.attributes("testrock-dev-1.rockspec"))
          -- TODO check contents
       end)
       
       it("runs with full flags", function()
          finally(function() os.remove("testrock-dev-1.rockspec") end)
-         assert.is_true(run.luarocks_bool("write_rockspec git://localhost/testrock --lua-version=5.1,5.2 --license=\"MIT/X11\" "
+         assert.is_true(run.luarocks_bool("write_rockspec git://localhost/testrock --lua-versions=5.1,5.2 --license=\"MIT/X11\" "
                                              .. " --homepage=\"http://www.luarocks.org\" --summary=\"A package manager for Lua modules\" "))
          assert.is.truthy(lfs.attributes("testrock-dev-1.rockspec"))
          -- TODO check contents
@@ -71,7 +71,7 @@ describe("LuaRocks write_rockspec tests #integration", function()
 
       it("with various flags", function()
          finally(function() os.remove("testrock-dev-1.rockspec") end)
-         assert.is_true(run.luarocks_bool("write_rockspec git://localhost/testrock --lib=fcgi --license=\"3-clause BSD\" " .. "--lua-version=5.1,5.2"))
+         assert.is_true(run.luarocks_bool("write_rockspec git://localhost/testrock --lib=fcgi --license=\"3-clause BSD\" " .. "--lua-versions=5.1,5.2"))
          assert.is.truthy(lfs.attributes("testrock-dev-1.rockspec"))
          -- TODO check contents
       end)
@@ -88,14 +88,14 @@ describe("LuaRocks write_rockspec tests #integration", function()
 
       it("via http", function()
          finally(function() os.remove("an_upstream_tarball-0.1-1.rockspec") end)
-         assert.is_true(run.luarocks_bool("write_rockspec http://localhost:8080/file/an_upstream_tarball-0.1.tar.gz --lua-version=5.1"))
+         assert.is_true(run.luarocks_bool("write_rockspec http://localhost:8080/file/an_upstream_tarball-0.1.tar.gz --lua-versions=5.1"))
          assert.is.truthy(lfs.attributes("an_upstream_tarball-0.1-1.rockspec"))
          -- TODO check contents
       end)
 
       it("with a different basedir", function()
          finally(function() os.remove("renamed_upstream_tarball-0.1-1.rockspec") end)
-         assert.is_true(run.luarocks_bool("write_rockspec http://localhost:8080/file/renamed_upstream_tarball-0.1.tar.gz --lua-version=5.1"))
+         assert.is_true(run.luarocks_bool("write_rockspec http://localhost:8080/file/renamed_upstream_tarball-0.1.tar.gz --lua-versions=5.1"))
          assert.is.truthy(lfs.attributes("renamed_upstream_tarball-0.1-1.rockspec"))
          -- TODO check contents
       end)
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,