Merge branch 'master' of github.com:keplerproject/luarocks

10 files changed, 86 insertions, 32 deletions

diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index 6eca0c3e..e6afde54 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -235,8 +235,9 @@ function build_rockspec(rockspec_file, need_to_fetch, minimal_mode)
       license = ("(license: "..rockspec.description.license..")")
    end
 
+   local root_dir = path.root_dir(cfg.rocks_dir)
    print()
-   print(name.." "..version.." is now built and installed in "..cfg.root_dir.." "..license)
+   print(name.." "..version.." is now built and installed in "..root_dir.." "..license)
    
    util.remove_scheduled_function(rollback)
    return true
@@ -278,10 +279,8 @@ function run(...)
    end
    assert(type(version) == "string" or not version)
 
-   if not flags["local"] and (fs.exists(cfg.root_dir) and not fs.is_writable(cfg.root_dir)) then
-      return nil, "Your user does not have write permissions in " .. cfg.root_dir ..
-                  " \n-- you may want to run as a privileged user or use your local tree with --local."
-   end
+   local ok, err = fs.check_command_permissions(flags)
+   if not ok then return nil, err end
 
    if name:match("%.rockspec$") then
       return build_rockspec(name, true)
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 0d991849..4bb376a4 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -24,7 +24,7 @@ end
 
 _M.config = config
 
-program_version = "2.0.3"
+program_version = "2.0.4"
 user_agent = "LuaRocks/"..program_version
 
 local persist = require("luarocks.persist")
@@ -64,6 +64,10 @@ if system == "FreeBSD" then
    detected.unix = true
    detected.freebsd = true
    detected.bsd = true
+elseif system == "OpenBSD" then
+   detected.unix = true
+   detected.openbsd = true
+   detected.bsd = true
 elseif system == "Darwin" then
    detected.unix = true
    detected.macosx = true
@@ -289,6 +293,11 @@ if detected.freebsd then
    defaults.variables.LIBFLAG = "-shared"
 end
 
+if detected.openbsd then
+   defaults.arch = "openbsd-"..proc
+   defaults.platforms = {"unix", "bsd", "openbsd"}
+end
+
 -- Expose some more values detected by LuaRocks for use by rockspec authors.
 defaults.variables.LUA = defaults.lua_interpreter
 defaults.variables.LIB_EXTENSION = defaults.lib_extension
diff --git a/src/luarocks/fetch/git.lua b/src/luarocks/fetch/git.lua
index 6305d781..a3b763d6 100644
--- a/src/luarocks/fetch/git.lua
+++ b/src/luarocks/fetch/git.lua
@@ -47,8 +47,8 @@ function get_sources(rockspec, extract, dest_dir)
          return nil, "Failed checking out tag/branch from git repository."
       end
    end
-   fs.delete(".git")
-   fs.delete(".gitignore")
+   fs.delete(dir.path(store_dir, module, ".git"))
+   fs.delete(dir.path(store_dir, module, ".gitignore"))
    fs.pop_dir()
    fs.pop_dir()
    return module, store_dir
diff --git a/src/luarocks/fs/lua.lua b/src/luarocks/fs/lua.lua
index 70df65be..5b3efd94 100644
--- a/src/luarocks/fs/lua.lua
+++ b/src/luarocks/fs/lua.lua
@@ -8,6 +8,7 @@ local fs = require("luarocks.fs")
 local cfg = require("luarocks.cfg")
 local dir = require("luarocks.dir")
 local util = require("luarocks.util")
+local path = require("luarocks.path")
 
 local socket_ok, http = pcall(require, "socket.http")
 local _, ftp = pcall(require, "socket.ftp")
@@ -615,3 +616,17 @@ function move(src, dest)
    end
    return true
 end
