rockspecs

4 files changed, 684 insertions, 483 deletions

diff --git a/src/luarocks/deps-original.lua b/src/luarocks/deps-incomplete.lua
index 1a9eefde..fe93a900 100644
--- a/src/luarocks/deps-original.lua
+++ b/src/luarocks/deps-incomplete.lua
@@ -1,7 +1,8 @@
+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 io = _tl_compat and _tl_compat.io or io; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local pairs = _tl_compat and _tl_compat.pairs or pairs; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table
 
---- High-level dependency related functions.
 local deps = {}
 
+
 local cfg = require("luarocks.core.cfg")
 local manif = require("luarocks.manif")
 local path = require("luarocks.path")
@@ -12,34 +13,56 @@ local vers = require("luarocks.core.vers")
 local queries = require("luarocks.queries")
 local deplocks = require("luarocks.deplocks")
 
---- Generate a function that matches dep queries against the manifest,
--- taking into account rocks_provided, the list of versions to skip,
--- and the lockfile.
--- @param deps_mode "one", "none", "all" or "order"
--- @param rocks_provided a one-level table mapping names to versions,
--- listing rocks to consider provided by the VM
--- @param rocks_provided table: A table of auto-provided dependencies.
--- by this Lua implementation for the given dependency.
--- @param depskey key to use when matching the lockfile ("dependencies",
--- "build_dependencies", etc.)
--- @param skip_set a two-level table mapping names to versions to
--- boolean, listing rocks that should not be matched
--- @return function(dep): {string}, {string:string}, string, boolean
--- * array of matching versions
--- * map of versions to locations
--- * version matched via lockfile if any
--- * true if rock matched via rocks_provided
+
+
+
+
+
+
+
+
+
+
+
+
+
+local v = require("luarocks.core.types.version")
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 local function prepare_get_versions(deps_mode, rocks_provided, depskey, skip_set)
-   assert(type(deps_mode) == "string")
-   assert(type(rocks_provided) == "table")
-   assert(type(depskey) == "string")
-   assert(type(skip_set) == "table" or skip_set == nil)
 
    return function(dep)
       local versions, locations
       local provided = rocks_provided[dep.name]
       if provided then
-         -- Provided rocks have higher priority than manifest's rocks.
+
          versions, locations = { provided }, {}
       else
          if deps_mode == "none" then
@@ -63,21 +86,20 @@ local function prepare_get_versions(deps_mode, rocks_provided, depskey, skip_set
    end
 end
 
---- Attempt to match a dependency to an installed rock.
--- @param get_versions a getter function obtained via prepare_get_versions
--- @return (string, string, table) or (nil, nil, table):
--- 1. latest installed version of the rock matching the dependency
--- 2. location where the installed version is installed
--- 3. the 'dep' query table
--- 4. true if provided via VM
--- or
--- 1. nil
--- 2. nil
--- 3. either 'dep' or an alternative query to be used
--- 4. false
-local function match_dep(dep, get_versions)
-   assert(type(dep) == "table")
-   assert(type(get_versions) == "function")
+
+
+
+
+
+
+
+
+
+
+
+
+local function match_dep(dep,
+   get_versions)
 
    local versions, locations, lockversion, provided = get_versions(dep)
 
@@ -105,9 +127,8 @@ local function match_dep(dep, get_versions)
    return latest_vstring, locations[latest_vstring], dep, provided
 end
 
-local function match_all_deps(dependencies, get_versions)
-   assert(type(dependencies) == "table")
-   assert(type(get_versions) == "function")
+local function match_all_deps(dependencies,
+   get_versions)
 
    local matched, missing, no_upgrade = {}, {}, {}
 
@@ -116,7 +137,7 @@ local function match_all_deps(dependencies, get_versions)
       found, _, dep, provided = match_dep(dep, get_versions)
       if found then
          if not provided then
-            matched[dep] = {name = dep.name, version = found}
+            matched[dep] = { name = dep.name, version = found }
          end
       else
          if dep.constraints[1] and dep.constraints[1].no_upgrade then
@@ -129,53 +150,41 @@ local function match_all_deps(dependencies, get_versions)
    return matched, missing, no_upgrade
 end
 
---- Attempt to match dependencies of a rockspec to installed rocks.
--- @param dependencies table: The table of dependencies.
--- @param rocks_provided table: The table of auto-provided dependencies.
--- @param skip_set table or nil: Program versions to not use as valid matches.
--- Table where keys are program names and values are tables where keys
--- are program versions and values are 'true'.
--- @param deps_mode string: Which trees to check dependencies for
--- @return table, table, table: A table where keys are dependencies parsed
--- in table format and values are tables containing fields 'name' and
--- version' representing matches; a table of missing dependencies
--- parsed as tables; and a table of "no-upgrade" missing dependencies
--- (to be used in plugin modules so that a plugin does not force upgrade of
--- its parent application).
+
+
+
+
+
+
+
+
+
+
+
+
+
 function deps.match_deps(dependencies, rocks_provided, deps_mode, skip_set)
-   assert(type(dependencies) == "table")
-   assert(type(rocks_provided) == "table")
-   assert(type(skip_set) == "table" or skip_set == nil)
-   assert(type(deps_mode) == "string")
 
    local get_versions = prepare_get_versions(deps_mode, rocks_provided, "dependencies", skip_set)
    return match_all_deps(dependencies, get_versions)
 end
 
 local function rock_status(dep, get_versions)
-   assert(dep:type() == "query")
-   assert(type(get_versions) == "function")
-
    local installed, _, _, provided = match_dep(dep, get_versions)
    local installation_type = provided and "provided by VM" or "installed"
-   return installed and installed.." "..installation_type..": success" or "not installed"
+   return installed and installed .. " " .. installation_type .. ": success" or "not installed"
 end
 
---- Check depenendencies of a package and report any missing ones.
--- @param name string: package name.
--- @param version string: package version.
--- @param dependencies table: array of dependencies.
--- @param deps_mode string: Which trees to check dependencies for
--- @param rocks_provided table: A table of auto-dependencies provided
--- by this Lua implementation for the given dependency.
--- "one" for the current default tree, "all" for all trees,
--- "order" for all trees with priority >= the current default, "none" for no trees.
+
+
+
+
+
+
+
+
+
 function deps.report_missing_dependencies(name, version, dependencies, deps_mode, rocks_provided)
-   assert(type(name) == "string")
-   assert(type(version) == "string")
-   assert(type(dependencies) == "table")
-   assert(type(deps_mode) == "string")
-   assert(type(rocks_provided) == "table")
 
    if deps_mode == "none" then
       return
@@ -200,11 +209,6 @@ function deps.report_missing_dependencies(name, version, dependencies, deps_mode
 end
 
 function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey)
-   assert(dep:type() == "query")
-   assert(type(deps_mode) == "string" or deps_mode == nil)
-   assert(type(rocks_provided) == "table" or rocks_provided == nil)
-   assert(type(verify) == "boolean" or verify == nil)
-   assert(type(depskey) == "string")
 
    deps_mode = deps_mode or "all"
    rocks_provided = rocks_provided or {}
@@ -224,9 +228,9 @@ function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey
 
    local url, search_err = search.find_suitable_rock(dep)
    if not url then
-      return nil, "Could not satisfy dependency "..tostring(dep)..": "..search_err
+      return nil, "Could not satisfy dependency " .. tostring(dep) .. ": " .. search_err
    end
-   util.printout("Installing "..url)
+   util.printout("Installing " .. url)
    local install_args = {
       rock = url,
       deps_mode = deps_mode,
@@ -235,7 +239,7 @@ function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey
    }
    local ok, install_err, errcode = install.command(install_args)
    if not ok then
-      return nil, "Failed installing dependency: "..url.." - "..install_err, errcode
+      return nil, "Failed installing dependency: " .. url .. " - " .. install_err, errcode
    end
 
    found, where = match_dep(dep, get_versions)
@@ -246,15 +250,15 @@ function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey
 end
 
 local function check_supported_platforms(rockspec)
-   if rockspec.supported_platforms and next(rockspec.supported_platforms) then
+   if rockspec.supported_platforms and next(rockspec.supported_platforms) ~= nil then
       local all_negative = true
       local supported = false
-      for _, plat in pairs(rockspec.supported_platforms) do
+      for _, plat in ipairs(rockspec.supported_platforms) do
          local neg
          neg, plat = plat:match("^(!?)(.*)")
          if neg == "!" then
             if cfg.is_platform(plat) then
-               return nil, "This rockspec for "..rockspec.package.." does not support "..plat.." platforms."
+               return nil, "This rockspec for " .. rockspec.package .. " does not support " .. plat .. " platforms."
             end
          else
             all_negative = false
@@ -266,32 +270,26 @@ local function check_supported_platforms(rockspec)
       end
       if supported == false and not all_negative then
          local plats = cfg.print_platforms()
-         return nil, "This rockspec for "..rockspec.package.." does not support "..plats.." platforms."
+         return nil, "This rockspec for " .. rockspec.package .. " does not support " .. plats .. " platforms."
       end
    end
 
    return true
 end
 
---- Check dependencies of a rock and attempt to install any missing ones.
--- Packages are installed using the LuaRocks "install" command.
--- Aborts the program if a dependency could not be fulfilled.
--- @param rockspec table: A rockspec in table format.
--- @param depskey string: Rockspec key to fetch to get dependency table
--- ("dependencies", "build_dependencies", etc.).
--- @param deps_mode string
--- @param verify boolean
--- @param deplock_dir string: dirname of the deplock file
--- @return boolean or (nil, string, [string]): True if no errors occurred, or
--- nil and an error message if any test failed, followed by an optional
--- error code.
-function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock_dir)
-   assert(type(rockspec) == "table")
-   assert(type(depskey) == "string")
-   assert(type(deps_mode) == "string")
-   assert(type(verify) == "boolean" or verify == nil)
-   assert(type(deplock_dir) == "string" or deplock_dir == nil)
 
