downloads

15 files changed, 107 insertions, 65 deletions

diff --git a/src/luarocks/build/make.tl b/src/luarocks/build/make.tl
index 58fc6e2e..4107bca1 100644
--- a/src/luarocks/build/make.tl
+++ b/src/luarocks/build/make.tl
@@ -64,7 +64,6 @@ function make.run(rockspec: Rockspec, not_install: boolean): boolean, string, st
    end
 
    util.warn_if_not_used(build.build_variables, { CFLAGS=true }, "variable %s was not passed in build_variables")
---  Here, `util.warn_if_not_used(build.build_variables, { CFLAGS=true }, "variable %s was not passed in build_variables")` isn't the type of  `build.build_variables`, `{string: string}`, like `variables`
    util.variable_substitutions(build.build_variables, rockspec.variables)
    util.variable_substitutions(build.install_variables, rockspec.variables)
 
diff --git a/src/luarocks/cmd.tl b/src/luarocks/cmd.tl
index e7ea3b19..93fa85dc 100644
--- a/src/luarocks/cmd.tl
+++ b/src/luarocks/cmd.tl
@@ -1,6 +1,17 @@
 
 --- Functions for command-line scripts.
 local record cmd
+   record Args
+      tree: string
+      global: boolean
+      deps_mode: string
+      ["local"]: boolean --!
+      project_tree: string
+      server: string
+      dev: boolean
+      only_server: string --!
+   end
+   errorcodes: {string: integer}
 end
 
 local manif = require("luarocks.manif")
@@ -13,10 +24,14 @@ local fun = require("luarocks.fun")
 local fs = require("luarocks.fs")
 local argparse = require("luarocks.vendor.argparse")
 
-local unpack = table.unpack or unpack
-local pack = table.pack or function(...) return { n = select("#", ...), ... } end
+local type t = require("luarocks.core.types.tree")
+local type Tree = t.Tree
 
-local hc_ok, hardcoded = pcall(require, "luarocks.core.hardcoded")
+local type Args = cmd.Args
+
+-- local pack = table.pack or function(...) return { n = select("#", ...), ... } end
+
+local hc_ok, hardcoded: boolean, {string: string} = pcall(require, "luarocks.core.hardcoded")
 if not hc_ok then
    hardcoded = {}
 end
@@ -45,19 +60,20 @@ local function check_popen()
    end
 end
 
-local process_tree_args
+local process_tree_args: function(Args, string): boolean, string
 do
-   local function replace_tree(args, root, tree)
+   local function replace_tree(args: Args, root: string, tree?: Tree)
       root = dir.normalize(root)
       args.tree = root
       path.use_tree(tree or root)
    end
 
    local function strip_trailing_slashes()
-      if type(cfg.root_dir) == "string" then
-        cfg.root_dir = cfg.root_dir:gsub("/+$", "")
+      local cfg_root_dir = cfg.root_dir
+      if cfg_root_dir is string then
+        cfg.root_dir = (cfg.root_dir as string):gsub("/+$", "")
       else
-        cfg.root_dir.root = cfg.root_dir.root:gsub("/+$", "")
+         (cfg.root_dir as Tree).root = (cfg.root_dir as Tree).root:gsub("/+$", "")
       end
       cfg.rocks_dir = cfg.rocks_dir:gsub("/+$", "")
       cfg.deploy_bin_dir = cfg.deploy_bin_dir:gsub("/+$", "")
@@ -65,9 +81,9 @@ do
       cfg.deploy_lib_dir = cfg.deploy_lib_dir:gsub("/+$", "")
    end
 
-   local function set_named_tree(args, name)
+   local function set_named_tree(args: Args, name: string): boolean, string
       for _, tree in ipairs(cfg.rocks_trees) do
-         if type(tree) == "table" and name == tree.name then
+         if tree is Tree and name == tree.name then
             if not tree.root then
                return nil, "Configuration error: tree '"..tree.name.."' has no 'root' field."
             end
@@ -78,7 +94,7 @@ do
       return false
    end
 
