1 files changed, 19 insertions, 15 deletions

diff --git a/src/luarocks/path.lua b/src/luarocks/path.lua
index fe241aa5..8c795e8b 100644
--- a/src/luarocks/path.lua
+++ b/src/luarocks/path.lua
@@ -193,22 +193,18 @@ function bin_dir(name, version, repo)
    return dir.path(rocks_dir(repo), name, version, "bin")
 end
 
---- Extract name, version and arch of a rock filename.
--- @param rock_file string: pathname of a rock
+--- Extract name, version and arch of a rock filename,
+-- or name, version and "rockspec" from a rockspec name.
+-- @param file_name string: pathname of a rock or rockspec
 -- @return (string, string, string) or nil: name, version and arch
--- of rock, or nil if name could not be parsed
-function parse_rock_name(rock_file)
-   assert(type(rock_file) == "string")
-   return dir.base_name(rock_file):match("(.*)-([^-]+-%d+)%.([^.]+)%.rock$")
-end
-
---- Extract name and version of a rockspec filename.
--- @param rockspec_file string: pathname of a rockspec
--- @return (string, string) or nil: name and version
--- of rockspec, or nil if name could not be parsed
-function parse_rockspec_name(rockspec_file)
-   assert(type(rockspec_file) == "string")
-   return dir.base_name(rockspec_file):match("(.*)-([^-]+-%d+)%.(rockspec)")
+-- or nil if name could not be parsed
+function parse_name(file_name)
+   assert(type(file_name) == "string")
+   if file_name:match("%.rock$") then
+      return dir.base_name(file_name):match("(.*)-([^-]+-%d+)%.([^.]+)%.rock$")
+   else
+      return dir.base_name(file_name):match("(.*)-([^-]+-%d+)%.(rockspec)")
+   end
 end
 
 --- Make a rockspec or rock URL.
@@ -301,6 +297,14 @@ function versioned_name(file, prefix, name, version)
    return dir.path(prefix, name_version.."-"..rest)
 end
 
+function use_tree(tree)
+   cfg.root_dir = tree
+   cfg.rocks_dir = rocks_dir(tree)
+   cfg.deploy_bin_dir = deploy_bin_dir(tree)
+   cfg.deploy_lua_dir = deploy_lua_dir(tree)
+   cfg.deploy_lib_dir = deploy_lib_dir(tree)
+end
+
 --- Driver function for "path" command.
 -- @return boolean This function always succeeds.
 function run(...)