+
+
+
+
+
+
+
+
+
+
+
+function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock_dir)
    local name = rockspec.name
    local version = rockspec.version
    local rocks_provided = rockspec.rocks_provided
@@ -301,16 +299,23 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
       util.printout("Using dependencies pinned in lockfile: " .. filename)
 
       local get_versions = prepare_get_versions("none", rocks_provided, depskey)
+      local dnsnamestr, dversionstr
       for dnsname, dversion in deplocks.each(depskey) do
-         local dname, dnamespace = util.split_namespace(dnsname)
-         local dep = queries.new(dname, dnamespace, dversion)
+         if type(dnsname) == "string" then
+            dnsnamestr = dnsname
+         end
+         if type(dversion) == "string" then
+            dversionstr = dversion
+         end
+         local dname, dnamespace = util.split_namespace(dnsnamestr)
+         local dep = queries.new(dname, dnamespace, dversionstr)
 
          util.printout(("%s %s is pinned to %s (%s)"):format(
-            name, version, tostring(dep), rock_status(dep, get_versions)))
+         name, version, tostring(dep), rock_status(dep, get_versions)))
 
-         local ok, err = deps.fulfill_dependency(dep, "none", rocks_provided, verify, depskey)
-         if not ok then
-            return nil, err
+         local okfullfill, errfullfill = deps.fulfill_dependency(dep, "none", rocks_provided, verify, depskey)
+         if not okfullfill then
+            return nil, errfullfill
          end
       end
       util.printout()
@@ -324,28 +329,28 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
       return nil, err
    end
 
-   deps.report_missing_dependencies(name, version, rockspec[depskey], deps_mode, rocks_provided)
+   deps.report_missing_dependencies(name, version, (rockspec)[depskey], deps_mode, rocks_provided)
 
    util.printout()
 
    local get_versions = prepare_get_versions(deps_mode, rocks_provided, depskey)
-   for _, dep in ipairs(rockspec[depskey]) do
+   for _, dep in ipairs((rockspec)[depskey]) do
 
       util.printout(("%s %s depends on %s (%s)"):format(
-         name, version, tostring(dep), rock_status(dep, get_versions)))
+      name, version, tostring(dep), rock_status(dep, get_versions)))
 
-      local ok, found_or_err, _, no_upgrade = deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey)
+      local ok, found_or_err, _ = deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey)
       if ok then
          deplocks.add(depskey, dep.name, found_or_err)
       else
-         if no_upgrade then
-            util.printerr("This version of "..name.." is designed for use with")
-            util.printerr(tostring(dep)..", but is configured to avoid upgrading it")
-            util.printerr("automatically. Please upgrade "..dep.name.." with")
-            util.printerr("   luarocks install "..dep.name)
-            util.printerr("or look for a suitable version of "..name.." with")
-            util.printerr("   luarocks search "..name)
-         end
+
+
+
+
+
+
+
+
          return nil, found_or_err
       end
    end
@@ -353,28 +358,28 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
    return true
 end
 
