Merge branch 'master' into luarocks-3

14 files changed, 72 insertions, 43 deletions

diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index 3601dc9b..f3b054d2 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -226,7 +226,7 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
    end
 
    if not minimal_mode then
-      local _, source_dir
+      local source_dir
       if need_to_fetch then
          ok, source_dir, errcode = fetch.fetch_sources(rockspec, true)
          if not ok then
diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
index 3a4beb17..db6f8bc4 100644
--- a/src/luarocks/build/builtin.lua
+++ b/src/luarocks/build/builtin.lua
@@ -175,7 +175,7 @@ function builtin.run(rockspec)
             add_flags(extras, "-Wl,-rpath,%s:", libdirs)
          end
          add_flags(extras, "-l%s", libraries)
-         if cfg.is_platform("cygwin") then
+         if cfg.link_lua_explicitly then
             add_flags(extras, "-l%s", {"lua"})
          end
          return execute(variables.LD.." "..variables.LIBFLAG, "-o", library, "-L"..variables.LUA_LIBDIR, unpack(extras))
diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua
index f7f6ccb6..96891b75 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/command_line.lua
@@ -2,7 +2,6 @@
 --- Functions for command-line scripts.
 local command_line = {}
 
-local pack = function(...) return {...}, select("#", ...) end
 local unpack = unpack or table.unpack
 
 local util = require("luarocks.util")
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index 17f76d14..de8b9281 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -131,24 +131,27 @@ else
    -- Fall back to Unix in unknown systems.
 end
 
--- Set order for platform overrides
+-- Set order for platform overrides.
+-- More general platform identifiers should be listed first,
+-- more specific ones later.
 local platform_order = {
    -- Unixes
-   unix = 1,
-   bsd = 2, 
-   solaris = 3,
-   netbsd = 4,
-   openbsd = 5,
-   freebsd = 6,
-   linux = 7,
-   macosx = 8,
-   cygwin = 9,
-   msys = 10,
-   haiku = 11,
+   "unix",
+   "bsd",
+   "solaris",
+   "netbsd",
+   "openbsd",
+   "freebsd",
+   "linux",
+   "macosx",
+   "cygwin",
+   "msys",
+   "haiku",
    -- Windows
-   win32 = 12,
-   mingw32 = 13,
-   windows = 14 }
+   "win32",
+   "mingw32",
+   "windows",
+}
 
 -- Path configuration:
 local sys_config_file, home_config_file
@@ -274,26 +277,50 @@ if not next(cfg.rocks_trees) then
    end
 end
 
-
 -- update platforms list; keyed -> array
 do
-   local lst = {} -- use temp array to not confuse `pairs` in loop
-   for plat in pairs(cfg.platforms) do 
-      if cfg.platforms[plat] then  -- entries set to 'false' skipped
-         if not platform_order[plat] then
-            local pl = ""
-            for k,_ in pairs(platform_order) do pl = pl .. ", " .. k end
-            io.stderr:write("Bad platform given; "..tostring(plat)..". Valid entries are: "..pl:sub(3,-1) ..".\n")
-            os.exit(cfg.errorcodes.CONFIGFILE)
+   -- if explicitly given by user,
+   if cfg.platforms[1] then
+      local is_windows = cfg.platforms.windows
+      -- Clear auto-detected values
+      for k, _ in pairs(cfg.platforms) do
+         if type(k) == "string" then
+            cfg.platforms[k] = nil
+         end
+      end
+      -- and set the ones given by the user.
+      for _, plat in ipairs(cfg.platforms) do
+         cfg.platforms[plat] = true
+      end
+      -- If no major platform family was set by the user,
+      if not (cfg.platforms.unix or cfg.platforms.windows) then
+         -- set some fallback defaults in case the user provides an incomplete configuration.
+         -- LuaRocks expects a set of defaults to be available.
+         -- This is used for setting defaults here only; the platform overrides
+         -- will use only the user's list.
+         if is_windows then
+            cfg.platforms.windows = true
+            table.insert(cfg.platforms, "windows")
+         else
+            cfg.platforms.unix = true
+            table.insert(cfg.platforms, "unix")
+         end
+      end
+   else
+      -- Sort detected platform defaults
+      local order = {}
+      for i, v in ipairs(platform_order) do
+         order[v] = i
+      end
+      local entries = {}
+      for k, v in pairs(cfg.platforms) do
+         if type(k) == "string" and v == true then
+            table.insert(entries, k)
          end
-         table.insert(lst, plat)
-      else
-         cfg.platforms[plat] = nil
       end
+      table.sort(entries, function(a, b) return order[a] < order[b] end)
+      util.deep_merge(cfg.platforms, entries)
    end
-   -- platform overrides depent on the order, so set priorities
-   table.sort(lst, function(key1, key2) return platform_order[key1] < platform_order[key2] end)
-   util.deep_merge(cfg.platforms, lst)
 end
 
 -- Configure defaults:
@@ -315,6 +342,7 @@ local defaults = {
    arch = "unknown",
    lib_extension = "unknown",
    obj_extension = "unknown",
+   link_lua_explicitly = false,
 
    rocks_servers = {
       {
@@ -536,6 +564,7 @@ if cfg.platforms.cygwin then
    defaults.variables.CC = "echo -llua | xargs gcc"
    defaults.variables.LD = "echo -llua | xargs gcc"
    defaults.variables.LIBFLAG = "-shared"
+   defaults.link_lua_explicitly = true
 end
 
 if cfg.platforms.msys then
diff --git a/src/luarocks/doc.lua b/src/luarocks/doc.lua
index 63c4c4e3..5d521276 100644
--- a/src/luarocks/doc.lua
+++ b/src/luarocks/doc.lua
@@ -61,6 +61,8 @@ function doc.command(flags, name, version)
       return nil, "Argument missing. "..util.see_help("doc")
    end
 
+   name = name:lower()
+
    local iname, iversion, repo = search.pick_installed_rock(name, version, flags["tree"])
    if not iname then
       util.printout(name..(version and " "..version or "").." is not installed. Looking for it in the rocks servers...")
diff --git a/src/luarocks/download.lua b/src/luarocks/download.lua
index c81958de..557d1b65 100644
--- a/src/luarocks/download.lua
+++ b/src/luarocks/download.lua
@@ -100,7 +100,7 @@ function download.command(flags, name, version)
       arch = flags["arch"]
    end
    
-   local dl, err = download.download(arch, name, version, flags["all"])
+   local dl, err = download.download(arch, name:lower(), version, flags["all"])
    return dl and true, err
 end
 
diff --git a/src/luarocks/lint.lua b/src/luarocks/lint.lua
index 742f1736..c9ea45ea 100644
--- a/src/luarocks/lint.lua
+++ b/src/luarocks/lint.lua
@@ -24,7 +24,7 @@ function lint.command(flags, input)
    local filename = input
    if not input:match(".rockspec$") then
       local err
-      filename, err = download.download("rockspec", input)
+      filename, err = download.download("rockspec", input:lower())
       if not filename then
          return nil, err
       end
diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua
index 40657fdf..8277b3a5 100644
--- a/src/luarocks/manif.lua
+++ b/src/luarocks/manif.lua
@@ -32,6 +32,7 @@ function manif.load_rock_manifest(name, version, root)
    return rock_manifest.rock_manifest
 end
 
+
 local function fetch_manifest_from(repo_url, filename)
    local url = dir.path(repo_url, filename)
    local name = repo_url:gsub("[/:]","_")
diff --git a/src/luarocks/new_version.lua b/src/luarocks/new_version.lua
index 000b459b..b13dbb97 100644
--- a/src/luarocks/new_version.lua
+++ b/src/luarocks/new_version.lua
@@ -140,7 +140,7 @@ function new_version.command(flags, input, version, url)
          return nil, err
       end
    else
-      filename, err = download.download("rockspec", input)
+      filename, err = download.download("rockspec", input:lower())
       if not filename then
          return nil, err
       end
diff --git a/src/luarocks/pack.lua b/src/luarocks/pack.lua
index 49c68e85..655cbf37 100644
--- a/src/luarocks/pack.lua
+++ b/src/luarocks/pack.lua
@@ -180,7 +180,7 @@ function pack.command(flags, arg, version)
    if arg:match(".*%.rockspec") then
       file, err = pack.pack_source_rock(arg)
    else
-      file, err = do_pack_binary_rock(arg, version, flags["tree"])
+      file, err = do_pack_binary_rock(arg:lower(), version, flags["tree"])
    end
    if err then
       return nil, err
diff --git a/src/luarocks/path_cmd.lua b/src/luarocks/path_cmd.lua
index 1f5bb07f..627d97cf 100644
--- a/src/luarocks/path_cmd.lua
+++ b/src/luarocks/path_cmd.lua
@@ -4,8 +4,8 @@
 local path_cmd = {}
 
 local util = require("luarocks.util")
-local deps = require("luarocks.deps")
 local cfg = require("luarocks.core.cfg")
+local cfg = require("luarocks.cfg")
 
 path_cmd.help_summary = "Return the currently configured package path."
 path_cmd.help_arguments = ""
@@ -34,8 +34,6 @@ And on Windows:
 --- Driver function for "path" command.
 -- @return boolean This function always succeeds.
 function path_cmd.command(flags)
-   local deps_mode = deps.get_deps_mode(flags)
-   
    local lr_path, lr_cpath, lr_bin = cfg.package_paths(flags["tree"])
    local path_sep = cfg.export_path_separator
 
diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua
index 008d2616..e7f37604 100644
--- a/src/luarocks/remove.lua
+++ b/src/luarocks/remove.lua
@@ -10,7 +10,6 @@ local repos = require("luarocks.repos")
 local path = require("luarocks.path")
 local util = require("luarocks.util")
 local cfg = require("luarocks.core.cfg")
-local writer = require("luarocks.manif.writer")
 local fs = require("luarocks.fs")
 
 remove.help_summary = "Uninstall a rock."
@@ -154,6 +153,7 @@ function remove.command(flags, name, version)
    end
 
    local results = {}
+   name = name:lower()
    search.manifest_search(results, cfg.rocks_dir, search.make_query(name, version))
    if not results[name] then
       return nil, "Could not find rock '"..name..(version and " "..version or "").."' in "..path.rocks_tree_to_string(cfg.root_dir)
diff --git a/src/luarocks/show.lua b/src/luarocks/show.lua
index 53d8ffa5..1ff81e08 100644
--- a/src/luarocks/show.lua
+++ b/src/luarocks/show.lua
@@ -76,7 +76,7 @@ function show.command(flags, name, version)
    end
    
    local repo, repo_url
-   name, version, repo, repo_url = search.pick_installed_rock(name, version, flags["tree"])
+   name, version, repo, repo_url = search.pick_installed_rock(name:lower(), version, flags["tree"])
    if not name then
       return nil, version
    end
diff --git a/src/luarocks/unpack.lua b/src/luarocks/unpack.lua
index af3398ab..c50701b0 100644
--- a/src/luarocks/unpack.lua
+++ b/src/luarocks/unpack.lua
@@ -157,7 +157,7 @@ function unpack.command(flags, name, version)
       return run_unpacker(name, flags["force"])
    else
       local search = require("luarocks.search")
-      return search.act_on_src_or_rockspec(run_unpacker, name, version)
+      return search.act_on_src_or_rockspec(run_unpacker, name:lower(), version)
    end
 end