Use versioned files only. (#734)

Let's take the opportunity of a new major version to make an important cleanup: getting rid of the error-prone unversioned configuration files. This drops support for:

* Unversioned config.lua -> use config-5.x.lua
* Unversioned luarocks/site_config.lua -> it always generates luarocks/core/site_config_5_x.lua
* Unversioned lib/luarocks/rocks -> it always uses lib/luarocks/rocks-5.x

1 files changed, 8 insertions, 55 deletions

diff --git a/spec/util_spec.lua b/spec/util_spec.lua
index 988d8ef0..25cc51d8 100644
--- a/spec/util_spec.lua
+++ b/spec/util_spec.lua
@@ -55,66 +55,19 @@ describe("Basic tests #blackbox #b_util", function()
    end)
    
    it("LuaRocks test site config", function()
-      assert.is.truthy(os.rename("src/luarocks/site_config.lua", "src/luarocks/site_config.lua.tmp"))
-      assert.is.falsy(lfs.attributes("src/luarocks/site_config.lua"))
-      assert.is.truthy(lfs.attributes("src/luarocks/site_config.lua.tmp"))
+      local scname = "src/luarocks/core/site_config_"..test_env.lua_version:gsub("%.", "_")..".lua"
+   
+      assert.is.truthy(os.rename(scname, scname..".tmp"))
+      assert.is.falsy(lfs.attributes(scname))
+      assert.is.truthy(lfs.attributes(scname..".tmp"))
 
       assert.is.truthy(run.luarocks(""))
       
-      assert.is.truthy(os.rename("src/luarocks/site_config.lua.tmp", "src/luarocks/site_config.lua"))
-      assert.is.falsy(lfs.attributes("src/luarocks/site_config.lua.tmp"))
-      assert.is.truthy(lfs.attributes("src/luarocks/site_config.lua"))
+      assert.is.truthy(os.rename(scname..".tmp", scname))
+      assert.is.falsy(lfs.attributes(scname..".tmp"))
+      assert.is.truthy(lfs.attributes(scname))
    end)
 
-   -- Disable versioned config temporarily, because it always takes
-   -- precedence over config.lua (config-5.x.lua is installed by default on Windows,
-   -- but not on Unix, so on Unix the os.rename commands below will fail silently, but this is harmless)
-   describe("LuaRocks config - more complex tests", function()
-      local scdir = testing_paths.testing_lrprefix .. "/etc/luarocks"
-      local versioned_scname = scdir .. "/config-" .. env_variables.LUA_VERSION .. ".lua"
-      local scname = scdir .. "/config.lua"
-
-      local configfile
-      if test_env.TEST_TARGET_OS == "windows" then
-         configfile = versioned_scname
-      else
-         configfile = scname
-      end
-
-      it("LuaRocks fail system config", function()
-         os.rename(versioned_scname, versioned_scname .. "bak")
-         local ok = run.luarocks_bool("config --system-config")
-         os.rename(versioned_scname .. ".bak", versioned_scname)
-         assert.is_false(ok)
-      end)
-
-      it("LuaRocks system config", function()
-         lfs.mkdir(testing_paths.testing_lrprefix)
-         lfs.mkdir(testing_paths.testing_lrprefix .. "/etc/")
-         lfs.mkdir(scdir)
-
-         local sysconfig = io.open(configfile, "w+")
-         sysconfig:write(" ")
-         sysconfig:close()
-
-         local output = run.luarocks("config --system-config")
-         os.remove(configfile)
-         assert.are.same(output, configfile)
-      end)
-
-      it("LuaRocks fail system config invalid", function()
-         lfs.mkdir(testing_paths.testing_lrprefix)
-         lfs.mkdir(testing_paths.testing_lrprefix .. "/etc/")
-         lfs.mkdir(scdir)
-
-         local sysconfig = io.open(configfile, "w+")
-         sysconfig:write("if if if")
-         sysconfig:close()
-         local ok = run.luarocks_bool("config --system-config")
-         os.remove(configfile)
-         assert.is_false(ok)
-      end)
-   end)
 end)
 
 test_env.unload_luarocks()