Add named trees, as suggested by @Tieske, plus tests.

1 files changed, 16 insertions, 3 deletions

diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua
index d16ef8e2..63b918b5 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/command_line.lua
@@ -98,9 +98,22 @@ function run_command(...)
       if flags["tree"] == true or flags["tree"] == "" then
          die("Argument error: use --tree=<path>")
       end
-      local fs = require("luarocks.fs")
-      local root_dir = fs.absolute_name(flags["tree"])
-      path.use_tree(root_dir)
+      local named = false
+      for _, tree in ipairs(cfg.rocks_trees) do
+         if type(tree) == "table" and flags["tree"] == tree.name then
+            if not tree.root then
+               die("Configuration error: tree '"..tree.name.."' has no 'root' field.")
+            end
+            path.use_tree(dir.normalize(tree.root))
+            named = true
+            break
+         end
+      end
+      if not named then
+         local fs = require("luarocks.fs")
+         local root_dir = fs.absolute_name(flags["tree"])
+         path.use_tree(root_dir)
+      end
    elseif flags["local"] then
       path.use_tree(cfg.home_tree)
    else