Fix and reorganize Lua version detection

Make it more robust when detecting the Lua version when working inside a
project, and hopefully make the detection logic easier to track in the
code. Reorganized code so that the `detected` table becomes internal
to the `init_config` operation and only the regular `cfg` global table
is used after that.

Includes regression tests.

1 files changed, 70 insertions, 0 deletions

diff --git a/spec/cmd_spec.lua b/spec/cmd_spec.lua
index 70b9625d..21b25fe5 100644
--- a/spec/cmd_spec.lua
+++ b/spec/cmd_spec.lua
@@ -1,4 +1,5 @@
 local test_env = require("spec.util.test_env")
+local lfs = require("lfs")
 local run = test_env.run
 
 test_env.unload_luarocks()
@@ -31,4 +32,73 @@ describe("LuaRocks command line #integration", function()
       end)
    end)
 
+   describe("--lua-dir", function()
+      it("fails if given an invalid path", function()
+         local output = run.luarocks("--lua-dir=/bad/lua/path")
+         assert.match("Lua interpreter not found at /bad/lua/path", output, 1, true)
+      end)
+
+      it("fails if given a valid path without Lua", function()
+         local output = run.luarocks("--lua-dir=.")
+         assert.match("Lua interpreter not found at .", output, 1, true)
+      end)
+
+      it("passes if given a valid path with Lua", function()
+         assert.truthy(run.luarocks("--lua-dir=" .. test_env.testing_paths.luadir))
+      end)
+   end)
+
+   describe("--lua-version", function()
+      it("warns but continues if given an invalid version", function()
+         local output = run.luarocks("--lua-version=1.0")
+         assert.match("Warning: Could not find a Lua 1.0 interpreter", output, 1, true)
+         assert.match("Lua version: 1.0", output, 1, true)
+      end)
+
+      it("sets the version independently of project tree", function()
+         test_env.run_in_tmp(function(tmpdir)
+            assert.truthy(run.luarocks_bool("init --lua-version=" .. test_env.lua_version .. " --lua-versions=" .. test_env.lua_version))
+
+            local output = run.luarocks("--lua-version=1.0")
+            assert.match("Lua version: 1.0", output, 1, true)
+
+            output = run.luarocks("--lua-version=1.0 --project-tree=.")
+            assert.match("Lua version: 1.0", output, 1, true)
+         end, finally)
+      end)
+   end)
+
+   it("detects version based on project tree", function()
+      test_env.run_in_tmp(function(tmpdir)
+         assert.truthy(run.luarocks_bool("init --lua-version=" .. test_env.lua_version))
+         assert.truthy(run.luarocks_bool("config lua_version 1.0 --project-tree=" .. tmpdir .. "/lua_modules"))
+
+         lfs.mkdir("aaa")
+         lfs.chdir("aaa")
+         lfs.mkdir("bbb")
+         lfs.chdir("bbb")
+
+         local output = run.luarocks("")
+         assert.match("Lua version: 1.0", output, 1, true)
+      end, finally)
+   end)
+
+   -- for backward compatibility
+   it("detects version of a project based on config", function()
+      test_env.run_in_tmp(function(tmpdir)
+         assert.truthy(run.luarocks_bool("init --lua-version=" .. test_env.lua_version))
+         os.remove(".luarocks/config-" .. test_env.lua_version .. ".lua")
+         os.remove(".luarocks/default-lua-version.lua")
+         test_env.write_file(".luarocks/config-5.2.lua", [[ ]], finally)
+
+         lfs.mkdir("aaa")
+         lfs.chdir("aaa")
+         lfs.mkdir("bbb")
+         lfs.chdir("bbb")
+
+         local output = run.luarocks("")
+         assert.match("Lua version: 5.2", output, 1, true)
+      end, finally)
+   end)
+
 end)