+
+--- Check if user has write permissions for the command.
+-- Assumes the configuration variables under cfg have been previously set up.
+-- @param flags table: the flags table passed to run() drivers.
+-- @return boolean or (boolean, string): true on success, false on failure,
+-- plus an error message.
+function check_command_permissions(flags)
+   local root_dir = path.root_dir(cfg.rocks_dir)
+   if not flags["local"] and not fs.is_writable(root_dir) then
+      return nil, "Your user does not have write permissions in " .. root_dir ..
+                  " \n-- you may want to run as a privileged user or use your local tree with --local."
+   end
+   return true
+end
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index a67dca49..c805fb48 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -302,14 +302,14 @@ function get_md5(file, md5sum)
       end
    elseif cfg.md5checker == "openssl" then
       local pipe = io.popen("openssl md5 "..file)
-      computed = pipe:read("*a")
+      computed = pipe:read("*l")
       pipe:close()
       if computed then
          computed = computed:sub(-32)
       end
    elseif cfg.md5checker == "md5" then
       local pipe = io.popen("md5 "..file)
-      computed = pipe:read("*a")
+      computed = pipe:read("*l")
       pipe:close()
       if computed then
          computed = computed:sub(-32)
@@ -350,7 +350,18 @@ end
 
 function get_permissions(filename)
    local ret
-   local flag = cfg.is_platform("bsd") and "-f '%A'" or "-c '%a'"
+
+   local flag
+   if cfg.is_platform("bsd") then
+      if cfg.is_platform("openbsd") then
+         flag = "-f '%Op'"
+      else
+         flag = "-f '%A'"
+      end
+   else
+      flag = "-c '%a'"
+   end
+
    local pipe = io.popen("stat "..flag.." "..fs.Q(filename))
    ret = pipe:read("*l")
    pipe:close()