-   process_tree_args = function(args, project_dir)
+   process_tree_args = function(args: Args, project_dir: string): boolean, string
 
       if args.global then
          local ok, err = set_named_tree(args, "system")
@@ -134,16 +150,22 @@ do
    end
 end
 
-local function process_server_args(args)
+local function process_server_args(args: Args): boolean, string
    if args.server then
       local protocol, pathname = dir.split_url(args.server)
       table.insert(cfg.rocks_servers, 1, protocol.."://"..pathname)
    end
 
    if args.dev then
-      local append_dev = function(s) return dir.path(s, "dev") end
-      local dev_servers = fun.traverse(cfg.rocks_servers, append_dev)
-      cfg.rocks_servers = fun.concat(dev_servers, cfg.rocks_servers)
+      for i, server in ipairs(cfg.rocks_servers) do
+         if server is string then
+            cfg.rocks_servers[i] = dir.path(server, "dev")
+         else
+            for j, mirror in ipairs(server) do
+               server[j] = dir.path(mirror, "dev")
+            end
+         end
+      end      
    end
 
    if args.only_server then
@@ -159,7 +181,7 @@ local function process_server_args(args)
    return true
 end
 
-local function error_handler(err)
+local function error_handler(err: string): string
    if not debug then
       return err
    end
@@ -180,8 +202,8 @@ end
 --- Display an error message and exit.
 -- @param message string: The error message.
 -- @param exitcode number: the exitcode to use
-local function die(message, exitcode)
-   assert(type(message) == "string", "bad error, expected string, got: " .. type(message))
+local function die(message: string, exitcode: number)
+   assert(type(message) == "string", "bad error, expected string, got: " .. type(message)) --!
    assert(exitcode == nil or type(exitcode) == "number", "bad error, expected number, got: " .. type(exitcode) .. " - " .. tostring(exitcode))
    util.printerr("\nError: "..message)
 
diff --git a/src/luarocks/cmd/doc.lua b/src/luarocks/cmd/doc.lua
index a3117007..cae929cb 100644
--- a/src/luarocks/cmd/doc.lua
+++ b/src/luarocks/cmd/doc.lua
@@ -47,7 +47,7 @@ local function try_to_open_homepage(name, namespace, version)
    util.schedule_function(fs.delete, temp_dir)
    local ok, err = fs.change_dir(temp_dir)
    if not ok then return nil, err end
-   local filename, err = download.download("rockspec", name, namespace, version)
+   local filename, err = download.download_file("rockspec", name, namespace, version)
    if not filename then return nil, err end
    local rockspec, err = fetch.load_local_rockspec(filename)
    if not rockspec then return nil, err end
diff --git a/src/luarocks/cmd/download.lua b/src/luarocks/cmd/download.lua
index eae82439..23433d30 100644
--- a/src/luarocks/cmd/download.lua
+++ b/src/luarocks/cmd/download.lua
@@ -44,8 +44,13 @@ function cmd_download.command(args)
       arch = args.arch
    end
 
-   local dl, err = download.download(arch, args.name, args.namespace, args.version, args.all, args.check_lua_versions)
-   return dl and true, err
+   if args.all then
+      local ok, err = download.download_all(arch, args.name, args.namespace, args.version)
+      return ok, err
+   else
+      local dl, err = download.download_file(arch, args.name, args.namespace, args.version, args.check_lua_versions)
+      return dl and true, err
+   end
 end
 
 return cmd_download
diff --git a/src/luarocks/cmd/lint.lua b/src/luarocks/cmd/lint.lua
index 738503ce..421803e1 100644
--- a/src/luarocks/cmd/lint.lua
+++ b/src/luarocks/cmd/lint.lua
@@ -21,7 +21,7 @@ function lint.command(args)
    local filename = args.rockspec
    if not filename:match(".rockspec$") then
       local err
-      filename, err = download.download("rockspec", filename:lower())
+      filename, err = download.download_file("rockspec", filename:lower())
       if not filename then
          return nil, err
       end
