12 files changed, 116 insertions, 28 deletions

diff --git a/install.bat b/install.bat
index 52d21355..ffde28db 100644
--- a/install.bat
+++ b/install.bat
@@ -729,7 +729,8 @@ IF NOT "%LUA_PATH_5_3%"=="" (
 )

 SET "PATH=$BINDIR;%PATH%"

 "$LUA_BINDIR\$LUA_INTERPRETER" "$BINDIR\]]..c..[[.lua" %*

-IF NOT "%ERRORLEVEL%"=="2" GOTO EXITLR

+SET EXITCODE=%ERRORLEVEL%

+IF NOT "%EXITCODE%"=="2" GOTO EXITLR

 

 REM Permission denied error, try and auto elevate...

 REM already an admin? (checking to prevent loops)

@@ -758,7 +759,7 @@ ECHO Now retrying as a priviledged user...
 PowerShell -Command (New-Object -com 'Shell.Application').ShellExecute('%TMPFILE%', '', '', 'runas')

 

 :EXITLR

-ENDLOCAL

+exit /b %EXITCODE% 

 ]])

         f:close()

         print(S"Created LuaRocks command: $BINDIR\\"..c..".bat")

diff --git a/rockspec b/rockspec
index 5b0ffc9c..bb7645f9 100644
--- a/rockspec
+++ b/rockspec
@@ -1,5 +1,6 @@
 package = "LuaRocks"
