sanity check

6 files changed, 64 insertions, 64 deletions

diff --git a/src/luarocks/core/types/rockmanifest.d.tl b/src/luarocks/core/types/rockmanifest.d.tl
index dbcb0380..59fec9f1 100644
--- a/src/luarocks/core/types/rockmanifest.d.tl
+++ b/src/luarocks/core/types/rockmanifest.d.tl
@@ -1,7 +1,7 @@
 local record rockmanifest
     record RockManifest
         type Entry = string | {string: Entry}
-        entries: {string: Entry}
+        rock_manifest: {string: Entry}
     end
 end
 return rockmanifest
\ No newline at end of file
diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua
index 754ad985..437ebe3b 100644
--- a/src/luarocks/manif.lua
+++ b/src/luarocks/manif.lua
@@ -72,7 +72,7 @@ function manif.load_rock_manifest(name, version, root)
 
    local name_version = name .. "/" .. version
    if manif.rock_manifest_cache[name_version] then
-      return manif.rock_manifest_cache[name_version].entries
+      return manif.rock_manifest_cache[name_version].rock_manifest
    end
    local pathname = path.rock_manifest_file(name, version, root)
    local rock_manifest = persist.load_into_table(pathname)
@@ -80,7 +80,7 @@ function manif.load_rock_manifest(name, version, root)
       return nil, "rock_manifest file not found for " .. name .. " " .. version .. " - not a LuaRocks tree?"
    end
    manif.rock_manifest_cache[name_version] = rock_manifest
-   return rock_manifest.entries
+   return rock_manifest.rock_manifest
 end
 
 
