Merge branch 'master' into luarocks-3

12 files changed, 166 insertions, 60 deletions

diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 60239d3f..e7356c16 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -362,6 +362,7 @@ local defaults = {
       FIND = "find",
       TEST = "test",
       CHMOD = "chmod",
+      MKTEMP = "mktemp",
 
       ZIP = "zip",
       UNZIP = "unzip -n",
@@ -604,13 +605,11 @@ defaults.variables.LUA = site_config.LUA_DIR_SET and (defaults.variables.LUA_BIN
 -- Add built-in modules to rocks_provided
 defaults.rocks_provided["lua"] = cfg.lua_version.."-1"
 
-if cfg.lua_version >= "5.2" then
-   -- Lua 5.2+
+if bit32 then -- Lua 5.2+
    defaults.rocks_provided["bit32"] = cfg.lua_version.."-1"
 end
 
-if cfg.lua_version >= "5.3" then
-   -- Lua 5.3+
+if utf8 then -- Lua 5.3+
    defaults.rocks_provided["utf8"] = cfg.lua_version.."-1"
 end
 
@@ -668,17 +667,23 @@ function cfg.make_paths_from_tree(tree)
    return lua_path, lib_path, bin_path
 end
 
-function cfg.package_paths()
+function cfg.package_paths(current)
    local new_path, new_cpath, new_bin = {}, {}, {}
-   for _,tree in ipairs(cfg.rocks_trees) do
+   local function add_tree_to_paths(tree)
       local lua_path, lib_path, bin_path = cfg.make_paths_from_tree(tree)
       table.insert(new_path, lua_path.."/?.lua")
       table.insert(new_path, lua_path.."/?/init.lua")
       table.insert(new_cpath, lib_path.."/?."..cfg.lib_extension)
       table.insert(new_bin, bin_path)
    end
+   if current then
+      add_tree_to_paths(current)
+   end
+   for _,tree in ipairs(cfg.rocks_trees) do
+      add_tree_to_paths(tree)
+   end
    if extra_luarocks_module_dir then
-     table.insert(new_path, extra_luarocks_module_dir)
+      table.insert(new_path, extra_luarocks_module_dir)
    end
    return table.concat(new_path, ";"), table.concat(new_cpath, ";"), table.concat(new_bin, cfg.export_path_separator)
 end
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index b9eda6e6..2a458b23 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -499,7 +499,7 @@ function deps.fulfill_dependencies(rockspec, deps_mode)
          if not match_dep(dep, nil, deps_mode, rockspec.rocks_provided) then
             local url, err = search.find_suitable_rock(dep)
             if not url then
-               return nil, "Could not satisfy dependency: "..deps.show_dep(dep)
+               return nil, "Could not satisfy dependency "..deps.show_dep(dep)..": "..err
             end
             local ok, err, errcode = install.run(url, deps.deps_mode_to_flag(deps_mode))
             if not ok then
diff --git a/src/luarocks/download.lua b/src/luarocks/download.lua
index f08ba7fe..090f49aa 100644
--- a/src/luarocks/download.lua
+++ b/src/luarocks/download.lua
@@ -39,6 +39,7 @@ end
 function download.download(arch, name, version, all)
    local query = search.make_query(name, version)
    if arch then query.arch = arch end
+   local search_err
 
    if all then
       if name == "" then query.exact_name = false end
@@ -67,12 +68,14 @@ function download.download(arch, name, version, all)
          return all_ok, any_err
       end
    else
-      local url = search.find_suitable_rock(query)
+      local url
+      url, search_err = search.find_suitable_rock(query)
       if url then
          return get_file(url)
       end
    end
-   return nil, "Could not find a result named "..name..(version and " "..version or "").."."
+   return nil, "Could not find a result named "..name..(version and " "..version or "")..
+      (search_err and ": "..search_err or ".")
 end
 
 --- Driver function for the "download" command.
diff --git a/src/luarocks/fs/lua.lua b/src/luarocks/fs/lua.lua
index 1d303c67..483b3e3c 100644
--- a/src/luarocks/fs/lua.lua
+++ b/src/luarocks/fs/lua.lua
@@ -28,8 +28,6 @@ local patch = require("luarocks.tools.patch")
 
 local dir_stack = {}
 
-math.randomseed(os.time())
-
 local dir_separator = "/"
 
 --- Quote argument for shell processing.
@@ -67,23 +65,6 @@ function fs_lua.is_writable(file)
    return result
 end
 
---- Create a temporary directory.
--- @param name string: name pattern to use for avoiding conflicts
--- when creating temporary directory.
--- @return string or (nil, string): name of temporary directory or (nil, error message) on failure.
-function fs_lua.make_temp_dir(name)
-   assert(type(name) == "string")
-   name = dir.normalize(name)
-
-   local temp_dir = (os.getenv("TMP") or "/tmp") .. "/luarocks_" .. name:gsub(dir.separator, "_") .. "-" .. tostring(math.floor(math.random() * 10000))
-   local ok, err = fs.make_dir(temp_dir)
-   if ok then
-      return temp_dir
-   else
-      return nil, err
-   end
-end
-
 local function quote_args(command, ...)
    local out = { command }
    for _, arg in ipairs({...}) do
@@ -785,6 +766,17 @@ function fs_lua.get_permissions(file)
    return posix.stat(file, "mode")
 end
 
+--- Create a temporary directory.
+-- @param name string: name pattern to use for avoiding conflicts
+-- when creating temporary directory.
+-- @return string or (nil, string): name of temporary directory or (nil, error message) on failure.
+function fs_lua.make_temp_dir(name)
+   assert(type(name) == "string")
+   name = dir.normalize(name)
+
+   return posix.mkdtemp((os.getenv("TMPDIR") or "/tmp") .. "/luarocks_" .. name:gsub(dir.separator, "_") .. "-XXXXXX")
+end
+
 end
 
 ---------------------------------------------------------------------
diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua
index 8eb3386a..570b26e4 100644
--- a/src/luarocks/fs/unix.lua
+++ b/src/luarocks/fs/unix.lua
@@ -9,8 +9,6 @@ local cfg = require("luarocks.cfg")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 
-math.randomseed(os.time())
-
 --- Annotate command string for quiet execution.
 -- @param cmd string: A command-line string.
 -- @return string: The command-line, with silencing annotation.
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index 767bae4d..ab55897e 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -357,4 +357,22 @@ function tools.set_time(file, time)
    return fs.execute(vars.TOUCH, "-d", "@"..tostring(time), file)
 end
 
+--- Create a temporary directory.
+-- @param name string: name pattern to use for avoiding conflicts
+-- when creating temporary directory.
+-- @return string or (nil, string): name of temporary directory or (nil, error message) on failure.
+function tools.make_temp_dir(name)
+   assert(type(name) == "string")
+   name = dir.normalize(name)
+
+   local template = (os.getenv("TMPDIR") or "/tmp") .. "/luarocks_" .. name:gsub(dir.separator, "_") .. "-XXXXXX"
+   local pipe = io.popen(vars.MKTEMP.." -d "..fs.Q(template))
+   local dirname = pipe:read("*l")
+   pipe:close()
+   if dirname and dirname:match("^/") then
+      return dirname
+   end
+   return nil, "Failed to create temporary directory "..tostring(dirname)
+end
+
 return tools
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua
index 0c8cc9e9..c14c421b 100644
--- a/src/luarocks/fs/win32.lua
+++ b/src/luarocks/fs/win32.lua
@@ -10,6 +10,8 @@ local cfg = require("luarocks.cfg")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 
+math.randomseed(os.time())
+
 -- Monkey patch io.popen and os.execute to make sure quoting
 -- works as expected.
 -- See http://lua-users.org/lists/lua-l/2013-11/msg00367.html
@@ -221,6 +223,23 @@ function win32.is_writable(file)
    return result
 end
 
+--- Create a temporary directory.
+-- @param name string: name pattern to use for avoiding conflicts
+-- when creating temporary directory.
+-- @return string or (nil, string): name of temporary directory or (nil, error message) on failure.
+function win32.make_temp_dir(name)
+   assert(type(name) == "string")
+   name = dir.normalize(name)
+
+   local temp_dir = os.getenv("TMP") .. "/luarocks_" .. name:gsub(dir.separator, "_") .. "-" .. tostring(math.floor(math.random() * 10000))
+   local ok, err = fs.make_dir(temp_dir)
+   if ok then
+      return temp_dir
+   else
+      return nil, err
+   end
+end
+
 function win32.tmpname()
    return os.getenv("TMP")..os.tmpname()
 end
diff --git a/src/luarocks/list.lua b/src/luarocks/list.lua
index fddded03..99868028 100644
--- a/src/luarocks/list.lua
+++ b/src/luarocks/list.lua
@@ -93,8 +93,8 @@ function list.run(...)
    
    local results = {}
    for _, tree in ipairs(trees) do
-      local ok, err = search.manifest_search(results, path.rocks_dir(tree), query)
-      if not ok then
+      local ok, err, errcode = search.manifest_search(results, path.rocks_dir(tree), query)
+      if not ok and errcode ~= "open" then
          util.warning(err)
       end
    end
diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua
index f53f8dca..05621315 100644
--- a/src/luarocks/manif.lua
+++ b/src/luarocks/manif.lua
@@ -105,18 +105,22 @@ end
 -- All functions that use manifest tables assume they were obtained
 -- through either this function or load_local_manifest.
 -- @param repo_url string: URL or pathname for the repository.
+-- @param lua_version string: Lua version in "5.x" format, defaults to installed version.
 -- @return table or (nil, string, [string]): A table representing the manifest,
 -- or nil followed by an error message and an optional error code.
-function manif.load_manifest(repo_url)
+function manif.load_manifest(repo_url, lua_version)
    assert(type(repo_url) == "string")
+   assert(type(lua_version) == "string" or not lua_version)
+   lua_version = lua_version or cfg.lua_version
 
-   if manif_core.manifest_cache[repo_url] then
-      return manif_core.manifest_cache[repo_url]
+   local cached_manifest = manif_core.get_cached_manifest(repo_url, lua_version)
+   if cached_manifest then
+      return cached_manifest
    end
-   
+
    local filenames = {
-      "manifest-"..cfg.lua_version..".zip",
-      "manifest-"..cfg.lua_version,
+      "manifest-"..lua_version..".zip",
+      "manifest-"..lua_version,
       "manifest",
    }
 
@@ -156,7 +160,7 @@ function manif.load_manifest(repo_url)
       end
       pathname = nozip
    end
-   return manif_core.manifest_loader(pathname, repo_url)
+   return manif_core.manifest_loader(pathname, repo_url, lua_version)
 end
 
 --- Output a table listing items of a package.
@@ -381,7 +385,7 @@ function manif.make_manifest(repo, deps_mode, remote)
    local results = search.disk_search(repo, query)
    local manifest = { repository = {}, modules = {}, commands = {} }
 
-   manif_core.manifest_cache[repo] = manifest
+   manif_core.cache_manifest(repo, nil, manifest)
 
    local dep_handler = nil
    if not remote then
diff --git a/src/luarocks/manif_core.lua b/src/luarocks/manif_core.lua
index d719caa2..610f9860 100644
--- a/src/luarocks/manif_core.lua
+++ b/src/luarocks/manif_core.lua
@@ -7,31 +7,56 @@ package.loaded["luarocks.manif_core"] = manif_core
 
 local persist = require("luarocks.persist")
 local type_check = require("luarocks.type_check")
+local cfg = require("luarocks.cfg")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
 local path = require("luarocks.path")
 
-manif_core.manifest_cache = {}
+-- Table with repository identifiers as keys and tables mapping
+-- Lua versions to cached loaded manifests as values.
+local manifest_cache = {}
+
+--- Cache a loaded manifest.
+-- @param repo_url string: The repository identifier.
+-- @param lua_version string: Lua version in "5.x" format, defaults to installed version.
+-- @param manifest table: the manifest to be cached.
+function manif_core.cache_manifest(repo_url, lua_version, manifest)
+   lua_version = lua_version or cfg.lua_version
+   manifest_cache[repo_url] = manifest_cache[repo_url] or {}
+   manifest_cache[repo_url][lua_version] = manifest
+end
+
+--- Attempt to get cached loaded manifest.
+-- @param repo_url string: The repository identifier.
+-- @param lua_version string: Lua version in "5.x" format, defaults to installed version.
+-- @return table or nil: loaded manifest or nil if cache is empty.
+function manif_core.get_cached_manifest(repo_url, lua_version)
+   lua_version = lua_version or cfg.lua_version
+   return manifest_cache[repo_url] and manifest_cache[repo_url][lua_version]
+end
 
 --- Back-end function that actually loads the manifest
 -- and stores it in the manifest cache.
 -- @param file string: The local filename of the manifest file.
 -- @param repo_url string: The repository identifier.
+-- @param lua_version string: Lua version in "5.x" format, defaults to installed version.
 -- @param quick boolean: If given, skips type checking.
-function manif_core.manifest_loader(file, repo_url, quick)
-   local manifest, err = persist.load_into_table(file)
+-- @return table or (nil, string, string): the manifest or nil,
+-- error message and error code ("open", "load", "run" or "type").
+function manif_core.manifest_loader(file, repo_url, lua_version, quick)
+   local manifest, err, errcode = persist.load_into_table(file)
    if not manifest then
-      return nil, "Failed loading manifest for "..repo_url..": "..err
+      return nil, "Failed loading manifest for "..repo_url..": "..err, errcode
    end
    local globals = err
    if not quick then
       local ok, err = type_check.type_check_manifest(manifest, globals)
       if not ok then
-         return nil, "Error checking manifest: "..err
+         return nil, "Error checking manifest: "..err, "type"
       end
    end
 
-   manif_core.manifest_cache[repo_url] = manifest
+   manif_core.cache_manifest(repo_url, lua_version, manifest)
    return manifest
 end
 
@@ -39,18 +64,18 @@ end
 -- All functions that use manifest tables assume they were obtained
 -- through either this function or load_manifest.
 -- @param repo_url string: URL or pathname for the repository.
--- @return table or (nil, string): A table representing the manifest,
--- or nil followed by an error message.
+-- @return table or (nil, string, string): A table representing the manifest,
+-- or nil followed by an error message and an error code, see manifest_loader.
 function manif_core.load_local_manifest(repo_url)
    assert(type(repo_url) == "string")
 
-   if manif_core.manifest_cache[repo_url] then
-      return manif_core.manifest_cache[repo_url]
+   local cached_manifest = manif_core.get_cached_manifest(repo_url)
+   if cached_manifest then
+      return cached_manifest
    end
 
    local pathname = dir.path(repo_url, "manifest")
-
-   return manif_core.manifest_loader(pathname, repo_url, true)
+   return manif_core.manifest_loader(pathname, repo_url, nil, true)
 end
 
 --- Get all versions of a package listed in a manifest file.
diff --git a/src/luarocks/path_cmd.lua b/src/luarocks/path_cmd.lua
index 2bee4cb5..ecd6d4b1 100644
--- a/src/luarocks/path_cmd.lua
+++ b/src/luarocks/path_cmd.lua
@@ -37,7 +37,7 @@ function path_cmd.run(...)
    local flags = util.parse_flags(...)
    local deps_mode = deps.get_deps_mode(flags)
    
-   local lr_path, lr_cpath, lr_bin = cfg.package_paths()
+   local lr_path, lr_cpath, lr_bin = cfg.package_paths(flags["tree"])
    local path_sep = cfg.export_path_separator
 
    if flags["lr-path"] then
diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua
index 5e6cf50e..6c0020c0 100644
--- a/src/luarocks/search.lua
+++ b/src/luarocks/search.lua
@@ -170,14 +170,15 @@ end
 -- If the arch field is omitted, the local architecture (cfg.arch)
 -- is used. The special value "any" is also recognized, returning all
 -- matches regardless of architecture.
--- @return true or, in case of errors, nil and an error message.
-function search.manifest_search(results, repo, query)
+-- @param lua_version string: Lua version in "5.x" format, defaults to installed version.
+-- @return true or, in case of errors, nil, an error message and an optional error code.
+function search.manifest_search(results, repo, query, lua_version)
    assert(type(results) == "table")
    assert(type(repo) == "string")
    assert(type(query) == "table")
    
    query_arch_as_table(query)
-   local manifest, err, errcode = manif.load_manifest(repo)
+   local manifest, err, errcode = manif.load_manifest(repo, lua_version)
    if not manifest then
       return nil, err, errcode
    end
@@ -193,10 +194,11 @@ end
 
 --- Search on all configured rocks servers.
 -- @param query table: A dependency query.
+-- @param lua_version string: Lua version in "5.x" format, defaults to installed version.
 -- @return table: A table where keys are package names
 -- and values are tables matching version strings to arrays of
 -- tables with fields "arch" and "repo".
-function search.search_repos(query)
+function search.search_repos(query, lua_version)
    assert(type(query) == "table")
 
    local results = {}
@@ -210,7 +212,7 @@ function search.search_repos(query)
             if protocol == "file" then
                mirror = pathname
             end
-            local ok, err, errcode = search.manifest_search(results, mirror, query)
+            local ok, err, errcode = search.manifest_search(results, mirror, query, lua_version)
             if errcode == "network" then
                cfg.disabled_servers[repo] = true
             end
@@ -278,6 +280,23 @@ local function pick_latest_version(name, versions)
    return nil
 end
 
+-- Find out which other Lua versions provide rock versions matching a query,
+-- @param query table: A dependency query matching a single rock.
+-- @return table: array of Lua versions supported, in "5.x" format.
+local function supported_lua_versions(query)
+   local results = {}
+
+   for lua_version in util.lua_versions() do
+      if lua_version ~= cfg.lua_version then
+         if search.search_repos(query, lua_version)[query.name] then
+            table.insert(results, lua_version)
+         end
+      end
+   end
+
+   return results
+end
+
 --- Attempt to get a single URL for a given search for a rock.
 -- @param query table: A dependency query matching a single rock.
 -- @return string or (nil, string): URL for latest matching version
@@ -288,6 +307,29 @@ function search.find_suitable_rock(query)
    local results = search.search_repos(query)
    local first_rock = next(results)
    if not first_rock then
+      if cfg.rocks_provided[query.name] == nil then
+         -- Check if constraints are satisfiable with other Lua versions.
+         local lua_versions = supported_lua_versions(query)
+
+         if #lua_versions ~= 0 then
+            -- Build a nice message in "only Lua 5.x and 5.y but not 5.z." format
+            for i, lua_version in ipairs(lua_versions) do
+               lua_versions[i] = "Lua "..lua_version
+            end
+
+            local versions_message = "only "..table.concat(lua_versions, " and ")..
+               " but not Lua "..cfg.lua_version.."."
+
+            if #query.constraints == 0 then
+               return nil, query.name.." supports "..versions_message
+            elseif #query.constraints == 1 and query.constraints[1].op == "==" then
+               return nil, query.name.." "..query.constraints[1].version.string.." supports "..versions_message
+            else
+               return nil, "Matching "..query.name.." versions support "..versions_message
+            end
+         end
+      end
+
       return nil, "No results matching query were found."
    elseif next(results, first_rock) then
       -- Shouldn't happen as query must match only one package.
@@ -369,7 +411,7 @@ function search.act_on_src_or_rockspec(action, name, version, ...)
    query.arch = "src|rockspec"
    local url, err = search.find_suitable_rock(query)
    if not url then
-      return nil, "Could not find a result named "..name..(version and " "..version or "").."."
+      return nil, "Could not find a result named "..name..(version and " "..version or "")..": "..err
    end
    return action(url, ...)
 end