-local VER = "scm-1"
+local VER = "scm"
+version = VER .. "-1"
 
 source = {
    url = "--this rockspec is used by `make bootstrap` only--",
diff --git a/src/bin/luarocks b/src/bin/luarocks
index d2f3c220..be6c2b81 100755
--- a/src/bin/luarocks
+++ b/src/bin/luarocks
@@ -27,6 +27,7 @@ commands = {
    purge = "luarocks.purge",
    doc = "luarocks.doc",
    upload = "luarocks.upload",
+   config = "luarocks.config_cmd",
 }
 
 command_line.run_command(...)
diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index 977be344..68f20264 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -132,7 +132,7 @@ function build.apply_patches(rockspec)
 end
 
 local function install_default_docs(name, version)
-   local patterns = { "readme", "license", "copying" }
+   local patterns = { "readme", "license", "copying", ".*%.md" }
    local dest = dir.path(path.install_dir(name, version), "doc")
    local has_dir = false
    for file in fs.dir() do
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 49ce5188..20aa4a21 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -146,16 +146,17 @@ cfg.variables = {}
 cfg.rocks_trees = {}
 
 sys_config_file = site_config.LUAROCKS_SYSCONFIG or sys_config_dir.."/config-"..cfg.lua_version..".lua"
-local err, errcode
-sys_config_ok, err, errcode = persist.load_into_table(sys_config_file, cfg)
-
-if (not sys_config_ok) and errcode == "open" then -- file not found, so try alternate file
-   sys_config_file = sys_config_dir.."/config.lua"
+do
+   local err, errcode
    sys_config_ok, err, errcode = persist.load_into_table(sys_config_file, cfg)
-end
-if (not sys_config_ok) and errcode ~= "open" then -- either "load" or "run"; bad config file, bail out with error
-   io.stderr:write(err.."\n")
-   os.exit(cfg.errorcodes.CONFIGFILE)
+   if (not sys_config_ok) and errcode == "open" then -- file not found, so try alternate file
+      sys_config_file = sys_config_dir.."/config.lua"
+      sys_config_ok, err, errcode = persist.load_into_table(sys_config_file, cfg)
+   end
+   if (not sys_config_ok) and errcode ~= "open" then -- either "load" or "run"; bad config file, bail out with error
+      io.stderr:write(err.."\n")
+      os.exit(cfg.errorcodes.CONFIGFILE)
+   end
 end
 
 local env_for_config_file = {
@@ -228,7 +229,7 @@ local defaults = {
 
    rocks_servers = {
       {
-        "https://rocks.moonscript.org",
+        "https://luarocks.org",
         "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/",
         "http://luafr.org/moonrocks/",
         "http://luarocks.logiceditor.com/rocks",
@@ -237,7 +238,7 @@ local defaults = {
    disabled_servers = {},
 
    upload = {
-      server = "https://rocks.moonscript.org",
+      server = "https://luarocks.org",
       tool_version = "1.0.0",
       api_version = "1",
    },
@@ -590,7 +591,16 @@ function cfg.init_package_paths()
 end
 
 function cfg.which_config()
-   return sys_config_file, sys_config_ok, home_config_file, home_config_ok
+   return {
+      system = {
+         file = sys_config_file,
+         ok = sys_config_ok,
+      },
+      user = {
+         file = home_config_file,
+         ok = home_config_ok,
+      }
+   }
 end
 
 cfg.user_agent = "LuaRocks/"..cfg.program_version.." "..cfg.arch
diff --git a/src/luarocks/config_cmd.lua b/src/luarocks/config_cmd.lua
new file mode 100644
index 00000000..c066cfec
--- /dev/null
+++ b/src/luarocks/config_cmd.lua
@@ -0,0 +1,58 @@
+--- Module implementing the LuaRocks "config" command.
+-- Queries information about the LuaRocks configuration.
+local config_cmd = {}
+
+local cfg = require("luarocks.cfg")
+local util = require("luarocks.util")
+local dir = require("luarocks.dir")
+
+local function config_file(conf)
+   print(dir.normalize(conf.file))
+   if conf.ok then
+      return true
+   else
+      return nil, "file not found"
+   end
+end
+
+--- Driver function for "config" command.
+-- @return boolean: True if succeeded, nil on errors.
+function config_cmd.run(...)
+   local flags = util.parse_flags(...)
+   
+   if flags["lua-incdir"] then
+      print(cfg.variables.LUA_INCDIR)
+      return true
+   end
+   if flags["lua-libdir"] then
+      print(cfg.variables.LUA_LIBDIR)
+      return true
+   end
+   if flags["lua-ver"] then
+      print(cfg.lua_version)
+      return true
+   end
+   local conf = cfg.which_config()
+   if flags["system-config"] then
+      return config_file(conf.system)
+   end
+   if flags["user-config"] then
+      return config_file(conf.user)
+   end
+
+   if flags["rock-trees"] then
+      for _, tree in ipairs(cfg.rocks_trees) do
+        if type(tree) == "string" then
+           util.printout(dir.normalize(tree))
+        else
+           local name = tree.name and "\t"..tree.name or ""
+           util.printout(dir.normalize(tree.root)..name)
+        end
+      end
+      return true
+   end
+   
+   return nil, "Please provide a flag for querying configuration values. "..util.see_help("config")
+end
+
+return config_cmd
diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua
index 497ae84f..83c76c9c 100644
--- a/src/luarocks/fetch.lua
+++ b/src/luarocks/fetch.lua
@@ -193,9 +193,8 @@ function fetch.load_local_rockspec(filename, quick)
    end
    local globals = err
 
-   local ok, err = true, nil
    if not quick then
-      ok, err = type_check.type_check_rockspec(rockspec, globals)
+      local ok, err = type_check.type_check_rockspec(rockspec, globals)
       if not ok then
          return nil, filename..": "..err
       end
diff --git a/src/luarocks/fs.lua b/src/luarocks/fs.lua
index 72e11c09..57302c7f 100644
--- a/src/luarocks/fs.lua
+++ b/src/luarocks/fs.lua
@@ -31,7 +31,8 @@ fs.verbose = function()    -- patch io.popen and os.execute to display commands
   
   old_exec = os.execute
   os.execute = function(cmd)
-    print("\nos.execute: ", cmd)
+    -- redact api keys if present
+    print("\nos.execute: ", (cmd:gsub("(/api/[^/]+/)([^/]+)/", function(cap, key) return cap.."<redacted>/" end)) )
     local code = pack(old_exec(cmd))
     print("Results: "..tostring(code.n))
     for i = 1,code.n do
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua
index 12d86d1d..32766e53 100644
--- a/src/luarocks/fs/win32.lua
+++ b/src/luarocks/fs/win32.lua
@@ -125,6 +125,7 @@ function win32.wrap_script(file, dest, name, version)
    local ppaths = "package.path="..util.LQ(lpath..";").."..package.path; package.cpath="..util.LQ(lcpath..";").."..package.cpath"
    local addctx = "local k,l,_=pcall(require,"..util.LQ("luarocks.loader")..") _=k and l.add_context("..util.LQ(name)..","..util.LQ(version)..")"
    wrapper:write(fs.Qb(lua)..' -e '..fs.Qb(ppaths)..' -e '..fs.Qb(addctx)..' '..fs.Qb(file)..' %*\n')
+   wrapper:write("exit /b %ERRORLEVEL%\n")
    wrapper:close()
    return true
 end
diff --git a/src/luarocks/help.lua b/src/luarocks/help.lua
index e6c214ff..92458b2b 100644
--- a/src/luarocks/help.lua
+++ b/src/luarocks/help.lua
@@ -31,10 +31,8 @@ end
 local function get_status(status)
    if status then
       return "ok"
-   elseif status == false then
-      return "not found"
    else
-      return "failed"
+      return "not found"
    end
 end
 
@@ -47,7 +45,7 @@ function help.run(...)
    local flags, command = util.parse_flags(...)
 
    if not command then
-      local sys_file, sys_ok, home_file, home_ok = cfg.which_config()
+      local conf = cfg.which_config()
       print_banner()
       print_section("NAME")
       util.printout("\t"..program..[[ - ]]..program_description)
@@ -83,9 +81,9 @@ function help.run(...)
       print_section("CONFIGURATION")
       util.printout("\tLua version: " .. cfg.lua_version)
       util.printout("\tConfiguration files:")
-      util.printout("\t\tSystem: ".. dir.normalize(sys_file) .. " (" .. get_status(sys_ok) ..")")
-      if home_file then
-         util.printout("\t\tUser  : ".. dir.normalize(home_file) .. " (" .. get_status(home_ok) ..")\n")
+      util.printout("\t\tSystem: ".. dir.normalize(conf.system.file) .. " (" .. get_status(conf.system.ok) ..")")
+      if conf.user.file then
+         util.printout("\t\tUser  : ".. dir.normalize(conf.user.file) .. " (" .. get_status(conf.user.ok) ..")\n")
       else
          util.printout("\t\tUser  : disabled in this LuaRocks installation.\n")
       end
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index 682c99e9..6a99b568 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -97,6 +97,9 @@ local supported_flags = {
    ["lr-cpath"] = true,
    ["lr-path"] = true,
    ["lua-version"] = "<vers>",
+   ["lua-ver"] = true,
+   ["lua-incdir"] = true,
+   ["lua-libdir"] = true,
    ["modules"] = true,
    ["mversion"] = true,
    ["no-refresh"] = true,
@@ -114,15 +117,18 @@ local supported_flags = {
    ["quick"] = true,
    ["rock-dir"] = true,
    ["rock-tree"] = true,
+   ["rock-trees"] = true,
    ["rockspec"] = true,
    ["server"] = "<server>",
    ["skip-pack"] = true,
    ["source"] = true,
    ["summary"] = "\"<text>\"",
+   ["system-config"] = true,
    ["tag"] = "<tag>",
    ["timeout"] = "<seconds>",
    ["to"] = "<path>",
    ["tree"] = "<path>",
+   ["user-config"] = true,
    ["verbose"] = true,
    ["version"] = true,
 }
diff --git a/test/testing.sh b/test/testing.sh
index 0fa6fe92..8d972d4c 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -256,10 +256,11 @@ mkdir -p "$testing_server"
    get "$luarocks_repo/luaposix-33.2.1-1.src.rock"
    get "$luarocks_repo/md5-1.2-1.src.rock"
    get "$luarocks_repo/lmathx-20120430.51-1.src.rock"
-   get "$luarocks_repo/lmathx-20120430.52-1.src.rock"
    get "$luarocks_repo/lmathx-20120430.51-1.rockspec"
+   get "$luarocks_repo/lmathx-20120430.52-1.src.rock"
    get "$luarocks_repo/lmathx-20120430.52-1.rockspec"
-   get "$luarocks_repo/lmathx-20140620-1.rockspec"
+   get "$luarocks_repo/lmathx-20150505-1.src.rock"
+   get "$luarocks_repo/lmathx-20150505-1.rockspec"
    get "$luarocks_repo/lua-path-0.2.3-1.src.rock"
    get "$luarocks_repo/lua-cjson-2.1.0-1.src.rock"
    get "$luarocks_repo/luacov-coveralls-0.1.1-1.src.rock"
@@ -496,6 +497,17 @@ fail_write_rockspec_args_url() { $luarocks write_rockspec http://example.com/inv
 test_write_rockspec_http() { $luarocks write_rockspec http://luarocks.org/releases/luarocks-2.1.0.tar.gz --lua-version=5.1; }
 test_write_rockspec_basedir() { $luarocks write_rockspec https://github.com/downloads/Olivine-Labs/luassert/luassert-1.2.tar.gz --lua-version=5.1; }
 
+fail_config_noflags() { $luarocks config; }
+test_config_lua_incdir() { $luarocks config --lua-incdir; }
+test_config_lua_libdir() { $luarocks config --lua-libdir; }
+test_config_lua_ver() { $luarocks config --lua-ver; }
+fail_config_system_config() { rm -f "$testing_lrprefix/etc/luarocks/config.lua"; $luarocks config --system-config; }
+test_config_system_config() { mkdir -p "$testing_lrprefix/etc/luarocks"; touch "$testing_lrprefix/etc/luarocks/config.lua"; $luarocks config --system-config; err=$?; rm -f "$testing_lrprefix/etc/luarocks/config.lua"; return $err; }
+fail_config_system_config_invalid() { mkdir -p "$testing_lrprefix/etc/luarocks"; echo "if if if" > "$testing_lrprefix/etc/luarocks/config.lua"; $luarocks config --system-config; err=$?; rm -f "$testing_lrprefix/etc/luarocks/config.lua"; return $err; }
+test_config_user_config() { $luarocks config --user-config; }
+fail_config_user_config() { LUAROCKS_CONFIG="/missing_file.lua" $luarocks config --user-config; }
+test_config_rock_trees() { $luarocks config --rock-trees; }
+
 test_doc() { $luarocks install luarepl; $luarocks doc luarepl; }
 
 # Driver #########################################