Don't handle multiple rock queries in find_suitable_rock

In practice search.find_suitable_rock is always
called with a precise query (no fuzzy name matching),
and not all callers handle table as return value correctly.

3 files changed, 25 insertions, 36 deletions

diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index a2215351..278b6356 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -484,13 +484,13 @@ function deps.fulfill_dependencies(rockspec, deps_mode)
       for _, dep in pairs(missing) do
          -- Double-check in case dependency was filled during recursion.
          if not match_dep(dep, nil, deps_mode) then
-            local rock = search.find_suitable_rock(dep)
-            if not rock then
+            local url, err = search.find_suitable_rock(dep)
+            if not url then
                return nil, "Could not satisfy dependency: "..deps.show_dep(dep)
             end
-            local ok, err, errcode = install.run(rock, deps.deps_mode_to_flag(deps_mode))
+            local ok, err, errcode = install.run(url, deps.deps_mode_to_flag(deps_mode))
             if not ok then
-               return nil, "Failed installing dependency: "..rock.." - "..err, errcode
+               return nil, "Failed installing dependency: "..url.." - "..err, errcode
             end
          end
       end
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index 6d457fc2..c938aa9f 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -186,20 +186,12 @@ function install.run(...)
       return name, version
    else
       local search = require("luarocks.search")
-      local results, err = search.find_suitable_rock(search.make_query(name:lower(), version))
-      if err then
+      local url, err = search.find_suitable_rock(search.make_query(name:lower(), version))
+      if not url then
          return nil, err
-      elseif type(results) == "string" then
-         local url = results
-         util.printout("Installing "..url.."...")
-         return install.run(url, util.forward_flags(flags))
-      else
-         util.printout()
-         util.printerr("Could not determine which rock to install.")
-         util.title("Search results:")
-         search.print_results(results)
-         return nil, (next(results) and "Please narrow your query." or "No results found.")
       end
+      util.printout("Installing "..url.."...")
+      return install.run(url, util.forward_flags(flags))
    end
 end
 
diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua
index 32af1f9e..5e6cf50e 100644
--- a/src/luarocks/search.lua
+++ b/src/luarocks/search.lua
@@ -278,28 +278,26 @@ local function pick_latest_version(name, versions)
    return nil
 end
 
---- Attempt to get a single URL for a given search.
--- @param query table: A dependency query.
--- @return string or table or (nil, string): URL for matching rock if
--- a single one was found, a table of candidates if it could not narrow to
--- a single result, or nil followed by an error message.
+--- 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
+-- of the rock if it was found, or nil followed by an error message.
 function search.find_suitable_rock(query)
    assert(type(query) == "table")
    
    local results = search.search_repos(query)
-   local first = next(results)
-   if not first then
+   local first_rock = next(results)
+   if not first_rock then
       return nil, "No results matching query were found."
-   elseif not next(results, first) then
-      if cfg.rocks_provided[query.name] ~= nil then
-         -- do not install versions that listed in cfg.rocks_provided
-         return nil, "Rock "..query.name..
-                     " "..cfg.rocks_provided[query.name]..
-                     " was found but it is provided by VM or 'rocks_provided' in the config file."
-      end
-      return pick_latest_version(query.name, results[first])
+   elseif next(results, first_rock) then
+      -- Shouldn't happen as query must match only one package.
+      return nil, "Several rocks matched query."
+   elseif cfg.rocks_provided[query.name] ~= nil then
+      -- Do not install versions listed in cfg.rocks_provided.
+      return nil, "Rock "..query.name.." "..cfg.rocks_provided[query.name]..
+         " was found but it is provided by VM or 'rocks_provided' in the config file."
    else
-      return results
+      return pick_latest_version(query.name, results[first_rock])
    end
 end
 
@@ -369,12 +367,11 @@ function search.act_on_src_or_rockspec(action, name, version, ...)
 
    local query = search.make_query(name, version)
    query.arch = "src|rockspec"
-   local results, err = search.find_suitable_rock(query)
-   if type(results) == "string" then
-      return action(results, ...)
-   else
+   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 "").."."
    end
+   return action(url, ...)
 end
 
 --- Driver function for "search" command.