diff --git a/src/luarocks/cmd/new_version.lua b/src/luarocks/cmd/new_version.lua
index ccba9335..2ec084e0 100644
--- a/src/luarocks/cmd/new_version.lua
+++ b/src/luarocks/cmd/new_version.lua
@@ -161,7 +161,7 @@ function new_version.command(args)
          return nil, err
       end
    else
-      filename, err = download.download("rockspec", args.rock:lower())
+      filename, err = download.download_file("rockspec", args.rock:lower())
       if not filename then
          return nil, err
       end
diff --git a/src/luarocks/core/cfg.d.tl b/src/luarocks/core/cfg.d.tl
index 409d2441..5903a49f 100644
--- a/src/luarocks/core/cfg.d.tl
+++ b/src/luarocks/core/cfg.d.tl
@@ -89,6 +89,11 @@ local record cfg
    -- make
    makefile: string
    make: string
+   -- cmd
+   local_by_default: boolean
+   fs_use_modules: boolean
+   is_binary: boolean
+   program_version: string
 end
 
 return cfg
\ No newline at end of file
diff --git a/src/luarocks/core/hardcoded-original.lua b/src/luarocks/core/hardcoded-original.lua
new file mode 100644
index 00000000..52b89fa5
--- /dev/null
+++ b/src/luarocks/core/hardcoded-original.lua
@@ -0,0 +1,6 @@
+return {
+SYSCONFDIR = "/home/victor/Documents/luarocks/testrun/testing_lrprefix-5.4/etc/luarocks",
+LUA_DIR = "/usr",
+LUA_BINDIR = "/usr/bin",
+LUA = "/usr/bin/lua",
+}
diff --git a/src/luarocks/core/hardcoded.tl b/src/luarocks/core/hardcoded.tl
new file mode 100644
index 00000000..52b89fa5
--- /dev/null
+++ b/src/luarocks/core/hardcoded.tl
@@ -0,0 +1,6 @@
+return {
+SYSCONFDIR = "/home/victor/Documents/luarocks/testrun/testing_lrprefix-5.4/etc/luarocks",
+LUA_DIR = "/usr",
+LUA_BINDIR = "/usr/bin",
+LUA = "/usr/bin/lua",
+}
diff --git a/src/luarocks/core/types/tree.d.tl b/src/luarocks/core/types/tree.d.tl
index df54def9..6af23f37 100644
--- a/src/luarocks/core/types/tree.d.tl
+++ b/src/luarocks/core/types/tree.d.tl
@@ -1,5 +1,6 @@
 local record tree
     record Tree
+        name: string
         root: string
         rocks_dir: string
         lua_dir: string
diff --git a/src/luarocks/download.tl b/src/luarocks/download.tl
index 43a57d8f..508f74b4 100644
--- a/src/luarocks/download.tl
+++ b/src/luarocks/download.tl
@@ -25,43 +25,50 @@ local function get_file(filename: string): string, string
    end
 end
 
-function download.download(arch: string, name: string, namespace: string, version: string, all, check_lua_versions: boolean): string, string
-   local substring = (all and name == "")
+function download.download_all(arch: string, name: string, namespace: string, version: string): boolean, string
+   local substring = (name == "")
    local query = queries.new(name, namespace, version, substring, arch)
    local search_err: string
 
-   if all then
-      local results = search.search_repos(query)
-      local has_result = false
-      local all_ok = true
-      local any_err = ""
-      for name, result in pairs(results) do  -- luacheck: ignore 422
-         for version, items in pairs(result) do  -- luacheck: ignore 422
-            for _, item in ipairs(items) do
-               -- Ignore provided rocks.
-               if item.arch ~= "installed" then
-                  has_result = true
-                  local filename = path.make_url(item.repo, name, version, item.arch)
-                  local ok, err = get_file(filename)
-                  if not ok then
-                     all_ok = false
-                     any_err = any_err .. "\n" .. err
-                  end
+   local results = search.search_repos(query)
+   local has_result = false
+   local all_ok = true
+   local any_err = ""
+   for name, result in pairs(results) do  -- luacheck: ignore 422
+      for version, items in pairs(result) do  -- luacheck: ignore 422
+         for _, item in ipairs(items) do
+            -- Ignore provided rocks.
+            if item.arch ~= "installed" then
+               has_result = true
+               local filename = path.make_url(item.repo, name, version, item.arch)
+               local ok, err = get_file(filename)
+               if not ok then
+                  all_ok = false
+                  any_err = any_err .. "\n" .. err
                end
             end
          end
       end
