Merge branch 'master' into luarocks-3

3 files changed, 54 insertions, 19 deletions

diff --git a/spec/install_spec.lua b/spec/install_spec.lua
index 8d43ca2a..74f8f493 100644
--- a/spec/install_spec.lua
+++ b/spec/install_spec.lua
@@ -88,6 +88,19 @@ describe("LuaRocks install tests #blackbox #b_install", function()
          assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/luarocks/rocks/luasec"))
       end)
 
+      it('LuaRocks install - handle relative path in --tree #632', function()
+         local relative_path = "./temp_dir_"..math.random(100000)
+         if test_env.TEST_TARGET_OS == "windows" then
+            relative_path = relative_path:gsub("/", "\\")
+         end
+         test_env.remove_dir(relative_path)
+         assert.is.falsy(lfs.attributes(relative_path))
+         assert.is_true(run.luarocks_bool("install luafilesystem --tree="..relative_path))
+         assert.is.truthy(lfs.attributes(relative_path))
+         test_env.remove_dir(relative_path)
+         assert.is.falsy(lfs.attributes(relative_path))
+      end)
+
       it('LuaRocks install - handle versioned modules when installing another version with --keep #268', function()
          assert.is_true(run.luarocks_bool("install luafilesystem"))
          assert.is.truthy(lfs.attributes(testing_paths.testing_sys_tree .. "/lib/lua/"..env_variables.LUA_VERSION.."/lfs."..test_env.lib_extension))
diff --git a/src/luarocks/core/manif.lua b/src/luarocks/core/manif.lua
index f0912bfd..49619e7f 100644
--- a/src/luarocks/core/manif.lua
+++ b/src/luarocks/core/manif.lua
@@ -88,20 +88,19 @@ end
 function manif.get_versions(name, deps_mode)
    assert(type(name) == "string")
    assert(type(deps_mode) == "string")
-   
-   local manifest = {}
+
+   local version_set = {}
    path.map_trees(deps_mode, function(tree)
-      local loaded = manif.load_local_manifest(path.rocks_dir(tree))
-      if loaded then
-         util.deep_merge(manifest, loaded)
+      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)
-   
-   local item = next(manifest) and manifest.repository[name]
-   if item then
-      return util.keys(item)
-   end
-   return {}
+
+   return util.keys(version_set)
 end
 
 return manif
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua
index 2216d2fa..789913a7 100644
--- a/src/luarocks/fs/win32.lua
+++ b/src/luarocks/fs/win32.lua
@@ -33,7 +33,24 @@ function win32.quiet_stderr(cmd)
    return cmd.." 2> NUL"
 end
 
-local drive_letter = "[%.a-zA-Z]?:?[\\/]"
+-- Split path into root and the rest.
+-- Root part consists of an optional drive letter (e.g. "C:")
+-- and an optional directory separator.
+local function split_root(path)
+   local root = ""
+
+   if path:match("^.:") then
+      root = path:sub(1, 2)
+      path = path:sub(3)
+   end
+
+   if path:match("^[\\/]") then
+      root = path:sub(1, 1)
+      path = path:sub(2)
+   end
+
+   return root, path
+end
 
 --- Quote argument for shell processing. Fixes paths on Windows.
 -- Adds double quotes and escapes.
@@ -41,8 +58,9 @@ local drive_letter = "[%.a-zA-Z]?:?[\\/]"
 -- @return string: Quoted argument.
 function win32.Q(arg)
    assert(type(arg) == "string")
-   -- Quote DIR for Windows
-   if arg:match("^"..drive_letter)  then
+   -- Use Windows-specific directory separator for paths.
+   -- Paths should be converted to absolute by now.
+   if split_root(arg) ~= "" then
       arg = arg:gsub("/", "\\")
    end
    if arg == "\\" then
@@ -62,8 +80,9 @@ end
 -- @return string: Quoted argument.
 function win32.Qb(arg)
    assert(type(arg) == "string")
-   -- Quote DIR for Windows
-   if arg:match("^"..drive_letter)  then
+   -- Use Windows-specific directory separator for paths.
+   -- Paths should be converted to absolute by now.
+   if split_root(arg) ~= "" then
       arg = arg:gsub("/", "\\")
    end
    if arg == "\\" then
@@ -88,10 +107,14 @@ function win32.absolute_name(pathname, relative_to)
    assert(type(relative_to) == "string" or not relative_to)
 
    relative_to = relative_to or fs.current_dir()
-   if pathname:match("^"..drive_letter) then
+   local root, rest = split_root(pathname)
+   if root:match("[\\/]$") then
+      -- It's an absolute path already.
       return pathname
    else
-      return relative_to .. "/" .. pathname
+      -- It's a relative path, join it with base path.
+      -- This drops drive letter from paths like "C:foo".
+      return relative_to .. "/" .. rest
    end
 end
 
@@ -100,7 +123,7 @@ end
 -- @param pathname string: pathname to use.
 -- @return string: The root of the given pathname.
 function win32.root_of(pathname)
-   return (fs.absolute_name(pathname):match("^("..drive_letter..")"))
+   return (split_root(fs.absolute_name(pathname)))
 end
 
 --- Create a wrapper to make a script executable from the command-line.