10 files changed, 99 insertions, 74 deletions

diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index fb9e4a4f..9a67f00b 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -314,12 +314,11 @@ function run(...)
    end
    assert(type(version) == "string" or not version)
 
-   local ok, err = fs.check_command_permissions(flags)
-   if not ok then return nil, err end
-   
    if flags["pack-binary-rock"] then
       return pack.pack_binary_rock(name, version, do_build, name, version)
    else
+      local ok, err = fs.check_command_permissions(flags)
+      if not ok then return nil, err end
       return do_build(name, version)
    end
 end
diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
index 2a18286f..c2bb0106 100644
--- a/src/luarocks/build/builtin.lua
+++ b/src/luarocks/build/builtin.lua
@@ -187,7 +187,7 @@ function run(rockspec)
       if type(info) == "string" then
          local ext = info:match(".([^.]+)$")
          if ext == "lua" then
-            if info:match("init.lua$") then
+            if info:match("init%.lua$") and not name:match("%.init$") then
                moddir = path.module_to_path(name..".init")
             end
             local dest = dir.path(luadir, moddir)
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index ec019761..9fce84f8 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -25,7 +25,7 @@ end
 
 _M.site_config = site_config
 
-program_version = "2.0.7"
+program_version = "2.0.7.1"
 user_agent = "LuaRocks/"..program_version
 
 local persist = require("luarocks.persist")
@@ -91,6 +91,7 @@ end
 -- Path configuration:
 
 local sys_config_file, home_config_file
+local sys_config_ok, home_config_ok = false, false
 if detected.windows or detected.mingw32 then
    home = os.getenv("APPDATA") or "c:"
    sys_config_file = "c:/luarocks/config.lua"
@@ -106,12 +107,18 @@ end
 variables = {}
 rocks_trees = {}
 
-persist.load_into_table(site_config.LUAROCKS_SYSCONFIG or sys_config_file, _M)
+local ok, err = persist.load_into_table(site_config.LUAROCKS_SYSCONFIG or sys_config_file, _M)
+if ok then
+   sys_config_ok = true
+elseif err and ok == nil then
+   io.stderr:write(err.."\n")
+end
 
 if not site_config.LUAROCKS_FORCE_CONFIG then
    home_config_file = os.getenv("LUAROCKS_CONFIG") or home_config_file
-   local home_overrides = persist.load_into_table(home_config_file, { home = home })
+   local home_overrides, err = persist.load_into_table(home_config_file, { home = home })
    if home_overrides then
+      home_config_ok = true
       local util = require("luarocks.util")
       if home_overrides.rocks_trees then
          _M.rocks_trees = nil
@@ -120,6 +127,8 @@ if not site_config.LUAROCKS_FORCE_CONFIG then
          _M.rocks_servers = nil
       end
       util.deep_merge(_M, home_overrides)
+   elseif err and home_overrides == nil then
+      io.stderr:write(err.."\n")
    end
 end
 
@@ -404,6 +413,10 @@ for _,tree in ipairs(rocks_trees) do
   end
 end
 
+function which_config()
+   return sys_config_file, sys_config_ok, home_config_file, home_config_ok
+end
+
 --- Check if platform was detected
 -- @param query string: The platform name to check.
 -- @return boolean: true if LuaRocks is currently running on queried platform.
diff --git a/src/luarocks/download.lua b/src/luarocks/download.lua
index 6ae5f7af..268dc113 100644
--- a/src/luarocks/download.lua
+++ b/src/luarocks/download.lua
@@ -9,11 +9,12 @@ local fetch = require("luarocks.fetch")
 local search = require("luarocks.search")
 
 help_summary = "Download a specific rock file from a rocks server."
-help_arguments = "[--all] [--source] [--arch=<arch>] [<name> [<version>]]"
+help_arguments = "[--all] [--arch=<arch> | --source | --rockspec] [<name> [<version>]]"
 
 help = [[
---all          Download multiple rock files if there is more than one match.
+--all          Download all files if there are multiple matches.
 --source       Download .src.rock if available.
+--rockspec     Download .rockspec if available.
 --arch=<arch>  Download rock for a specific architecture.
 ]]
 
diff --git a/src/luarocks/fs/lua.lua b/src/luarocks/fs/lua.lua
index d75bb476..1cae25f4 100644
--- a/src/luarocks/fs/lua.lua
+++ b/src/luarocks/fs/lua.lua
@@ -578,7 +578,26 @@ end
 
 if posix_ok then
 