+   end
 
-      if has_result then
-         return all_ok, any_err
-      end
-   else
-      local url: string
-      url, search_err = search.find_rock_checking_lua_versions(query, check_lua_versions)
-      if url then
-         return get_file(url)
-      end
+   if has_result then
+      return all_ok, any_err
+   end
+   
+   local rock = util.format_rock_name(name, namespace, version)
+   return nil, "Could not find a result named "..rock..(search_err and ": "..search_err or ".")
+end
+   
+function download.download_file(arch: string, name: string, namespace: string, version: string, check_lua_versions?: boolean): string, string
+   local query = queries.new(name, namespace, version, false, arch)
+   local search_err: string
+
+   local url: string
+   url, search_err = search.find_rock_checking_lua_versions(query, check_lua_versions)
+   if url then
+      return get_file(url)
    end
+   
    local rock = util.format_rock_name(name, namespace, version)
    return nil, "Could not find a result named "..rock..(search_err and ": "..search_err or ".")
 end
diff --git a/src/luarocks/fs.d.tl b/src/luarocks/fs.d.tl
index b72bd35a..93555b08 100644
--- a/src/luarocks/fs.d.tl
+++ b/src/luarocks/fs.d.tl
@@ -67,6 +67,8 @@ local record fs
    execute_env: function({any: any}, string, ...:string): boolean
    -- pack
    zip: function(string, ...:string): boolean, string
+   -- cmd
+   is_superuser: function(): boolean
 end
 
 return fs
diff --git a/src/luarocks/fun.tl b/src/luarocks/fun.tl
index e2d43d5d..5d581af5 100644
--- a/src/luarocks/fun.tl
+++ b/src/luarocks/fun.tl
@@ -44,17 +44,6 @@ function fun.filter<K>(xs: {K}, f: function): {K}
    return rs
 end
 
-function fun.traverse<K, V>(t: {K}, f: function(K): V): {V} | V --? right or {any} | any
-   return fun.map(t, function(x: K): {V} | V
-      -- return x is table and fun.traverse(x, f) or f(x) --? 
-      if x is {any} then
-         return fun.traverse(x, f)
-      else
-         return f(x)
-      end
-   end)
-end
-
 function fun.reverse_in<K>(t: {K}): {K}
    for i = 1, math.floor(#t/2) do
       local m, n = i, #t - i + 1
diff --git a/src/luarocks/path.tl b/src/luarocks/path.tl
index 65c425d3..d6a06b5d 100644
--- a/src/luarocks/path.tl
+++ b/src/luarocks/path.tl
@@ -207,7 +207,7 @@ function path.module_to_path(mod: string): string
    return (mod:gsub("[^.]*$", ""):gsub("%.", "/"))
 end
 
-function path.use_tree(tree: Tree)
+function path.use_tree(tree: string | Tree)
    cfg.root_dir = tree
    cfg.rocks_dir = path.rocks_dir(tree)
    cfg.deploy_bin_dir = path.deploy_bin_dir(tree)
diff --git a/src/luarocks/util.tl b/src/luarocks/util.tl
index d57de5e8..5e22e840 100644
--- a/src/luarocks/util.tl
+++ b/src/luarocks/util.tl
@@ -112,7 +112,7 @@ local var_format_pattern = "%$%((%a[%a%d_]+)%)"
 -- @param needed_set: a set where keys are the names of
 -- needed variables.
 -- @param msg string: the warning message to display.
-function util.warn_if_not_used(var_defs: {string: string}, needed_set: {string: string}, msg: string)
+function util.warn_if_not_used(var_defs: {string: string}, needed_set: {string: boolean}, msg: string)
    local seen = {}
    for _, val in pairs(var_defs) do
       for used in val:gmatch(var_format_pattern) do