cfg, cmd: major reorganization

* `--lua-dir` flag, specifying a prefix for the Lua installation to
  be used. This reconfigures LuaRocks entirely, including allowing
  a LuaRocks which is itself running using one Lua 5.x version to
  manage packages for a different Lua 5.y version. The resulting
  configuration can be checked with `luarocks config --lua-dir=<path>`.
* requiring `luarocks.core.cfg` no longer has side-effects
  * configuration now needs to be initialized with `cfg.init([lua_data])`,
    where `lua_data` is a table with the configuration of the VM:
    * `lua_version` - e.g. `"5.3"`
    * `luajit_version` - e.g. `"2.1.0-beta3"`
    * `lua_interpreter` - e.g. `"lua5.3"`
    * `lua_bindir` - e.g. `"/usr/local/bin"`
    * `lua_libdir` - e.g. `"/usr/local/lib"`
    * `lua_incdir` - e.g. `"/usr/local/include/lua-5.3"`
  * `cfg.init` can be called multiple times, reconfiguring the global state.
    This is important since `luarocks.loader` now calls it, and the `--lua-dir`
    command line can override the configuration and reconfigure LuaRocks.
* `site_config_*` is no more: LuaRocks is no longer dependent on a properly-written
  site_config file. Instead, it can *optionally* use `luarocks.core.hardcoded`
  for hardcoded values, or detect its configuration at runtime, based on
  OS detection, arg[-1] or command-line flags.
* reduction of moving parts in the configuration:
  * `cfg.platforms` is no longer a globally-visible table; instead, `cfg`
    provides an API of read-only functions: `is_platform`, `each_platform`,
    `print_platforms`.
  * `cfg.*_proxy` options are no longer configured via the config files,
    but rather via the standard `*_proxy` environment variables.
* `"windows"` is now the more general platform name of the Windows family.
  This is technically a breaking change but I don't expect it to cause
  problems with real-world rockspecs.
* internal code reorganization in `luarocks.cmd` module

6 files changed, 44 insertions, 35 deletions

diff --git a/spec/config_spec.lua b/spec/config_spec.lua
index 94757244..e78c3de0 100644
--- a/spec/config_spec.lua
+++ b/spec/config_spec.lua
@@ -3,7 +3,7 @@ local lfs = require("lfs")
 local run = test_env.run
 local testing_paths = test_env.testing_paths
 local env_variables = test_env.env_variables
-local site_config
+local hardcoded
 
 test_env.unload_luarocks()
 
