Move get_versions from luarocks.core.manif to luarocks.manif.

All functions that were in core only for get_versions are moved out as well.
Made possible by PR #654.

6 files changed, 76 insertions, 77 deletions

diff --git a/src/luarocks/core/dir.lua b/src/luarocks/core/dir.lua
index 240bb38a..05b2c72d 100644
--- a/src/luarocks/core/dir.lua
+++ b/src/luarocks/core/dir.lua
@@ -39,17 +39,5 @@ function dir.split_url(url)
    return protocol, pathname
 end
 
---- Normalize a url or local path.
--- URLs should be in the "protocol://path" format. System independent
--- forward slashes are used, removing trailing and double slashes
--- @param url string: an URL or a local pathname.
--- @return string: Normalized result.
-function dir.normalize(name)
-   local protocol, pathname = dir.split_url(name)
-   pathname = pathname:gsub("\\", "/"):gsub("(.)/*$", "%1"):gsub("//", "/")
-   if protocol ~= "file" then pathname = protocol .."://"..pathname end
-   return pathname
-end
-
 return dir
 
diff --git a/src/luarocks/core/manif.lua b/src/luarocks/core/manif.lua
index 49619e7f..549cfb4c 100644
--- a/src/luarocks/core/manif.lua
+++ b/src/luarocks/core/manif.lua
@@ -6,8 +6,6 @@ local persist = require("luarocks.core.persist")
 local type_check = require("luarocks.core.type_check")
 local cfg = require("luarocks.core.cfg")
 local dir = require("luarocks.core.dir")
-local util = require("luarocks.core.util")
-local path = require("luarocks.core.path")
 local require = nil
 --------------------------------------------------------------------------------
 
@@ -77,30 +75,4 @@ function manif.load_local_manifest(repo_url)
    return manif.manifest_loader(pathname, repo_url, nil, true)
 end
 
---- Get all versions of a package listed in a manifest file.
--- @param name string: a package name.
--- @param deps_mode string: "one", to use only the currently
--- configured tree; "order" to select trees based on order
--- (use the current tree and all trees below it on the list)
--- or "all", to use all trees.
--- @return table: An array of strings listing installed
--- versions of a package.
-function manif.get_versions(name, deps_mode)
-   assert(type(name) == "string")
-   assert(type(deps_mode) == "string")
-
-   local version_set = {}
-   path.map_trees(deps_mode, function(tree)
-      local manifest = manif.load_local_manifest(path.rocks_dir(tree))
-
-      if manifest and manifest.repository[name] then
-         for version in pairs(manifest.repository[name]) do
-            version_set[version] = true
-         end
-      end
-   end)
-
-   return util.keys(version_set)
-end
-
 return manif
diff --git a/src/luarocks/core/path.lua b/src/luarocks/core/path.lua
index a4eb8b4b..ed85aeac 100644
--- a/src/luarocks/core/path.lua
+++ b/src/luarocks/core/path.lua
@@ -111,41 +111,4 @@ function path.which_i(file_name, name, version, tree, i)
    return file_name
 end
 
-function path.rocks_tree_to_string(tree)
-   if type(tree) == "string" then
-      return tree
-   else
-      assert(type(tree) == "table")
-      return tree.root
-   end
-end
-
---- Apply a given function to the active rocks trees based on chosen dependency mode.
--- @param deps_mode string: Dependency mode: "one" for the current default tree,
--- "all" for all trees, "order" for all trees with priority >= the current default,
--- "none" for no trees (this function becomes a nop).
--- @param fn function: function to be applied, with the tree dir (string) as the first
--- argument and the remaining varargs of map_trees as the following arguments.
--- @return a table with all results of invocations of fn collected.
-function path.map_trees(deps_mode, fn, ...)
-   local result = {}
-   if deps_mode == "one" then
-      table.insert(result, (fn(cfg.root_dir, ...)) or 0)
-   elseif deps_mode == "all" or deps_mode == "order" then
-      local use = false
-      if deps_mode == "all" then
-         use = true
-      end
-      for _, tree in ipairs(cfg.rocks_trees) do
-         if dir.normalize(path.rocks_tree_to_string(tree)) == dir.normalize(path.rocks_tree_to_string(cfg.root_dir)) then
-            use = true
-         end
-         if use then
-            table.insert(result, (fn(tree, ...)) or 0)
-         end
-      end
-   end
-   return result
-end
-
 return path
