diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2018-06-20 10:28:49 -0300 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-07-01 15:51:13 -0300 |
commit | 4c1c170b9d344b6c069c8e6df5798f6e0bd63966 (patch) | |
tree | 21b0061a4c41434239320db45749ec5b4086be4c /spec/fs_spec.lua | |
parent | 50cd8ea8941d38678e8e6cf82065108dc3217d91 (diff) | |
download | luarocks-4c1c170b9d344b6c069c8e6df5798f6e0bd63966.tar.gz luarocks-4c1c170b9d344b6c069c8e6df5798f6e0bd63966.tar.bz2 luarocks-4c1c170b9d344b6c069c8e6df5798f6e0bd63966.zip |
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
Diffstat (limited to 'spec/fs_spec.lua')
-rw-r--r-- | spec/fs_spec.lua | 2 |
1 files changed, 2 insertions, 0 deletions
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") | |||
3 | test_env.unload_luarocks() | 3 | test_env.unload_luarocks() |
4 | test_env.setup_specs() | 4 | test_env.setup_specs() |
5 | local fs = require("luarocks.fs") | 5 | local fs = require("luarocks.fs") |
6 | local cfg = require("luarocks.core.cfg") | ||
6 | local lfs = require("lfs") | 7 | local lfs = require("lfs") |
7 | local is_win = test_env.TEST_TARGET_OS == "windows" | 8 | local is_win = test_env.TEST_TARGET_OS == "windows" |
8 | local posix_ok = pcall(require, "posix") | 9 | local posix_ok = pcall(require, "posix") |
@@ -55,6 +56,7 @@ describe("Luarocks fs test #unit", function() | |||
55 | local runner | 56 | local runner |
56 | 57 | ||
57 | setup(function() | 58 | setup(function() |
59 | cfg.init() | ||
58 | fs.init() | 60 | fs.init() |
59 | runner = require("luacov.runner") | 61 | runner = require("luacov.runner") |
60 | runner.init(testing_paths.testrun_dir .. "/luacov.config") | 62 | runner.init(testing_paths.testrun_dir .. "/luacov.config") |