@@ -11,30 +11,30 @@ describe("LuaRocks config tests #integration", function()
    
    before_each(function()
       test_env.setup_specs()
-      test_env.unload_luarocks() -- need to be required here, because site_config is created after first loading of specs
-      site_config = require("luarocks.core.site_config_" .. test_env.lua_version:gsub("%.", "_"))
+      test_env.unload_luarocks() -- need to be required here, because hardcoded is created after first loading of specs
+      hardcoded = require("luarocks.core.hardcoded")
    end)
 
    describe("LuaRocks config - basic tests", function()
       it("LuaRocks config with no flags/arguments", function()
-         assert.is_false(run.luarocks_bool("config"))
+         assert.match("rocks_servers", run.luarocks("config"))
       end)
       
       it("LuaRocks config include dir", function()
          local output = run.luarocks("config --lua-incdir")
          if test_env.TEST_TARGET_OS == "windows" then
-            assert.are.same(output, site_config.LUA_INCDIR:gsub("\\","/"))
+            assert.are.same(output, hardcoded.LUA_INCDIR:gsub("\\","/"))
          else
-            assert.are.same(output, site_config.LUA_INCDIR)
+            assert.are.same(output, hardcoded.LUA_INCDIR)
          end
       end)
       
       it("LuaRocks config library dir", function()
          local output = run.luarocks("config --lua-libdir")
          if test_env.TEST_TARGET_OS == "windows" then
-            assert.are.same(output, site_config.LUA_LIBDIR:gsub("\\","/"))
+            assert.are.same(output, hardcoded.LUA_LIBDIR:gsub("\\","/"))
          else
-            assert.are.same(output, site_config.LUA_LIBDIR)
+            assert.are.same(output, hardcoded.LUA_LIBDIR)
          end
       end)
       
diff --git a/spec/fetch_spec.lua b/spec/fetch_spec.lua
index 6e00bc22..b878c1e6 100644
--- a/spec/fetch_spec.lua
+++ b/spec/fetch_spec.lua
@@ -3,6 +3,7 @@ local git_repo = require("spec.util.git_repo")
 
 test_env.unload_luarocks()
 test_env.setup_specs()
+local cfg = require("luarocks.core.cfg")
 local fs = require("luarocks.fs")
 local fetch = require("luarocks.fetch")
 local fs = require("luarocks.fs")
@@ -21,6 +22,7 @@ describe("Luarocks fetch test #unit #mock", function()
    local runner
    
    setup(function()
+      cfg.init()
       fs.init()
       test_env.mock_server_init()
 
diff --git a/spec/fs_spec.lua b/spec/fs_spec.lua
index b8091f75..3f115df9 100644
--- a/spec/fs_spec.lua
+++ b/spec/fs_spec.lua
@@ -3,6 +3,7 @@ local test_env = require("spec.util.test_env")
 test_env.unload_luarocks()
 test_env.setup_specs()
 local fs = require("luarocks.fs")
+local cfg = require("luarocks.core.cfg")
 local lfs = require("lfs")
 local is_win = test_env.TEST_TARGET_OS == "windows"
 local posix_ok = pcall(require, "posix")
@@ -55,6 +56,7 @@ describe("Luarocks fs test #unit", function()
    local runner
    
    setup(function()
+      cfg.init()
       fs.init()
       runner = require("luacov.runner")
       runner.init(testing_paths.testrun_dir .. "/luacov.config")
diff --git a/spec/tools_spec.lua b/spec/tools_spec.lua
index 10dafb0b..c84dbab3 100644
--- a/spec/tools_spec.lua
+++ b/spec/tools_spec.lua
@@ -5,6 +5,7 @@ local write_file = test_env.write_file
 
 test_env.unload_luarocks()
 local fs = require("luarocks.fs")
+local cfg = require("luarocks.core.cfg")
 local patch = require("luarocks.tools.patch")
 
 local lao = 
@@ -148,6 +149,7 @@ describe("Luarocks patch test #unit", function()
    local runner
    
    setup(function()
+      cfg.init()
       fs.init()
       runner = require("luacov.runner")
       runner.init(testing_paths.testrun_dir .. "/luacov.config")
diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua
index 6d8a962c..1d4e98d8 100644
--- a/spec/util/test_env.lua
+++ b/spec/util/test_env.lua
@@ -40,6 +40,10 @@ function test_env.exists(path)
    return lfs.attributes(path, "mode") ~= nil
 end
 
+function test_env.file_if_exists(path)
+   return lfs.attributes(path, "mode") and path
+end
+
 --- Quote argument for shell processing. Fixes paths on Windows.
 -- Adds double quotes and escapes. Based on function in fs/win32.lua.
 -- @param arg string: Unquoted argument.
@@ -251,7 +255,15 @@ function test_env.set_args()
             end
          end
       end
+      print(test_env.TEST_TARGET_OS)
+   end
+
+   if test_env.TEST_TARGET_OS == "windows" then
+      test_env.lib_extension = "dll"
+   else
+      test_env.lib_extension = "so"
    end
+
    return true
 end
 
@@ -394,12 +406,8 @@ local function create_env(testing_paths)
    env_variables.LUA_PATH = env_variables.LUA_PATH .. testing_paths.testing_sys_tree .. "/share/lua/" .. luaversion_short .. "/?.lua;"
    env_variables.LUA_PATH = env_variables.LUA_PATH .. testing_paths.testing_sys_tree .. "/share/lua/".. luaversion_short .. "/?/init.lua;"
    env_variables.LUA_PATH = env_variables.LUA_PATH .. testing_paths.src_dir .. "/?.lua;"
-   local lib_extension = "so"
-   if test_env.TEST_TARGET_OS == "windows" then
-      lib_extension = "dll"
-   end
-   env_variables.LUA_CPATH = testing_paths.testing_tree .. "/lib/lua/" .. luaversion_short .. "/?." .. lib_extension .. ";"
-                           .. testing_paths.testing_sys_tree .. "/lib/lua/" .. luaversion_short .. "/?." .. lib_extension .. ";"
+   env_variables.LUA_CPATH = testing_paths.testing_tree .. "/lib/lua/" .. luaversion_short .. "/?." .. test_env.lib_extension .. ";"
+                           .. testing_paths.testing_sys_tree .. "/lib/lua/" .. luaversion_short .. "/?." .. test_env.lib_extension .. ";"
    env_variables.PATH = os.getenv("PATH") .. ";" .. testing_paths.testing_tree .. "/bin;" .. testing_paths.testing_sys_tree .. "/bin;"
 
    return env_variables
@@ -584,8 +592,7 @@ function test_env.setup_specs(extra_rocks)
 
       package.path = test_env.env_variables.LUA_PATH
 
-      test_env.platform = execute_output(test_env.testing_paths.lua .. " -e \"print(require('luarocks.core.cfg').arch)\"", false, test_env.env_variables)
-      test_env.lib_extension = execute_output(test_env.testing_paths.lua .. " -e \"print(require('luarocks.core.cfg').lib_extension)\"", false, test_env.env_variables)
+      test_env.platform = execute_output(test_env.testing_paths.lua .. " -e \"cfg = require('luarocks.core.cfg'); cfg.init(); print(cfg.arch)\"", false, test_env.env_variables)
       test_env.wrapper_extension = test_env.TEST_TARGET_OS == "windows" and ".bat" or ""
       test_env.md5sums = create_md5sums(test_env.testing_paths)
       test_env.setup_done = true
@@ -737,11 +744,21 @@ local function install_luarocks(install_env_vars)
       assert(execute_bool("install.bat /LUA " .. testing_paths.luadir .. " " .. compiler_flag .. " /P " .. testing_paths.testing_lrprefix .. " /NOREG /NOADMIN /F /Q /CONFIG " .. testing_paths.testing_lrprefix .. "/etc/luarocks", false, install_env_vars))
       assert(execute_bool(testing_paths.win_tools .. "/cp " .. testing_paths.testing_lrprefix .. "/lua/luarocks/core/site_config* " .. testing_paths.src_dir .. "/luarocks/core"))
    else
-      local configure_cmd = "./configure --with-lua=" .. testing_paths.luadir .. " --prefix=" .. testing_paths.testing_lrprefix
-      assert(execute_bool(configure_cmd, false, install_env_vars))
-      assert(execute_bool("make clean", false, install_env_vars))
-      assert(execute_bool("make src/luarocks/core/site_config_"..test_env.lua_version:gsub("%.", "_")..".lua", false, install_env_vars))
-      assert(execute_bool("make dev", false, install_env_vars))
+      local incfile = test_env.file_if_exists(testing_paths.luadir .. "/include/lua.h")
+                   or test_env.file_if_exists(testing_paths.luadir .. "/include/lua/" .. test_env.lua_version .. "/lua.h")
+                   or test_env.file_if_exists(testing_paths.luadir .. "/include/lua" .. test_env.lua_version .. "/lua.h")
+      local incdir = assert(incfile):gsub("/lua.h$", "")
+
+      local lines = {
+         "return {",
+         ("SYSCONFDIR = %q,"):format(testing_paths.testing_lrprefix .. "/etc/luarocks"),
+         ("LUA_DIR = %q,"):format(testing_paths.luadir),
+         ("LUA_INCDIR = %q,"):format(incdir),
+         ("LUA_LIBDIR = %q,"):format(testing_paths.luadir .. "/lib"),
+         ("LUA_BINDIR = %q,"):format(testing_paths.luadir .. "/bin"),
+         "}",
+      }
+      test_env.write_file("src/luarocks/core/hardcoded.lua", table.concat(lines, "\n") .. "\n")
    end
    print("LuaRocks installed correctly!")
 end
diff --git a/spec/util_spec.lua b/spec/util_spec.lua
index 26e93e14..cbdde095 100644
--- a/spec/util_spec.lua
+++ b/spec/util_spec.lua
@@ -53,20 +53,6 @@ describe("Basic tests #integration", function()
       assert.is.truthy(run.luarocks("--only-server=testing"))
    end)
 
-   it("#only LuaRocks test site config", function()
-      local scname = testing_paths.src_dir .. "/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(scname..".tmp", scname))
-      assert.is.falsy(lfs.attributes(scname..".tmp"))
-      assert.is.truthy(lfs.attributes(scname))
-   end)
-
 end)
 
 test_env.unload_luarocks()