From 36b0198c669e1fcbe706b371bb983e190decd664 Mon Sep 17 00:00:00 2001 From: Hisham Date: Thu, 28 Jul 2016 18:25:24 -0300 Subject: Fix download in test. --- spec/unpack_spec.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/unpack_spec.lua b/spec/unpack_spec.lua index 495c514e..8db779c3 100644 --- a/spec/unpack_spec.lua +++ b/spec/unpack_spec.lua @@ -49,7 +49,7 @@ describe("LuaRocks unpack tests #blackbox #b_unpack", function() end) -- #595 luarocks unpack of a git:// rockspec fails to copy the rockspec it("LuaRocks unpack git:// rockspec", function() - assert.is_true(run.luarocks_bool("download --rockspec cprint")) + assert.is_true(run.luarocks_bool("download --rockspec luazip")) assert.is_true(run.luarocks_bool("unpack luazip-1.2.4-1.rockspec")) assert.is_truthy(lfs.attributes("luazip-1.2.4-1/luazip/luazip-1.2.4-1.rockspec")) test_env.remove_dir("luazip-1.2.4-1") -- cgit v1.2.3-55-g6feb From 5cdc22fb3c3a85160cd7c2d49ba10ab113e4a784 Mon Sep 17 00:00:00 2001 From: Hisham Date: Thu, 11 Aug 2016 20:55:08 -0300 Subject: Make behavior of config files on Windows more consistent with that on Unix. This was detected during the port of the new testsuite to Windows by @robooo. --- install.bat | 2 +- src/luarocks/cfg.lua | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/install.bat b/install.bat index dcd132ff..cc4a5257 100644 --- a/install.bat +++ b/install.bat @@ -993,7 +993,7 @@ if FORCE_CONFIG then f:write("site_config.LUAROCKS_FORCE_CONFIG=true\n") end if vars.SYSCONFFORCE then -- only write this value when explcitly given, otherwise rely on defaults - f:write(S("site_config.LUAROCKS_SYSCONFIG=[[$CONFIG_FILE]]\n")) + f:write(S("site_config.LUAROCKS_SYSCONFDIR=[[$SYSCONFDIR]]\n")) end f:write("return site_config\n") f:close() diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index d58c7407..d84ebc6e 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua @@ -5,10 +5,9 @@ -- file format documentation for details. -- -- End-users shouldn't edit this file. They can override any defaults --- set in this file using their system-wide $LUAROCKS_SYSCONFIG file --- (see luarocks.site_config) or their user-specific configuration file --- (~/.luarocks/config.lua on Unix or %APPDATA%/luarocks/config.lua on --- Windows). +-- set in this file using their system-wide or user-specific configuration +-- files. Run `luarocks` with no arguments to see the locations of +-- these files in your platform. local rawset, next, table, pairs, require, io, os, setmetatable, pcall, ipairs, package, tonumber, type, assert, _VERSION = rawset, next, table, pairs, require, io, os, setmetatable, pcall, ipairs, package, tonumber, type, assert, _VERSION -- cgit v1.2.3-55-g6feb From e3c6073f5912d3fd9d098783483a63bf39610fb3 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Sun, 21 Aug 2016 18:26:53 +0300 Subject: Refactor look_for_interpreter in install.bat Replace repeating code with loops. The only side effect should be that LUA_BINDIR now does not have trailing backslash when it's inferred. --- install.bat | 66 ++++++++++++++++++++----------------------------------------- 1 file changed, 21 insertions(+), 45 deletions(-) diff --git a/install.bat b/install.bat index cc4a5257..1bce4c53 100644 --- a/install.bat +++ b/install.bat @@ -287,56 +287,32 @@ end -- *********************************************************** -- Detect Lua -- *********************************************************** -local function look_for_interpreter (directory) +local function look_for_interpreter(directory) + local names = {S"lua$LUA_VERSION.exe", S"lua$LUA_SHORTV.exe", "lua.exe", "luajit.exe"} + local directories if vars.LUA_BINDIR then - -- if LUA_BINDIR is specified, it must be there, otherwise we fail - if exists( S"$LUA_BINDIR\\lua$LUA_VERSION.exe" ) then - vars.LUA_INTERPRETER = S"lua$LUA_VERSION.exe" - print(S" Found $LUA_BINDIR\\$LUA_INTERPRETER") - return true - elseif exists( S"$LUA_BINDIR\\lua$LUA_SHORTV.exe" ) then - vars.LUA_INTERPRETER = S"lua$LUA_SHORTV.exe" - print(S" Found $LUA_BINDIR\\$LUA_INTERPRETER") - return true - elseif exists(S"$LUA_BINDIR\\lua.exe") then - vars.LUA_INTERPRETER = "lua.exe" - print(S" Found $LUA_BINDIR\\$LUA_INTERPRETER") - return true - elseif exists(S"$LUA_BINDIR\\luajit.exe") then - vars.LUA_INTERPRETER = "luajit.exe" - print(S" Found $LUA_BINDIR\\$LUA_INTERPRETER") - return true - end - die(S"Lua executable lua.exe, luajit.exe, lua$LUA_SHORTV.exe or lua$LUA_VERSION.exe not found in $LUA_BINDIR") + -- If LUA_BINDIR is specified, look only in that directory. + directories = {vars.LUA_BINDIR} + else + -- Try candidate directory and its `bin` subdirectory. + directories = {directory, directory .. "\\bin"} end - for _, e in ipairs{ [[\]], [[\bin\]] } do - if exists(directory..e.."\\lua"..vars.LUA_VERSION..".exe") then - vars.LUA_INTERPRETER = S"lua$LUA_VERSION.exe" - vars.LUA_BINDIR = directory .. e - print(" Found ."..e..vars.LUA_INTERPRETER) - return true - - elseif exists(directory..e.."\\lua"..vars.LUA_SHORTV..".exe") then - vars.LUA_INTERPRETER = S"lua$LUA_SHORTV.exe" - vars.LUA_BINDIR = directory .. e - print(" Found ."..e..vars.LUA_INTERPRETER) - return true - - elseif exists(directory..e.."\\lua.exe") then - vars.LUA_INTERPRETER = "lua.exe" - vars.LUA_BINDIR = directory..e - print(" Found ."..e..vars.LUA_INTERPRETER) - return true - - elseif exists(directory..e.."\\luajit.exe") then - vars.LUA_INTERPRETER = "luajit.exe" - vars.LUA_BINDIR = directory..e - print(" Found ."..e..vars.LUA_INTERPRETER) - return true + for _, dir in ipairs(directories) do + for _, name in ipairs(names) do + local full_name = dir .. "\\" .. name + if exists(full_name) then + vars.LUA_INTERPRETER = name + vars.LUA_BINDIR = dir + print(" Found " .. full_name) + return true + end end end - --print(" No Lua interpreter found") + + if vars.LUA_BINDIR then + die(S"Lua executable lua.exe, luajit.exe, lua$LUA_SHORTV.exe or lua$LUA_VERSION.exe not found in $LUA_BINDIR") + end return false end -- cgit v1.2.3-55-g6feb From 1adda57f6d311e181998918ce27bdd5bd743975e Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Sun, 21 Aug 2016 18:36:25 +0300 Subject: Refactor look_for_link_libraries in install.bat One side effect should be that inferred LIB_DIR has no trailing backslash. --- install.bat | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/install.bat b/install.bat index 1bce4c53..0f377d8d 100644 --- a/install.bat +++ b/install.bat @@ -316,30 +316,30 @@ local function look_for_interpreter(directory) return false end -local function look_for_link_libraries (directory) +local function look_for_link_libraries(directory) + local directories if vars.LUA_LIBDIR then - for name in vars.LUA_LIB_NAMES:gmatch("[^%s]+") do - print(S" checking for $LUA_LIBDIR\\"..name) - if exists(vars.LUA_LIBDIR.."\\"..name) then - vars.LUA_LIBNAME = name - print(" Found "..name) - return true - end - end - die(S"link library (one of; $LUA_LIB_NAMES) not found in $LUA_LIBDIR") + directories = {vars.LUA_LIBDIR} + else + directories = {directory, directory .. "\\lib", directory .. "\\bin"} end - for _, e in ipairs{ [[\]], [[\lib\]], [[\bin\]]} do + for _, dir in ipairs(directories) do for name in vars.LUA_LIB_NAMES:gmatch("[^%s]+") do - print(" checking for "..directory..e.."\\"..name) - if exists(directory..e.."\\"..name) then - vars.LUA_LIBDIR = directory .. e + local full_name = dir .. "\\" .. name + print(" checking for " .. full_name) + if exists(full_name) then + vars.LUA_LIBDIR = dir vars.LUA_LIBNAME = name - print(" Found "..name) + print(" Found " .. name) return true end end end + + if vars.LUA_LIBDIR then + die(S"link library (one of; $LUA_LIB_NAMES) not found in $LUA_LIBDIR") + end return false end -- cgit v1.2.3-55-g6feb From 285bf935d0cf7fe12640d788b29fa092027a8d60 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Sun, 21 Aug 2016 18:49:21 +0300 Subject: Refactor look_for_headers in install.bat One side effect should be that LUA_INCDIR does not have trailing backslash when inferred. --- install.bat | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/install.bat b/install.bat index 0f377d8d..41474c47 100644 --- a/install.bat +++ b/install.bat @@ -343,31 +343,33 @@ local function look_for_link_libraries(directory) return false end -local function look_for_headers (directory) +local function look_for_headers(directory) + local directories if vars.LUA_INCDIR then - print(S" checking for $LUA_INCDIR\\lua.h") - if exists(S"$LUA_INCDIR\\lua.h") then - print(" Found lua.h") - return true - end - die(S"lua.h not found in $LUA_INCDIR") + directories = {vars.LUA_INCDIR} + else + directories = { + directory .. S"\\include\\lua\\$LUA_VERSION", + directory .. S"\\include\\lua$LUA_SHORTV", + directory .. S"\\include\\lua$LUA_VERSION", + directory .. "\\include", + directory + } end - for _, e in ipairs{ - S([[\include\lua\$LUA_VERSION]]), - S([[\include\lua$LUA_SHORTV]]), - S([[\include\lua$LUA_VERSION]]), - S([[\include\$LUA_VERSION]]), - [[\include\]], - [[\]], - } do - print(" checking for "..directory..e.."\\lua.h") - if exists(directory..e.."\\lua.h") then - vars.LUA_INCDIR = directory..e + for _, dir in ipairs(directories) do + local full_name = dir .. "\\lua.h" + print(" checking for " .. full_name) + if exists(full_name) then + vars.LUA_INCDIR = dir print(" Found lua.h") return true end end + + if vars.LUA_INCDIR then + die(S"lua.h not found in $LUA_INCDIR") + end return false end -- cgit v1.2.3-55-g6feb From 112342feb7f6da3b04251f29fd75bb2eb7c26a97 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Sun, 21 Aug 2016 19:08:14 +0300 Subject: Split look_for_lua_install in install.bat Move gathering of potential lua directories into a separate function, call it only when needed. --- install.bat | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/install.bat b/install.bat index 41474c47..32988022 100644 --- a/install.bat +++ b/install.bat @@ -526,33 +526,33 @@ local function get_msvc_env_setup_cmd() return "" end -local function look_for_lua_install () - print("Looking for Lua interpreter") - local directories +local function get_possible_lua_directories() if vars.LUA_PREFIX then - directories = { vars.LUA_PREFIX } - else - -- no prefix given, so use path - directories = (os.getenv("PATH",";") or "") - directories = directories:gsub(";+", ";") --remove all doubles - directories = split_string(directories,";") - -- if a path element ends with "\bin\" then remove it, as the searcher will check there anyway - for i, val in ipairs(directories) do - -- remove trailing backslash - while val:sub(-1,-1) == "\\" and val:sub(-2,-1) ~= ":\\" do - val = val:sub(1,-2) - end - -- remove trailing 'bin' - if val:upper():sub(-4,-1) == "\\BIN" or val:upper():sub(-4,-1) == ":BIN" then - val = val:sub(1,-5) - end - directories[i] = val + return {vars.LUA_PREFIX} + end + + -- No prefix given, so use PATH. + local path = os.getenv("PATH") or "" + path = path:gsub(";+", ";") -- Remove duplicates. + local directories = split_string(path, ";") + for i, dir in ipairs(directories) do + -- Remove trailing backslashes, but not from a drive letter like `C:\`. + dir = dir:gsub("([^:])\\+$", "%1") + -- Remove trailing `bin` subdirectory, the searcher will check there anyway. + if dir:upper():match("[:\\]BIN$") then + dir = dir:sub(1, -5) end - -- finaly add some other default paths - table.insert(directories, [[c:\lua5.1.2]]) - table.insert(directories, [[c:\lua]]) - table.insert(directories, [[c:\kepler\1.1]]) + directories[i] = dir end + -- Finally add some other default paths. + table.insert(directories, [[c:\lua5.1.2]]) + table.insert(directories, [[c:\lua]]) + table.insert(directories, [[c:\kepler\1.1]]) + return directories +end + +local function look_for_lua_install () + print("Looking for Lua interpreter") if vars.LUA_BINDIR and vars.LUA_LIBDIR and vars.LUA_INCDIR then if look_for_interpreter(vars.LUA_BINDIR) and look_for_link_libraries(vars.LUA_LIBDIR) and @@ -569,8 +569,8 @@ local function look_for_lua_install () end return false end - - for _, directory in ipairs(directories) do + + for _, directory in ipairs(get_possible_lua_directories()) do print(" checking " .. directory) if exists(directory) then if look_for_interpreter(directory) then -- cgit v1.2.3-55-g6feb From 2f3c8648289bb4e22eee5f8ff8d27afca6592fa4 Mon Sep 17 00:00:00 2001 From: roboo Date: Sun, 21 Aug 2016 21:50:38 +0200 Subject: Windows and appveyor support for tests --- spec/add_spec.lua | 16 ++-- spec/build_spec.lua | 89 +++++++++++++++-------- spec/config_spec.lua | 70 +++++++++++++----- spec/deps_spec.lua | 70 +++++++++--------- spec/install_spec.lua | 36 +++++---- spec/make_manifest_spec.lua | 2 +- spec/make_spec.lua | 43 ++++++----- spec/pack_spec.lua | 18 +++-- spec/refresh_cache_spec.lua | 2 +- spec/remove_spec.lua | 6 +- spec/search_spec.lua | 1 - spec/show_spec.lua | 6 +- spec/unpack_spec.lua | 18 ++--- spec/upload_spec.lua | 14 +++- spec/util_spec.lua | 59 ++++++++++----- test/test_environment.lua | 173 +++++++++++++++++++++++++++++++++----------- 16 files changed, 408 insertions(+), 215 deletions(-) diff --git a/spec/add_spec.lua b/spec/add_spec.lua index dca6f850..d42a97d0 100644 --- a/spec/add_spec.lua +++ b/spec/add_spec.lua @@ -5,8 +5,8 @@ local testing_paths = test_env.testing_paths test_env.unload_luarocks() local extra_rocks = { - "/luasocket-3.0rc1-1.src.rock", - "/luasocket-3.0rc1-1.rockspec" + "/luasocket-3.0rc1-2.src.rock", + "/luasocket-3.0rc1-2.rockspec" } describe("LuaRocks add tests #blackbox #b_add", function() @@ -25,20 +25,20 @@ describe("LuaRocks add tests #blackbox #b_add", function() end) it("LuaRocks-admin add invalid server", function() - assert.is_false(run.luarocks_admin_bool("--server=invalid add " .. testing_paths.testing_server .. "/luasocket-3.0rc1-1.src.rock")) + assert.is_false(run.luarocks_admin_bool("--server=invalid add " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.src.rock")) end) it("LuaRocks-admin add invalid server #ssh", function() - assert.is_true(run.luarocks_admin_bool("--server=testing add " .. testing_paths.testing_server .. "/luasocket-3.0rc1-1.src.rock")) + assert.is_true(run.luarocks_admin_bool("--server=testing add " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.src.rock")) end) - --TODO This test fails, sftp not implemented - it("LuaRocks-admin add invalid server", function() --? - assert.is_false(run.luarocks_admin_bool("--server=testing add luasocket-3.0rc1-1.src.rock", { LUAROCKS_CONFIG = testing_paths.testing_dir .. "/testing_config_sftp.lua" } )) + --TODO This test fails, sftp support not yet implemented + it("LuaRocks-admin add invalid server", function() + assert.is_false(run.luarocks_admin_bool("--server=testing add luasocket-3.0rc1-2.src.rock", { LUAROCKS_CONFIG = testing_paths.testing_dir .. "/testing_config_sftp.lua" } )) end) it("LuaRocks-admin add, split server url", function() - assert.is_false(run.luarocks_admin_bool("--server=\"localhost@/tmp/luarocks_testing\" add " .. testing_paths.testing_server .. "luasocket-3.0rc1-1.src.rock")) + assert.is_false(run.luarocks_admin_bool("--server=\"localhost@/tmp/luarocks_testing\" add " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.src.rock")) end) end) end) diff --git a/spec/build_spec.lua b/spec/build_spec.lua index 2ede5211..b4f838ca 100644 --- a/spec/build_spec.lua +++ b/spec/build_spec.lua @@ -12,15 +12,16 @@ local extra_rocks = { "/lmathx-20120430.52-1.rockspec", "/lmathx-20150505-1.src.rock", "/lmathx-20150505-1.rockspec", - "/lpeg-0.12-1.src.rock", + "/lpeg-1.0.0-1.rockspec", + "/lpeg-1.0.0-1.src.rock", "/lpty-1.0.1-1.src.rock", "/luadoc-3.0.1-1.src.rock", "/luafilesystem-1.6.3-1.src.rock", "/lualogging-1.3.0-1.src.rock", "/luarepl-0.4-1.src.rock", "/luasec-0.6-1.rockspec", - "/luasocket-3.0rc1-1.src.rock", - "/luasocket-3.0rc1-1.rockspec", + "/luasocket-3.0rc1-2.src.rock", + "/luasocket-3.0rc1-2.rockspec", "/lxsh-0.8.6-2.src.rock", "/lxsh-0.8.6-2.rockspec", "/stdlib-41.0.0-1.src.rock", @@ -57,27 +58,35 @@ describe("LuaRocks build tests #blackbox #b_build", function() end) it("LuaRocks build lpeg verbose", function() - assert.is.truthy(run.luarocks("build --verbose lpeg")) + assert.is_true(run.luarocks_bool("build --verbose lpeg")) end) it("LuaRocks build lpeg branch=master", function() assert.is_true(run.luarocks_bool("build --branch=master lpeg")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) end) it("LuaRocks build lpeg deps-mode=123", function() - assert.is_false(run.luarocks_bool("build --deps-mode=123 lpeg")) - assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg")) + assert.is_false(run.luarocks_bool("build --deps-mode=123 lpeg --verbose")) + assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) end) it("LuaRocks build lpeg only-sources example", function() - assert.is_true(run.luarocks_bool("build --only-sources=\"http://example.com\" lpeg")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg")) + assert.is_true(run.luarocks_bool("download --rockspec lpeg")) + assert.is_false(run.luarocks_bool("build --only-sources=\"http://example.com\" lpeg-1.0.0-1.rockspec")) + assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + + assert.is_true(run.luarocks_bool("download --source lpeg")) + assert.is_true(run.luarocks_bool("build --only-sources=\"http://example.com\" lpeg-1.0.0-1.src.rock")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + + assert.is_true(os.remove("lpeg-1.0.0-1.rockspec")) + assert.is_true(os.remove("lpeg-1.0.0-1.src.rock")) end) it("LuaRocks build lpeg with empty tree", function() assert.is_false(run.luarocks_bool("build --tree=\"\" lpeg")) - assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg")) + assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) end) end) @@ -88,32 +97,47 @@ describe("LuaRocks build tests #blackbox #b_build", function() it("LuaRocks build luacov diff version", function() assert.is_true(run.luarocks_bool("build luacov 0.11.0-1")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luacov")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luacov/0.11.0-1/luacov-0.11.0-1.rockspec")) end) it("LuaRocks build command stdlib", function() assert.is_true(run.luarocks_bool("build stdlib")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/stdlib")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/stdlib/41.0.0-1/stdlib-41.0.0-1.rockspec")) end) it("LuaRocks build install bin luarepl", function() assert.is_true(run.luarocks_bool("build luarepl")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luarepl")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luarepl/0.4-1/luarepl-0.4-1.rockspec")) end) it("LuaRocks build supported platforms lpty", function() - assert.is_true(run.luarocks_bool(test_env.quiet("build lpty"))) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpty")) + if test_env.TEST_TARGET_OS == "windows" then + assert.is_false(run.luarocks_bool("build lpty")) --Error: This rockspec for lpty does not support win32, windows platforms + else + assert.is_true(run.luarocks_bool(test_env.quiet("build lpty"))) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpty/1.0.1-1/lpty-1.0.1-1.rockspec")) + end end) it("LuaRocks build luasec with skipping dependency checks", function() - assert.is_true(run.luarocks_bool(test_env.quiet("build luasec --nodeps"))) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasec")) + if test_env.APPVEYOR then + assert.is_true(run.luarocks_bool("build luasec " .. test_env.APPVEYOR_OPENSSL .. " --nodeps")) + else + assert.is_true(run.luarocks_bool("build luasec --nodeps")) + end + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasec/0.6-1/luasec-0.6-1.rockspec")) end) it("LuaRocks build lmathx deps partial match", function() assert.is_true(run.luarocks_bool("build lmathx")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lmathx")) + + if test_env.LUA_V == "5.1" or test_env.LUAJIT_V then + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lmathx/20120430.51-1/lmathx-20120430.51-1.rockspec")) + elseif test_env.LUA_V == "5.2" then + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lmathx/20120430.52-1/lmathx-20120430.52-1.rockspec")) + elseif test_env.LUA_V == "5.3" then + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lmathx/20150505-1/lmathx-20150505-1.rockspec")) + end end) end) @@ -126,17 +150,21 @@ describe("LuaRocks build tests #blackbox #b_build", function() end it("LuaRocks build luasec only deps", function() - assert.is_true(run.luarocks_bool(test_env.quiet("build luasec --only-deps"))) + if test_env.APPVEYOR then + assert.is_true(run.luarocks_bool(test_env.quiet("build luasec " .. test_env.APPVEYOR_OPENSSL .. " --only-deps"))) + else + assert.is_true(run.luarocks_bool(test_env.quiet("build luasec --only-deps"))) + end assert.is_false(run.luarocks_bool("show luasec")) - assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasec")) + assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasec/0.6-1/luasec-0.6-1.rockspec")) end) it("LuaRocks build only deps of downloaded rockspec of lxsh", function() assert.is_true(run.luarocks_bool("download --rockspec lxsh 0.8.6-2")) assert.is.truthy(run.luarocks("build lxsh-0.8.6-2.rockspec --only-deps")) assert.is_false(run.luarocks_bool("show lxsh")) - assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg")) + assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) assert.is_true(os.remove("lxsh-0.8.6-2.rockspec")) end) @@ -144,8 +172,8 @@ describe("LuaRocks build tests #blackbox #b_build", function() assert.is_true(run.luarocks_bool("download --source lxsh 0.8.6-2")) assert.is.truthy(run.luarocks("build lxsh-0.8.6-2.src.rock --only-deps")) assert.is_false(run.luarocks_bool("show lxsh")) - assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg")) + assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) assert.is_true(os.remove("lxsh-0.8.6-2.src.rock")) end) @@ -154,19 +182,22 @@ describe("LuaRocks build tests #blackbox #b_build", function() assert.is_true(run.luarocks_bool("build validate-args-1.5.4-1.rockspec")) assert.is.truthy(run.luarocks("show validate-args")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/validate-args")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/validate-args/1.5.4-1/validate-args-1.5.4-1.rockspec")) assert.is_true(os.remove("validate-args-1.5.4-1.rockspec")) end) it("LuaRocks build with https", function() assert.is_true(run.luarocks_bool("download --rockspec validate-args 1.5.4-1")) - assert.is_true(run.luarocks_bool(test_env.quiet("install luasec"))) + + if test_env.APPVEYOR then + assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.APPVEYOR_OPENSSL))) + else + assert.is_true(run.luarocks_bool(test_env.quiet("install luasec"))) + end assert.is_true(run.luarocks_bool("build validate-args-1.5.4-1.rockspec")) - assert.is.truthy(run.luarocks("show validate-args")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/validate-args")) - + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/validate-args/1.5.4-1/validate-args-1.5.4-1.rockspec")) assert.is_true(os.remove("validate-args-1.5.4-1.rockspec")) end) diff --git a/spec/config_spec.lua b/spec/config_spec.lua index 0dee8620..439d0493 100644 --- a/spec/config_spec.lua +++ b/spec/config_spec.lua @@ -2,6 +2,7 @@ local test_env = require("test/test_environment") 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 test_env.unload_luarocks() @@ -21,12 +22,20 @@ describe("LuaRocks config tests #blackbox #b_config", function() it("LuaRocks config include dir", function() local output = run.luarocks("config --lua-incdir") - assert.are.same(output, site_config.LUA_INCDIR) + if test_env.TEST_TARGET_OS == "windows" then + assert.are.same(output, site_config.LUA_INCDIR:gsub("\\","/")) + else + assert.are.same(output, site_config.LUA_INCDIR) + end end) it("LuaRocks config library dir", function() local output = run.luarocks("config --lua-libdir") - assert.are.same(output, site_config.LUA_LIBDIR) + if test_env.TEST_TARGET_OS == "windows" then + assert.are.same(output, site_config.LUA_LIBDIR:gsub("\\","/")) + else + assert.are.same(output, site_config.LUA_LIBDIR) + end end) it("LuaRocks config lua version", function() @@ -53,38 +62,61 @@ describe("LuaRocks config tests #blackbox #b_config", function() end) 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.remove(testing_paths.testing_lrprefix .. "/etc/luarocks/config.lua") - assert.is_false(run.luarocks_bool("config --system-config;")) + os.rename(versioned_scname, versioned_scname .. ".bak") + assert.is_false(run.luarocks_bool("config --system-config")) + os.rename(versioned_scname .. ".bak", versioned_scname) end) it("LuaRocks system config", function() - local scdir = testing_paths.testing_lrprefix .. "/etc/luarocks" lfs.mkdir(testing_paths.testing_lrprefix) lfs.mkdir(testing_paths.testing_lrprefix .. "/etc/") lfs.mkdir(scdir) - local sysconfig = io.open(scdir .. "/config.lua", "w+") - sysconfig:write(" ") - sysconfig:close() - - local output = run.luarocks("config --system-config;") - assert.are.same(output, scdir .. "/config.lua") - test_env.remove_dir(testing_paths.testing_lrprefix) + if test_env.TEST_TARGET_OS == "windows" then + local output = run.luarocks("config --system-config") + assert.are.same(output, versioned_scname) + else + sysconfig = io.open(scname, "w+") + sysconfig:write(" ") + sysconfig:close() + + local output = run.luarocks("config --system-config") + assert.are.same(output, scname) + os.remove(scname) + end end) it("LuaRocks fail system config invalid", function() - local scdir = testing_paths.testing_lrprefix .. "/etc/luarocks" lfs.mkdir(testing_paths.testing_lrprefix) lfs.mkdir(testing_paths.testing_lrprefix .. "/etc/") lfs.mkdir(scdir) - local sysconfig = io.open(scdir .. "/config.lua", "w+") - sysconfig:write("if if if") - sysconfig:close() - - assert.is_false(run.luarocks_bool("config --system-config;")) - test_env.remove_dir(testing_paths.testing_lrprefix) + if test_env.TEST_TARGET_OS == "windows" then + test_env.copy(versioned_scname, "versioned_scname_temp") + sysconfig = io.open(versioned_scname, "w+") + sysconfig:write("if if if") + sysconfig:close() + assert.is_false(run.luarocks_bool("config --system-config")) + test_env.copy("versioned_scname_temp", versioned_scname) + else + sysconfig = io.open(scname, "w+") + sysconfig:write("if if if") + sysconfig:close() + assert.is_false(run.luarocks_bool("config --system-config")) + os.remove(scname) + end end) end) end) diff --git a/spec/deps_spec.lua b/spec/deps_spec.lua index c1bd404d..e453c9a1 100644 --- a/spec/deps_spec.lua +++ b/spec/deps_spec.lua @@ -8,9 +8,9 @@ test_env.unload_luarocks() local extra_rocks = { "/lxsh-0.8.6-2.src.rock", "/lxsh-0.8.6-2.rockspec", - "/luasocket-3.0rc1-1.src.rock", - "/luasocket-3.0rc1-1.rockspec", - "/lpeg-0.12-1.src.rock" + "/luasocket-3.0rc1-2.src.rock", + "/luasocket-3.0rc1-2.rockspec", + "/lpeg-1.0.0-1.src.rock", } describe("LuaRocks deps tests #blackbox #b_deps", function() @@ -23,59 +23,59 @@ describe("LuaRocks deps tests #blackbox #b_deps", function() assert.is_true(run.luarocks_bool("build --tree=system lpeg")) assert.is_true(run.luarocks_bool("build --deps-mode=one --tree=" .. testing_paths.testing_tree .. " lxsh")) - assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lpeg")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg")) - assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh")) - assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh")) + assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) + assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) end) it("LuaRocks deps mode order", function() assert.is_true(run.luarocks_bool("build --tree=system lpeg")) assert.is_true(run.luarocks_bool("build --deps-mode=order --tree=" .. testing_paths.testing_tree .. " lxsh")) - assert.is.falsy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lpeg")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg")) - assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh")) - assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh")) + assert.is.falsy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) + assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) end) it("LuaRocks deps mode order sys", function() assert.is_true(run.luarocks_bool("build --tree=" .. testing_paths.testing_tree .. " lpeg")) assert.is_true(run.luarocks_bool("build --deps-mode=order --tree=" .. testing_paths.testing_sys_tree .. " lxsh")) - assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lpeg")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg")) - assert.is.falsy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh")) + assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + assert.is.falsy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) end) it("LuaRocks deps mode all sys", function() assert.is_true(run.luarocks_bool("build --tree=" .. testing_paths.testing_tree .. " lpeg")) assert.is_true(run.luarocks_bool("build --deps-mode=all --tree=" .. testing_paths.testing_sys_tree .. " lxsh")) - assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lpeg")) - assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg")) - assert.is.falsy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh")) + assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + assert.is.falsy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) end) it("LuaRocks deps mode none", function() assert.is_true(run.luarocks_bool("build --tree=" .. testing_paths.testing_tree .. " lpeg")) assert.is_true(run.luarocks_bool("build --deps-mode=none lxsh")) - assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lpeg")) - assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg")) - assert.is.falsy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh")) + assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + assert.is.falsy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) end) it("LuaRocks nodeps alias", function() assert.is_true(run.luarocks_bool("build --tree=" .. testing_paths.testing_tree .. " --nodeps lxsh")) - assert.is.falsy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lpeg")) - assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg")) - assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh")) - assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh")) + assert.is.falsy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) + assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) end) it("LuaRocks deps mode make order", function() @@ -89,10 +89,10 @@ describe("LuaRocks deps tests #blackbox #b_deps", function() test_env.remove_dir("lxsh-0.8.6-2") assert.is_true(os.remove("lxsh-0.8.6-2.src.rock")) - assert.is.falsy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lpeg")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg")) - assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh")) - assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh")) + assert.is.falsy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) + assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) end) it("LuaRocks deps mode make order sys", function() @@ -106,9 +106,9 @@ describe("LuaRocks deps tests #blackbox #b_deps", function() test_env.remove_dir("lxsh-0.8.6-2") assert.is_true(os.remove("lxsh-0.8.6-2.src.rock")) - assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lpeg")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg")) - assert.is.falsy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh")) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh")) + assert.is.truthy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpeg/1.0.0-1/lpeg-1.0.0-1.rockspec")) + assert.is.falsy(lfs.attributes(testing_paths.testing_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) end) end) diff --git a/spec/install_spec.lua b/spec/install_spec.lua index bd480c21..2b6cb77f 100644 --- a/spec/install_spec.lua +++ b/spec/install_spec.lua @@ -12,8 +12,8 @@ local extra_rocks = { "/lpeg-0.12-1.src.rock", "/luasec-0.6-1.rockspec", "/luassert-1.7.0-1.src.rock", - "/luasocket-3.0rc1-1.src.rock", - "/luasocket-3.0rc1-1.rockspec", + "/luasocket-3.0rc1-2.src.rock", + "/luasocket-3.0rc1-2.rockspec", "/lxsh-0.8.6-2.src.rock", "/lxsh-0.8.6-2.rockspec", "/say-1.2-1.src.rock", @@ -44,8 +44,8 @@ describe("LuaRocks install tests #blackbox #b_install", function() assert.is_false(run.luarocks_bool("install \"invalid.rock\" ")) end) - it("LuaRocks install with local flag as root", function() - assert.is_false(run.luarocks_bool("install --local luasocket", { USER = "root" } )) + it("LuaRocks install with local flag as root #unix", function() + assert.is_false(run.luarocks_bool("install --local luasocket ", { USER = "root" } )) end) it("LuaRocks install not a zip file", function() @@ -66,14 +66,22 @@ describe("LuaRocks install tests #blackbox #b_install", function() end) it("LuaRocks install luasec and show luasocket (dependency)", function() - assert.is_true(run.luarocks_bool("install luasec")) + if test_env.APPVEYOR then + assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.APPVEYOR_OPENSSL))) + else + assert.is_true(run.luarocks_bool(test_env.quiet("install luasec"))) + end assert.is_true(run.luarocks_bool("show luasocket")) end) end) describe("LuaRocks install - more complex tests", function() it('LuaRocks install luasec with skipping dependency checks', function() - run.luarocks_bool(test_env.quiet(" install luasec --nodeps")) + if test_env.APPVEYOR then + assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.APPVEYOR_OPENSSL .. " --nodeps"))) + else + assert.is_true(run.luarocks_bool(test_env.quiet("install luasec --nodeps"))) + end assert.is_true(run.luarocks_bool(test_env.quiet("show luasec"))) if env_variables.TYPE_TEST_ENV == "minimal" then assert.is_false(run.luarocks_bool(test_env.quiet("show luasocket"))) @@ -83,17 +91,17 @@ describe("LuaRocks install tests #blackbox #b_install", function() end) it("LuaRocks install only-deps of luasocket packed rock", function() - assert.is_true(run.luarocks_bool(test_env.quiet("build --pack-binary-rock luasocket 3.0rc1-1"))) - local output = run.luarocks("install --only-deps " .. "luasocket-3.0rc1-1." .. test_env.platform .. ".rock") - assert.are.same(output, "Successfully installed dependencies for luasocket 3.0rc1-1") - assert.is_true(os.remove("luasocket-3.0rc1-1." .. test_env.platform .. ".rock")) + assert.is_true(run.luarocks_bool(test_env.quiet("build --pack-binary-rock luasocket 3.0rc1-2"))) + local output = run.luarocks("install --only-deps " .. "luasocket-3.0rc1-2." .. test_env.platform .. ".rock") + assert.are.same(output, "Successfully installed dependencies for luasocket 3.0rc1-2") + assert.is_true(os.remove("luasocket-3.0rc1-2." .. test_env.platform .. ".rock")) end) it("LuaRocks install reinstall", function() - assert.is_true(run.luarocks_bool(test_env.quiet("build --pack-binary-rock luasocket 3.0rc1-1"))) - assert.is_true(run.luarocks_bool("install " .. "luasocket-3.0rc1-1." .. test_env.platform .. ".rock")) - assert.is_true(run.luarocks_bool("install --deps-mode=none " .. "luasocket-3.0rc1-1." .. test_env.platform .. ".rock")) - assert.is_true(os.remove("luasocket-3.0rc1-1." .. test_env.platform .. ".rock")) + assert.is_true(run.luarocks_bool(test_env.quiet("build --pack-binary-rock luasocket 3.0rc1-2"))) + assert.is_true(run.luarocks_bool("install " .. "luasocket-3.0rc1-2." .. test_env.platform .. ".rock")) + assert.is_true(run.luarocks_bool("install --deps-mode=none " .. "luasocket-3.0rc1-2." .. test_env.platform .. ".rock")) + assert.is_true(os.remove("luasocket-3.0rc1-2." .. test_env.platform .. ".rock")) end) it("LuaRocks install binary rock of cprint", function() diff --git a/spec/make_manifest_spec.lua b/spec/make_manifest_spec.lua index 1c7f5bf8..3e998cbf 100644 --- a/spec/make_manifest_spec.lua +++ b/spec/make_manifest_spec.lua @@ -4,7 +4,7 @@ local run = test_env.run test_env.unload_luarocks() describe("LuaRocks make_manifest tests #blackbox #b_make_manifest", function() - + before_each(function() test_env.setup_specs() end) diff --git a/spec/make_spec.lua b/spec/make_spec.lua index e684033a..624badff 100644 --- a/spec/make_spec.lua +++ b/spec/make_spec.lua @@ -6,9 +6,9 @@ local testing_paths = test_env.testing_paths test_env.unload_luarocks() local extra_rocks = { - "/lpeg-0.12-1.src.rock", - "/luasocket-3.0rc1-1.src.rock", - "/luasocket-3.0rc1-1.rockspec", + "lpeg-1.0.0-1.rockspec", + "/luasocket-3.0rc1-2.src.rock", + "/luasocket-3.0rc1-2.rockspec", "/lxsh-0.8.6-2.src.rock", "/lxsh-0.8.6-2.rockspec" } @@ -27,19 +27,19 @@ describe("LuaRocks make tests #blackbox #b_make", function() it("LuaRocks make with rockspec", function() -- make luasocket - assert.is_true(run.luarocks_bool("download --source luasocket 3.0rc1-1")) - assert.is_true(run.luarocks_bool("unpack luasocket-3.0rc1-1.src.rock")) - lfs.chdir("luasocket-3.0rc1-1/luasocket-3.0-rc1/") - assert.is_true(run.luarocks_bool(test_env.quiet("make luasocket-3.0rc1-1.rockspec"))) + assert.is_true(run.luarocks_bool("download --source luasocket 3.0rc1-2")) + assert.is_true(run.luarocks_bool("unpack luasocket-3.0rc1-2.src.rock")) + lfs.chdir("luasocket-3.0rc1-2/luasocket-3.0-rc1/") + assert.is_true(run.luarocks_bool(test_env.quiet("make luasocket-3.0rc1-2.rockspec"))) -- test it assert.is_true(run.luarocks_bool(test_env.quiet("show luasocket"))) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasocket")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasocket/3.0rc1-2/luasocket-3.0rc1-2.rockspec")) -- delete downloaded and unpacked files lfs.chdir(testing_paths.luarocks_dir) - test_env.remove_dir("luasocket-3.0rc1-1") - assert.is_true(os.remove("luasocket-3.0rc1-1.src.rock")) + test_env.remove_dir("luasocket-3.0rc1-2") + assert.is_true(os.remove("luasocket-3.0rc1-2.src.rock")) end) describe("LuaRocks making rockspecs (using lxsh)", function() @@ -61,33 +61,36 @@ describe("LuaRocks make tests #blackbox #b_make", function() assert.is_true(run.luarocks_bool("new_version lxsh-0.8.6-2.rockspec")) assert.is_true(run.luarocks_bool("make")) - assert.is_true(run.luarocks_bool(test_env.quiet("show lxsh"))) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh")) + assert.is_true(run.luarocks_bool("show lxsh")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-3/lxsh-0.8.6-3.rockspec")) end) it("LuaRocks make unnamed rockspec", function() - os.execute("cp lxsh-0.8.6-2.rockspec rockspec") --rewrite with lfs + test_env.copy("lxsh-0.8.6-2.rockspec", "rockspec") assert.is_true(run.luarocks_bool("make")) assert.is_true(run.luarocks_bool(test_env.quiet("show lxsh"))) - assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh")) + assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) + os.remove("rockspec") end) it("LuaRocks make ambiguous rockspec", function() assert.is.truthy(os.rename("lxsh-0.8.6-2.rockspec", "lxsh2-0.8.6-2.rockspec")) - assert.is_false(run.luarocks_bool("make")) + local output = run.luarocks("make") + assert.is.truthy(output:match("Error: Inconsistency between rockspec filename")) assert.is_false(run.luarocks_bool("show lxsh")) - assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh")) + assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) end) - + it("LuaRocks make ambiguous unnamed rockspec", function() assert.is.truthy(os.rename("lxsh-0.8.6-2.rockspec", "1_rockspec")) - os.execute("cp 1_rockspec 2_rockspec") --rewrite with lfs - assert.is_false(run.luarocks_bool("make")) + test_env.copy("1_rockspec", "2_rockspec") + local output = run.luarocks("make") + assert.is.truthy(output:match("Error: Please specify which rockspec file to use")) assert.is_false(run.luarocks_bool("show lxsh")) - assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh")) + assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) end) it("LuaRocks make pack binary rock", function() diff --git a/spec/pack_spec.lua b/spec/pack_spec.lua index 0e5b31c6..21f33b02 100644 --- a/spec/pack_spec.lua +++ b/spec/pack_spec.lua @@ -6,9 +6,10 @@ local testing_paths = test_env.testing_paths test_env.unload_luarocks() local extra_rocks = { - "/luasec-0.6-1.rockspec", - "/luasocket-3.0rc1-1.src.rock", - "/luasocket-3.0rc1-1.rockspec", + "/luasec-0.6-1.rockspec", + "/luassert-1.7.0-1.src.rock", + "/luasocket-3.0rc1-2.src.rock", + "/luasocket-3.0rc1-2.rockspec", "/say-1.2-1.src.rock", "/say-1.0-1.src.rock" } @@ -44,14 +45,17 @@ describe("LuaRocks pack tests #blackbox #b_pack", function() assert.is_true(run.luarocks_bool("install say 1.2")) assert.is_true(run.luarocks_bool("install luassert")) assert.is_true(run.luarocks_bool("install say 1.0")) - assert.is_false(run.luarocks_bool("pack say")) end) it("LuaRocks pack src", function() - assert.is_true(run.luarocks_bool(test_env.quiet("install luasec"))) - assert.is_true(run.luarocks_bool("download --rockspec luasocket 3.0rc1-1")) - assert.is_true(run.luarocks_bool("pack luasocket-3.0rc1-1.rockspec")) + if test_env.APPVEYOR then + assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.APPVEYOR_OPENSSL))) + else + assert.is_true(run.luarocks_bool(test_env.quiet("install luasec"))) + end + assert.is_true(run.luarocks_bool("download --rockspec luasocket 3.0rc1-2")) + assert.is_true(run.luarocks_bool("pack luasocket-3.0rc1-2.rockspec")) assert.is_true(test_env.remove_files(lfs.currentdir(), "luasocket-")) end) end) diff --git a/spec/refresh_cache_spec.lua b/spec/refresh_cache_spec.lua index c20771ab..09f5645e 100644 --- a/spec/refresh_cache_spec.lua +++ b/spec/refresh_cache_spec.lua @@ -4,7 +4,7 @@ local run = test_env.run test_env.unload_luarocks() describe("LuaRocks refresh_cache tests #blackbox #b_refresh_cache", function() - + before_each(function() test_env.setup_specs() end) diff --git a/spec/remove_spec.lua b/spec/remove_spec.lua index 7bf1bb10..3d321e30 100644 --- a/spec/remove_spec.lua +++ b/spec/remove_spec.lua @@ -8,8 +8,8 @@ test_env.unload_luarocks() local extra_rocks = { "/abelhas-1.0-1.rockspec", "/lualogging-1.3.0-1.src.rock", - "/luasocket-3.0rc1-1.src.rock", - "/luasocket-3.0rc1-1.rockspec" + "/luasocket-3.0rc1-2.src.rock", + "/luasocket-3.0rc1-2.rockspec" } describe("LuaRocks remove tests #blackbox #b_remove", function() @@ -76,7 +76,7 @@ describe("LuaRocks remove tests #blackbox #b_remove", function() end) it("LuaRocks-admin remove #ssh", function() - assert.is_true(run.luarocks_admin_bool("--server=testing remove luasocket-3.0rc1-1.src.rock")) + assert.is_true(run.luarocks_admin_bool("--server=testing remove luasocket-3.0rc1-2.src.rock")) end) it("LuaRocks-admin remove missing", function() diff --git a/spec/search_spec.lua b/spec/search_spec.lua index b31624b8..f75bc3c1 100644 --- a/spec/search_spec.lua +++ b/spec/search_spec.lua @@ -32,5 +32,4 @@ describe("LuaRocks search tests #blackbox #b_search", function() it("LuaRocks search with flag all", function() assert.is_true(run.luarocks_bool(test_env.quiet("search --all"))) end) - end) diff --git a/spec/show_spec.lua b/spec/show_spec.lua index f528a6de..915129ae 100644 --- a/spec/show_spec.lua +++ b/spec/show_spec.lua @@ -20,10 +20,12 @@ describe("LuaRocks show tests #blackbox #b_show", function() it("LuaRocks show luacov", function() local output = run.luarocks("show luacov") + assert.is.truthy(output:match("LuaCov")) end) it("LuaRocks show modules of luacov", function() local output = run.luarocks("show --modules luacov") + assert.is.truthy(output:match("luacovluacov.defaultsluacov.reporterluacov.reporter.defaultluacov.runnerluacov.statsluacov.tick")) end) it("LuaRocks show dependencies of luacov", function() @@ -32,10 +34,12 @@ describe("LuaRocks show tests #blackbox #b_show", function() it("LuaRocks show rockspec of luacov", function() local output = run.luarocks("show --rockspec luacov") + assert.is.truthy(output:match("luacov-0.11.0-1.rockspec")) end) it("LuaRocks show mversion of luacov", function() local output = run.luarocks("show --mversion luacov") + assert.is.truthy(output:match("0.11.0--1")) end) it("LuaRocks show rock tree of luacov", function() @@ -49,6 +53,6 @@ describe("LuaRocks show tests #blackbox #b_show", function() it("LuaRocks show old version of luacov", function() run.luarocks("install luacov 0.11.0") - run.luarocks("show luacov 0.11.0") + run.luarocks_bool("show luacov 0.11.0") end) end) diff --git a/spec/unpack_spec.lua b/spec/unpack_spec.lua index 8db779c3..220ef00d 100644 --- a/spec/unpack_spec.lua +++ b/spec/unpack_spec.lua @@ -1,14 +1,12 @@ local test_env = require("test/test_environment") local run = test_env.run local testing_paths = test_env.testing_paths -local lfs = require("lfs") test_env.unload_luarocks() local extra_rocks = { "/cprint-0.1-2.src.rock", - "/cprint-0.1-2.rockspec", - "/luazip-1.2.4-1.rockspec" + "/cprint-0.1-2.rockspec" } describe("LuaRocks unpack tests #blackbox #b_unpack", function() @@ -21,9 +19,11 @@ describe("LuaRocks unpack tests #blackbox #b_unpack", function() it("LuaRocks unpack with no flags/arguments", function() assert.is_false(run.luarocks_bool("unpack")) end) + it("LuaRocks unpack with invalid rockspec", function() assert.is_false(run.luarocks_bool("unpack invalid.rockspec")) end) + it("LuaRocks unpack with invalid patch", function() assert.is_false(run.luarocks_bool("unpack " .. testing_paths.testing_dir .. "/testfiles/invalid_patch-0.1-1.rockspec")) end) @@ -34,26 +34,22 @@ describe("LuaRocks unpack tests #blackbox #b_unpack", function() assert.is_true(run.luarocks_bool("unpack cprint")) test_env.remove_dir("cprint-0.1-2") end) + it("LuaRocks unpack src", function() assert.is_true(run.luarocks_bool("download --source cprint")) assert.is_true(run.luarocks_bool("unpack cprint-0.1-2.src.rock")) os.remove("cprint-0.1-2.src.rock") test_env.remove_dir("cprint-0.1-2") end) - it("LuaRocks unpack rockspec", function() + + it("LuaRocks unpack src", function() assert.is_true(run.luarocks_bool("download --rockspec cprint")) assert.is_true(run.luarocks_bool("unpack cprint-0.1-2.rockspec")) os.remove("cprint-0.1-2.rockspec") os.remove("lua-cprint") test_env.remove_dir("cprint-0.1-2") end) - -- #595 luarocks unpack of a git:// rockspec fails to copy the rockspec - it("LuaRocks unpack git:// rockspec", function() - assert.is_true(run.luarocks_bool("download --rockspec luazip")) - assert.is_true(run.luarocks_bool("unpack luazip-1.2.4-1.rockspec")) - assert.is_truthy(lfs.attributes("luazip-1.2.4-1/luazip/luazip-1.2.4-1.rockspec")) - test_env.remove_dir("luazip-1.2.4-1") - end) + it("LuaRocks unpack binary", function() assert.is_true(run.luarocks_bool("build cprint")) assert.is_true(run.luarocks_bool("pack cprint")) diff --git a/spec/upload_spec.lua b/spec/upload_spec.lua index c68a1cdf..af4c36d3 100644 --- a/spec/upload_spec.lua +++ b/spec/upload_spec.lua @@ -45,7 +45,7 @@ describe("LuaRocks upload tests #blackbox #b_upload", function() assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --skip-pack luacov-0.11.0-1.rockspec")) end) - it("LuaRocks upload force", function() + it("LuaRocks upload force #unix", function() assert.is_true(run.luarocks_bool("install lua-cjson")) assert.is_false(run.luarocks_bool("upload --api-key=\"invalid\" --force luacov-0.11.0-1.rockspec")) assert.is_true(run.luarocks_bool("install lua-cjson")) @@ -63,10 +63,18 @@ describe("LuaRocks upload tests #blackbox #b_upload", function() end) it("LuaRocks upload rockspec with api-key", function() - assert.is_true(run.luarocks_bool("upload " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec --api-key=123", {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/luarocks_site.lua"})) + if test_env.APPVEYOR then + assert.is_true(run.luarocks_bool("upload " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec " .. test_env.APPVEYOR_OPENSSL .. " --api-key=123", {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/luarocks_site.lua"})) + else + assert.is_true(run.luarocks_bool("upload " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec --api-key=123", {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/luarocks_site.lua"})) + end end) it("LuaRocks upload rockspec with api-key and skip-pack", function() - assert.is_true(run.luarocks_bool("upload --skip-pack " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec --api-key=123", {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/luarocks_site.lua"})) + if test_env.APPVEYOR then + assert.is_true(run.luarocks_bool("upload --skip-pack " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec " .. test_env.APPVEYOR_OPENSSL .. " --api-key=123", {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/luarocks_site.lua"})) + else + assert.is_true(run.luarocks_bool("upload --skip-pack " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec --api-key=123", {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/luarocks_site.lua"})) + end end) end) end) diff --git a/spec/util_spec.lua b/spec/util_spec.lua index 23e3ebd8..e6776e4b 100644 --- a/spec/util_spec.lua +++ b/spec/util_spec.lua @@ -27,7 +27,7 @@ describe("Basic tests #blackbox #b_util", function() assert.is_false(run.luarocks_bool("invalid=5")) end) - it("LuaRocks execute from not existing directory", function() + it("LuaRocks execute from not existing directory #unix", function() local main_path = lfs.currentdir() assert.is_true(lfs.mkdir("idontexist")) assert.is_true(lfs.chdir("idontexist")) @@ -66,34 +66,53 @@ describe("Basic tests #blackbox #b_util", function() assert.is.truthy(lfs.attributes("src/luarocks/site_config.lua")) end) - describe("LuaRocks sysconfig fails", function() - local scdir = "" - - before_each(function() - scdir = testing_paths.testing_lrprefix .. "/etc/luarocks/" + -- 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) - end) - - after_each(function() - test_env.remove_dir(testing_paths.testing_lrprefix) - end) - it("LuaRocks sysconfig fail", function() - local sysconfig = io.open(scdir .. "/config.lua", "w+") - sysconfig:write("aoeui") + local sysconfig = io.open(configfile, "w+") + sysconfig:write(" ") sysconfig:close() - assert.is_false(run.luarocks_bool("list")) + local output = run.luarocks("config --system-config") + os.remove(configfile) + assert.are.same(output, configfile) end) - it("LuaRocks sysconfig fail", function() - local sysconfig = io.open(scdir .. "/config-" .. env_variables.LUA_VERSION .. ".lua", "w+") - sysconfig:write("aoeui") - sysconfig:close() + it("LuaRocks fail system config invalid", function() + lfs.mkdir(testing_paths.testing_lrprefix) + lfs.mkdir(testing_paths.testing_lrprefix .. "/etc/") + lfs.mkdir(scdir) - assert.is_false(run.luarocks_bool("list")) + 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) diff --git a/test/test_environment.lua b/test/test_environment.lua index 13e548f9..42473b38 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua @@ -17,6 +17,7 @@ ARGUMENTS noreset Don't reset environment after each test clean Remove existing testing environment. travis Add if running on TravisCI. + appveyor Add if running on Appveyor. os= Set OS ("linux", "osx", or "windows"). ]] @@ -36,18 +37,54 @@ local function exists(path) return lfs.attributes(path, "mode") ~= nil end -function test_env.quiet(commad) +--- 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. +-- @return string: Quoted argument. +local function Q(arg) + if test_env.TEST_TARGET_OS == "windows" then + local drive_letter = "[%.a-zA-Z]?:?[\\/]" + -- Quote DIR for Windows + if arg:match("^"..drive_letter) then + arg = arg:gsub("/", "\\") + end + + if arg == "\\" then + return '\\' -- CHDIR needs special handling for root dir + end + + return '"' .. arg .. '"' + else + return "'" .. arg:gsub("'", "'\\''") .. "'" + end +end + +function test_env.quiet(command) if not test_env.VERBOSE then - if test_env.TEST_TARGET_OS == "linux" or test_env.TEST_TARGET_OS == "osx" then - return commad .. " 1> /dev/null 2> /dev/null" - elseif test_env.TEST_TARGET_OS == "windows" then - return commad .. " 2> NUL 1> NUL" + if test_env.TEST_TARGET_OS == "windows" then + return command .. " 1> NUL 2> NUL" + else + return command .. " 1> /dev/null 2> /dev/null" end else return command end end +function test_env.copy(source, destination) + local r_source, err = io.open(source, "r") + local r_destination, err = io.open(destination, "w") + + while true do + local block = r_source:read(8192) + if not block then break end + r_destination:write(block) + end + + r_source:close() + r_destination:close() +end + --- Helper function for execute_bool and execute_output -- @param command string: command to execute -- @param print_command boolean: print command if 'true' @@ -61,15 +98,22 @@ function test_env.execute_helper(command, print_command, env_variables) end if env_variables then - final_command = "export " - for k,v in pairs(env_variables) do - final_command = final_command .. k .. "='" .. v .. "' " + if test_env.TEST_TARGET_OS == "windows" then + for k,v in pairs(env_variables) do + final_command = final_command .. "set " .. k .. "=" .. v .. "&" + end + final_command = final_command:sub(1, -2) .. "&" + else + final_command = "export " + for k,v in pairs(env_variables) do + final_command = final_command .. k .. "='" .. v .. "' " + end + -- remove last space and add ';' to separate exporting variables from command + final_command = final_command:sub(1, -2) .. "; " end - -- remove last space and add ';' to separate exporting variables from command - final_command = final_command:sub(1, -2) .. "; " end - final_command = final_command .. command + final_command = final_command .. command .. " 2>&1" return final_command end @@ -122,6 +166,9 @@ function test_env.set_args() test_env.VERBOSE = true elseif argument == "travis" then test_env.TRAVIS = true + elseif argument == "appveyor" then + test_env.APPVEYOR = true + test_env.APPVEYOR_OPENSSL = "OPENSSL_LIBDIR=C:\\OpenSSL-Win32\\lib OPENSSL_INCDIR=C:\\OpenSSL-Win32\\include" elseif argument:find("^os=") then test_env.TEST_TARGET_OS = argument:match("^os=(.*)$") else @@ -143,6 +190,15 @@ function test_env.set_args() return true end +local function copy_dir(source_path, target_path) + local testing_paths = test_env.testing_paths + if test_env.TEST_TARGET_OS == "windows" then + execute_bool(testing_paths.win_tools .. "/cp -R ".. source_path .. "/. " .. target_path) + else + execute_bool("cp -a ".. source_path .. "/. " .. target_path) + end +end + --- Remove directory recursively -- @param path string: directory path to delete function test_env.remove_dir(path) @@ -159,7 +215,7 @@ function test_env.remove_dir(path) end end end - os.remove(path) + lfs.rmdir(path) end --- Remove subdirectories of a directory that match a pattern @@ -205,13 +261,17 @@ end -- @param save_path string: path to directory, where to download rocks/rockspecs -- @return make_manifest boolean: true if new rocks downloaded local function download_rocks(urls, save_path) - local luarocks_repo = "https://luarocks.org" + local luarocks_repo = "https://www.luarocks.org" local make_manifest = false for _, url in ipairs(urls) do -- check if already downloaded if not exists(save_path .. url) then - execute_bool("wget -cP " .. save_path .. " " .. luarocks_repo .. url) + if test_env.TEST_TARGET_OS == "windows" then + execute_bool(test_env.testing_paths.win_tools .. "/wget -cP " .. save_path .. " " .. luarocks_repo .. url .. " --no-check-certificate") + else + execute_bool("wget -cP " .. save_path .. " " .. luarocks_repo .. url) + end make_manifest = true end end @@ -235,9 +295,9 @@ local function hash_environment(path) return execute_output("find " .. path .. " -printf \"%s %p\n\" | md5sum") elseif test_env.TEST_TARGET_OS == "osx" then return execute_output("find " .. path .. " -type f -exec stat -f \"%z %N\" {} \\; | md5") - else - -- TODO: Windows - return "" + elseif test_env.TEST_TARGET_OS == "windows" then + return execute_output("\"" .. Q(test_env.testing_paths.win_tools .. "/find") .. " " .. Q(path) + .. " -printf \"%s %p\"\" > temp_sum.txt && certUtil -hashfile temp_sum.txt && del temp_sum.txt") end end @@ -278,13 +338,17 @@ local function create_md5sums(testing_paths) end local function make_run_function(cmd_name, exec_function, with_coverage, do_print) - local cmd_prefix = test_env.testing_paths.lua .. " " + local cmd_prefix = Q(test_env.testing_paths.lua) .. " " if with_coverage then cmd_prefix = cmd_prefix .. "-e \"require('luacov.runner')('" .. test_env.testing_paths.testing_dir .. "/luacov.config')\" " end - - cmd_prefix = cmd_prefix .. test_env.testing_paths.src_dir .. "/bin/" .. cmd_name .. " " + + if test_env.TEST_TARGET_OS == "windows" then + cmd_prefix = cmd_prefix .. Q(test_env.testing_paths.testing_lrprefix .. "/" .. cmd_name .. ".lua") .. " " + else + cmd_prefix = cmd_prefix .. test_env.testing_paths.src_dir .. "/bin/" .. cmd_name .. " " + end return function(cmd, new_vars) local temp_vars = {} @@ -327,19 +391,23 @@ local function build_environment(rocks, env_variables) lfs.mkdir(testing_paths.testing_tree) lfs.mkdir(testing_paths.testing_sys_tree) - test_env.run.luarocks_admin_nocov("make_manifest " .. testing_paths.testing_server) - test_env.run.luarocks_admin_nocov("make_manifest " .. testing_paths.testing_cache) + test_env.run.luarocks_admin_nocov("make_manifest " .. Q(testing_paths.testing_server)) + test_env.run.luarocks_admin_nocov("make_manifest " .. Q(testing_paths.testing_cache)) for _, rock in ipairs(rocks) do - if not test_env.run.luarocks_nocov("install --only-server=" .. testing_paths.testing_cache .. " --tree=" .. testing_paths.testing_sys_tree .. " " .. rock, env_variables) then - test_env.run.luarocks_nocov("build --tree=" .. testing_paths.testing_sys_tree .. " " .. rock, env_variables) - test_env.run.luarocks_nocov("pack --tree=" .. testing_paths.testing_sys_tree .. " " .. rock, env_variables) - execute_bool("mv " .. rock .. "-*.rock " .. testing_paths.testing_cache) + if not test_env.run.luarocks_nocov("install --only-server=" .. testing_paths.testing_cache .. " --tree=" .. testing_paths.testing_sys_tree .. " " .. Q(rock), env_variables) then + test_env.run.luarocks_nocov("build --tree=" .. Q(testing_paths.testing_sys_tree) .. " " .. Q(rock) .. "", env_variables) + test_env.run.luarocks_nocov("pack --tree=" .. Q(testing_paths.testing_sys_tree) .. " " .. Q(rock), env_variables) + if test_env.TEST_TARGET_OS == "windows" then + execute_bool(testing_paths.win_tools .. "/mv " .. rock .. "-*.rock " .. testing_paths.testing_cache) + else + execute_bool("mv " .. rock .. "-*.rock " .. testing_paths.testing_cache) + end end end - - execute_bool("cp -a " .. testing_paths.testing_tree .. "/. " .. testing_paths.testing_tree_copy) - execute_bool("cp -a " .. testing_paths.testing_sys_tree .. "/. " .. testing_paths.testing_sys_tree_copy) + + copy_dir(testing_paths.testing_tree, testing_paths.testing_tree_copy) + copy_dir(testing_paths.testing_sys_tree, testing_paths.testing_sys_tree_copy) end --- Reset testing environment @@ -349,14 +417,13 @@ local function reset_environment(testing_paths, md5sums) if testing_tree_md5 ~= md5sums.testing_tree_copy_md5 then test_env.remove_dir(testing_paths.testing_tree) - execute_bool("cp -a " .. testing_paths.testing_tree_copy .. "/. " .. testing_paths.testing_tree) + copy_dir(testing_paths.testing_tree_copy, testing_paths.testing_tree) end if testing_sys_tree_md5 ~= md5sums.testing_sys_tree_copy_md5 then test_env.remove_dir(testing_paths.testing_sys_tree) - execute_bool("cp -a " .. testing_paths.testing_sys_tree_copy .. "/. " .. testing_paths.testing_sys_tree) + copy_dir(testing_paths.testing_sys_tree_copy, testing_paths.testing_sys_tree) end - print("\n[ENVIRONMENT RESET]") end @@ -367,9 +434,18 @@ local function create_paths(luaversion_full) testing_paths.luadir = cfg.variables.LUA_BINDIR:gsub("/bin/?$", "") testing_paths.lua = cfg.variables.LUA_BINDIR .. "/" .. cfg.lua_interpreter - testing_paths.luarocks_tmp = "/tmp/luarocks_testing" --windows? + if test_env.TEST_TARGET_OS == "windows" then + testing_paths.luarocks_tmp = os.getenv("TEMP") + else + testing_paths.luarocks_tmp = "/tmp/luarocks_testing" + end testing_paths.luarocks_dir = lfs.currentdir() + + if test_env.TEST_TARGET_OS == "windows" then + testing_paths.luarocks_dir = testing_paths.luarocks_dir:gsub("\\","/") + end + testing_paths.testing_dir = testing_paths.luarocks_dir .. "/test" testing_paths.src_dir = testing_paths.luarocks_dir .. "/src" testing_paths.testing_lrprefix = testing_paths.testing_dir .. "/testing_lrprefix-" .. luaversion_full @@ -380,6 +456,10 @@ local function create_paths(luaversion_full) testing_paths.testing_cache = testing_paths.testing_dir .. "/testing_cache-" .. luaversion_full testing_paths.testing_server = testing_paths.testing_dir .. "/testing_server-" .. luaversion_full + if test_env.TEST_TARGET_OS == "windows" then + testing_paths.win_tools = testing_paths.testing_lrprefix .. "/tools" + end + return testing_paths end @@ -409,7 +489,7 @@ function test_env.setup_specs(extra_rocks) test_env.main() package.path = test_env.env_variables.LUA_PATH - test_env.platform = execute_output(test_env.testing_paths.lua .. " -e 'print(require(\"luarocks.cfg\").arch)'", false, test_env.env_variables) + test_env.platform = execute_output(test_env.testing_paths.lua .. " -e \"print(require('luarocks.cfg').arch)\"", false, test_env.env_variables) test_env.md5sums = create_md5sums(test_env.testing_paths) test_env.setup_done = true title("RUNNING TESTS") @@ -546,13 +626,22 @@ end --- Install luarocks into testing prefix. local function install_luarocks(install_env_vars) - -- Configure LuaRocks testing environment + local testing_paths = test_env.testing_paths title("Installing LuaRocks") - local configure_cmd = "./configure --with-lua=" .. test_env.testing_paths.luadir .. " --prefix=" .. test_env.testing_paths.testing_lrprefix - assert(execute_bool(test_env.quiet(configure_cmd), false, install_env_vars)) - assert(execute_bool(test_env.quiet("make clean"), false, install_env_vars)) - assert(execute_bool(test_env.quiet("make src/luarocks/site_config.lua"), false, install_env_vars)) - assert(execute_bool(test_env.quiet("make dev"), false, install_env_vars)) + if test_env.TEST_TARGET_OS == "windows" then + if test_env.LUA_V then + assert(execute_bool("install.bat /LUA " .. testing_paths.luadir .. " /LV " .. test_env.LUA_V .. " /P " .. testing_paths.testing_lrprefix .. " /NOREG /NOADMIN /F /Q /CONFIG " .. testing_paths.testing_lrprefix .. "/etc/luarocks", false, install_env_vars)) + else + assert(execute_bool("install.bat /LUA " .. testing_paths.luadir .. " /P " .. testing_paths.testing_lrprefix .. " /NOREG /NOADMIN /F /Q /CONFIG " .. testing_paths.testing_lrprefix .. "/etc/luarocks", false, install_env_vars)) + end + assert(execute_bool(testing_paths.win_tools .. "/cp " .. testing_paths.testing_lrprefix .. "/lua/luarocks/site_config* " .. testing_paths.src_dir .. "/luarocks/site_config.lua")) + 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/site_config.lua", false, install_env_vars)) + assert(execute_bool("make dev", false, install_env_vars)) + end print("LuaRocks installed correctly!") end @@ -572,8 +661,8 @@ function test_env.main() local install_env_vars = { LUAROCKS_CONFIG = test_env.testing_paths.testing_dir .. "/testing_config.lua", - LUA_PATH = "", - LUA_CPATH = "" + LUA_PATH, + LUA_CPATH } install_luarocks(install_env_vars) -- cgit v1.2.3-55-g6feb From c22227e0e0bdf27e273d9faee7955686ceb4724c Mon Sep 17 00:00:00 2001 From: roboo Date: Sun, 21 Aug 2016 22:20:23 +0200 Subject: Fix of show test --- spec/show_spec.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/show_spec.lua b/spec/show_spec.lua index 915129ae..b2cdc07e 100644 --- a/spec/show_spec.lua +++ b/spec/show_spec.lua @@ -34,7 +34,7 @@ describe("LuaRocks show tests #blackbox #b_show", function() it("LuaRocks show rockspec of luacov", function() local output = run.luarocks("show --rockspec luacov") - assert.is.truthy(output:match("luacov-0.11.0-1.rockspec")) + assert.is.truthy(output:match("luacov--0.11.0--1.rockspec")) end) it("LuaRocks show mversion of luacov", function() -- cgit v1.2.3-55-g6feb From 3dd43e885f1d273bd3b51f4f9e7e7d20a1beb146 Mon Sep 17 00:00:00 2001 From: roboo Date: Sun, 21 Aug 2016 22:23:09 +0200 Subject: Update of YAML files, changed coveralls for codecov --- .travis.yml | 2 +- appveyor.yml | 34 +++++++++++++++++++++------------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 02bdb6c9..4962f290 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,8 +55,8 @@ script: - busted -Xhelper travis,env=full --verbose after_success: - - luacov-coveralls -c $TRAVIS_BUILD_DIR/test/luacov.config --exclude $TRAVIS_BUILD_DIR/test/ - luacov -c $TRAVIS_BUILD_DIR/test/luacov.config + - cd $TRAVIS_BUILD_DIR/test/ && bash <(curl -s https://codecov.io/bash) - grep "Summary" -B1 -A1000 $TRAVIS_BUILD_DIR/test/luacov.report.out notifications: diff --git a/appveyor.yml b/appveyor.yml index d7fc7cc2..66a12896 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,28 +3,36 @@ version: 2.2.1.{build}-test shallow_clone: true environment: - LUAROCKS_VER: 2.2.1 + LUAROCKS_VER: 2.3.0 matrix: - - LUA_VER: 5.1.5 - - LUA_VER: 5.2.4 - - LUA_VER: 5.3.1 - - LJ_VER: 2.0.4 - - LJ_VER: 2.1 + - LUA: "lua 5.1" + - LUA: "lua 5.2" + - LUA: "lua 5.3" + - LUA: "luajit 2.0" + - LUA: "luajit 2.1" + init: # Setup Lua development/build environment # Make VS 2015 command line tools available - call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %platform% -install: -# Setup Lua development/build environment -- call .appveyor\install.bat +before_build: + - set PATH=C:\Python27\Scripts;%PATH% # Add directory containing 'pip' to PATH + - pip install hererocks + - hererocks env --%LUA% -rlatest + - call env\bin\activate build_script: -- call .appveyor\build.bat + - luarocks install busted 1> NUL 2> NUL test_script: -- echo "Testing..." -- cd test -- call testing.bat + - busted --lpath=.//?.lua --exclude-tags=ssh,unix,mock -Xhelper appveyor + +after_test: + - if "%LUA%"=="lua 5.1" (luarocks show bit32 || luarocks install bit32) + - luarocks install luacov + - pip install codecov + - luacov -c test/luacov.config + - cd test && codecov \ No newline at end of file -- cgit v1.2.3-55-g6feb From cb212b167b120490d872cc9e1b8548a0770dd4c4 Mon Sep 17 00:00:00 2001 From: roboo Date: Sun, 21 Aug 2016 22:36:23 +0200 Subject: Update of README --- test/README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/test/README.md b/test/README.md index c374438f..5deaa175 100644 --- a/test/README.md +++ b/test/README.md @@ -12,7 +12,7 @@ Test suite for LuaRocks project with Busted unit testing framework(http://olivin ##Usage -Running of tests is based on basic Busted usage. *-Xhelper* flag is mandatory for inserting arguments into testing (primary black-box). Flag *--tags=* or *-t* is mandatory for specifying which tests will run. Mandatory *-Xhelper* flag always needs version of Lua or LuaJIT (e.g. *lua=5.2.4* or *luajit=2.0.3*). Start tests inside LuaRocks folder or specify with *-C* flag. +Running of tests is based on basic Busted usage. *-Xhelper* flag is mandatory for inserting arguments into testing (primary black-box). Flag *--tags=* or *-t* is mandatory for specifying which tests will run. Start tests inside LuaRocks folder or specify with *-C* flag. **Arguments for Busted helper script** @@ -22,7 +22,9 @@ OR luajit=, !mandatory! type your full version of LuaJIT (e.g. luajit=5.2.4) env=, (default:"minimal") type what kind of environment to use ["minimal", "full"] +noreset, Don't reset environment after each test clean, remove existing testing environment +appveyor, add just if running on TravisCI travis, add just if running on TravisCI os=, type your OS ["linux", "os x", "windows"] ``` @@ -35,6 +37,10 @@ os=, type your OS ["linux", "os x", "windows"] **ssh** - run all tests which require ssh +**mock** - run all tests which require mock LuaRocks server (upload tests) + +**unix** - run all tests which are UNIX based, won't work on Windows systems + **w**\_*name-of-command* - whitebox testing of command **b**\_*name-of-command* - blackbox testing of command @@ -42,6 +48,9 @@ os=, type your OS ["linux", "os x", "windows"] for example: `b_install` or `w_help` ###Examples +To run all tests: +`busted` + To run white-box tests in LuaRocks directory type : `busted -t "whitebox"` -- cgit v1.2.3-55-g6feb From beaecdbccb9fa244bbc0253aedd26d372aa312aa Mon Sep 17 00:00:00 2001 From: roboo Date: Sun, 21 Aug 2016 22:46:19 +0200 Subject: Fix of test_environment --- test/test_environment.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_environment.lua b/test/test_environment.lua index 42473b38..1c31462c 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua @@ -181,7 +181,7 @@ function test_env.set_args() if execute_bool("sw_vers") then test_env.TEST_TARGET_OS = "osx" - elseif execute_bool("uname -s") then + elseif execute_output("uname -s") == "Linux" then test_env.TEST_TARGET_OS = "linux" else test_env.TEST_TARGET_OS = "windows" @@ -321,7 +321,7 @@ local function create_env(testing_paths) env_variables.LUA_PATH = env_variables.LUA_PATH .. testing_paths.src_dir .. "/?.lua;" env_variables.LUA_CPATH = testing_paths.testing_tree .. "/lib/lua/" .. luaversion_short .. "/?.so;" .. testing_paths.testing_sys_tree .. "/lib/lua/" .. luaversion_short .. "/?.so;" - env_variables.PATH = os.getenv("PATH") .. ":" .. testing_paths.testing_tree .. "/bin:" .. testing_paths.testing_sys_tree .. "/bin" + env_variables.PATH = os.getenv("PATH") .. ";" .. testing_paths.testing_tree .. "/bin;" .. testing_paths.testing_sys_tree .. "/bin;" return env_variables end -- cgit v1.2.3-55-g6feb From ecfdd47e1b627e916692affe6ea93ba0ac6d4ac8 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Sun, 21 Aug 2016 23:48:23 +0300 Subject: Autodetect Lua version in install.bat --- install.bat | 69 +++++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 18 deletions(-) diff --git a/install.bat b/install.bat index 32988022..c95967a6 100644 --- a/install.bat +++ b/install.bat @@ -42,6 +42,8 @@ local NOADMIN = false local PROMPT = true local SELFCONTAINED = false +local lua_version_set = false + --- -- Some helpers -- @@ -220,6 +222,7 @@ local function parse_options(args) vars.TREE_CMODULE = option.value elseif name == "/LV" then vars.LUA_VERSION = option.value + lua_version_set = true elseif name == "/L" then INSTALL_LUA = true elseif name == "/MW" then @@ -287,8 +290,31 @@ end -- *********************************************************** -- Detect Lua -- *********************************************************** +local function detect_lua_version(interpreter_path) + local handler = io.popen(('type NUL && "%s" -e "io.stdout:write(_VERSION)" 2>NUL'):format(interpreter_path), "r") + if not handler then + return nil, "interpreter does not work" + end + local full_version = handler:read("*a") + handler:close() + + local version = full_version:match("^Lua (5%.[123])$") + if not version then + return nil, "unknown interpreter version '" .. full_version .. "'" + end + return version +end + local function look_for_interpreter(directory) - local names = {S"lua$LUA_VERSION.exe", S"lua$LUA_SHORTV.exe", "lua.exe", "luajit.exe"} + local names + if lua_version_set then + names = {S"lua$LUA_VERSION.exe", S"lua$LUA_SHORTV.exe"} + else + names = {"lua5.3.exe", "lua53.exe", "lua5.2.exe", "lua52.exe", "lua5.1.exe", "lua51.exe"} + end + table.insert(names, "lua.exe") + table.insert(names, "luajit.exe") + local directories if vars.LUA_BINDIR then -- If LUA_BINDIR is specified, look only in that directory. @@ -302,16 +328,31 @@ local function look_for_interpreter(directory) for _, name in ipairs(names) do local full_name = dir .. "\\" .. name if exists(full_name) then - vars.LUA_INTERPRETER = name - vars.LUA_BINDIR = dir - print(" Found " .. full_name) - return true + print(" Found " .. name .. ", testing it...") + local version, err = detect_lua_version(full_name) + if not version then + print(" Error: " .. err) + else + if version ~= vars.LUA_VERSION then + if lua_version_set then + die("Version of interpreter clashes with the value of /LV. Please check your configuration.") + else + vars.LUA_VERSION = version + vars.LUA_SHORTV = version:gsub("%.", "") + vars.LUA_LIB_NAMES = vars.LUA_LIB_NAMES:gsub("5([%.]?)[123]", "5%1" .. version:sub(-1)) + end + end + + vars.LUA_INTERPRETER = name + vars.LUA_BINDIR = dir + return true + end end end end if vars.LUA_BINDIR then - die(S"Lua executable lua.exe, luajit.exe, lua$LUA_SHORTV.exe or lua$LUA_VERSION.exe not found in $LUA_BINDIR") + die(("Working Lua executable (one of %s) not found in %s"):format(table.concat(names, ", "), vars.LUA_BINDIR)) end return false end @@ -559,12 +600,8 @@ local function look_for_lua_install () look_for_headers(vars.LUA_INCDIR) then if get_runtime() then - print("Runtime check completed, now testing interpreter...") - if exec(S[["$LUA_BINDIR\$LUA_INTERPRETER" -v 2>NUL]]) then - print(" Ok") - return true - end - print(" Interpreter returned an error, not ok") + print("Runtime check completed.") + return true end end return false @@ -580,12 +617,8 @@ local function look_for_lua_install () if look_for_headers(directory) then print("Headers found, checking runtime to use...") if get_runtime() then - print("Runtime check completed, now testing interpreter...") - if exec(S[["$LUA_BINDIR\$LUA_INTERPRETER" -v 2>NUL]]) then - print(" Ok") - return true - end - print(" Interpreter returned an error, not ok") + print("Runtime check completed.") + return true end end end -- cgit v1.2.3-55-g6feb From d73b0db51368d6b6e9d9b6d1980b666906a442ad Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Mon, 22 Aug 2016 00:07:02 +0300 Subject: Update install.bat help message --- install.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.bat b/install.bat index c95967a6..e28734dc 100644 --- a/install.bat +++ b/install.bat @@ -151,7 +151,7 @@ Configuring the destinations: Configuring the Lua interpreter: /LV [version] Lua version to use; either 5.1, 5.2, or 5.3. - Default is 5.1 + Default is auto-detected. /LUA [dir] Location where Lua is installed - e.g. c:\lua\5.1\ If not provided, the installer will search the system path and some default locations for a valid Lua -- cgit v1.2.3-55-g6feb From f1c9fd4895fe107683488c501bc07d4e22f46a4f Mon Sep 17 00:00:00 2001 From: roboo Date: Mon, 22 Aug 2016 13:40:03 +0200 Subject: Fix of config test --- spec/config_spec.lua | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/spec/config_spec.lua b/spec/config_spec.lua index 439d0493..807b077a 100644 --- a/spec/config_spec.lua +++ b/spec/config_spec.lua @@ -61,7 +61,7 @@ describe("LuaRocks config tests #blackbox #b_config", function() end) end) - describe("LuaRocks config - more complex tests", function() + describe("LuaRocks config - more complex tests #special", function() local scdir = testing_paths.testing_lrprefix .. "/etc/luarocks" local versioned_scname = scdir .. "/config-" .. env_variables.LUA_VERSION .. ".lua" local scname = scdir .. "/config.lua" @@ -74,9 +74,9 @@ describe("LuaRocks config tests #blackbox #b_config", function() end it("LuaRocks fail system config", function() - os.rename(versioned_scname, versioned_scname .. ".bak") + os.rename(configfile, configfile .. ".bak") assert.is_false(run.luarocks_bool("config --system-config")) - os.rename(versioned_scname .. ".bak", versioned_scname) + os.rename(configfile .. ".bak", configfile) end) it("LuaRocks system config", function() @@ -84,18 +84,20 @@ describe("LuaRocks config tests #blackbox #b_config", function() lfs.mkdir(testing_paths.testing_lrprefix .. "/etc/") lfs.mkdir(scdir) - if test_env.TEST_TARGET_OS == "windows" then - local output = run.luarocks("config --system-config") - assert.are.same(output, versioned_scname) - else - sysconfig = io.open(scname, "w+") + -- if test_env.TEST_TARGET_OS == "windows" then + -- local output = run.luarocks("config --system-config") + -- assert.are.same(output, versioned_scname) + -- else + local sysconfig = io.open(configfile, "w+") + test_env.copy(configfile, "configfile_temp") sysconfig:write(" ") sysconfig:close() local output = run.luarocks("config --system-config") - assert.are.same(output, scname) - os.remove(scname) - end + assert.are.same(output, configfile) + test_env.copy("configfile_temp", configfile) + os.remove("configfile_temp") + -- end end) it("LuaRocks fail system config invalid", function() @@ -103,20 +105,21 @@ describe("LuaRocks config tests #blackbox #b_config", function() lfs.mkdir(testing_paths.testing_lrprefix .. "/etc/") lfs.mkdir(scdir) - if test_env.TEST_TARGET_OS == "windows" then - test_env.copy(versioned_scname, "versioned_scname_temp") - sysconfig = io.open(versioned_scname, "w+") + -- if test_env.TEST_TARGET_OS == "windows" then + sysconfig = io.open(configfile, "w+") + test_env.copy(configfile, "configfile_temp") sysconfig:write("if if if") sysconfig:close() assert.is_false(run.luarocks_bool("config --system-config")) - test_env.copy("versioned_scname_temp", versioned_scname) - else - sysconfig = io.open(scname, "w+") - sysconfig:write("if if if") - sysconfig:close() - assert.is_false(run.luarocks_bool("config --system-config")) - os.remove(scname) - end + test_env.copy("configfile_temp", configfile) + os.remove("configfile_temp") + -- else + -- sysconfig = io.open(scname, "w+") + -- sysconfig:write("if if if") + -- sysconfig:close() + -- assert.is_false(run.luarocks_bool("config --system-config")) + -- os.remove(scname) + -- end end) end) end) -- cgit v1.2.3-55-g6feb From 1026d63ba37b8a1074c49797ce737edb5726ed2f Mon Sep 17 00:00:00 2001 From: roboo Date: Mon, 22 Aug 2016 13:50:53 +0200 Subject: Fix of config test --- spec/config_spec.lua | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/spec/config_spec.lua b/spec/config_spec.lua index 807b077a..4a7f4aea 100644 --- a/spec/config_spec.lua +++ b/spec/config_spec.lua @@ -61,7 +61,7 @@ describe("LuaRocks config tests #blackbox #b_config", function() end) end) - describe("LuaRocks config - more complex tests #special", function() + 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" @@ -84,20 +84,18 @@ describe("LuaRocks config tests #blackbox #b_config", function() lfs.mkdir(testing_paths.testing_lrprefix .. "/etc/") lfs.mkdir(scdir) - -- if test_env.TEST_TARGET_OS == "windows" then - -- local output = run.luarocks("config --system-config") - -- assert.are.same(output, versioned_scname) - -- else + if test_env.TEST_TARGET_OS == "windows" then + local output = run.luarocks("config --system-config") + assert.are.same(output, configfile) + else local sysconfig = io.open(configfile, "w+") - test_env.copy(configfile, "configfile_temp") sysconfig:write(" ") sysconfig:close() local output = run.luarocks("config --system-config") assert.are.same(output, configfile) - test_env.copy("configfile_temp", configfile) - os.remove("configfile_temp") - -- end + os.remove(configfile) + end end) it("LuaRocks fail system config invalid", function() @@ -105,21 +103,20 @@ describe("LuaRocks config tests #blackbox #b_config", function() lfs.mkdir(testing_paths.testing_lrprefix .. "/etc/") lfs.mkdir(scdir) - -- if test_env.TEST_TARGET_OS == "windows" then - sysconfig = io.open(configfile, "w+") + if test_env.TEST_TARGET_OS == "windows" then test_env.copy(configfile, "configfile_temp") + local sysconfig = io.open(configfile, "w+") sysconfig:write("if if if") sysconfig:close() assert.is_false(run.luarocks_bool("config --system-config")) test_env.copy("configfile_temp", configfile) - os.remove("configfile_temp") - -- else - -- sysconfig = io.open(scname, "w+") - -- sysconfig:write("if if if") - -- sysconfig:close() - -- assert.is_false(run.luarocks_bool("config --system-config")) - -- os.remove(scname) - -- end + else + local sysconfig = io.open(configfile, "w+") + sysconfig:write("if if if") + sysconfig:close() + assert.is_false(run.luarocks_bool("config --system-config")) + os.remove(configfile) + end end) end) end) -- cgit v1.2.3-55-g6feb From de72b50eb21fa264a6090c3d062217963c52f74b Mon Sep 17 00:00:00 2001 From: roboo Date: Mon, 22 Aug 2016 16:08:34 +0200 Subject: Remove unused global variables --- test/test_environment.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/test_environment.lua b/test/test_environment.lua index 1c31462c..37bd38f1 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua @@ -660,9 +660,7 @@ function test_env.main() create_configs() local install_env_vars = { - LUAROCKS_CONFIG = test_env.testing_paths.testing_dir .. "/testing_config.lua", - LUA_PATH, - LUA_CPATH + LUAROCKS_CONFIG = test_env.testing_paths.testing_dir .. "/testing_config.lua" } install_luarocks(install_env_vars) -- cgit v1.2.3-55-g6feb From 7225a3d4513137a8e13a5db39538e007b8faa886 Mon Sep 17 00:00:00 2001 From: roboo Date: Mon, 22 Aug 2016 20:57:26 +0200 Subject: Change APPVEYOR_OPENSSL to OPENSSL_DIRS for better test readability --- test/test_environment.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test_environment.lua b/test/test_environment.lua index 37bd38f1..ab6c3edd 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua @@ -153,6 +153,7 @@ end function test_env.set_args() -- if at least Lua/LuaJIT version argument was found on input start to parse other arguments to env. variables test_env.TYPE_TEST_ENV = "minimal" + test_env.OPENSSL_DIRS = "" test_env.RESET_ENV = true for _, argument in ipairs(arg) do @@ -168,7 +169,7 @@ function test_env.set_args() test_env.TRAVIS = true elseif argument == "appveyor" then test_env.APPVEYOR = true - test_env.APPVEYOR_OPENSSL = "OPENSSL_LIBDIR=C:\\OpenSSL-Win32\\lib OPENSSL_INCDIR=C:\\OpenSSL-Win32\\include" + test_env.OPENSSL_DIRS = "OPENSSL_LIBDIR=C:\\OpenSSL-Win32\\lib OPENSSL_INCDIR=C:\\OpenSSL-Win32\\include" elseif argument:find("^os=") then test_env.TEST_TARGET_OS = argument:match("^os=(.*)$") else -- cgit v1.2.3-55-g6feb From 6d9c9997645c07ed93719d85e260d9ffbc2d1d25 Mon Sep 17 00:00:00 2001 From: roboo Date: Mon, 22 Aug 2016 21:01:23 +0200 Subject: Change APPVEYOR_OPENSSL to OPENSSL_DIRS for better test readability --- spec/build_spec.lua | 18 +++--------------- spec/install_spec.lua | 12 ++---------- spec/pack_spec.lua | 6 +----- spec/upload_spec.lua | 12 ++---------- 4 files changed, 8 insertions(+), 40 deletions(-) diff --git a/spec/build_spec.lua b/spec/build_spec.lua index b4f838ca..8f08f0a0 100644 --- a/spec/build_spec.lua +++ b/spec/build_spec.lua @@ -120,11 +120,7 @@ describe("LuaRocks build tests #blackbox #b_build", function() end) it("LuaRocks build luasec with skipping dependency checks", function() - if test_env.APPVEYOR then - assert.is_true(run.luarocks_bool("build luasec " .. test_env.APPVEYOR_OPENSSL .. " --nodeps")) - else - assert.is_true(run.luarocks_bool("build luasec --nodeps")) - end + assert.is_true(run.luarocks_bool("build luasec " .. test_env.OPENSSL_DIRS .. " --nodeps")) assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasec/0.6-1/luasec-0.6-1.rockspec")) end) @@ -150,11 +146,7 @@ describe("LuaRocks build tests #blackbox #b_build", function() end it("LuaRocks build luasec only deps", function() - if test_env.APPVEYOR then - assert.is_true(run.luarocks_bool(test_env.quiet("build luasec " .. test_env.APPVEYOR_OPENSSL .. " --only-deps"))) - else - assert.is_true(run.luarocks_bool(test_env.quiet("build luasec --only-deps"))) - end + assert.is_true(run.luarocks_bool(test_env.quiet("build luasec " .. test_env.OPENSSL_DIRS .. " --only-deps"))) assert.is_false(run.luarocks_bool("show luasec")) assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasec/0.6-1/luasec-0.6-1.rockspec")) end) @@ -189,12 +181,8 @@ describe("LuaRocks build tests #blackbox #b_build", function() it("LuaRocks build with https", function() assert.is_true(run.luarocks_bool("download --rockspec validate-args 1.5.4-1")) + assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.OPENSSL_DIRS))) - if test_env.APPVEYOR then - assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.APPVEYOR_OPENSSL))) - else - assert.is_true(run.luarocks_bool(test_env.quiet("install luasec"))) - end assert.is_true(run.luarocks_bool("build validate-args-1.5.4-1.rockspec")) assert.is.truthy(run.luarocks("show validate-args")) assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/validate-args/1.5.4-1/validate-args-1.5.4-1.rockspec")) diff --git a/spec/install_spec.lua b/spec/install_spec.lua index 2b6cb77f..e5b9e2cc 100644 --- a/spec/install_spec.lua +++ b/spec/install_spec.lua @@ -66,22 +66,14 @@ describe("LuaRocks install tests #blackbox #b_install", function() end) it("LuaRocks install luasec and show luasocket (dependency)", function() - if test_env.APPVEYOR then - assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.APPVEYOR_OPENSSL))) - else - assert.is_true(run.luarocks_bool(test_env.quiet("install luasec"))) - end + assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.OPENSSL_DIRS))) assert.is_true(run.luarocks_bool("show luasocket")) end) end) describe("LuaRocks install - more complex tests", function() it('LuaRocks install luasec with skipping dependency checks', function() - if test_env.APPVEYOR then - assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.APPVEYOR_OPENSSL .. " --nodeps"))) - else - assert.is_true(run.luarocks_bool(test_env.quiet("install luasec --nodeps"))) - end + assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.OPENSSL_DIRS .. " --nodeps"))) assert.is_true(run.luarocks_bool(test_env.quiet("show luasec"))) if env_variables.TYPE_TEST_ENV == "minimal" then assert.is_false(run.luarocks_bool(test_env.quiet("show luasocket"))) diff --git a/spec/pack_spec.lua b/spec/pack_spec.lua index 21f33b02..3191e80c 100644 --- a/spec/pack_spec.lua +++ b/spec/pack_spec.lua @@ -49,11 +49,7 @@ describe("LuaRocks pack tests #blackbox #b_pack", function() end) it("LuaRocks pack src", function() - if test_env.APPVEYOR then - assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.APPVEYOR_OPENSSL))) - else - assert.is_true(run.luarocks_bool(test_env.quiet("install luasec"))) - end + assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.OPENSSL_DIRS))) assert.is_true(run.luarocks_bool("download --rockspec luasocket 3.0rc1-2")) assert.is_true(run.luarocks_bool("pack luasocket-3.0rc1-2.rockspec")) assert.is_true(test_env.remove_files(lfs.currentdir(), "luasocket-")) diff --git a/spec/upload_spec.lua b/spec/upload_spec.lua index af4c36d3..ff39cb96 100644 --- a/spec/upload_spec.lua +++ b/spec/upload_spec.lua @@ -63,18 +63,10 @@ describe("LuaRocks upload tests #blackbox #b_upload", function() end) it("LuaRocks upload rockspec with api-key", function() - if test_env.APPVEYOR then - assert.is_true(run.luarocks_bool("upload " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec " .. test_env.APPVEYOR_OPENSSL .. " --api-key=123", {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/luarocks_site.lua"})) - else - assert.is_true(run.luarocks_bool("upload " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec --api-key=123", {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/luarocks_site.lua"})) - end + assert.is_true(run.luarocks_bool("upload " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec " .. test_env.OPENSSL_DIRS .. " --api-key=123", {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/luarocks_site.lua"})) end) it("LuaRocks upload rockspec with api-key and skip-pack", function() - if test_env.APPVEYOR then - assert.is_true(run.luarocks_bool("upload --skip-pack " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec " .. test_env.APPVEYOR_OPENSSL .. " --api-key=123", {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/luarocks_site.lua"})) - else - assert.is_true(run.luarocks_bool("upload --skip-pack " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec --api-key=123", {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/luarocks_site.lua"})) - end + assert.is_true(run.luarocks_bool("upload --skip-pack " .. testing_paths.testing_server .. "/luasocket-3.0rc1-2.rockspec " .. test_env.OPENSSL_DIRS .. " --api-key=123", {LUAROCKS_CONFIG = testing_paths.testing_dir .. "/luarocks_site.lua"})) end) end) end) -- cgit v1.2.3-55-g6feb From 523af94efbedba37bf62279b88e1334fb64c4924 Mon Sep 17 00:00:00 2001 From: Hisham Date: Mon, 22 Aug 2016 16:01:43 -0300 Subject: Add support for testing using MinGW --- appveyor.yml | 18 +++++++++++++++++- test/test_environment.lua | 11 ++++++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 66a12896..0220514f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,10 +7,25 @@ environment: matrix: - LUA: "lua 5.1" + COMPILER: "msvc" - LUA: "lua 5.2" + COMPILER: "msvc" - LUA: "lua 5.3" + COMPILER: "msvc" - LUA: "luajit 2.0" + COMPILER: "msvc" - LUA: "luajit 2.1" + COMPILER: "msvc" + - LUA: "lua 5.1" + COMPILER: "mingw" + - LUA: "lua 5.2" + COMPILER: "mingw" + - LUA: "lua 5.3" + COMPILER: "mingw" + - LUA: "luajit 2.0" + COMPILER: "mingw" + - LUA: "luajit 2.1" + COMPILER: "mingw" init: @@ -28,7 +43,8 @@ build_script: - luarocks install busted 1> NUL 2> NUL test_script: - - busted --lpath=.//?.lua --exclude-tags=ssh,unix,mock -Xhelper appveyor + - set PATH=C:\MinGW\bin;%PATH% # Add MinGW compiler to the path + - busted --lpath=.//?.lua --exclude-tags=ssh,unix,mock -Xhelper appveyor,%COMPILER% after_test: - if "%LUA%"=="lua 5.1" (luarocks show bit32 || luarocks install bit32) diff --git a/test/test_environment.lua b/test/test_environment.lua index 37bd38f1..f7cdcaa1 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua @@ -171,6 +171,10 @@ function test_env.set_args() test_env.APPVEYOR_OPENSSL = "OPENSSL_LIBDIR=C:\\OpenSSL-Win32\\lib OPENSSL_INCDIR=C:\\OpenSSL-Win32\\include" elseif argument:find("^os=") then test_env.TEST_TARGET_OS = argument:match("^os=(.*)$") + elseif argument == "mingw" then + test_env.MINGW = true + elseif argument == "msvc" then + test_env.MINGW = false else help() end @@ -629,11 +633,8 @@ local function install_luarocks(install_env_vars) local testing_paths = test_env.testing_paths title("Installing LuaRocks") if test_env.TEST_TARGET_OS == "windows" then - if test_env.LUA_V then - assert(execute_bool("install.bat /LUA " .. testing_paths.luadir .. " /LV " .. test_env.LUA_V .. " /P " .. testing_paths.testing_lrprefix .. " /NOREG /NOADMIN /F /Q /CONFIG " .. testing_paths.testing_lrprefix .. "/etc/luarocks", false, install_env_vars)) - else - assert(execute_bool("install.bat /LUA " .. testing_paths.luadir .. " /P " .. testing_paths.testing_lrprefix .. " /NOREG /NOADMIN /F /Q /CONFIG " .. testing_paths.testing_lrprefix .. "/etc/luarocks", false, install_env_vars)) - end + local compiler_flag = test_env.MINGW and "/MW" or "" + 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/site_config* " .. testing_paths.src_dir .. "/luarocks/site_config.lua")) else local configure_cmd = "./configure --with-lua=" .. testing_paths.luadir .. " --prefix=" .. testing_paths.testing_lrprefix -- cgit v1.2.3-55-g6feb From 043c656a11140df8411f0635dc9b79700040d37d Mon Sep 17 00:00:00 2001 From: Hisham Date: Mon, 22 Aug 2016 16:07:36 -0300 Subject: Replace coverage badge with CodeCov badge --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 02543ef3..92171db8 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ A package manager for Lua modules. [![Build Status](https://travis-ci.org/keplerproject/luarocks.png?branch=master)](https://travis-ci.org/keplerproject/luarocks) -[![Build status](https://ci.appveyor.com/api/projects/status/4x4630tcf64da48i/branch/master?svg=true)](https://ci.appveyor.com/project/hishamhm/luarocks/branch/master) -[![Coverage Status](https://coveralls.io/repos/keplerproject/luarocks/badge.svg?branch=master)](https://coveralls.io/r/keplerproject/luarocks?branch=master) +[![Build Status](https://ci.appveyor.com/api/projects/status/4x4630tcf64da48i/branch/master?svg=true)](https://ci.appveyor.com/project/hishamhm/luarocks/branch/master) +[![Coverage Status](https://codecov.io/gh/keplerproject/luarocks/coverage.svg?branch=master)](https://codecov.io/gh/keplerproject/luarocks/branch/master) Main website: [luarocks.org](http://www.luarocks.org) -- cgit v1.2.3-55-g6feb From ec177a4227d14ad28556baa5132376337feea7fb Mon Sep 17 00:00:00 2001 From: Hisham Date: Mon, 22 Aug 2016 17:24:22 -0300 Subject: Build Lua using the same compiler as the one we're testing --- appveyor.yml | 20 ++++++++++---------- test/test_environment.lua | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0220514f..94fd6289 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,23 +7,23 @@ environment: matrix: - LUA: "lua 5.1" - COMPILER: "msvc" - - LUA: "lua 5.2" - COMPILER: "msvc" - - LUA: "lua 5.3" - COMPILER: "msvc" - - LUA: "luajit 2.0" - COMPILER: "msvc" - - LUA: "luajit 2.1" - COMPILER: "msvc" + COMPILER: "vs" - LUA: "lua 5.1" COMPILER: "mingw" + - LUA: "lua 5.2" + COMPILER: "vs" - LUA: "lua 5.2" COMPILER: "mingw" + - LUA: "lua 5.3" + COMPILER: "vs" - LUA: "lua 5.3" COMPILER: "mingw" + - LUA: "luajit 2.0" + COMPILER: "vs" - LUA: "luajit 2.0" COMPILER: "mingw" + - LUA: "luajit 2.1" + COMPILER: "vs" - LUA: "luajit 2.1" COMPILER: "mingw" @@ -36,7 +36,7 @@ init: before_build: - set PATH=C:\Python27\Scripts;%PATH% # Add directory containing 'pip' to PATH - pip install hererocks - - hererocks env --%LUA% -rlatest + - hererocks env --%LUA% -rlatest --target=%COMPILER% - call env\bin\activate build_script: diff --git a/test/test_environment.lua b/test/test_environment.lua index f7cdcaa1..764cd65f 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua @@ -173,7 +173,7 @@ function test_env.set_args() test_env.TEST_TARGET_OS = argument:match("^os=(.*)$") elseif argument == "mingw" then test_env.MINGW = true - elseif argument == "msvc" then + elseif argument == "vs" then test_env.MINGW = false else help() -- cgit v1.2.3-55-g6feb From 35ff15f4ce2f5345df07d8512db65f170a50d4ab Mon Sep 17 00:00:00 2001 From: Hisham Date: Mon, 22 Aug 2016 17:40:29 -0300 Subject: Put MinGW in PATH for hererocks too --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 94fd6289..1d29b18d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,6 +32,8 @@ init: # Setup Lua development/build environment # Make VS 2015 command line tools available - call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %platform% +# Add MinGW compiler to the path +- set PATH=C:\MinGW\bin;%PATH% before_build: - set PATH=C:\Python27\Scripts;%PATH% # Add directory containing 'pip' to PATH @@ -43,7 +45,6 @@ build_script: - luarocks install busted 1> NUL 2> NUL test_script: - - set PATH=C:\MinGW\bin;%PATH% # Add MinGW compiler to the path - busted --lpath=.//?.lua --exclude-tags=ssh,unix,mock -Xhelper appveyor,%COMPILER% after_test: -- cgit v1.2.3-55-g6feb From 0e5cc18334cce0680d1b7be1050b2e67e019e286 Mon Sep 17 00:00:00 2001 From: Hisham Date: Mon, 22 Aug 2016 18:05:07 -0300 Subject: Run failing test with --verbose --- spec/build_spec.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/build_spec.lua b/spec/build_spec.lua index b4f838ca..f2c14e8e 100644 --- a/spec/build_spec.lua +++ b/spec/build_spec.lua @@ -92,7 +92,7 @@ describe("LuaRocks build tests #blackbox #b_build", function() describe("LuaRocks build - basic builds", function() it("LuaRocks build luadoc", function() - assert.is_true(run.luarocks_bool(test_env.quiet("build luadoc"))) + assert.is_true(run.luarocks_bool("build luadoc --verbose")) end) it("LuaRocks build luacov diff version", function() -- cgit v1.2.3-55-g6feb From af41c31d62c4e44c9f5c12a8ce10d6d49aa05347 Mon Sep 17 00:00:00 2001 From: Hisham Date: Mon, 22 Aug 2016 18:36:30 -0300 Subject: Use Unix makefile by default on MinGW; Makefile.win is a leftover from Kepler days, and those are usually NMAKE makefiles for MSVC. --- src/luarocks/cfg.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index d84ebc6e..bcb30342 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua @@ -468,6 +468,7 @@ if cfg.platforms.mingw32 then defaults.variables.LD = "mingw32-gcc" defaults.variables.CFLAGS = "-O2" defaults.variables.LIBFLAG = "-shared" + defaults.makefile = "Makefile" defaults.external_deps_patterns = { bin = { "?.exe", "?.bat" }, -- mingw lookup list from http://stackoverflow.com/a/15853231/1793220 -- cgit v1.2.3-55-g6feb From a57e1f97870bb25aec22b886b731689e61884ed5 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Mon, 22 Aug 2016 19:55:21 +0300 Subject: Remove a redundant check in install.bat check_flags() already ensures that if bundled Lua is being installed LUA_VERSION is 5.1. --- install.bat | 3 --- 1 file changed, 3 deletions(-) diff --git a/install.bat b/install.bat index e28734dc..7ed59525 100644 --- a/install.bat +++ b/install.bat @@ -763,9 +763,6 @@ vars.INCDIR = S"$PREFIX\\include" vars.LUA_SHORTV = vars.LUA_VERSION:gsub("%.", "") if INSTALL_LUA then - if vars.LUA_VERSION ~= "5.1" then - die("Cannot install own copy of Lua because only 5.1 is bundled") - end vars.LUA_INTERPRETER = "lua5.1" vars.LUA_BINDIR = vars.BINDIR vars.LUA_LIBDIR = vars.LIBDIR -- cgit v1.2.3-55-g6feb From b603e64b7e41e718157e98d1bcfa8673351b87f9 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Mon, 22 Aug 2016 20:03:15 +0300 Subject: install.bat: get rid of vars.LUA_LIB_NAMES Generate list of names when needed instead of pregenerating a list of 5.1 and then changing it when LUA_VERSION is different. --- install.bat | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/install.bat b/install.bat index 7ed59525..bdde4413 100644 --- a/install.bat +++ b/install.bat @@ -24,10 +24,6 @@ vars.LUA_LIBDIR = nil vars.LUA_LIBNAME = nil vars.LUA_VERSION = "5.1" vars.LUA_SHORTV = nil -- "51" --- MinGW does not generate .lib, nor needs it to link, but MSVC does --- so .lib must be listed first to ensure they are found first if present. --- To prevent MSVC trying to link to a .dll, which won't work. -vars.LUA_LIB_NAMES = "lua5.1.lib lua51.lib lua5.1.dll lua51.dll liblua.dll.a" vars.LUA_RUNTIME = nil vars.UNAME_M = nil vars.COMPILER_ENV_CMD = nil @@ -273,14 +269,8 @@ local function check_flags() die("Bundled Lua version is 5.1, cannot install "..vars.LUA_VERSION) end end - if vars.LUA_VERSION ~= "5.1" then - if vars.LUA_VERSION == "5.2" then - vars.LUA_LIB_NAMES = vars.LUA_LIB_NAMES:gsub("5([%.]?)1", "5%12") - elseif vars.LUA_VERSION == "5.3" then - vars.LUA_LIB_NAMES = vars.LUA_LIB_NAMES:gsub("5([%.]?)1", "5%13") - else - die("Bad argument: /LV must either be 5.1, 5.2, or 5.3") - end + if not vars.LUA_VERSION:match("^5%.[123]$") then + die("Bad argument: /LV must either be 5.1, 5.2, or 5.3") end if USE_MSVC_MANUAL and USE_MINGW then die("Cannot combine option /MSVC and /MW") @@ -339,7 +329,6 @@ local function look_for_interpreter(directory) else vars.LUA_VERSION = version vars.LUA_SHORTV = version:gsub("%.", "") - vars.LUA_LIB_NAMES = vars.LUA_LIB_NAMES:gsub("5([%.]?)[123]", "5%1" .. version:sub(-1)) end end @@ -358,6 +347,10 @@ local function look_for_interpreter(directory) end local function look_for_link_libraries(directory) + -- MinGW does not generate .lib, nor needs it to link, but MSVC does, + -- so .lib must be listed first to ensure they are found first if present, + -- to prevent MSVC trying to link to a .dll, which won't work. + local names = {S"lua$LUA_VERSION.lib", S"lua$LUA_SHORTV.lib", S"lua$LUA_VERSION.dll", S"lua$LUA_SHORTV.dll", "liblua.dll.a"} local directories if vars.LUA_LIBDIR then directories = {vars.LUA_LIBDIR} @@ -366,7 +359,7 @@ local function look_for_link_libraries(directory) end for _, dir in ipairs(directories) do - for name in vars.LUA_LIB_NAMES:gmatch("[^%s]+") do + for _, name in ipairs(names) do local full_name = dir .. "\\" .. name print(" checking for " .. full_name) if exists(full_name) then @@ -379,7 +372,7 @@ local function look_for_link_libraries(directory) end if vars.LUA_LIBDIR then - die(S"link library (one of; $LUA_LIB_NAMES) not found in $LUA_LIBDIR") + die(("Link library (one of %s) not found in %s"):format(table.concat(names, ", "), vars.LUA_LIBDIR)) end return false end -- cgit v1.2.3-55-g6feb From 4c837a0c953f0dd83485d65979893c3c773eb1ba Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Mon, 22 Aug 2016 20:14:43 +0300 Subject: install.bat: get rid of string splitting function --- install.bat | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/install.bat b/install.bat index bdde4413..cfa080e5 100644 --- a/install.bat +++ b/install.bat @@ -53,32 +53,6 @@ local function die(message) os.exit(1) end -local function split_string(str, delim, maxNb) - -- Eliminate bad cases... - if string.find(str, delim) == nil then - return { str } - end - if maxNb == nil or maxNb < 1 then - maxNb = 0 -- No limit - end - local result = {} - local pat = "(.-)" .. delim .. "()" - local nb = 0 - local lastPos - for part, pos in string.gmatch(str, pat) do - nb = nb + 1 - result[nb] = part - lastPos = pos - if nb == maxNb then break end - end - -- Handle the last field - if nb ~= maxNb then - result[nb + 1] = string.sub(str, lastPos) - end - return result -end - - local function exec(cmd) --print(cmd) local status = os.execute("type NUL && "..cmd) @@ -567,16 +541,15 @@ local function get_possible_lua_directories() -- No prefix given, so use PATH. local path = os.getenv("PATH") or "" - path = path:gsub(";+", ";") -- Remove duplicates. - local directories = split_string(path, ";") - for i, dir in ipairs(directories) do + local directories = {} + for dir in path:gmatch("[^;]+") do -- Remove trailing backslashes, but not from a drive letter like `C:\`. dir = dir:gsub("([^:])\\+$", "%1") -- Remove trailing `bin` subdirectory, the searcher will check there anyway. if dir:upper():match("[:\\]BIN$") then dir = dir:sub(1, -5) end - directories[i] = dir + table.insert(directories, dir) end -- Finally add some other default paths. table.insert(directories, [[c:\lua5.1.2]]) -- cgit v1.2.3-55-g6feb From 00c12a63ed41c1506b84d5682d8c457c40ae8872 Mon Sep 17 00:00:00 2001 From: Hisham Date: Tue, 23 Aug 2016 13:21:57 -0300 Subject: Revert verbose after debugging --- spec/build_spec.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/build_spec.lua b/spec/build_spec.lua index f2c14e8e..b4f838ca 100644 --- a/spec/build_spec.lua +++ b/spec/build_spec.lua @@ -92,7 +92,7 @@ describe("LuaRocks build tests #blackbox #b_build", function() describe("LuaRocks build - basic builds", function() it("LuaRocks build luadoc", function() - assert.is_true(run.luarocks_bool("build luadoc --verbose")) + assert.is_true(run.luarocks_bool(test_env.quiet("build luadoc"))) end) it("LuaRocks build luacov diff version", function() -- cgit v1.2.3-55-g6feb From 0e6b922d2618fc90195299e2f944110c4ffe5600 Mon Sep 17 00:00:00 2001 From: Hisham Date: Tue, 23 Aug 2016 15:59:45 -0300 Subject: Remove Appveyor scripts replaced by Hererocks --- .appveyor/build.bat | 111 ------------------------------------ .appveyor/install.bat | 154 -------------------------------------------------- 2 files changed, 265 deletions(-) delete mode 100644 .appveyor/build.bat delete mode 100644 .appveyor/install.bat diff --git a/.appveyor/build.bat b/.appveyor/build.bat deleted file mode 100644 index a4ff6378..00000000 --- a/.appveyor/build.bat +++ /dev/null @@ -1,111 +0,0 @@ -@echo off -Setlocal EnableDelayedExpansion EnableExtensions - -cd %APPVEYOR_BUILD_FOLDER% - -:: ========================================================= -:: Make sure some environment variables are set -if not defined LUA_VER call :die LUA_VER is not defined -if not defined LUA call :die LUA is not defined -if not defined LUA_SHORTV call :die LUA_SHORTV is not defined -if not defined LUA_DIR call :die LUA_DIR is not defined - -:: ========================================================= -:: Set some defaults. Infer some variables. -:: -if not defined LUAROCKS_VER set LUAROCKS_VER=2.2.1 - -set LUAROCKS_SHORTV=%LUAROCKS_VER:~0,3% - -if not defined LR_EXTERNAL set LR_EXTERNAL=c:\external -if not defined LR_ROOT set LR_ROOT=%LUA_DIR%\LuaRocks -if not defined LR_SYSTREE set LR_SYSTREE=%LR_ROOT%\systree - -:: -:: ========================================================= - - -if not exist %LUA_DIR%\bin\%LUA%.exe call :die "Missing Lua interpreter at %LUA_DIR%\bin\%LUA%.exe" - - - -:: ========================================================= -:: LuaRocks -:: ========================================================= - -cd %APPVEYOR_BUILD_FOLDER% -call install.bat /LUA %LUA_DIR% /Q /LV %LUA_SHORTV% /P "%LR_ROOT%" /TREE "%LR_SYSTREE%" - -if not exist "%LR_ROOT%" call :die "LuaRocks not found at %LR_ROOT%" - -set PATH=%LR_ROOT%;%LR_SYSTREE%\bin;%PATH% - -:: Lua will use just the system rocks -set LUA_PATH=%LR_ROOT%\lua\?.lua;%LR_ROOT%\lua\?\init.lua -set LUA_PATH=%LUA_PATH%;%LR_SYSTREE%\share\lua\%LUA_SHORTV%\?.lua -set LUA_PATH=%LUA_PATH%;%LR_SYSTREE%\share\lua\%LUA_SHORTV%\?\init.lua -set LUA_CPATH=%LR_SYSTREE%\lib\lua\%LUA_SHORTV%\?.dll - -call luarocks --version || call :die "Error with LuaRocks installation" -call luarocks list - - -if not exist "%LR_EXTERNAL%" ( - mkdir "%LR_EXTERNAL%" - mkdir "%LR_EXTERNAL%\lib" - mkdir "%LR_EXTERNAL%\include" -) - -set PATH=%LR_EXTERNAL%;%PATH% - -:: Exports the following variables: -:: (beware of whitespace between & and ^ below) -endlocal & set PATH=%PATH%&^ -set LR_SYSTREE=%LR_SYSTREE%&^ -set LUA_PATH=%LUA_PATH%&^ -set LUA_CPATH=%LUA_CPATH%&^ -set LR_EXTERNAL=%LR_EXTERNAL% - -echo. -echo ====================================================== -echo Installation of LuaRocks %LUAROCKS_VER% done. -echo . -echo LUA_PATH - %LUA_PATH% -echo LUA_CPATH - %LUA_CPATH% -echo. -echo LR_EXTERNAL - %LR_EXTERNAL% -echo ====================================================== -echo. - -goto :eof - - - - - - - - - - - - - - - - - - -:: This blank space is intentional. If you see errors like "The system cannot find the batch label specified 'foo'" -:: then try adding or removing blank lines lines above. -:: Yes, really. -:: http://stackoverflow.com/questions/232651/why-the-system-cannot-find-the-batch-label-specified-is-thrown-even-if-label-e - -:: helper functions: - -:: for bailing out when an error occurred -:die %1 -echo %1 -exit /B 1 -goto :eof - diff --git a/.appveyor/install.bat b/.appveyor/install.bat deleted file mode 100644 index a2aefdd2..00000000 --- a/.appveyor/install.bat +++ /dev/null @@ -1,154 +0,0 @@ -@echo off - -cd %APPVEYOR_BUILD_FOLDER% - -:: ========================================================= -:: Set some defaults. Infer some variables. -:: -:: These are set globally -if "%LUA_VER%" NEQ "" ( - set LUA=lua - set LUA_SHORTV=%LUA_VER:~0,3% -) else ( - set LUA=luajit - set LJ_SHORTV=%LJ_VER:~0,3% - set LUA_SHORTV=5.1 -) - -:: unless we specify a platform on appveyor.yaml, we won't get this variable -if not defined platform set platform=x86 - -:: defines LUA_DIR so Cmake can find this Lua install -if "%LUA%"=="luajit" ( - set LUA_DIR=c:\lua\%platform%\lj%LJ_SHORTV% -) else ( - set LUA_DIR=c:\lua\%platform%\%LUA_VER% -) - -:: Now we declare a scope -Setlocal EnableDelayedExpansion EnableExtensions - -if not defined LUA_URL set LUA_URL=http://www.lua.org/ftp -if not defined LUAJIT_GIT_REPO set LUAJIT_GIT_REPO=http://luajit.org/git/luajit-2.0.git -if not defined LUAJIT_URL set LUAJIT_URL=http://luajit.org/download - -if not defined SEVENZIP set SEVENZIP=7z -:: -:: ========================================================= - -:: first create some necessary directories: -mkdir downloads 2>NUL - -:: Download and compile Lua (or LuaJIT) -if "%LUA%"=="luajit" ( - if not exist %LUA_DIR% ( - if "%LJ_SHORTV%"=="2.1" ( - :: Clone repository and checkout 2.1 branch - set lj_source_folder=%APPVEYOR_BUILD_FOLDER%\downloads\luajit-%LJ_VER% - if not exist !lj_source_folder! ( - echo Cloning git repo %LUAJIT_GIT_REPO% !lj_source_folder! - git clone %LUAJIT_GIT_REPO% !lj_source_folder! || call :die "Failed to clone repository" - ) - cd !lj_source_folder!\src - git checkout v2.1 || call :die - ) else ( - set lj_source_folder=%APPVEYOR_BUILD_FOLDER%\downloads\luajit-%LJ_VER% - if not exist !lj_source_folder! ( - echo Downloading... %LUAJIT_URL%/LuaJIT-%LJ_VER%.tar.gz - curl --silent --fail --max-time 120 --connect-timeout 30 %LUAJIT_URL%/LuaJIT-%LJ_VER%.tar.gz | %SEVENZIP% x -si -so -tgzip | %SEVENZIP% x -si -ttar -aoa -odownloads - ) - cd !lj_source_folder!\src - ) - :: Compiles LuaJIT - call msvcbuild.bat - - mkdir %LUA_DIR% 2> NUL - for %%a in (bin include lib) do ( mkdir "%LUA_DIR%\%%a" ) - - for %%a in (luajit.exe lua51.dll) do ( move "!lj_source_folder!\src\%%a" "%LUA_DIR%\bin" ) - - move "!lj_source_folder!\src\lua51.lib" "%LUA_DIR%\lib" - for %%a in (lauxlib.h lua.h lua.hpp luaconf.h lualib.h luajit.h) do ( - copy "!lj_source_folder!\src\%%a" "%LUA_DIR%\include" - ) - - ) else ( - echo LuaJIT %LJ_VER% already installed at %LUA_DIR% - ) -) else ( - if not exist %LUA_DIR% ( - :: Download and compile Lua - if not exist downloads\lua-%LUA_VER% ( - curl --silent --fail --max-time 120 --connect-timeout 30 %LUA_URL%/lua-%LUA_VER%.tar.gz | %SEVENZIP% x -si -so -tgzip | %SEVENZIP% x -si -ttar -aoa -odownloads - ) - - mkdir downloads\lua-%LUA_VER%\etc 2> NUL - if not exist downloads\lua-%LUA_VER%\etc\winmake.bat ( - curl --silent --location --insecure --fail --max-time 120 --connect-timeout 30 https://github.com/Tieske/luawinmake/archive/master.tar.gz | %SEVENZIP% x -si -so -tgzip | %SEVENZIP% e -si -ttar -aoa -odownloads\lua-%LUA_VER%\etc luawinmake-master\etc\winmake.bat - ) - - cd downloads\lua-%LUA_VER% - call etc\winmake - call etc\winmake install %LUA_DIR% - ) else ( - echo Lua %LUA_VER% already installed at %LUA_DIR% - ) -) - -if not exist %LUA_DIR%\bin\%LUA%.exe call :die "Missing Lua interpreter at %LUA_DIR%\bin\%LUA%.exe" - -set PATH=%LUA_DIR%\bin;%PATH% -call %LUA% -v - - - -:: Exports the following variables: -endlocal & set PATH=%PATH% - -echo. -echo ====================================================== -if "%LUA%"=="luajit" ( - echo Installation of LuaJIT %LJ_VER% done. -) else ( - echo Installation of Lua %LUA_VER% done. -) -echo Platform - %platform% -echo LUA - %LUA% -echo LUA_SHORTV - %LUA_SHORTV% -echo LJ_SHORTV - %LJ_SHORTV% -echo. -echo ====================================================== -echo. - -goto :eof - - - - - - - - - - - - - - - - - - -:: This blank space is intentional. If you see errors like "The system cannot find the batch label specified 'foo'" -:: then try adding or removing blank lines lines above. -:: Yes, really. -:: http://stackoverflow.com/questions/232651/why-the-system-cannot-find-the-batch-label-specified-is-thrown-even-if-label-e - -:: helper functions: - -:: for bailing out when an error occurred -:die %1 -echo %1 -exit /B 1 -goto :eof - -- cgit v1.2.3-55-g6feb From c53a3c84000cfeaa5749abe3a5917b55f74c21de Mon Sep 17 00:00:00 2001 From: Hisham Date: Thu, 8 Sep 2016 11:28:52 -0300 Subject: Make `pack` use the same logic as `show` for finding a rock. --- src/luarocks/doc.lua | 4 ++-- src/luarocks/pack.lua | 36 +++++++++--------------------------- src/luarocks/search.lua | 33 +++++++++++++++++++++++++++++++++ src/luarocks/show.lua | 37 ++----------------------------------- 4 files changed, 46 insertions(+), 64 deletions(-) diff --git a/src/luarocks/doc.lua b/src/luarocks/doc.lua index ec2b1110..15460b31 100644 --- a/src/luarocks/doc.lua +++ b/src/luarocks/doc.lua @@ -5,7 +5,7 @@ local doc = {} package.loaded["luarocks.doc"] = doc local util = require("luarocks.util") -local show = require("luarocks.show") +local search = require("luarocks.search") local path = require("luarocks.path") local dir = require("luarocks.dir") local fetch = require("luarocks.fetch") @@ -63,7 +63,7 @@ function doc.command(flags, name, version) return nil, "Argument missing. "..util.see_help("doc") end - local iname, iversion, repo = show.pick_installed_rock(name, version, flags["tree"]) + local iname, iversion, repo = search.pick_installed_rock(name, version, flags["tree"]) if not iname then util.printout(name..(version and " "..version or "").." is not installed. Looking for it in the rocks servers...") return try_to_open_homepage(name, version) diff --git a/src/luarocks/pack.lua b/src/luarocks/pack.lua index 277cf246..fb40a576 100644 --- a/src/luarocks/pack.lua +++ b/src/luarocks/pack.lua @@ -85,38 +85,20 @@ end -- @param name string: Name of package to pack. -- @param version string or nil: A version number may also be passed. +-- @param tree string or nil: An optional tree to pick the package from. -- @return string or (nil, string): The filename of the resulting -- .src.rock file; or nil and an error message. -local function do_pack_binary_rock(name, version) +local function do_pack_binary_rock(name, version, tree) assert(type(name) == "string") assert(type(version) == "string" or not version) - local query = search.make_query(name, version) - query.exact_name = true - local results = {} - - search.manifest_search(results, cfg.rocks_dir, query) - - if not next(results) then - return nil, "'"..name.."' does not seem to be an installed rock." - end - - local versions = results[name] - - if not version then - local first = next(versions) - if next(versions, first) then - return nil, "Please specify which version of '"..name.."' to pack." - end - version = first - end - if not version:match("[^-]+%-%d+") then - return nil, "Expected version "..version.." in version-revision format." + local repo, repo_url + name, version, repo, repo_url = search.pick_installed_rock(name, version, tree) + if not name then + return nil, version end - - local info = versions[version][1] - - local root = path.root_dir(info.repo) + + local root = path.root_dir(repo_url) local prefix = path.install_dir(name, version, root) if not fs.exists(prefix) then return nil, "'"..name.." "..version.."' does not seem to be an installed rock." @@ -202,7 +184,7 @@ function pack.command(flags, arg, version) if arg:match(".*%.rockspec") then file, err = pack.pack_source_rock(arg) else - file, err = do_pack_binary_rock(arg, version) + file, err = do_pack_binary_rock(arg, version, flags["tree"]) end if err then return nil, err diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua index eaa321d5..d22c2a18 100644 --- a/src/luarocks/search.lua +++ b/src/luarocks/search.lua @@ -416,6 +416,39 @@ function search.act_on_src_or_rockspec(action, name, version, ...) return action(url, ...) end +function search.pick_installed_rock(name, version, given_tree) + local results = {} + local query = search.make_query(name, version) + query.exact_name = true + local tree_map = {} + local trees = cfg.rocks_trees + if given_tree then + trees = { given_tree } + end + for _, tree in ipairs(trees) do + local rocks_dir = path.rocks_dir(tree) + tree_map[rocks_dir] = tree + search.manifest_search(results, rocks_dir, query) + end + + if not next(results) then -- + return nil,"cannot find package "..name.." "..(version or "").."\nUse 'list' to find installed rocks." + end + + version = nil + local repo_url + local package, versions = util.sortedpairs(results)() + --question: what do we do about multiple versions? This should + --give us the latest version on the last repo (which is usually the global one) + for vs, repositories in util.sortedpairs(versions, deps.compare_versions) do + if not version then version = vs end + for _, rp in ipairs(repositories) do repo_url = rp.repo end + end + + local repo = tree_map[repo_url] + return name, version, repo, repo_url +end + --- Driver function for "search" command. -- @param name string: A substring of a rock name to search. -- @param version string or nil: a version may also be passed. diff --git a/src/luarocks/show.lua b/src/luarocks/show.lua index 01860e78..88f9512d 100644 --- a/src/luarocks/show.lua +++ b/src/luarocks/show.lua @@ -58,45 +58,12 @@ local function format_text(text) return (table.concat(paragraphs, "\n\n"):gsub("%s$", "")) end -function show.pick_installed_rock(name, version, tree) - local results = {} - local query = search.make_query(name, version) - query.exact_name = true - local tree_map = {} - local trees = cfg.rocks_trees - if tree then - trees = { tree } - end - for _, tree in ipairs(trees) do - local rocks_dir = path.rocks_dir(tree) - tree_map[rocks_dir] = tree - search.manifest_search(results, rocks_dir, query) - end - - if not next(results) then -- - return nil,"cannot find package "..name.." "..(version or "").."\nUse 'list' to find installed rocks." - end - - version = nil - local repo_url - local package, versions = util.sortedpairs(results)() - --question: what do we do about multiple versions? This should - --give us the latest version on the last repo (which is usually the global one) - for vs, repositories in util.sortedpairs(versions, deps.compare_versions) do - if not version then version = vs end - for _, rp in ipairs(repositories) do repo_url = rp.repo end - end - - local repo = tree_map[repo_url] - return name, version, repo, repo_url -end - local function installed_rock_label(name, tree) local installed, version if cfg.rocks_provided[name] then installed, version = true, cfg.rocks_provided[name] else - installed, version = show.pick_installed_rock(name, nil, tree) + installed, version = search.pick_installed_rock(name, nil, tree) end return installed and "(using "..version..")" or "(missing)" end @@ -111,7 +78,7 @@ function show.command(flags, name, version) end local repo, repo_url - name, version, repo, repo_url = show.pick_installed_rock(name, version, flags["tree"]) + name, version, repo, repo_url = search.pick_installed_rock(name, version, flags["tree"]) if not name then return nil, version end -- cgit v1.2.3-55-g6feb From c6d48427430b6b96f88b249dee1533fb5e6ff681 Mon Sep 17 00:00:00 2001 From: Hisham Date: Thu, 8 Sep 2016 13:10:40 -0300 Subject: Fix pack-binary-rock operation. --- src/luarocks/pack.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/luarocks/pack.lua b/src/luarocks/pack.lua index fb40a576..932ff0d5 100644 --- a/src/luarocks/pack.lua +++ b/src/luarocks/pack.lua @@ -164,7 +164,7 @@ function pack.pack_binary_rock(name, version, cmd, ...) if not rname then rname, rversion = name, version end - return do_pack_binary_rock(rname, rversion) + return do_pack_binary_rock(rname, rversion, temp_dir) end --- Driver function for the "pack" command. -- cgit v1.2.3-55-g6feb From f91fc9a6ef9ef488c709894a29ce63db2bc1e399 Mon Sep 17 00:00:00 2001 From: Hisham Date: Thu, 8 Sep 2016 14:04:40 -0300 Subject: Tests: luarocks_bool commands log their outputs on failure. --- spec/build_spec.lua | 8 ++++---- spec/help_spec.lua | 4 ++-- spec/install_spec.lua | 12 ++++++------ spec/make_spec.lua | 8 ++++---- spec/pack_spec.lua | 4 ++-- spec/search_spec.lua | 2 +- test/test_environment.lua | 22 +++++++++++++++++++--- 7 files changed, 38 insertions(+), 22 deletions(-) diff --git a/spec/build_spec.lua b/spec/build_spec.lua index 8f08f0a0..2ff7cbe6 100644 --- a/spec/build_spec.lua +++ b/spec/build_spec.lua @@ -92,7 +92,7 @@ describe("LuaRocks build tests #blackbox #b_build", function() describe("LuaRocks build - basic builds", function() it("LuaRocks build luadoc", function() - assert.is_true(run.luarocks_bool(test_env.quiet("build luadoc"))) + assert.is_true(run.luarocks_bool("build luadoc")) end) it("LuaRocks build luacov diff version", function() @@ -114,7 +114,7 @@ describe("LuaRocks build tests #blackbox #b_build", function() if test_env.TEST_TARGET_OS == "windows" then assert.is_false(run.luarocks_bool("build lpty")) --Error: This rockspec for lpty does not support win32, windows platforms else - assert.is_true(run.luarocks_bool(test_env.quiet("build lpty"))) + assert.is_true(run.luarocks_bool("build lpty")) assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lpty/1.0.1-1/lpty-1.0.1-1.rockspec")) end end) @@ -146,7 +146,7 @@ describe("LuaRocks build tests #blackbox #b_build", function() end it("LuaRocks build luasec only deps", function() - assert.is_true(run.luarocks_bool(test_env.quiet("build luasec " .. test_env.OPENSSL_DIRS .. " --only-deps"))) + assert.is_true(run.luarocks_bool("build luasec " .. test_env.OPENSSL_DIRS .. " --only-deps")) assert.is_false(run.luarocks_bool("show luasec")) assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasec/0.6-1/luasec-0.6-1.rockspec")) end) @@ -181,7 +181,7 @@ describe("LuaRocks build tests #blackbox #b_build", function() it("LuaRocks build with https", function() assert.is_true(run.luarocks_bool("download --rockspec validate-args 1.5.4-1")) - assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.OPENSSL_DIRS))) + assert.is_true(run.luarocks_bool("install luasec " .. test_env.OPENSSL_DIRS)) assert.is_true(run.luarocks_bool("build validate-args-1.5.4-1.rockspec")) assert.is.truthy(run.luarocks("show validate-args")) diff --git a/spec/help_spec.lua b/spec/help_spec.lua index 88aa5030..71b1b9f6 100644 --- a/spec/help_spec.lua +++ b/spec/help_spec.lua @@ -10,7 +10,7 @@ describe("LuaRocks help tests #blackbox #b_help", function() end) it("LuaRocks help with no flags/arguments", function() - assert.is_true(run.luarocks_bool(test_env.quiet("help"))) + assert.is_true(run.luarocks_bool("help")) end) it("LuaRocks help invalid argument", function() @@ -18,7 +18,7 @@ describe("LuaRocks help tests #blackbox #b_help", function() end) it("LuaRocks help config", function() - assert.is_true(run.luarocks_bool(test_env.quiet("help config"))) + assert.is_true(run.luarocks_bool("help config")) end) it("LuaRocks-admin help with no flags/arguments", function() diff --git a/spec/install_spec.lua b/spec/install_spec.lua index e5b9e2cc..8857e4bd 100644 --- a/spec/install_spec.lua +++ b/spec/install_spec.lua @@ -66,15 +66,15 @@ describe("LuaRocks install tests #blackbox #b_install", function() end) it("LuaRocks install luasec and show luasocket (dependency)", function() - assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.OPENSSL_DIRS))) + assert.is_true(run.luarocks_bool("install luasec " .. test_env.OPENSSL_DIRS)) assert.is_true(run.luarocks_bool("show luasocket")) end) end) describe("LuaRocks install - more complex tests", function() it('LuaRocks install luasec with skipping dependency checks', function() - assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.OPENSSL_DIRS .. " --nodeps"))) - assert.is_true(run.luarocks_bool(test_env.quiet("show luasec"))) + assert.is_true(run.luarocks_bool("install luasec " .. test_env.OPENSSL_DIRS .. " --nodeps")) + assert.is_true(run.luarocks_bool("show luasec")) if env_variables.TYPE_TEST_ENV == "minimal" then assert.is_false(run.luarocks_bool(test_env.quiet("show luasocket"))) assert.is.falsy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasocket")) @@ -83,21 +83,21 @@ describe("LuaRocks install tests #blackbox #b_install", function() end) it("LuaRocks install only-deps of luasocket packed rock", function() - assert.is_true(run.luarocks_bool(test_env.quiet("build --pack-binary-rock luasocket 3.0rc1-2"))) + assert.is_true(run.luarocks_bool("build --pack-binary-rock luasocket 3.0rc1-2")) local output = run.luarocks("install --only-deps " .. "luasocket-3.0rc1-2." .. test_env.platform .. ".rock") assert.are.same(output, "Successfully installed dependencies for luasocket 3.0rc1-2") assert.is_true(os.remove("luasocket-3.0rc1-2." .. test_env.platform .. ".rock")) end) it("LuaRocks install reinstall", function() - assert.is_true(run.luarocks_bool(test_env.quiet("build --pack-binary-rock luasocket 3.0rc1-2"))) + assert.is_true(run.luarocks_bool("build --pack-binary-rock luasocket 3.0rc1-2")) assert.is_true(run.luarocks_bool("install " .. "luasocket-3.0rc1-2." .. test_env.platform .. ".rock")) assert.is_true(run.luarocks_bool("install --deps-mode=none " .. "luasocket-3.0rc1-2." .. test_env.platform .. ".rock")) assert.is_true(os.remove("luasocket-3.0rc1-2." .. test_env.platform .. ".rock")) end) it("LuaRocks install binary rock of cprint", function() - assert.is_true(run.luarocks_bool(test_env.quiet("build --pack-binary-rock cprint"))) + assert.is_true(run.luarocks_bool("build --pack-binary-rock cprint")) assert.is_true(run.luarocks_bool("install cprint-0.1-2." .. test_env.platform .. ".rock")) assert.is_true(os.remove("cprint-0.1-2." .. test_env.platform .. ".rock")) end) diff --git a/spec/make_spec.lua b/spec/make_spec.lua index 624badff..ae79a29c 100644 --- a/spec/make_spec.lua +++ b/spec/make_spec.lua @@ -30,10 +30,10 @@ describe("LuaRocks make tests #blackbox #b_make", function() assert.is_true(run.luarocks_bool("download --source luasocket 3.0rc1-2")) assert.is_true(run.luarocks_bool("unpack luasocket-3.0rc1-2.src.rock")) lfs.chdir("luasocket-3.0rc1-2/luasocket-3.0-rc1/") - assert.is_true(run.luarocks_bool(test_env.quiet("make luasocket-3.0rc1-2.rockspec"))) + assert.is_true(run.luarocks_bool("make luasocket-3.0rc1-2.rockspec")) -- test it - assert.is_true(run.luarocks_bool(test_env.quiet("show luasocket"))) + assert.is_true(run.luarocks_bool("show luasocket")) assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasocket/3.0rc1-2/luasocket-3.0rc1-2.rockspec")) -- delete downloaded and unpacked files @@ -69,7 +69,7 @@ describe("LuaRocks make tests #blackbox #b_make", function() test_env.copy("lxsh-0.8.6-2.rockspec", "rockspec") assert.is_true(run.luarocks_bool("make")) - assert.is_true(run.luarocks_bool(test_env.quiet("show lxsh"))) + assert.is_true(run.luarocks_bool("show lxsh")) assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/lxsh/0.8.6-2/lxsh-0.8.6-2.rockspec")) os.remove("rockspec") end) @@ -94,7 +94,7 @@ describe("LuaRocks make tests #blackbox #b_make", function() end) it("LuaRocks make pack binary rock", function() - assert.is_true(run.luarocks_bool(test_env.quiet("make --deps-mode=none --pack-binary-rock"))) + assert.is_true(run.luarocks_bool("make --deps-mode=none --pack-binary-rock")) assert.is.truthy(lfs.attributes("lxsh-0.8.6-2.all.rock")) end) end) diff --git a/spec/pack_spec.lua b/spec/pack_spec.lua index 3191e80c..3c9ed9fd 100644 --- a/spec/pack_spec.lua +++ b/spec/pack_spec.lua @@ -25,7 +25,7 @@ describe("LuaRocks pack tests #blackbox #b_pack", function() end) it("LuaRocks pack basic", function() - assert.is_true(run.luarocks_bool(test_env.quiet("pack luacov"))) + assert.is_true(run.luarocks_bool("pack luacov")) assert.is_true(test_env.remove_files(lfs.currentdir(), "luacov-")) end) @@ -49,7 +49,7 @@ describe("LuaRocks pack tests #blackbox #b_pack", function() end) it("LuaRocks pack src", function() - assert.is_true(run.luarocks_bool(test_env.quiet("install luasec " .. test_env.OPENSSL_DIRS))) + assert.is_true(run.luarocks_bool("install luasec " .. test_env.OPENSSL_DIRS)) assert.is_true(run.luarocks_bool("download --rockspec luasocket 3.0rc1-2")) assert.is_true(run.luarocks_bool("pack luasocket-3.0rc1-2.rockspec")) assert.is_true(test_env.remove_files(lfs.currentdir(), "luasocket-")) diff --git a/spec/search_spec.lua b/spec/search_spec.lua index f75bc3c1..04f84eeb 100644 --- a/spec/search_spec.lua +++ b/spec/search_spec.lua @@ -30,6 +30,6 @@ describe("LuaRocks search tests #blackbox #b_search", function() end) it("LuaRocks search with flag all", function() - assert.is_true(run.luarocks_bool(test_env.quiet("search --all"))) + assert.is_true(run.luarocks_bool("search --all")) end) end) diff --git a/test/test_environment.lua b/test/test_environment.lua index 00213d31..8239795d 100644 --- a/test/test_environment.lua +++ b/test/test_environment.lua @@ -119,13 +119,29 @@ function test_env.execute_helper(command, print_command, env_variables) end --- Execute command and returns true/false --- In Lua5.1 os.execute returns numeric value, but in Lua5.2+ returns boolean -- @return true/false boolean: status of the command execution local function execute_bool(command, print_command, env_variables) command = test_env.execute_helper(command, print_command, env_variables) - local ok = os.execute(command) - return ok == true or ok == 0 + local redirect_filename + local redirect = "" + if print_command ~= nil then + redirect_filename = test_env.testing_paths.luarocks_tmp.."/output.txt" + redirect = " > "..redirect_filename + end + local ok = os.execute(command .. redirect) + ok = (ok == true or ok == 0) -- normalize Lua 5.1 output to boolean + if redirect ~= "" then + if not ok then + local fd = io.open(redirect_filename, "r") + if fd then + print(fd:read("*a")) + fd:close() + end + end + os.remove(redirect_filename) + end + return ok end --- Execute command and returns output of command -- cgit v1.2.3-55-g6feb From f2daf51d17f696bebf6db59a53e26eee579bb5a7 Mon Sep 17 00:00:00 2001 From: Hisham Date: Thu, 8 Sep 2016 14:38:37 -0300 Subject: Fix test to match new behavior of `pack`. --- spec/pack_spec.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spec/pack_spec.lua b/spec/pack_spec.lua index 3c9ed9fd..aa84be8d 100644 --- a/spec/pack_spec.lua +++ b/spec/pack_spec.lua @@ -41,11 +41,12 @@ describe("LuaRocks pack tests #blackbox #b_pack", function() assert.is_false(run.luarocks_bool("pack /non/exist/temp.manif")) end) - it("LuaRocks pack specify which version of rock", function() + it("LuaRocks pack detects latest version version of rock", function() assert.is_true(run.luarocks_bool("install say 1.2")) assert.is_true(run.luarocks_bool("install luassert")) assert.is_true(run.luarocks_bool("install say 1.0")) - assert.is_false(run.luarocks_bool("pack say")) + assert.is_truthy(lfs.attributes("say-1.2-1.all.rock")) + assert.is_true(test_env.remove_files(lfs.currentdir(), "say-")) end) it("LuaRocks pack src", function() -- cgit v1.2.3-55-g6feb From 412ada2cf8ca4792e8c36c181df2a948cecd892d Mon Sep 17 00:00:00 2001 From: Hisham Date: Thu, 8 Sep 2016 14:55:07 -0300 Subject: Restore accidentally deleted line! --- spec/pack_spec.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/pack_spec.lua b/spec/pack_spec.lua index aa84be8d..0c6dd8f2 100644 --- a/spec/pack_spec.lua +++ b/spec/pack_spec.lua @@ -45,6 +45,7 @@ describe("LuaRocks pack tests #blackbox #b_pack", function() assert.is_true(run.luarocks_bool("install say 1.2")) assert.is_true(run.luarocks_bool("install luassert")) assert.is_true(run.luarocks_bool("install say 1.0")) + assert.is_true(run.luarocks_bool("pack say")) assert.is_truthy(lfs.attributes("say-1.2-1.all.rock")) assert.is_true(test_env.remove_files(lfs.currentdir(), "say-")) end) -- cgit v1.2.3-55-g6feb From 87f2b81d3bf95e9c3bd99b1c09a8260c90a07d3b Mon Sep 17 00:00:00 2001 From: Hisham Date: Thu, 8 Sep 2016 14:59:47 -0300 Subject: Remove old testing.bat --- test/testing.bat | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 test/testing.bat diff --git a/test/testing.bat b/test/testing.bat deleted file mode 100644 index 7083678b..00000000 --- a/test/testing.bat +++ /dev/null @@ -1,9 +0,0 @@ -@echo off -Setlocal EnableDelayedExpansion EnableExtensions - -if not defined LUAROCKS_REPO set LUAROCKS_REPO=https://luarocks.org - -appveyor DownloadFile %LUAROCKS_REPO%/stdlib-41.0.0-1.src.rock -luarocks build stdlib - -endlocal -- cgit v1.2.3-55-g6feb From 6d539e2f36131e02693a0b09003cd5852b2f9c3f Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Sun, 11 Sep 2016 17:46:06 -0300 Subject: Add Gitter badge, change Travis badge to svg --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 92171db8..3df3c853 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,10 @@ A package manager for Lua modules. -[![Build Status](https://travis-ci.org/keplerproject/luarocks.png?branch=master)](https://travis-ci.org/keplerproject/luarocks) +[![Build Status](https://travis-ci.org/keplerproject/luarocks.svg?branch=master)](https://travis-ci.org/keplerproject/luarocks) [![Build Status](https://ci.appveyor.com/api/projects/status/4x4630tcf64da48i/branch/master?svg=true)](https://ci.appveyor.com/project/hishamhm/luarocks/branch/master) [![Coverage Status](https://codecov.io/gh/keplerproject/luarocks/coverage.svg?branch=master)](https://codecov.io/gh/keplerproject/luarocks/branch/master) +[![Join the chat at https://gitter.im/keplerproject/luarocks](https://badges.gitter.im/keplerproject/luarocks.svg)](https://gitter.im/keplerproject/luarocks?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) Main website: [luarocks.org](http://www.luarocks.org) -- cgit v1.2.3-55-g6feb From 34963cbc145f9ea1521c24919a9c2c38ee24a7d8 Mon Sep 17 00:00:00 2001 From: Hisham Date: Wed, 5 Oct 2016 03:18:26 -0300 Subject: Simulate module() for older wrappers. Older versions of LuaRocks (e.g. 2.1.0) install script wrappers that assume that `luarocks.loader` is available in the global namespace (this is from the module() era). This workaround detects this (because site_config.lua files written by these old versions use module(), and therefore create a `luarocks` global. To reproduce this issue, make a clean install of LuaRocks 2.1.0, then run `luarocks install luarocks`. Installation succeds, but running `luarocks` produces `attempt to index field 'loader' (a nil value)`. Bug reported by @tomasguisasola. --- src/luarocks/loader.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/luarocks/loader.lua b/src/luarocks/loader.lua index 26280e94..06a0cfda 100644 --- a/src/luarocks/loader.lua +++ b/src/luarocks/loader.lua @@ -22,6 +22,11 @@ local manif_core = require("luarocks.manif_core") local deps = require("luarocks.deps") local util = require("luarocks.util") +-- Workaround for wrappers produced by older versions of LuaRocks +if luarocks then + luarocks.loader = loader +end + loader.context = {} -- Contains a table when rocks trees are loaded, -- cgit v1.2.3-55-g6feb From adcba81974979be3763c8d9d46eb2de9a88ff67c Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Thu, 6 Oct 2016 16:24:55 +0300 Subject: Add tests for util.sortedpairs --- spec/util_spec.lua | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/spec/util_spec.lua b/spec/util_spec.lua index e6776e4b..2779b1ce 100644 --- a/spec/util_spec.lua +++ b/spec/util_spec.lua @@ -116,3 +116,59 @@ describe("Basic tests #blackbox #b_util", function() end) end) end) + +test_env.unload_luarocks() +local util = require("luarocks.util") + +describe("Luarocks util test #whitebox #w_util", function() + describe("util.sortedpairs", function() + local function collect(iter, state, var) + local collected = {} + + while true do + local returns = {iter(state, var)} + + if returns[1] == nil then + return collected + else + table.insert(collected, returns) + var = returns[1] + end + end + end + + it("default sort", function() + assert.are.same({}, collect(util.sortedpairs({}))) + assert.are.same({ + {1, "v1"}, + {2, "v2"}, + {3, "v3"}, + {"bar", "v5"}, + {"foo", "v4"} + }, collect(util.sortedpairs({"v1", "v2", "v3", foo = "v4", bar = "v5"}))) + end) + + it("sort by function", function() + local function compare(a, b) return a > b end + assert.are.same({}, collect(util.sortedpairs({}, compare))) + assert.are.same({ + {3, "v3"}, + {2, "v2"}, + {1, "v1"} + }, collect(util.sortedpairs({"v1", "v2", "v3"}, compare))) + end) + + it("sort by priority table", function() + assert.are.same({}, collect(util.sortedpairs({}, {"k1", "k2"}))) + assert.are.same({ + {"k3", "v3"}, + {"k2", "v2", {"sub order"}}, + {"k1", "v1"}, + {"k4", "v4"}, + {"k5", "v5"}, + }, collect(util.sortedpairs({ + k1 = "v1", k2 = "v2", k3 = "v3", k4 = "v4", k5 = "v5" + }, {"k3", {"k2", {"sub order"}}, "k1"}))) + end) + end) +end) -- cgit v1.2.3-55-g6feb From eb7427676a2f09556f9d5f19a1a6392fd945e8bc Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Thu, 6 Oct 2016 16:51:04 +0300 Subject: Rewrite util.sortedpairs to avoid using coroutines util.sortedpairs is used in luarocks loader since @6dc745a. Openresty does not like coroutines being used from inside `require`, resulting in "attempt to yield across C-call boundary" error. New version of util.sortedpairs uses a prepared array of ordered keys instead of coroutines. Ref #620. --- src/luarocks/util.lua | 79 ++++++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 36 deletions(-) diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua index 532bea8b..c9fb7d63 100644 --- a/src/luarocks/util.lua +++ b/src/luarocks/util.lua @@ -357,52 +357,59 @@ local function default_sort(a, b) end end --- The iterator function used internally by util.sortedpairs. +--- A table iterator generator that returns elements sorted by key, +-- to be used in "for" loops. -- @param tbl table: The table to be iterated. --- @param sort_function function or nil: An optional comparison function --- to be used by table.sort when sorting keys. --- @see sortedpairs -local function sortedpairs_iterator(tbl, sort_function) - local ks = util.keys(tbl) - if not sort_function or type(sort_function) == "function" then - table.sort(ks, sort_function or default_sort) - for _, k in ipairs(ks) do - coroutine.yield(k, tbl[k]) - end +-- @param sort_function function or table or nil: An optional comparison function +-- to be used by table.sort when sorting keys, or an array listing an explicit order +-- for keys. If a value itself is an array, it is taken so that the first element +-- is a string representing the field name, and the second element is a priority table +-- for that key, which is returned by the iterator as the third value after the key +-- and the value. +-- @return function: the iterator function. +function util.sortedpairs(tbl, sort_function) + sort_function = sort_function or default_sort + local keys = util.keys(tbl) + local sub_orders = {} + + if type(sort_function) == "function" then + table.sort(keys, sort_function) else local order = sort_function - local done = {} - for _, k in ipairs(order) do - local sub_order - if type(k) == "table" then - sub_order = k[2] - k = k[1] + local ordered_keys = {} + local all_keys = keys + keys = {} + + for _, order_entry in ipairs(order) do + local key, sub_order + if type(order_entry) == "table" then + key = order_entry[1] + sub_order = order_entry[2] + else + key = order_entry end - if tbl[k] then - done[k] = true - coroutine.yield(k, tbl[k], sub_order) + + if tbl[key] then + ordered_keys[key] = true + sub_orders[key] = sub_order + table.insert(keys, key) end end - table.sort(ks, default_sort) - for _, k in ipairs(ks) do - if not done[k] then - coroutine.yield(k, tbl[k]) + + table.sort(all_keys, default_sort) + for _, key in ipairs(all_keys) do + if not ordered_keys[key] then + table.insert(keys, key) end end end -end ---- A table iterator generator that returns elements sorted by key, --- to be used in "for" loops. --- @param tbl table: The table to be iterated. --- @param sort_function function or table or nil: An optional comparison function --- to be used by table.sort when sorting keys, or an array listing an explicit order --- for keys. If a value itself is an array, it is taken so that the first element --- is a string representing the field name, and the second element is a priority table --- for that key. --- @return function: the iterator function. -function util.sortedpairs(tbl, sort_function) - return coroutine.wrap(function() sortedpairs_iterator(tbl, sort_function) end) + local i = 1 + return function() + local key = keys[i] + i = i + 1 + return key, tbl[key], sub_orders[key] + end end function util.lua_versions() -- cgit v1.2.3-55-g6feb From 67a7d4faee164903769d001abbebd1073ad87e01 Mon Sep 17 00:00:00 2001 From: Hisham Date: Thu, 6 Oct 2016 11:51:31 -0300 Subject: Make the workaround for older LuaRocks versions more robust. --- src/luarocks/loader.lua | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/luarocks/loader.lua b/src/luarocks/loader.lua index 06a0cfda..874bc10c 100644 --- a/src/luarocks/loader.lua +++ b/src/luarocks/loader.lua @@ -23,8 +23,25 @@ local deps = require("luarocks.deps") local util = require("luarocks.util") -- Workaround for wrappers produced by older versions of LuaRocks +local temporary_global = false if luarocks then + -- The site_config.lua file generated by old versions uses module(), + -- so it produces a global `luarocks` table. Since we have the table, + -- add the `loader` field to make the old wrappers happy. luarocks.loader = loader +else + -- When a new version is installed on top of an old version, + -- site_config.lua may be replaced, and then it no longer creates + -- a global. + -- Detect when being called via -lluarocks.loader; this is + -- most likely a wrapper. + local info = debug.getinfo(2, "nS") + if info.what == "C" and not info.name then + luarocks = { loader = loader } + temporary_global = true + -- For the other half of this hack, + -- see the next use of `temporary_global` below. + end end loader.context = {} @@ -60,6 +77,13 @@ function loader.add_context(name, version) -- assert(type(name) == "string") -- assert(type(version) == "string") + if temporary_global then + -- The first thing a wrapper does is to call add_context. + -- From here on, it's safe to clean the global environment. + luarocks = nil + temporary_global = false + end + if loader.context[name] then return end -- cgit v1.2.3-55-g6feb From ccfcd97d14659ba540927272fb307a4113ce0992 Mon Sep 17 00:00:00 2001 From: Hisham Date: Thu, 6 Oct 2016 14:38:32 -0300 Subject: Install site_config.lua after Makefile calls luarocks. Otherwise, when luarocks removes a previous version it may end up deleting the site_config.lua file that was freshly installed. Closes #625. --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index dc9079b0..ae308a67 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,8 @@ include config.unix .PHONY: all build dev build_bins luadoc check_makefile cleanup_bins clean \ - install_site_config write_sysconfig install bootstrap install_rock + install_site_config write_sysconfig install bootstrap install_rock \ + run_luarocks ROCKS_TREE ?= $(PREFIX) SYSCONFDIR ?= $(PREFIX)/etc/luarocks @@ -124,6 +125,9 @@ cleanup_bins: clean: cleanup_bins rm -f src/luarocks/site_config.lua +run_luarocks: + '$(LUA_BINDIR)/lua$(LUA_SUFFIX)' -e "package.path=[[$(SAFEPWD)/src/?.lua;]]..package.path" src/bin/luarocks make rockspec --tree="$(PREFIX)" + install_site_config: src/luarocks/site_config.lua mkdir -p "$(DESTDIR)$(LUADIR)/luarocks" cp src/luarocks/site_config.lua "$(DESTDIR)$(LUADIR)/luarocks" @@ -144,8 +148,7 @@ write_sysconfig: install: install_bins install_luas install_site_config write_sysconfig -bootstrap: src/luarocks/site_config.lua install_site_config write_sysconfig cleanup_bins - '$(LUA_BINDIR)/lua$(LUA_SUFFIX)' -e "package.path=[[$(SAFEPWD)/src/?.lua;]]..package.path" src/bin/luarocks make rockspec --tree="$(PREFIX)" +bootstrap: src/luarocks/site_config.lua run_luarocks install_site_config write_sysconfig cleanup_bins install_rock: install_bins install_luas -- cgit v1.2.3-55-g6feb From 1fea0e3a0972bcc6b4319cd3d9e79834562486bc Mon Sep 17 00:00:00 2001 From: Hisham Date: Thu, 6 Oct 2016 15:41:13 -0300 Subject: Fixup LUAROCKS_PREFIX when copying over site_config.lua. See #625. --- Makefile.luarocks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.luarocks b/Makefile.luarocks index 1eecfeae..20ede467 100644 --- a/Makefile.luarocks +++ b/Makefile.luarocks @@ -12,4 +12,4 @@ install: install_bins install_luas copy_site_config copy_site_config: luaver="$(LUA_VERSION)" && [ -n "$$luaver" ] || luaver=`$(LUA) -e 'print(_VERSION:sub(5))'`; \ mkdir -p "$(DESTDIR)$(LUADIR)/luarocks"; \ - cp $(LUAROCKS_PREFIX)/share/lua/$$luaver/luarocks/site_config.lua "$(DESTDIR)$(LUADIR)/luarocks" + lprefix=`echo "$(LUADIR)" | sed 's,/lib/luarocks/.*,,'`; sed "s,LUAROCKS_PREFIX=.*,LUAROCKS_PREFIX=[[$$lprefix]],g" $(LUAROCKS_PREFIX)/share/lua/$$luaver/luarocks/site_config.lua > "$(DESTDIR)$(LUADIR)/luarocks/site_config.lua" -- cgit v1.2.3-55-g6feb