diff --git a/src/luarocks/index.lua b/src/luarocks/index.lua
index 18afd797..570db431 100644
--- a/src/luarocks/index.lua
+++ b/src/luarocks/index.lua
@@ -64,6 +64,7 @@ local index_package_start = [[
 <td class="package">
 <p><a name="$anchor"></a><b>$package</b> - $summary<br/>
 </p><blockquote><p>$detailed<br/>
+$externaldependencies
 <font size="-1"><a href="$original">latest sources</a> $homepage | License: $license</font></p>
 </blockquote></a></td>
 <td class="version">
@@ -83,6 +84,34 @@ local index_footer = [[
 </html>
 ]]
 
+function format_external_dependencies(rockspec)
+   if rockspec.external_dependencies then
+      local deplist = {}
+      local listed_set = {}
+      local plats = nil
+      for name, desc in util.sortedpairs(rockspec.external_dependencies) do
+         if name ~= "platforms" then
+            table.insert(deplist, name:lower())
+            listed_set[name] = true
+         else
+            plats = desc
+         end
+      end
+      if plats then
+         for plat, entries in util.sortedpairs(plats) do
+            for name, desc in util.sortedpairs(entries) do
+               if not listed_set[name] then
+                  table.insert(deplist, name:lower() .. " (on "..plat..")")
+               end
+            end
+         end
+      end
+      return '<p><b>External dependencies:</b> ' .. table.concat(deplist, ',&nbsp;').. '</p>'
+   else
+      return ""
+   end
+end
+
 function make_index(repo)
    if not fs.is_dir(repo) then
       return nil, "Cannot access repository at "..repo
@@ -96,9 +125,8 @@ function make_index(repo)
       local output = index_package_start
       for version, data in util.sortedpairs(version_list, deps.compare_versions) do
          local versions = {}
-         local versions_order = {}
          output = output..version..':&nbsp;'
-         
+         table.sort(data, function(a,b) return a.arch < b.arch end)
          for _, item in ipairs(data) do
             local link = '<a href="$url">'..item.arch..'</a>'
             if item.arch == 'rockspec' then
@@ -108,14 +136,9 @@ function make_index(repo)
             else
                link = link:gsub("$url", ("%s-%s.%s.rock"):format(package, version, item.arch))
             end
-            versions[item.arch] = link
-            table.insert(versions_order, item.arch)
-         end
-         table.sort(versions_order)
-         for i, arch in ipairs(versions_order) do
-            versions_order[i] = versions[versions_order[i]]
+            table.insert(versions, link)
          end
-         output = output .. table.concat(versions_order, ',&nbsp;') .. '<br/>'
+         output = output .. table.concat(versions, ',&nbsp;') .. '<br/>'
       end
       output = output .. index_package_end
       if latest_rockspec then
@@ -127,7 +150,8 @@ function make_index(repo)
             summary = rockspec.description.summary or "",
             detailed = rockspec.description.detailed or "",
             license = rockspec.description.license or "N/A",
-            homepage = rockspec.description.homepage and ("| <a href="..rockspec.description.homepage..">project homepage</a>") or ""
+            homepage = rockspec.description.homepage and ("| <a href="..rockspec.description.homepage..">project homepage</a>") or "",
+            externaldependencies = format_external_dependencies(rockspec)
          }
          vars.detailed = vars.detailed:gsub("\n\n", "</p><p>"):gsub("%s+", " ")
          output = output:gsub("$(%w+)", vars)
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index f9f27ccf..016e73bb 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -84,8 +84,9 @@ function install_binary_rock(rock_file)
       license = ("(license: "..rockspec.description.license..")")
    end
 
+   local root_dir = path.root_dir(cfg.rocks_dir)
    print()
-   print(name.." "..version.." is now installed in "..cfg.root_dir.." "..license)
+   print(name.." "..version.." is now installed in "..root_dir.." "..license)
    
    util.remove_scheduled_function(rollback)
    return true
@@ -107,10 +108,8 @@ function run(...)
       return nil, "Argument missing, see help."
    end
 
-   if not flags["local"] and (fs.exists(cfg.root_dir) and not fs.is_writable(cfg.root_dir)) then
-      return nil, "Your user does not have write permissions in " .. cfg.root_dir ..
-                  " \n-- you may want to run as a privileged user or use your local tree with --local."
-   end
+   local ok, err = fs.check_command_permissions(flags)
+   if not ok then return nil, err end
 
    if name:match("%.rockspec$") or name:match("%.src%.rock$") then
       local build = require("luarocks.build")
diff --git a/src/luarocks/make.lua b/src/luarocks/make.lua
index ec3772ac..4af5a16c 100644
--- a/src/luarocks/make.lua
+++ b/src/luarocks/make.lua
@@ -32,10 +32,8 @@ function run(...)
    local flags, rockspec = util.parse_flags(...)
    assert(type(rockspec) == "string" or not rockspec)
 
-   if not flags["local"] and not fs.is_writable(cfg.root_dir) then
-      return nil, "Your user does not have write permissions in " .. cfg.root_dir ..
-                  " \n-- you may want to run as a privileged user or use your local tree with --local."
-   end
+   local ok, err = fs.check_command_permissions(flags)
+   if not ok then return nil, err end
    
    if not rockspec then
       local files = fs.list_dir(fs.current_dir())
diff --git a/src/luarocks/show.lua b/src/luarocks/show.lua
index 82568d13..34837c19 100644
--- a/src/luarocks/show.lua
+++ b/src/luarocks/show.lua
@@ -83,7 +83,7 @@ function run(...)
    --question: what do we do about multiple versions? This should
    --give us the latest version on the last repo (which is usually the global one)
    for vs, repos in util.sortedpairs(versions, deps.compare_versions) do
-      version = vs
+      if not version then version = vs end
       for _, rp in ipairs(repos) do repo_url = rp.repo end
    end
 
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index ed70b2ba..10fc1e36 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -362,4 +362,3 @@ function show_table(t, name, indent)
    addtocart(t, name, indent)
    return cart .. autoref
 end
-