---- If filename matches a pattern, return the capture.
--- For example, given "libfoo.so" and "lib?.so" is a pattern,
--- returns "foo" (which can then be used to build names
--- based on other patterns.
--- @param file string: a filename
--- @param pattern string: a pattern, where ? is to be matched by the filename.
--- @return string The pattern, if found, or nil.
+
+
+
+
+
+
+
 local function deconstruct_pattern(file, pattern)
-   local depattern = "^"..(pattern:gsub("%.", "%%."):gsub("%*", ".*"):gsub("?", "(.*)")).."$"
+   local depattern = "^" .. (pattern:gsub("%.", "%%."):gsub("%*", ".*"):gsub("?", "(.*)")) .. "$"
    return (file:match(depattern))
 end
 
---- Construct all possible patterns for a name and add to the files array.
--- Run through the patterns array replacing all occurrences of "?"
--- with the given file name and store them in the files array.
--- @param file string A raw name (e.g. "foo")
--- @param array of string An array of patterns with "?" as the wildcard
--- (e.g. {"?.so", "lib?.so"})
--- @param files The array of constructed names
+
+
+
+
+
+
+
 local function add_all_patterns(file, patterns, files)
    for _, pattern in ipairs(patterns) do
-      table.insert(files, {#files + 1, (pattern:gsub("?", file))})
+      table.insert(files, { #files + 1, (pattern:gsub("?", file)) })
    end
 end
 
@@ -388,7 +393,7 @@ local function get_external_deps_dirs(mode)
    local dirs = {
       BINDIR = { subdir = subdirs.bin, testfile = "program", pattern = patterns.bin },
       INCDIR = { subdir = subdirs.include, testfile = "header", pattern = patterns.include },
-      LIBDIR = { subdir = subdirs.lib, testfile = "library", pattern = patterns.lib }
+      LIBDIR = { subdir = subdirs.lib, testfile = "library", pattern = patterns.lib },
    }
    if mode == "install" then
       dirs.INCDIR = nil
@@ -416,7 +421,7 @@ local function resolve_prefix(prefix, dirs)
 end
 
 local function add_patterns_for_file(files, file, patterns)
-   -- If it doesn't look like it contains a filename extension
+
    if not (file:match("%.[a-z]+$") or file:match("%.[a-z]+%.")) then
       add_all_patterns(file, patterns, files)
    else
@@ -426,26 +431,35 @@ local function add_patterns_for_file(files, file, patterns)
             add_all_patterns(matched, patterns, files)
          end
       end
-      table.insert(files, {#files + 1, file})
+      table.insert(files, { #files + 1, file })
    end
 end
 
-local function check_external_dependency_at(prefix, name, ext_files, vars, dirs, err_files, cache)
+local function check_external_dependency_at(
+   prefix,
+   name,
+   ext_files,
+   vars,
+   dirs,
+   err_files,
+   cache)
+
    local fs = require("luarocks.fs")
    cache = cache or {}
 
    for dirname, dirdata in util.sortedpairs(dirs) do
       local paths
-      local path_var_value = vars[name.."_"..dirname]
+      local path_var_value = vars[name .. "_" .. dirname]
+      local dirdatastr = dirdata.subdir
       if path_var_value then
          paths = { path_var_value }
-      elseif type(dirdata.subdir) == "table" then
+      elseif type(dirdatastr) == "table" then
          paths = {}
-         for i,v in ipairs(dirdata.subdir) do
+         for i, v in ipairs(dirdatastr) do
             paths[i] = dir.path(prefix, v)
          end
       else
-         paths = { dir.path(prefix, dirdata.subdir) }
+         paths = { dir.path(prefix, dirdatastr) }
       end
       local file_or_files = ext_files[dirdata.testfile]
       if file_or_files then
@@ -471,15 +485,15 @@ local function check_external_dependency_at(prefix, name, ext_files, vars, dirs,
          for _, fa in ipairs(files) do
 
             local f = fa[2]
-            -- small convenience hack
+
             if f:match("%.so$") or f:match("%.dylib$") or f:match("%.dll$") then
-               f = f:gsub("%.[^.]+$", "."..cfg.external_lib_extension)
+               f = f:gsub("%.[^.]+$", "." .. cfg.external_lib_extension)
             end
 
             local pattern
             if f:match("%*") then
                pattern = "^" .. f:gsub("([-.+])", "%%%1"):gsub("%*", ".*") .. "$"
-               f = "matching "..f
+               f = "matching " .. f
             end
 
             for _, d in ipairs(paths) do
@@ -502,7 +516,7 @@ local function check_external_dependency_at(prefix, name, ext_files, vars, dirs,
                   dirdata.file = f
                   break
                else
-                  table.insert(err_files[dirdata.testfile], f.." in "..d)
+                  table.insert(err_files[dirdata.testfile], f .. " in " .. d)
                end
             end
             if found then
@@ -513,9 +527,9 @@ local function check_external_dependency_at(prefix, name, ext_files, vars, dirs,
             return nil, dirname, dirdata.testfile
          end
       else
-         -- When we have a set of subdir suffixes, look for one that exists.
-         -- For these reason, we now put "lib" ahead of "" on Windows in our
-         -- default set.
+
+
+
          dirdata.dir = paths[1]
          for _, p in ipairs(paths) do
             if fs.exists(p) then
@@ -527,18 +541,23 @@ local function check_external_dependency_at(prefix, name, ext_files, vars, dirs,
    end
 
    for dirname, dirdata in pairs(dirs) do
-      vars[name.."_"..dirname] = dirdata.dir
-      vars[name.."_"..dirname.."_FILE"] = dirdata.file
+      vars[name .. "_" .. dirname] = dirdata.dir
+      vars[name .. "_" .. dirname .. "_FILE"] = dirdata.file
    end
-   vars[name.."_DIR"] = prefix
+   vars[name .. "_DIR"] = prefix
    return true
 end
 
-local function check_external_dependency(name, ext_files, vars, mode, cache)
+local function check_external_dependency(
+   name,
+   ext_files,
+   vars,
+   mode,
+   cache)
    local ok
    local err_dirname
    local err_testfile
-   local err_files = {program = {}, header = {}, library = {}}
+   local err_files = { program = {}, header = {}, library = {} }
 
    local dirs = get_external_deps_dirs(mode)
 
@@ -572,7 +591,7 @@ local function check_external_dependency(name, ext_files, vars, mode, cache)
 end
 
 function deps.autodetect_external_dependencies(build)
-   -- only applies to the 'builtin' build type
+
    if not build or not build.modules then
       return nil
    end
@@ -581,9 +600,12 @@ function deps.autodetect_external_dependencies(build)
    local any = false
    for _, data in pairs(build.modules) do
       if type(data) == "table" and data.libraries then
-         local libraries = data.libraries
-         if type(libraries) == "string" then
-            libraries = { libraries }
+         local libraries
+         local librariesstr = data.libraries
+         if type(librariesstr) == "string" then
+            libraries = { librariesstr }
+         else
+            libraries = librariesstr
          end
          local incdirs = {}
          local libdirs = {}
@@ -605,21 +627,20 @@ function deps.autodetect_external_dependencies(build)
    return any and extdeps or nil
 end
 
---- Set up path-related variables for external dependencies.
--- For each key in the external_dependencies table in the
--- rockspec file, four variables are created: <key>_DIR, <key>_BINDIR,
--- <key>_INCDIR and <key>_LIBDIR. These are not overwritten
--- if already set (e.g. by the LuaRocks config file or through the
--- command-line). Values in the external_dependencies table
--- are tables that may contain a "header" or a "library" field,
--- with filenames to be tested for existence.
--- @param rockspec table: The rockspec table.
--- @param mode string: if "build" is given, checks all files;
--- if "install" is given, do not scan for headers.
--- @return boolean or (nil, string): True if no errors occurred, or
--- nil and an error message if any test failed.
+
+
+
+
+
+
+
+
+
+
+
+
+
 function deps.check_external_deps(rockspec, mode)
-   assert(rockspec:type() == "rockspec")
 
    if not rockspec.external_dependencies then
       rockspec.external_dependencies = deps.autodetect_external_dependencies(rockspec.build)
@@ -628,21 +649,21 @@ function deps.check_external_deps(rockspec, mode)
       return true
    end
 
-   for name, ext_files in util.sortedpairs(rockspec.external_dependencies) do
+   for name, ext_files in util.sortedpairs(rockspec.external_dependencies.queries) do
       local ok, err_dirname, err_testfile, err_files = check_external_dependency(name, ext_files, rockspec.variables, mode)
       if not ok then
-         local lines = {"Could not find "..err_testfile.." file for "..name}
+         local lines = { "Could not find " .. err_testfile .. " file for " .. name }
 
          local err_paths = {}
          for _, err_file in ipairs(err_files[err_testfile]) do
             if not err_paths[err_file] then
                err_paths[err_file] = true
-               table.insert(lines, "  No file "..err_file)
+               table.insert(lines, "  No file " .. err_file)
             end
          end
 
-         table.insert(lines, "You may have to install "..name.." in your system and/or pass "..name.."_DIR or "..name.."_"..err_dirname.." to the luarocks command.")
-         table.insert(lines, "Example: luarocks install "..rockspec.name.." "..name.."_DIR=/usr/local")
+         table.insert(lines, "You may have to install " .. name .. " in your system and/or pass " .. name .. "_DIR or " .. name .. "_" .. err_dirname .. " to the luarocks command.")
+         table.insert(lines, "Example: luarocks install " .. rockspec.name .. " " .. name .. "_DIR=/usr/local")
 
          return nil, table.concat(lines, "\n"), "dependency"
       end
@@ -650,18 +671,17 @@ function deps.check_external_deps(rockspec, mode)
    return true
 end
 
---- Recursively add satisfied dependencies of a package to a table,
--- to build a transitive closure of all dependent packages.
--- Additionally ensures that `dependencies` table of the manifest is up-to-date.
--- @param results table: The results table being built, maps package names to versions.
--- @param mdeps table: The manifest dependencies table.
--- @param name string: Package name.
--- @param version string: Package version.
+
+
+
+
+
+
+
 function deps.scan_deps(results, mdeps, name, version, deps_mode)
    assert(type(results) == "table")
    assert(type(mdeps) == "table")
-   assert(type(name) == "string" and not name:match("/"))
-   assert(type(version) == "string")
+   assert(not name:match("/"))
 
    local fetch = require("luarocks.fetch")
 
@@ -673,7 +693,7 @@ function deps.scan_deps(results, mdeps, name, version, deps_mode)
    local dependencies = mdn[version]
    local rocks_provided
    if not dependencies then
-      local rockspec, err = fetch.load_local_rockspec(path.rockspec_file(name, version), false)
+      local rockspec = fetch.load_local_rockspec(path.rockspec_file(name, version), false)
       if not rockspec then
          return
       end
@@ -686,7 +706,7 @@ function deps.scan_deps(results, mdeps, name, version, deps_mode)
 
    local get_versions = prepare_get_versions(deps_mode, rocks_provided, "dependencies")
 
-   local matched = match_all_deps(dependencies, get_versions)
+   local matched = match_all_deps(dependencies.queries, get_versions)
    results[name] = version
    for _, match in pairs(matched) do
       deps.scan_deps(results, mdeps, match.name, match.version, deps_mode)
@@ -736,13 +756,13 @@ local function find_lua_incdir(prefix, luaver, luajitver)
       end
    end
 
-   -- not found, will fallback to a default
+
    return nil, mainerr
 end
 
 function deps.check_lua_incdir(vars)
-   if vars.LUA_INCDIR_OK == true
-      then return true
+   if vars.LUA_INCDIR_OK == true then
+      return true
    end
 
    local ljv = util.get_luajit_version()
@@ -769,8 +789,8 @@ function deps.check_lua_incdir(vars)
 end
 
 function deps.check_lua_libdir(vars)
-   if vars.LUA_LIBDIR_OK == true
-      then return true
+   if vars.LUA_LIBDIR_OK == true then
+      return true
    end
 
    local fs = require("luarocks.fs")
@@ -803,10 +823,10 @@ function deps.check_lua_libdir(vars)
       local fd = io.open(filename, "r")
       if fd then
          if not vars.LUA_LIBDIR_FILE:match((cfg.lua_version:gsub("%.", "%%.?"))) then
-            -- if filename isn't versioned, check file contents
+
             local txt = fd:read("*a")
-            ok = txt:match("Lua " .. cfg.lua_version, 1, true)
-                 or txt:match("lua" .. (cfg.lua_version:gsub("%.", "")), 1, true)
+            ok = txt:match("Lua " .. cfg.lua_version, 1) or
+            txt:match("lua" .. (cfg.lua_version:gsub("%.", "")), 1)
             if not ok then
                err = "Lua library at " .. filename .. " does not match Lua version " .. cfg.lua_version .. ". You can use `luarocks config variables.LUA_LIBDIR <path>` to set the correct location."
             end
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index fe93a900..1a9eefde 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -1,8 +1,7 @@
-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 io = _tl_compat and _tl_compat.io or io; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local pairs = _tl_compat and _tl_compat.pairs or pairs; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table
 
+--- High-level dependency related functions.
 local deps = {}
 
-
 local cfg = require("luarocks.core.cfg")
 local manif = require("luarocks.manif")
 local path = require("luarocks.path")
@@ -13,56 +12,34 @@ local vers = require("luarocks.core.vers")
 local queries = require("luarocks.queries")
 local deplocks = require("luarocks.deplocks")
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-local v = require("luarocks.core.types.version")
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+--- Generate a function that matches dep queries against the manifest,
+-- taking into account rocks_provided, the list of versions to skip,
+-- and the lockfile.
+-- @param deps_mode "one", "none", "all" or "order"
+-- @param rocks_provided a one-level table mapping names to versions,
+-- listing rocks to consider provided by the VM
+-- @param rocks_provided table: A table of auto-provided dependencies.
+-- by this Lua implementation for the given dependency.
+-- @param depskey key to use when matching the lockfile ("dependencies",
+-- "build_dependencies", etc.)
+-- @param skip_set a two-level table mapping names to versions to
+-- boolean, listing rocks that should not be matched
+-- @return function(dep): {string}, {string:string}, string, boolean
+-- * array of matching versions
+-- * map of versions to locations
+-- * version matched via lockfile if any
+-- * true if rock matched via rocks_provided
 local function prepare_get_versions(deps_mode, rocks_provided, depskey, skip_set)
+   assert(type(deps_mode) == "string")
+   assert(type(rocks_provided) == "table")
+   assert(type(depskey) == "string")
+   assert(type(skip_set) == "table" or skip_set == nil)
 
    return function(dep)
       local versions, locations
       local provided = rocks_provided[dep.name]
       if provided then
-
+         -- Provided rocks have higher priority than manifest's rocks.
          versions, locations = { provided }, {}
       else
          if deps_mode == "none" then
@@ -86,20 +63,21 @@ local function prepare_get_versions(deps_mode, rocks_provided, depskey, skip_set
    end
 end
 
-
-
-
-
-
-
-
-
-
-
-
-
-local function match_dep(dep,
-   get_versions)
+--- Attempt to match a dependency to an installed rock.
+-- @param get_versions a getter function obtained via prepare_get_versions
+-- @return (string, string, table) or (nil, nil, table):
+-- 1. latest installed version of the rock matching the dependency
+-- 2. location where the installed version is installed
+-- 3. the 'dep' query table
+-- 4. true if provided via VM
+-- or
+-- 1. nil
+-- 2. nil
+-- 3. either 'dep' or an alternative query to be used
+-- 4. false
+local function match_dep(dep, get_versions)
+   assert(type(dep) == "table")
+   assert(type(get_versions) == "function")
 
    local versions, locations, lockversion, provided = get_versions(dep)
 
@@ -127,8 +105,9 @@ local function match_dep(dep,
    return latest_vstring, locations[latest_vstring], dep, provided
 end
 
-local function match_all_deps(dependencies,
-   get_versions)
+local function match_all_deps(dependencies, get_versions)
+   assert(type(dependencies) == "table")
+   assert(type(get_versions) == "function")
 
    local matched, missing, no_upgrade = {}, {}, {}
 
@@ -137,7 +116,7 @@ local function match_all_deps(dependencies,
       found, _, dep, provided = match_dep(dep, get_versions)
       if found then
          if not provided then
-            matched[dep] = { name = dep.name, version = found }
+            matched[dep] = {name = dep.name, version = found}
          end
       else
          if dep.constraints[1] and dep.constraints[1].no_upgrade then
@@ -150,41 +129,53 @@ local function match_all_deps(dependencies,
    return matched, missing, no_upgrade
 end
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+--- Attempt to match dependencies of a rockspec to installed rocks.
+-- @param dependencies table: The table of dependencies.
+-- @param rocks_provided table: The table of auto-provided dependencies.
+-- @param skip_set table or nil: Program versions to not use as valid matches.
+-- Table where keys are program names and values are tables where keys
+-- are program versions and values are 'true'.
+-- @param deps_mode string: Which trees to check dependencies for
+-- @return table, table, table: A table where keys are dependencies parsed
+-- in table format and values are tables containing fields 'name' and
+-- version' representing matches; a table of missing dependencies
+-- parsed as tables; and a table of "no-upgrade" missing dependencies
+-- (to be used in plugin modules so that a plugin does not force upgrade of
+-- its parent application).
 function deps.match_deps(dependencies, rocks_provided, deps_mode, skip_set)
+   assert(type(dependencies) == "table")
+   assert(type(rocks_provided) == "table")
+   assert(type(skip_set) == "table" or skip_set == nil)
+   assert(type(deps_mode) == "string")
 
    local get_versions = prepare_get_versions(deps_mode, rocks_provided, "dependencies", skip_set)
    return match_all_deps(dependencies, get_versions)
 end
 
 local function rock_status(dep, get_versions)
+   assert(dep:type() == "query")
+   assert(type(get_versions) == "function")
+
    local installed, _, _, provided = match_dep(dep, get_versions)
    local installation_type = provided and "provided by VM" or "installed"
-   return installed and installed .. " " .. installation_type .. ": success" or "not installed"
+   return installed and installed.." "..installation_type..": success" or "not installed"
 end
 
-
-
-
-
-
-
-
-
-
+--- Check depenendencies of a package and report any missing ones.
+-- @param name string: package name.
+-- @param version string: package version.
+-- @param dependencies table: array of dependencies.
+-- @param deps_mode string: Which trees to check dependencies for
+-- @param rocks_provided table: A table of auto-dependencies provided
+-- by this Lua implementation for the given dependency.
+-- "one" for the current default tree, "all" for all trees,
+-- "order" for all trees with priority >= the current default, "none" for no trees.
 function deps.report_missing_dependencies(name, version, dependencies, deps_mode, rocks_provided)
+   assert(type(name) == "string")
+   assert(type(version) == "string")
+   assert(type(dependencies) == "table")
+   assert(type(deps_mode) == "string")
+   assert(type(rocks_provided) == "table")
 
    if deps_mode == "none" then
       return
@@ -209,6 +200,11 @@ function deps.report_missing_dependencies(name, version, dependencies, deps_mode
 end
 
 function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey)
+   assert(dep:type() == "query")
+   assert(type(deps_mode) == "string" or deps_mode == nil)
+   assert(type(rocks_provided) == "table" or rocks_provided == nil)
+   assert(type(verify) == "boolean" or verify == nil)
+   assert(type(depskey) == "string")
 
    deps_mode = deps_mode or "all"
    rocks_provided = rocks_provided or {}
@@ -228,9 +224,9 @@ function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey
 
    local url, search_err = search.find_suitable_rock(dep)
    if not url then
-      return nil, "Could not satisfy dependency " .. tostring(dep) .. ": " .. search_err
+      return nil, "Could not satisfy dependency "..tostring(dep)..": "..search_err
    end
-   util.printout("Installing " .. url)
+   util.printout("Installing "..url)
    local install_args = {
       rock = url,
       deps_mode = deps_mode,
@@ -239,7 +235,7 @@ function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey
    }
    local ok, install_err, errcode = install.command(install_args)
    if not ok then
-      return nil, "Failed installing dependency: " .. url .. " - " .. install_err, errcode
+      return nil, "Failed installing dependency: "..url.." - "..install_err, errcode
    end
 
    found, where = match_dep(dep, get_versions)
@@ -250,15 +246,15 @@ function deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey
 end
 
 local function check_supported_platforms(rockspec)
-   if rockspec.supported_platforms and next(rockspec.supported_platforms) ~= nil then
+   if rockspec.supported_platforms and next(rockspec.supported_platforms) then
       local all_negative = true
       local supported = false
-      for _, plat in ipairs(rockspec.supported_platforms) do
+      for _, plat in pairs(rockspec.supported_platforms) do
          local neg
          neg, plat = plat:match("^(!?)(.*)")
          if neg == "!" then
             if cfg.is_platform(plat) then
-               return nil, "This rockspec for " .. rockspec.package .. " does not support " .. plat .. " platforms."
+               return nil, "This rockspec for "..rockspec.package.." does not support "..plat.." platforms."
             end
          else
             all_negative = false
@@ -270,26 +266,32 @@ local function check_supported_platforms(rockspec)
       end
       if supported == false and not all_negative then
          local plats = cfg.print_platforms()
-         return nil, "This rockspec for " .. rockspec.package .. " does not support " .. plats .. " platforms."
+         return nil, "This rockspec for "..rockspec.package.." does not support "..plats.." platforms."
       end
    end
 
    return true
 end
 
-
-
-
-
-
-
-
-
-
-
-
-
+--- Check dependencies of a rock and attempt to install any missing ones.
+-- Packages are installed using the LuaRocks "install" command.
+-- Aborts the program if a dependency could not be fulfilled.
+-- @param rockspec table: A rockspec in table format.
+-- @param depskey string: Rockspec key to fetch to get dependency table
+-- ("dependencies", "build_dependencies", etc.).
+-- @param deps_mode string
+-- @param verify boolean
+-- @param deplock_dir string: dirname of the deplock file
+-- @return boolean or (nil, string, [string]): True if no errors occurred, or
+-- nil and an error message if any test failed, followed by an optional
+-- error code.
 function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock_dir)
+   assert(type(rockspec) == "table")
+   assert(type(depskey) == "string")
+   assert(type(deps_mode) == "string")
+   assert(type(verify) == "boolean" or verify == nil)
+   assert(type(deplock_dir) == "string" or deplock_dir == nil)
+
    local name = rockspec.name
    local version = rockspec.version
    local rocks_provided = rockspec.rocks_provided
@@ -299,23 +301,16 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
       util.printout("Using dependencies pinned in lockfile: " .. filename)
 
       local get_versions = prepare_get_versions("none", rocks_provided, depskey)
-      local dnsnamestr, dversionstr
       for dnsname, dversion in deplocks.each(depskey) do
-         if type(dnsname) == "string" then
-            dnsnamestr = dnsname
-         end
-         if type(dversion) == "string" then
-            dversionstr = dversion
-         end
-         local dname, dnamespace = util.split_namespace(dnsnamestr)
-         local dep = queries.new(dname, dnamespace, dversionstr)
+         local dname, dnamespace = util.split_namespace(dnsname)
+         local dep = queries.new(dname, dnamespace, dversion)
 
          util.printout(("%s %s is pinned to %s (%s)"):format(
-         name, version, tostring(dep), rock_status(dep, get_versions)))
+            name, version, tostring(dep), rock_status(dep, get_versions)))
 
-         local okfullfill, errfullfill = deps.fulfill_dependency(dep, "none", rocks_provided, verify, depskey)
-         if not okfullfill then
-            return nil, errfullfill
+         local ok, err = deps.fulfill_dependency(dep, "none", rocks_provided, verify, depskey)
+         if not ok then
+            return nil, err
          end
       end
       util.printout()
@@ -329,28 +324,28 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
       return nil, err
    end
 
-   deps.report_missing_dependencies(name, version, (rockspec)[depskey], deps_mode, rocks_provided)
+   deps.report_missing_dependencies(name, version, rockspec[depskey], deps_mode, rocks_provided)
 
    util.printout()
 
    local get_versions = prepare_get_versions(deps_mode, rocks_provided, depskey)
-   for _, dep in ipairs((rockspec)[depskey]) do
+   for _, dep in ipairs(rockspec[depskey]) do
 
       util.printout(("%s %s depends on %s (%s)"):format(
-      name, version, tostring(dep), rock_status(dep, get_versions)))
+         name, version, tostring(dep), rock_status(dep, get_versions)))
 
-      local ok, found_or_err, _ = deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey)
+      local ok, found_or_err, _, no_upgrade = deps.fulfill_dependency(dep, deps_mode, rocks_provided, verify, depskey)
       if ok then
          deplocks.add(depskey, dep.name, found_or_err)
       else
-
-
-
-
-
-
-
-
+         if no_upgrade then
+            util.printerr("This version of "..name.." is designed for use with")
+            util.printerr(tostring(dep)..", but is configured to avoid upgrading it")
+            util.printerr("automatically. Please upgrade "..dep.name.." with")
+            util.printerr("   luarocks install "..dep.name)
+            util.printerr("or look for a suitable version of "..name.." with")
+            util.printerr("   luarocks search "..name)
+         end
          return nil, found_or_err
       end
    end
@@ -358,28 +353,28 @@ function deps.fulfill_dependencies(rockspec, depskey, deps_mode, verify, deplock
    return true
 end
 
-
-
-
-
-
-
-
+--- If filename matches a pattern, return the capture.
+-- For example, given "libfoo.so" and "lib?.so" is a pattern,
+-- returns "foo" (which can then be used to build names
+-- based on other patterns.
+-- @param file string: a filename
+-- @param pattern string: a pattern, where ? is to be matched by the filename.
+-- @return string The pattern, if found, or nil.
 local function deconstruct_pattern(file, pattern)
-   local depattern = "^" .. (pattern:gsub("%.", "%%."):gsub("%*", ".*"):gsub("?", "(.*)")) .. "$"
+   local depattern = "^"..(pattern:gsub("%.", "%%."):gsub("%*", ".*"):gsub("?", "(.*)")).."$"
    return (file:match(depattern))
 end
 
-
-
-
-
-
-
-
+--- Construct all possible patterns for a name and add to the files array.
+-- Run through the patterns array replacing all occurrences of "?"
+-- with the given file name and store them in the files array.
+-- @param file string A raw name (e.g. "foo")
+-- @param array of string An array of patterns with "?" as the wildcard
+-- (e.g. {"?.so", "lib?.so"})
+-- @param files The array of constructed names
 local function add_all_patterns(file, patterns, files)
    for _, pattern in ipairs(patterns) do
-      table.insert(files, { #files + 1, (pattern:gsub("?", file)) })
+      table.insert(files, {#files + 1, (pattern:gsub("?", file))})
    end
 end
 
@@ -393,7 +388,7 @@ local function get_external_deps_dirs(mode)
    local dirs = {
       BINDIR = { subdir = subdirs.bin, testfile = "program", pattern = patterns.bin },
       INCDIR = { subdir = subdirs.include, testfile = "header", pattern = patterns.include },
-      LIBDIR = { subdir = subdirs.lib, testfile = "library", pattern = patterns.lib },
+      LIBDIR = { subdir = subdirs.lib, testfile = "library", pattern = patterns.lib }
    }
    if mode == "install" then
       dirs.INCDIR = nil
@@ -421,7 +416,7 @@ local function resolve_prefix(prefix, dirs)
 end
 
 local function add_patterns_for_file(files, file, patterns)
-
+   -- If it doesn't look like it contains a filename extension
    if not (file:match("%.[a-z]+$") or file:match("%.[a-z]+%.")) then
       add_all_patterns(file, patterns, files)
    else
@@ -431,35 +426,26 @@ local function add_patterns_for_file(files, file, patterns)
             add_all_patterns(matched, patterns, files)
          end
       end
-      table.insert(files, { #files + 1, file })
+      table.insert(files, {#files + 1, file})
    end
 end
 
-local function check_external_dependency_at(
-   prefix,
-   name,
-   ext_files,
-   vars,
-   dirs,
-   err_files,
-   cache)
-
+local function check_external_dependency_at(prefix, name, ext_files, vars, dirs, err_files, cache)
    local fs = require("luarocks.fs")
    cache = cache or {}
 
    for dirname, dirdata in util.sortedpairs(dirs) do
       local paths
-      local path_var_value = vars[name .. "_" .. dirname]
-      local dirdatastr = dirdata.subdir
+      local path_var_value = vars[name.."_"..dirname]
       if path_var_value then
          paths = { path_var_value }
-      elseif type(dirdatastr) == "table" then
+      elseif type(dirdata.subdir) == "table" then
          paths = {}
-         for i, v in ipairs(dirdatastr) do
+         for i,v in ipairs(dirdata.subdir) do
             paths[i] = dir.path(prefix, v)
          end
       else
-         paths = { dir.path(prefix, dirdatastr) }
+         paths = { dir.path(prefix, dirdata.subdir) }
       end
       local file_or_files = ext_files[dirdata.testfile]
       if file_or_files then
@@ -485,15 +471,15 @@ local function check_external_dependency_at(
          for _, fa in ipairs(files) do
 
             local f = fa[2]
-
+            -- small convenience hack
             if f:match("%.so$") or f:match("%.dylib$") or f:match("%.dll$") then
-               f = f:gsub("%.[^.]+$", "." .. cfg.external_lib_extension)
+               f = f:gsub("%.[^.]+$", "."..cfg.external_lib_extension)
             end
 
             local pattern
             if f:match("%*") then
                pattern = "^" .. f:gsub("([-.+])", "%%%1"):gsub("%*", ".*") .. "$"
-               f = "matching " .. f
+               f = "matching "..f
             end
 
             for _, d in ipairs(paths) do
@@ -516,7 +502,7 @@ local function check_external_dependency_at(
                   dirdata.file = f
                   break
                else
-                  table.insert(err_files[dirdata.testfile], f .. " in " .. d)
+                  table.insert(err_files[dirdata.testfile], f.." in "..d)
                end
             end
             if found then
@@ -527,9 +513,9 @@ local function check_external_dependency_at(
             return nil, dirname, dirdata.testfile
          end
       else
-
-
-
+         -- When we have a set of subdir suffixes, look for one that exists.
+         -- For these reason, we now put "lib" ahead of "" on Windows in our
+         -- default set.
          dirdata.dir = paths[1]
          for _, p in ipairs(paths) do
             if fs.exists(p) then
@@ -541,23 +527,18 @@ local function check_external_dependency_at(
    end
 
    for dirname, dirdata in pairs(dirs) do
-      vars[name .. "_" .. dirname] = dirdata.dir
-      vars[name .. "_" .. dirname .. "_FILE"] = dirdata.file
+      vars[name.."_"..dirname] = dirdata.dir
+      vars[name.."_"..dirname.."_FILE"] = dirdata.file
    end
-   vars[name .. "_DIR"] = prefix
+   vars[name.."_DIR"] = prefix
    return true
 end
 
-local function check_external_dependency(
-   name,
-   ext_files,
-   vars,
-   mode,
-   cache)
+local function check_external_dependency(name, ext_files, vars, mode, cache)
    local ok
    local err_dirname
    local err_testfile
-   local err_files = { program = {}, header = {}, library = {} }
+   local err_files = {program = {}, header = {}, library = {}}
 
    local dirs = get_external_deps_dirs(mode)
 
@@ -591,7 +572,7 @@ local function check_external_dependency(
 end
 
 function deps.autodetect_external_dependencies(build)
-
+   -- only applies to the 'builtin' build type
    if not build or not build.modules then
       return nil
    end
@@ -600,12 +581,9 @@ function deps.autodetect_external_dependencies(build)
    local any = false
    for _, data in pairs(build.modules) do
       if type(data) == "table" and data.libraries then
-         local libraries
-         local librariesstr = data.libraries
-         if type(librariesstr) == "string" then
-            libraries = { librariesstr }
-         else
-            libraries = librariesstr
+         local libraries = data.libraries
+         if type(libraries) == "string" then
+            libraries = { libraries }
          end
          local incdirs = {}
          local libdirs = {}
@@ -627,20 +605,21 @@ function deps.autodetect_external_dependencies(build)
    return any and extdeps or nil
 end
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+--- Set up path-related variables for external dependencies.
+-- For each key in the external_dependencies table in the
+-- rockspec file, four variables are created: <key>_DIR, <key>_BINDIR,
+-- <key>_INCDIR and <key>_LIBDIR. These are not overwritten
+-- if already set (e.g. by the LuaRocks config file or through the
+-- command-line). Values in the external_dependencies table
+-- are tables that may contain a "header" or a "library" field,
+-- with filenames to be tested for existence.
+-- @param rockspec table: The rockspec table.
+-- @param mode string: if "build" is given, checks all files;
+-- if "install" is given, do not scan for headers.
+-- @return boolean or (nil, string): True if no errors occurred, or
+-- nil and an error message if any test failed.
 function deps.check_external_deps(rockspec, mode)
+   assert(rockspec:type() == "rockspec")
 
    if not rockspec.external_dependencies then
       rockspec.external_dependencies = deps.autodetect_external_dependencies(rockspec.build)
@@ -649,21 +628,21 @@ function deps.check_external_deps(rockspec, mode)
       return true
    end
 
-   for name, ext_files in util.sortedpairs(rockspec.external_dependencies.queries) do
+   for name, ext_files in util.sortedpairs(rockspec.external_dependencies) do
       local ok, err_dirname, err_testfile, err_files = check_external_dependency(name, ext_files, rockspec.variables, mode)
       if not ok then
-         local lines = { "Could not find " .. err_testfile .. " file for " .. name }
+         local lines = {"Could not find "..err_testfile.." file for "..name}
 
          local err_paths = {}
          for _, err_file in ipairs(err_files[err_testfile]) do
             if not err_paths[err_file] then
                err_paths[err_file] = true
-               table.insert(lines, "  No file " .. err_file)
+               table.insert(lines, "  No file "..err_file)
             end
          end
 
-         table.insert(lines, "You may have to install " .. name .. " in your system and/or pass " .. name .. "_DIR or " .. name .. "_" .. err_dirname .. " to the luarocks command.")
-         table.insert(lines, "Example: luarocks install " .. rockspec.name .. " " .. name .. "_DIR=/usr/local")
+         table.insert(lines, "You may have to install "..name.." in your system and/or pass "..name.."_DIR or "..name.."_"..err_dirname.." to the luarocks command.")
+         table.insert(lines, "Example: luarocks install "..rockspec.name.." "..name.."_DIR=/usr/local")
 
          return nil, table.concat(lines, "\n"), "dependency"
       end
@@ -671,17 +650,18 @@ function deps.check_external_deps(rockspec, mode)
    return true
 end
 
-
-
-
-
-
-
-
+--- Recursively add satisfied dependencies of a package to a table,
+-- to build a transitive closure of all dependent packages.
+-- Additionally ensures that `dependencies` table of the manifest is up-to-date.
+-- @param results table: The results table being built, maps package names to versions.
+-- @param mdeps table: The manifest dependencies table.
+-- @param name string: Package name.
+-- @param version string: Package version.
 function deps.scan_deps(results, mdeps, name, version, deps_mode)
    assert(type(results) == "table")
    assert(type(mdeps) == "table")
-   assert(not name:match("/"))
+   assert(type(name) == "string" and not name:match("/"))
+   assert(type(version) == "string")
 
    local fetch = require("luarocks.fetch")
 
@@ -693,7 +673,7 @@ function deps.scan_deps(results, mdeps, name, version, deps_mode)
    local dependencies = mdn[version]
    local rocks_provided
    if not dependencies then
-      local rockspec = fetch.load_local_rockspec(path.rockspec_file(name, version), false)
+      local rockspec, err = fetch.load_local_rockspec(path.rockspec_file(name, version), false)
       if not rockspec then
          return
       end
@@ -706,7 +686,7 @@ function deps.scan_deps(results, mdeps, name, version, deps_mode)
 
    local get_versions = prepare_get_versions(deps_mode, rocks_provided, "dependencies")
 
-   local matched = match_all_deps(dependencies.queries, get_versions)
+   local matched = match_all_deps(dependencies, get_versions)
    results[name] = version
    for _, match in pairs(matched) do
       deps.scan_deps(results, mdeps, match.name, match.version, deps_mode)
@@ -756,13 +736,13 @@ local function find_lua_incdir(prefix, luaver, luajitver)
       end
    end
 
-
+   -- not found, will fallback to a default
    return nil, mainerr
 end
 
 function deps.check_lua_incdir(vars)
-   if vars.LUA_INCDIR_OK == true then
-      return true
+   if vars.LUA_INCDIR_OK == true
+      then return true
    end
 
    local ljv = util.get_luajit_version()
@@ -789,8 +769,8 @@ function deps.check_lua_incdir(vars)
 end
 
 function deps.check_lua_libdir(vars)
-   if vars.LUA_LIBDIR_OK == true then
-      return true
+   if vars.LUA_LIBDIR_OK == true
+      then return true
    end
 
    local fs = require("luarocks.fs")
@@ -823,10 +803,10 @@ function deps.check_lua_libdir(vars)
       local fd = io.open(filename, "r")
       if fd then
          if not vars.LUA_LIBDIR_FILE:match((cfg.lua_version:gsub("%.", "%%.?"))) then
-
+            -- if filename isn't versioned, check file contents
             local txt = fd:read("*a")
-            ok = txt:match("Lua " .. cfg.lua_version, 1) or
-            txt:match("lua" .. (cfg.lua_version:gsub("%.", "")), 1)
+            ok = txt:match("Lua " .. cfg.lua_version, 1, true)
+                 or txt:match("lua" .. (cfg.lua_version:gsub("%.", "")), 1, true)
             if not ok then
                err = "Lua library at " .. filename .. " does not match Lua version " .. cfg.lua_version .. ". You can use `luarocks config variables.LUA_LIBDIR <path>` to set the correct location."
             end
diff --git a/src/luarocks/rockspecs-original.lua b/src/luarocks/rockspecs-original.lua
new file mode 100644
index 00000000..454bab77
--- /dev/null
+++ b/src/luarocks/rockspecs-original.lua
@@ -0,0 +1,183 @@
+local rockspecs = {}
+
+local cfg = require("luarocks.core.cfg")
+local dir = require("luarocks.dir")
+local path = require("luarocks.path")
+local queries = require("luarocks.queries")
+local type_rockspec = require("luarocks.type.rockspec")
+local util = require("luarocks.util")
+local vers = require("luarocks.core.vers")
+
+local vendored_build_type_set = {
+   ["builtin"] = true,
+   ["cmake"] = true,
+   ["command"] = true,
+   ["make"] = true,
+   ["module"] = true, -- compatibility alias
+   ["none"] = true,
+}
+
+local rockspec_mt = {}
+
+rockspec_mt.__index = rockspec_mt
+
+function rockspec_mt.type()
+   return "rockspec"
+end
+
+--- Perform platform-specific overrides on a table.
+-- Overrides values of table with the contents of the appropriate
+-- subset of its "platforms" field. The "platforms" field should
+-- be a table containing subtables keyed with strings representing
+-- platform names. Names that match the contents of the global
+-- detected platforms setting are used. For example, if
+-- platform "unix" is detected, then the fields of
+-- tbl.platforms.unix will overwrite those of tbl with the same
+-- names. For table values, the operation is performed recursively
+-- (tbl.platforms.foo.x.y.z overrides tbl.x.y.z; other contents of
+-- tbl.x are preserved).
+-- @param tbl table or nil: Table which may contain a "platforms" field;
+-- if it doesn't (or if nil is passed), this function does nothing.
+local function platform_overrides(tbl)
+   assert(type(tbl) == "table" or not tbl)
+
+   if not tbl then return end
+
+   if tbl.platforms then
+      for platform in cfg.each_platform() do
+         local platform_tbl = tbl.platforms[platform]
+         if platform_tbl then
+            util.deep_merge(tbl, platform_tbl)
+         end
+      end
+   end
+   tbl.platforms = nil
+end
+
+local function convert_dependencies(rockspec, key)
+   if rockspec[key] then
+      for i = 1, #rockspec[key] do
+         local parsed, err = queries.from_dep_string(rockspec[key][i])
+         if not parsed then
+            return nil, "Parse error processing dependency '"..rockspec[key][i].."': "..tostring(err)
+         end
+         rockspec[key][i] = parsed
+      end
+   else
+      rockspec[key] = {}
+   end
+   return true
+end
+
+--- Set up path-related variables for a given rock.
+-- Create a "variables" table in the rockspec table, containing
+-- adjusted variables according to the configuration file.
+-- @param rockspec table: The rockspec table.
+local function configure_paths(rockspec)
+   local vars = {}
+   for k,v in pairs(cfg.variables) do
+      vars[k] = v
+   end
+   local name, version = rockspec.name, rockspec.version
+   vars.PREFIX = path.install_dir(name, version)
+   vars.LUADIR = path.lua_dir(name, version)
+   vars.LIBDIR = path.lib_dir(name, version)
+   vars.CONFDIR = path.conf_dir(name, version)
+   vars.BINDIR = path.bin_dir(name, version)
+   vars.DOCDIR = path.doc_dir(name, version)
+   rockspec.variables = vars
+end
+
+function rockspecs.from_persisted_table(filename, rockspec, globals, quick)
+   assert(type(rockspec) == "table")
+   assert(type(globals) == "table" or globals == nil)
+   assert(type(filename) == "string")
+   assert(type(quick) == "boolean" or quick == nil)
+
+   if rockspec.rockspec_format then
+      if vers.compare_versions(rockspec.rockspec_format, type_rockspec.rockspec_format) then
+         return nil, "Rockspec format "..rockspec.rockspec_format.." is not supported, please upgrade LuaRocks."
+      end
+   end
+
+   if not quick then
+      local ok, err = type_rockspec.check(rockspec, globals or {})
+      if not ok then
+         return nil, err
+      end
+   end
+
+   --- Check if rockspec format version satisfies version requirement.
+   -- @param rockspec table: The rockspec table.
+   -- @param version string: required version.
+   -- @return boolean: true if rockspec format matches version or is newer, false otherwise.
+   do
+      local parsed_format = vers.parse_version(rockspec.rockspec_format or "1.0")
+      rockspec.format_is_at_least = function(self, version)
+         return parsed_format >= vers.parse_version(version)
+      end
+   end
+
+   platform_overrides(rockspec.build)
+   platform_overrides(rockspec.dependencies)
+   platform_overrides(rockspec.build_dependencies)
+   platform_overrides(rockspec.test_dependencies)
+   platform_overrides(rockspec.external_dependencies)
+   platform_overrides(rockspec.source)
+   platform_overrides(rockspec.hooks)
+   platform_overrides(rockspec.test)
+
+   rockspec.name = rockspec.package:lower()
+
+   local protocol, pathname = dir.split_url(rockspec.source.url)
+   if dir.is_basic_protocol(protocol) then
+      rockspec.source.file = rockspec.source.file or dir.base_name(rockspec.source.url)
+   end
+   rockspec.source.protocol, rockspec.source.pathname = protocol, pathname
+
+   -- Temporary compatibility
+   if rockspec.source.cvs_module then rockspec.source.module = rockspec.source.cvs_module end
+   if rockspec.source.cvs_tag then rockspec.source.tag = rockspec.source.cvs_tag end
+
+   rockspec.local_abs_filename = filename
+   rockspec.source.dir_set = rockspec.source.dir ~= nil
+   rockspec.source.dir = rockspec.source.dir or rockspec.source.module
+
+   rockspec.rocks_provided = util.get_rocks_provided(rockspec)
+
+   for _, key in ipairs({"dependencies", "build_dependencies", "test_dependencies"}) do
+      local ok, err = convert_dependencies(rockspec, key)
+      if not ok then
+         return nil, err
+      end
+   end
+
+   if rockspec.build
+      and rockspec.build.type
+      and not vendored_build_type_set[rockspec.build.type] then
+      local build_pkg_name = "luarocks-build-" .. rockspec.build.type
+      if not rockspec.build_dependencies then
+         rockspec.build_dependencies = {}
+      end
+
+      local found = false
+      for _, dep in ipairs(rockspec.build_dependencies) do
+         if dep.name == build_pkg_name then
+            found = true
+            break
+         end
+      end
+
+      if not found then
+         table.insert(rockspec.build_dependencies, queries.from_dep_string(build_pkg_name))
+      end
+   end
+
+   if not quick then
+      configure_paths(rockspec)
+   end
+
+   return setmetatable(rockspec, rockspec_mt)
+end
+
+return rockspecs
diff --git a/src/luarocks/rockspecs.lua b/src/luarocks/rockspecs.lua
index 454bab77..559a874a 100644
--- a/src/luarocks/rockspecs.lua
+++ b/src/luarocks/rockspecs.lua
@@ -1,4 +1,5 @@
-local rockspecs = {}
+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 ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local pairs = _tl_compat and _tl_compat.pairs or pairs; local table = _tl_compat and _tl_compat.table or table; local rockspecs = {}
+
 
 local cfg = require("luarocks.core.cfg")
 local dir = require("luarocks.dir")
@@ -8,45 +9,53 @@ local type_rockspec = require("luarocks.type.rockspec")
 local util = require("luarocks.util")
 local vers = require("luarocks.core.vers")
 
+local r = require("luarocks.core.types.rockspec")
+
+
+
+
+
+
 local vendored_build_type_set = {
    ["builtin"] = true,
    ["cmake"] = true,
    ["command"] = true,
    ["make"] = true,
-   ["module"] = true, -- compatibility alias
+   ["module"] = true,
    ["none"] = true,
 }
 
 local rockspec_mt = {}
 
-rockspec_mt.__index = rockspec_mt
+rockspec_mt.__index = r.Rockspec
 
-function rockspec_mt.type()
+function r.Rockspec.type()
    return "rockspec"
 end
 
---- Perform platform-specific overrides on a table.
--- Overrides values of table with the contents of the appropriate
--- subset of its "platforms" field. The "platforms" field should
--- be a table containing subtables keyed with strings representing
--- platform names. Names that match the contents of the global
--- detected platforms setting are used. For example, if
--- platform "unix" is detected, then the fields of
--- tbl.platforms.unix will overwrite those of tbl with the same
--- names. For table values, the operation is performed recursively
--- (tbl.platforms.foo.x.y.z overrides tbl.x.y.z; other contents of
--- tbl.x are preserved).
--- @param tbl table or nil: Table which may contain a "platforms" field;
--- if it doesn't (or if nil is passed), this function does nothing.
+
+
+
+
+
+
+
+
+
+
+
+
+
 local function platform_overrides(tbl)
-   assert(type(tbl) == "table" or not tbl)
 
    if not tbl then return end
 
-   if tbl.platforms then
+   local tblp = tbl.platforms
+
+   if type(tblp) == "table" then
       for platform in cfg.each_platform() do
-         local platform_tbl = tbl.platforms[platform]
-         if platform_tbl then
+         local platform_tbl = tblp[platform]
+         if type(platform_tbl) == "table" then
             util.deep_merge(tbl, platform_tbl)
          end
       end
@@ -54,28 +63,28 @@ local function platform_overrides(tbl)
    tbl.platforms = nil
 end
 
-local function convert_dependencies(rockspec, key)
-   if rockspec[key] then
-      for i = 1, #rockspec[key] do
-         local parsed, err = queries.from_dep_string(rockspec[key][i])
-         if not parsed then
-            return nil, "Parse error processing dependency '"..rockspec[key][i].."': "..tostring(err)
-         end
-         rockspec[key][i] = parsed
+local function convert_dependencies(dependencies)
+   if not dependencies then
+      return {}
+   end
+   local qs = {}
+   for i = 1, #dependencies do
+      local parsed, err = queries.from_dep_string(dependencies[i])
+      if not parsed then
+         return nil, "Parse error processing dependency '" .. dependencies[i] .. "': " .. tostring(err)
       end
-   else
-      rockspec[key] = {}
+      qs[i] = parsed
    end
-   return true
+   return qs
 end
 
---- Set up path-related variables for a given rock.
--- Create a "variables" table in the rockspec table, containing
--- adjusted variables according to the configuration file.
--- @param rockspec table: The rockspec table.
+
+
+
+
 local function configure_paths(rockspec)
    local vars = {}
-   for k,v in pairs(cfg.variables) do
+   for k, v in pairs(cfg.variables) do
       vars[k] = v
    end
    local name, version = rockspec.name, rockspec.version
@@ -89,14 +98,10 @@ local function configure_paths(rockspec)
 end
 
 function rockspecs.from_persisted_table(filename, rockspec, globals, quick)
-   assert(type(rockspec) == "table")
-   assert(type(globals) == "table" or globals == nil)
-   assert(type(filename) == "string")
-   assert(type(quick) == "boolean" or quick == nil)
 
    if rockspec.rockspec_format then
       if vers.compare_versions(rockspec.rockspec_format, type_rockspec.rockspec_format) then
-         return nil, "Rockspec format "..rockspec.rockspec_format.." is not supported, please upgrade LuaRocks."
+         return nil, "Rockspec format " .. rockspec.rockspec_format .. " is not supported, please upgrade LuaRocks."
       end
    end
 
@@ -107,10 +112,10 @@ function rockspecs.from_persisted_table(filename, rockspec, globals, quick)
       end
    end
 
-   --- Check if rockspec format version satisfies version requirement.
-   -- @param rockspec table: The rockspec table.
-   -- @param version string: required version.
-   -- @return boolean: true if rockspec format matches version or is newer, false otherwise.
+
+
+
+
    do
       local parsed_format = vers.parse_version(rockspec.rockspec_format or "1.0")
       rockspec.format_is_at_least = function(self, version)
@@ -135,7 +140,7 @@ function rockspecs.from_persisted_table(filename, rockspec, globals, quick)
    end
    rockspec.source.protocol, rockspec.source.pathname = protocol, pathname
 
-   -- Temporary compatibility
+
    if rockspec.source.cvs_module then rockspec.source.module = rockspec.source.cvs_module end
    if rockspec.source.cvs_tag then rockspec.source.tag = rockspec.source.cvs_tag end
 
@@ -145,23 +150,32 @@ function rockspecs.from_persisted_table(filename, rockspec, globals, quick)
 
    rockspec.rocks_provided = util.get_rocks_provided(rockspec)
 
-   for _, key in ipairs({"dependencies", "build_dependencies", "test_dependencies"}) do
-      local ok, err = convert_dependencies(rockspec, key)
-      if not ok then
-         return nil, err
-      end
+   local err
+   rockspec.dependencies.queries, err = convert_dependencies(rockspec.dependencies)
+   if err then
+      return nil, err
    end
 
-   if rockspec.build
-      and rockspec.build.type
-      and not vendored_build_type_set[rockspec.build.type] then
+   rockspec.build_dependencies.queries, err = convert_dependencies(rockspec.build_dependencies)
+   if err then
+      return nil, err
+   end
+
+   rockspec.test_dependencies.queries, err = convert_dependencies(rockspec.test_dependencies)
+   if err then
+      return nil, err
+   end
+
+   if rockspec.build and
+      rockspec.build.type and
+      not vendored_build_type_set[rockspec.build.type] then
       local build_pkg_name = "luarocks-build-" .. rockspec.build.type
       if not rockspec.build_dependencies then
          rockspec.build_dependencies = {}
       end
 
       local found = false
-      for _, dep in ipairs(rockspec.build_dependencies) do
+      for _, dep in ipairs(rockspec.build_dependencies.queries) do
          if dep.name == build_pkg_name then
             found = true
             break
@@ -169,7 +183,11 @@ function rockspecs.from_persisted_table(filename, rockspec, globals, quick)
       end
 
       if not found then
-         table.insert(rockspec.build_dependencies, queries.from_dep_string(build_pkg_name))
+         local query, err = queries.from_dep_string(build_pkg_name)
+         if err then
+            return nil, "Invalid dependency in rockspec: " .. err
+         end
+         table.insert(rockspec.build_dependencies.queries, query)
       end
    end