+local octal_to_rwx = {
+   ["0"] = "---",
+   ["1"] = "--x",
+   ["2"] = "-w-",
+   ["3"] = "-wx",
+   ["4"] = "r--",
+   ["5"] = "r-x",
+   ["6"] = "rw-",
+   ["7"] = "rwx",
+}
+
 function chmod(file, mode)
+   -- LuaPosix (as of 5.1.15) does not support octal notation...
+   if mode:sub(1,1) == "0" then
+      local new_mode = {}
+      for c in mode:sub(2):gmatch(".") do
+         table.insert(new_mode, octal_to_rwx[c])
+      end
+      mode = table.concat(new_mode)
+   end
    local err = posix.chmod(file, mode)
    return err == 0
 end
diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua
index 262cb3d0..979fd166 100644
--- a/src/luarocks/fs/unix.lua
+++ b/src/luarocks/fs/unix.lua
@@ -54,7 +54,7 @@ function wrap_script(file, dest)
    wrapper:write('export LUA_PATH LUA_CPATH\n')
    wrapper:write('exec "'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader "'..file..'" "$@"\n')
    wrapper:close()
-   if fs.execute("chmod +x",wrapname) then
+   if fs.chmod(wrapname, "0755") then
       return true
    else
       return nil, "Could not make "..wrapname.." executable."
@@ -74,35 +74,6 @@ function is_actual_binary(filename)
    if file then
       local found = false
       local first = file:read()
-      if first:match("#!.*lua") then
-         found = true
-      elseif first:match("#!/bin/sh") then
-         local line = file:read()
-         line = file:read()
-         if not(line and line:match("LUA_PATH")) then
-            found = true
-         end
-      end
-      file:close()
-      if found then
-         return false
-      else
-         return true
-      end
-   else
-      return true
-   end
-   return false
-end
-
-function is_actual_binary(filename)
-   if filename:match("%.lua$") then
-      return false
-   end
-   local file = io.open(filename)
-   if file then
-      local found = false
-      local first = file:read()
       if not first then
          file:close()
          util.printerr("Warning: could not read "..filename)
@@ -127,6 +98,5 @@ function is_actual_binary(filename)
 end
 
 function copy_binary(filename, dest) 
-   -- LuaPosix (as of 5.1.15) does not support octal notation...
-   return fs.copy(filename, dest, "u=rwx,g=rx,o=rx")
+   return fs.copy(filename, dest, "0755")
 end
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index 5e91439b..d6d60adc 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -101,7 +101,7 @@ function copy(src, dest, perm)
          if fs.is_dir(dest) then
             dest = dir.path(dest, dir.base_name(src))
          end
-         if fs.execute(vars.CHMOD, perm, dest) then
+         if fs.chmod(dest, perm) then
             return true
          else
             return false, "Failed setting permissions of "..dest
diff --git a/src/luarocks/help.lua b/src/luarocks/help.lua
index 718580ce..3a366f44 100644
--- a/src/luarocks/help.lua
+++ b/src/luarocks/help.lua
@@ -9,13 +9,21 @@ module("luarocks.help", package.seeall)
 local util = require("luarocks.util")
 local cfg = require("luarocks.cfg")
 
-help_summary = "Help on commands."
+help_summary = "Help on commands. Type '"..program_name.." help <command>' for more."
 
 help_arguments = "[<command>]"
 help = [[
 <command> is the command to show help for.
 ]]
 
+local function print_banner()
+   util.printout("\nLuaRocks "..cfg.program_version..", a module deployment system for Lua")
+end
+
+local function print_section(section)
+   util.printout("\n"..section)
+end
+
 --- Driver function for the "help" command.
 -- @param command string or nil: command to show help for; if not
 -- given, help summaries for all commands are shown.
@@ -25,27 +33,29 @@ function run(...)
    local flags, command = util.parse_flags(...)
 
    if not command then
+      local sys_file, sys_ok, home_file, home_ok = cfg.which_config()
+      print_banner()
+      print_section("NAME")
+      util.printout("\t"..program_name..[[ - ]]..program_description)
+      print_section("SYNOPSIS")
+      util.printout("\t"..program_name..[[ [--from=<server> | --only-from=<server>] [--to=<tree>] [VAR=VALUE]... <command> [<argument>] ]])
+      print_section("GENERAL OPTIONS")
       util.printout([[
-LuaRocks ]]..cfg.program_version..[[, a module deployment system for Lua
-
-]]..program_name..[[ - ]]..program_description..[[
+        These apply to all commands, as appropriate:
 
-usage: ]]..program_name..[[ [--from=<server> | --only-from=<server>] [--to=<tree>] [VAR=VALUE]... <command> [<argument>]
-
-Variables from the "variables" table of the configuration file
-can be overriden with VAR=VALUE assignments.
-
---server=<server>      Fetch rocks/rockspecs from this server
-                       (takes priority over config file)
---only-server=<server> Fetch rocks/rockspecs from this server only
-                       (overrides any entries in the config file)
---only-sources=<url>   Restrict downloads to paths matching the
-                       given URL.
---tree=<tree>          Which tree to operate on.
---local                Use the tree in the user's home directory.
-
-Supported commands:
-]])
+        --server=<server>      Fetch rocks/rockspecs from this server
+                               (takes priority over config file)
+        --only-server=<server> Fetch rocks/rockspecs from this server only
+                               (overrides any entries in the config file)
+        --only-sources=<url>   Restrict downloads to paths matching the
+                               given URL.
+        --tree=<tree>          Which tree to operate on.
+        --local                Use the tree in the user's home directory.]])
+      print_section("VARIABLES")
+      util.printout([[
+        Variables from the "variables" table of the configuration file
+        can be overriden with VAR=VALUE assignments.]])
+      print_section("COMMANDS")
       local names = {}
       for name, command in pairs(commands) do
          table.insert(names, name)
@@ -53,18 +63,26 @@ Supported commands:
       table.sort(names)
       for _, name in ipairs(names) do
          local command = commands[name]
-         util.printout(name, command.help_summary)
+         util.printout("", name)
+         util.printout("\t", command.help_summary)
       end
+      print_section("CONFIGURATION")
+      util.printout([[
+        Using system configuration file: ]]..sys_file .. " (" .. (sys_ok and "ok" or "failed") ..[[)
+        and user configuration file: ]]..home_file .. " (" .. (home_ok and "ok" or "failed") ..")\n")
    else
       command = command:gsub("-", "_")
       if commands[command] then
          local arguments = commands[command].help_arguments or "<argument>"