diff --git a/src/luarocks/manif.tl b/src/luarocks/manif.tl
index 3ce753e1..0a329fff 100644
--- a/src/luarocks/manif.tl
+++ b/src/luarocks/manif.tl
@@ -72,7 +72,7 @@ function manif.load_rock_manifest(name: string, version: string, root?: string |
 
    local name_version = name.."/"..version
    if manif.rock_manifest_cache[name_version] then
-      return manif.rock_manifest_cache[name_version].entries
+      return manif.rock_manifest_cache[name_version].rock_manifest
    end
    local pathname = path.rock_manifest_file(name, version, root)
    local rock_manifest = persist.load_into_table(pathname) as RockManifest
@@ -80,7 +80,7 @@ function manif.load_rock_manifest(name: string, version: string, root?: string |
       return nil, "rock_manifest file not found for "..name.." "..version.." - not a LuaRocks tree?"
    end
    manif.rock_manifest_cache[name_version] = rock_manifest
-   return rock_manifest.entries
+   return rock_manifest.rock_manifest
 end
 
 --- Load a local or remote manifest describing a repository.
diff --git a/src/luarocks/repos.tl b/src/luarocks/repos.tl
index 5ce73831..b5e1efe8 100644
--- a/src/luarocks/repos.tl
+++ b/src/luarocks/repos.tl
@@ -450,8 +450,8 @@ function repos.deploy_local_files(name: string, version: string, wrap_bin_script
    if not rock_manifest then return nil, load_err end
 
    local repo = cfg.root_dir
-   local renames = {}
-   local installs = {}
+   local renames: {Op} = {}
+   local installs: {Op} = {}
 
    local function install_binary(source: string, target: string): boolean, string
       if wrap_bin_scripts and fs.is_lua(source) then
diff --git a/src/luarocks/test-original.lua b/src/luarocks/test-incomplete.lua
index d074b950..762b98b5 100644
--- a/src/luarocks/test-original.lua
+++ b/src/luarocks/test-incomplete.lua
@@ -1,10 +1,24 @@
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local pcall = _tl_compat and _tl_compat.pcall or pcall; local table = _tl_compat and _tl_compat.table or table; local test = {TestModules = {}, }
+
+
+
+
+
 
-local test = {}
 
 local fetch = require("luarocks.fetch")
 local deps = require("luarocks.deps")
 local util = require("luarocks.util")
 
+
+
+
+
+
+
+
+
+
 local test_types = {
    "busted",
    "command",
@@ -13,10 +27,15 @@ local test_types = {
 local test_modules = {}
 
 for _, test_type in ipairs(test_types) do
-   local mod = require("luarocks.test." .. test_type)
+   local mod
+   if test_type == "command" then
+      mod = require("luarocks.test.command")
+   elseif test_type == "busted" then
+      mod = require("luarocks.test.busted")
+   end
    table.insert(test_modules, mod)
-   test_modules[test_type] = mod
-   test_modules[mod] = test_type
+   test_modules.typetomod[test_type] = mod
+   test_modules.modtotype[mod] = test_type
 end
 
 local function get_test_type(rockspec)
@@ -26,14 +45,14 @@ local function get_test_type(rockspec)
 
    for _, test_module in ipairs(test_modules) do
       if test_module.detect_type() then
-         return test_modules[test_module]
+         return test_modules.modtotype[test_module]
       end
    end
 
    return nil, "could not detect test type -- no test suite for " .. rockspec.package .. "?"
 end
 
--- Run test suite as configured in rockspec in the current directory.
+
 function test.run_test_suite(rockspec_arg, test_type, args, prepare)
    local rockspec
    if type(rockspec_arg) == "string" then
@@ -43,13 +62,12 @@ function test.run_test_suite(rockspec_arg, test_type, args, prepare)
          return nil, err, errcode
       end
    else
-      assert(type(rockspec_arg) == "table")
       rockspec = rockspec_arg
    end
 
    if not test_type then
       local err
-      test_type, err = get_test_type(rockspec, test_type)
+      test_type, err = get_test_type(rockspec)
       if not test_type then
          return nil, err
       end
@@ -62,23 +80,30 @@ function test.run_test_suite(rockspec_arg, test_type, args, prepare)
       "test_dependencies",
    }
    for _, dep_kind in ipairs(all_deps) do
-      if rockspec[dep_kind] and next(rockspec[dep_kind]) then
-         local ok, err, errcode = deps.fulfill_dependencies(rockspec, dep_kind, "all")
+      if (rockspec)[dep_kind] and next((rockspec)[dep_kind]) ~= nil then
+         local _, err, errcode = deps.fulfill_dependencies(rockspec, dep_kind, "all")
          if err then
             return nil, err, errcode
          end
       end
    end
 
-   local mod_name = "luarocks.test." .. test_type
-   local pok, test_mod = pcall(require, mod_name)
-   if not pok then
-      return nil, "failed loading test execution module " .. mod_name
+   local pok, test_mod
+   if test_type == "command" then
+      pok, test_mod = pcall(require, "luarocks.test.command")
+      if not pok then
+         return nil, "failed loading test execution module luarocks.test.command"
+      end
+   elseif test_type == "busted" then
+      pok, test_mod = pcall(require, "luarocks.test.busted")
+      if not pok then
+         return nil, "failed loading test execution module luarocks.test.busted"
+      end
    end
 
    if prepare then
       if test_type == "busted" then
-         return test_mod.run_tests(rockspec_arg, {"--version"})
+         return test_mod.run_tests(rockspec.test, { "--version" })
       else
          return true
       end
@@ -87,7 +112,7 @@ function test.run_test_suite(rockspec_arg, test_type, args, prepare)
       if type(flags) == "table" then
          util.variable_substitutions(flags, rockspec.variables)
 
-         -- insert any flags given in test.flags at the front of args
+
          for i = 1, #flags do
             table.insert(args, i, flags[i])
          end
diff --git a/src/luarocks/test.lua b/src/luarocks/test.lua
index 762b98b5..d074b950 100644
--- a/src/luarocks/test.lua
+++ b/src/luarocks/test.lua
@@ -1,24 +1,10 @@
-local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local pcall = _tl_compat and _tl_compat.pcall or pcall; local table = _tl_compat and _tl_compat.table or table; local test = {TestModules = {}, }
-
-
-
-
-
 
+local test = {}
 
 local fetch = require("luarocks.fetch")
 local deps = require("luarocks.deps")
 local util = require("luarocks.util")
 
-
-
-
-
-
-
-
-
-
 local test_types = {
    "busted",
    "command",
@@ -27,15 +13,10 @@ local test_types = {
 local test_modules = {}
 
 for _, test_type in ipairs(test_types) do
-   local mod
-   if test_type == "command" then
-      mod = require("luarocks.test.command")
-   elseif test_type == "busted" then
-      mod = require("luarocks.test.busted")
-   end
+   local mod = require("luarocks.test." .. test_type)
    table.insert(test_modules, mod)
-   test_modules.typetomod[test_type] = mod
-   test_modules.modtotype[mod] = test_type
+   test_modules[test_type] = mod
+   test_modules[mod] = test_type
 end
 
 local function get_test_type(rockspec)
@@ -45,14 +26,14 @@ local function get_test_type(rockspec)
 
    for _, test_module in ipairs(test_modules) do
       if test_module.detect_type() then
-         return test_modules.modtotype[test_module]
+         return test_modules[test_module]
       end
    end
 
    return nil, "could not detect test type -- no test suite for " .. rockspec.package .. "?"
 end
 
-
+-- Run test suite as configured in rockspec in the current directory.
 function test.run_test_suite(rockspec_arg, test_type, args, prepare)
    local rockspec
    if type(rockspec_arg) == "string" then
@@ -62,12 +43,13 @@ function test.run_test_suite(rockspec_arg, test_type, args, prepare)
          return nil, err, errcode
       end
    else
+      assert(type(rockspec_arg) == "table")
       rockspec = rockspec_arg
    end
 
    if not test_type then
       local err
-      test_type, err = get_test_type(rockspec)
+      test_type, err = get_test_type(rockspec, test_type)
       if not test_type then
          return nil, err
       end
@@ -80,30 +62,23 @@ function test.run_test_suite(rockspec_arg, test_type, args, prepare)
       "test_dependencies",
    }
    for _, dep_kind in ipairs(all_deps) do
-      if (rockspec)[dep_kind] and next((rockspec)[dep_kind]) ~= nil then
-         local _, err, errcode = deps.fulfill_dependencies(rockspec, dep_kind, "all")
+      if rockspec[dep_kind] and next(rockspec[dep_kind]) then
+         local ok, err, errcode = deps.fulfill_dependencies(rockspec, dep_kind, "all")
          if err then
             return nil, err, errcode
          end
       end
    end
 
-   local pok, test_mod
-   if test_type == "command" then
-      pok, test_mod = pcall(require, "luarocks.test.command")
-      if not pok then
-         return nil, "failed loading test execution module luarocks.test.command"
-      end
-   elseif test_type == "busted" then
-      pok, test_mod = pcall(require, "luarocks.test.busted")
-      if not pok then
-         return nil, "failed loading test execution module luarocks.test.busted"
-      end
+   local mod_name = "luarocks.test." .. test_type
+   local pok, test_mod = pcall(require, mod_name)
+   if not pok then
+      return nil, "failed loading test execution module " .. mod_name
    end
 
    if prepare then
       if test_type == "busted" then
-         return test_mod.run_tests(rockspec.test, { "--version" })
+         return test_mod.run_tests(rockspec_arg, {"--version"})
       else
          return true
       end
@@ -112,7 +87,7 @@ function test.run_test_suite(rockspec_arg, test_type, args, prepare)
       if type(flags) == "table" then
          util.variable_substitutions(flags, rockspec.variables)
 
-
+         -- insert any flags given in test.flags at the front of args
          for i = 1, #flags do
             table.insert(args, i, flags[i])
          end