diff --git a/src/luarocks/dir.lua b/src/luarocks/dir.lua
index ad7fb870..71477804 100644
--- a/src/luarocks/dir.lua
+++ b/src/luarocks/dir.lua
@@ -24,4 +24,16 @@ function dir.dir_name(pathname)
    return (pathname:gsub("/*$", ""):match("(.*)[/]+[^/]*")) or ""
 end
 
+--- Normalize a url or local path.
+-- URLs should be in the "protocol://path" format. System independent
+-- forward slashes are used, removing trailing and double slashes
+-- @param url string: an URL or a local pathname.
+-- @return string: Normalized result.
+function dir.normalize(name)
+   local protocol, pathname = dir.split_url(name)
+   pathname = pathname:gsub("\\", "/"):gsub("(.)/*$", "%1"):gsub("//", "/")
+   if protocol ~= "file" then pathname = protocol .."://"..pathname end
+   return pathname
+end
+
 return dir
diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua
index 7fdfecda..7f3085db 100644
--- a/src/luarocks/manif.lua
+++ b/src/luarocks/manif.lua
@@ -11,6 +11,7 @@ local dir = require("luarocks.dir")
 local fs = require("luarocks.fs")
 local cfg = require("luarocks.core.cfg")
 local path = require("luarocks.path")
+local util = require("luarocks.util")
 
 manif.rock_manifest_cache = {}
 
@@ -194,4 +195,30 @@ function manif.get_providing_file(name, version, item_type, item_name, repo)
    return type(subtree) == "string" and "lib" or "lua", file_path
 end
 
+--- Get all versions of a package listed in a manifest file.
+-- @param name string: a package name.
+-- @param deps_mode string: "one", to use only the currently
+-- configured tree; "order" to select trees based on order
+-- (use the current tree and all trees below it on the list)
+-- or "all", to use all trees.
+-- @return table: An array of strings listing installed
+-- versions of a package.
+function manif.get_versions(name, deps_mode)
+   assert(type(name) == "string")
+   assert(type(deps_mode) == "string")
+
+   local version_set = {}
+   path.map_trees(deps_mode, function(tree)
+      local manifest = manif.load_local_manifest(path.rocks_dir(tree))
+
+      if manifest and manifest.repository[name] then
+         for version in pairs(manifest.repository[name]) do
+            version_set[version] = true
+         end
+      end
+   end)
+
+   return util.keys(version_set)
+end
+
 return manif
diff --git a/src/luarocks/path.lua b/src/luarocks/path.lua
index 71893cf1..37898435 100644
--- a/src/luarocks/path.lua
+++ b/src/luarocks/path.lua
@@ -231,4 +231,41 @@ function path.use_tree(tree)
    cfg.deploy_lib_dir = path.deploy_lib_dir(tree)
 end
 
+function path.rocks_tree_to_string(tree)
+   if type(tree) == "string" then
+      return tree
+   else
+      assert(type(tree) == "table")
+      return tree.root
+   end
+end
+
+--- Apply a given function to the active rocks trees based on chosen dependency mode.
+-- @param deps_mode string: Dependency mode: "one" for the current default tree,
+-- "all" for all trees, "order" for all trees with priority >= the current default,
+-- "none" for no trees (this function becomes a nop).
+-- @param fn function: function to be applied, with the tree dir (string) as the first
+-- argument and the remaining varargs of map_trees as the following arguments.
+-- @return a table with all results of invocations of fn collected.
+function path.map_trees(deps_mode, fn, ...)
+   local result = {}
+   if deps_mode == "one" then
+      table.insert(result, (fn(cfg.root_dir, ...)) or 0)
+   elseif deps_mode == "all" or deps_mode == "order" then
+      local use = false
+      if deps_mode == "all" then
+         use = true
+      end
+      for _, tree in ipairs(cfg.rocks_trees) do
+         if dir.normalize(path.rocks_tree_to_string(tree)) == dir.normalize(path.rocks_tree_to_string(cfg.root_dir)) then
+            use = true
+         end
+         if use then
+            table.insert(result, (fn(tree, ...)) or 0)
+         end
+      end
+   end
+   return result
+end
+
 return path