-         util.printout()
-         util.printout(program_name.." "..command.." "..arguments)
-         util.printout()
-         util.printout(command.." - "..commands[command].help_summary)
-         util.printout()
-         util.printout(commands[command].help)
+         print_banner()
+         print_section("NAME")
+         util.printout("\t"..program_name.." "..command.." - "..commands[command].help_summary)
+         print_section("SYNOPSIS")
+         util.printout("\t"..program_name.." "..command.." "..arguments)
+         print_section("DESCRIPTION")
+         util.printout("",(commands[command].help:gsub("\n","\n\t"):gsub("\n\t$","")))
+         print_section("SEE ALSO")
+         util.printout("","'luarocks help' for general options and configuration.\n")
       else
          return nil, "Unknown command '"..command.."'"
       end
diff --git a/src/luarocks/make.lua b/src/luarocks/make.lua
index d39dd226..e20c399a 100644
--- a/src/luarocks/make.lua
+++ b/src/luarocks/make.lua
@@ -37,9 +37,6 @@ in the current directory.
 function run(...)
    local flags, rockspec = util.parse_flags(...)
    assert(type(rockspec) == "string" or not rockspec)
-
-   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())
@@ -64,6 +61,8 @@ function run(...)
       local rspec, err, errcode = fetch.load_rockspec(rockspec)
       return pack.pack_binary_rock(rspec.name, rspec.version, build.build_rockspec, rockspec, false, true)
    else
+      local ok, err = fs.check_command_permissions(flags)
+      if not ok then return nil, err end
       return build.build_rockspec(rockspec, false, true)
    end
 end
diff --git a/src/luarocks/persist.lua b/src/luarocks/persist.lua
index 91c28a32..6d411e0f 100644
--- a/src/luarocks/persist.lua
+++ b/src/luarocks/persist.lua
@@ -20,11 +20,17 @@ function load_into_table(filename, tbl)
 
    local chunk, err = loadfile(filename)
    if not chunk then
-      return nil, err
+      if err:sub(1,5) ~= filename:sub(1,5) then
+         return false, err
+      end
+      return nil, "Error loading file: "..err
    end
    local result = tbl or {}
    setfenv(chunk, result)
-   chunk()
+   local ok, err = pcall(chunk)
+   if not ok then
+      return nil, "Error running file: "..err
+   end
    return result
 end