From f2beb5ee1fd2c54d59a43f4f2a8fe0f7a1701daa Mon Sep 17 00:00:00 2001 From: Hisham Date: Thu, 30 Jun 2016 01:15:01 -0300 Subject: Core modules reorganization. Isolate all modules used by luarocks.loader in a luarocks.core.* namespace. Core modules can only require other core modules, and they only use require() at the top-level chunk. In other words, after luarocks.loader is setup, package.path can be altered at will and it should not affect the ability of luarocks.loader to run, and the luarocks.loader modules should not interfere with modules loaded later. This was motivated by @robooo's GSoC work on porting the LuaRocks test suite to Lua using Busted. Busted itself runs using luarocks.loader, and we need to ensure that the modules loaded by the tests do not conflict with the ones used by luarocks.loader. A circular dependency between luarocks.manif and luarocks.search was removed by creating a separate luarocks.manif.writer module. Also, luarocks-admin commands were moved to a luarocks.admin.* namespace. --- src/bin/luarocks | 2 +- src/bin/luarocks-admin | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/bin') diff --git a/src/bin/luarocks b/src/bin/luarocks index be6c2b81..21f17da9 100755 --- a/src/bin/luarocks +++ b/src/bin/luarocks @@ -1,7 +1,7 @@ #!/usr/bin/env lua -- this should be loaded first. -local cfg = require("luarocks.cfg") +local cfg = require("luarocks.core.cfg") local loader = require("luarocks.loader") local command_line = require("luarocks.command_line") diff --git a/src/bin/luarocks-admin b/src/bin/luarocks-admin index 2890d1f1..660c0a70 100755 --- a/src/bin/luarocks-admin +++ b/src/bin/luarocks-admin @@ -1,7 +1,7 @@ #!/usr/bin/env lua -- this should be loaded first. -local cfg = require("luarocks.cfg") +local cfg = require("luarocks.core.cfg") local loader = require("luarocks.loader") local command_line = require("luarocks.command_line") @@ -10,10 +10,10 @@ program_description = "LuaRocks repository administration interface" commands = { help = "luarocks.help", - make_manifest = "luarocks.make_manifest", - add = "luarocks.add", - remove = "luarocks.admin_remove", - refresh_cache = "luarocks.refresh_cache", + make_manifest = "luarocks.admin.make_manifest", + add = "luarocks.admin.add", + remove = "luarocks.admin.remove", + refresh_cache = "luarocks.admin.refresh_cache", } command_line.run_command(...) -- cgit v1.2.3-55-g6feb