From 58c492d6dafb4592c863a11565ab7ad53c9c7537 Mon Sep 17 00:00:00 2001
From: Xpol Wan <xpolife@gmail.com>
Date: Tue, 3 May 2016 10:21:21 +0800
Subject: Add cross compiling support for MSVC.

This is needed, when native compiler is not installed but cross compiler does.
---
 install.bat | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/install.bat b/install.bat
index 053fdfd6..8e89aafe 100644
--- a/install.bat
+++ b/install.bat
@@ -508,17 +508,22 @@ local function get_msvc_env_setup_cmd()
 	-- 1. try visual studio command line tools
 	local vcdir = get_visual_studio_directory()
 	if vcdir then
-		-- 1.1. try vcvarsall.bat
-		local vcvarsall = vcdir .. 'vcvarsall.bat'
-		if exists(vcvarsall) then
-			return ('call "%s"%s'):format(vcvarsall, x64 and ' amd64' or '')
-		end
-
-		-- 1.2. try vcvars32.bat / vcvars64.bat
-		local relative_path = x64 and "bin\\amd64\\vcvars64.bat" or "bin\\vcvars32.bat"
-		local full_path = vcdir .. relative_path
-		if exists(full_path) then
-			return ('call "%s"'):format(full_path)
+		local vcvars_bats = {
+			x86 = {
+				"bin\\vcvars32.bat", -- prefers native compiler
+				"bin\\amd64_x86\\vcvarsamd64_x86.bat"-- then cross compiler
+			},
+			x86_64 = {
+				"bin\\amd64\\vcvars64.bat", -- prefers native compiler
+				"bin\\x86_amd64\\vcvarsx86_amd64.bat" -- then cross compiler
+			}
+		}
+		assert(vcvars_bats[vars.UNAME_M], "vars.UNAME_M: only x86 and x86_64 are supported")
+		for _, bat in ipairs(vcvars_bats[vars.UNAME_M]) do
+			local full_path = vcdir .. bat
+			if exists(full_path) then
+				return ('call "%s"'):format(full_path)
+			end
 		end
 	end
 
-- 
cgit v1.2.3-55-g6feb


From d80b18dec30e60d68a5060ab4f0f053045d301b9 Mon Sep 17 00:00:00 2001
From: Hisham <hisham@gobolinux.org>
Date: Tue, 3 May 2016 18:54:31 -0300
Subject: Set permissions explicitly when copying or moving files.

---
 src/luarocks/add.lua           |  2 +-
 src/luarocks/build.lua         | 20 +++++++++++---------
 src/luarocks/build/builtin.lua | 19 +++++++++++--------
 src/luarocks/cfg.lua           |  2 ++
 src/luarocks/download.lua      |  3 ++-
 src/luarocks/fs/lua.lua        | 23 ++++++++++++++++-------
 src/luarocks/fs/unix.lua       |  4 ++--
 src/luarocks/pack.lua          | 12 ++++++------
 src/luarocks/repos.lua         | 12 +++++++-----
 src/luarocks/unpack.lua        |  3 ++-
 10 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/src/luarocks/add.lua b/src/luarocks/add.lua
index 81adff9b..ccd303e6 100644
--- a/src/luarocks/add.lua
+++ b/src/luarocks/add.lua
@@ -54,7 +54,7 @@ local function add_files_to_server(refresh, rockfiles, server, upload_server)
       if fs.exists(rockfile) then
          util.printout("Copying file "..rockfile.." to "..local_cache.."...")
          local absolute = fs.absolute_name(rockfile)
-         fs.copy(absolute, local_cache)
+         fs.copy(absolute, local_cache, cfg.perm_read)
          table.insert(files, dir.base_name(absolute))
       else
          util.printerr("File "..rockfile.." not found")
diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index 68f20264..bdc3b57a 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -53,9 +53,11 @@ or the name of a rock to be fetched from a repository.
 -- @param location string: The base directory files should be copied to.
 -- @param is_module_path boolean: True if string keys in files should be
 -- interpreted as dotted module paths.
+-- @param perms string: Permissions of the newly created files installed.
+-- Directories are always created with the default permissions.
 -- @return boolean or (nil, string): True if succeeded or 
 -- nil and an error message.
-local function install_files(files, location, is_module_path)
+local function install_files(files, location, is_module_path, perms)
    assert(type(files) == "table" or not files)
    assert(type(location) == "string")
    if files then
@@ -85,7 +87,7 @@ local function install_files(files, location, is_module_path)
             local ok, err = fs.make_dir(dest)
             if not ok then return nil, err end
          end
-         local ok = fs.copy(dir.path(file), dir.path(dest, filename))
+         local ok = fs.copy(dir.path(file), dir.path(dest, filename), perms)
          if not ok then
             return nil, "Failed copying "..file
          end
@@ -142,7 +144,7 @@ local function install_default_docs(name, version)
                fs.make_dir(dest)
                has_dir = true
             end
-            fs.copy(file, dest)
+            fs.copy(file, dest, cfg.perm_read)
             break
          end
       end
@@ -220,10 +222,10 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
    end
    
    local dirs = {
-      lua = { name = path.lua_dir(name, version), is_module_path = true },
-      lib = { name = path.lib_dir(name, version), is_module_path = true },
-      conf = { name = path.conf_dir(name, version), is_module_path = false },
-      bin = { name = path.bin_dir(name, version), is_module_path = false },
+      lua = { name = path.lua_dir(name, version), is_module_path = true, perms = cfg.perm_read },
+      lib = { name = path.lib_dir(name, version), is_module_path = true, perms = cfg.perm_exec },
+      conf = { name = path.conf_dir(name, version), is_module_path = false, perms = cfg.perm_read },
+      bin = { name = path.bin_dir(name, version), is_module_path = false, perms = cfg.perm_exec },
    }
    
    for _, d in pairs(dirs) do
@@ -270,7 +272,7 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
 
    if build_spec.install then
       for id, install_dir in pairs(dirs) do
-         ok, err = install_files(build_spec.install[id], install_dir.name, install_dir.is_module_path)
+         ok, err = install_files(build_spec.install[id], install_dir.name, install_dir.is_module_path, install_dir.perms)
          if not ok then 
             return nil, err
          end
@@ -308,7 +310,7 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
 
    fs.pop_dir()
    
-   fs.copy(rockspec.local_filename, path.rockspec_file(name, version))
+   fs.copy(rockspec.local_filename, path.rockspec_file(name, version), cfg.perm_read)
    if need_to_fetch then
       fs.pop_dir()
    end
diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
index afd05954..b6062bd7 100644
--- a/src/luarocks/build/builtin.lua
+++ b/src/luarocks/build/builtin.lua
@@ -175,7 +175,8 @@ function builtin.run(rockspec)
    end
 
    local ok, err
-   local built_modules = {}
+   local lua_modules = {}
+   local lib_modules = {}
    local luadir = path.lua_dir(rockspec.name, rockspec.version)
    local libdir = path.lib_dir(rockspec.name, rockspec.version)
    --TODO EXEWRAPPER
@@ -215,7 +216,7 @@ function builtin.run(rockspec)
                end
             end
             local dest = dir.path(luadir, moddir, filename)
-            built_modules[info] = dest
+            lua_modules[info] = dest
          else
             info = {info}
          end
@@ -242,18 +243,20 @@ function builtin.run(rockspec)
             ok, err = fs.make_dir(moddir)
             if not ok then return nil, err end
          end
-         built_modules[module_name] = dir.path(libdir, module_name)
+         lib_modules[module_name] = dir.path(libdir, module_name)
          ok = compile_library(module_name, objects, info.libraries, info.libdirs, name)
          if not ok then
             return nil, "Failed compiling module "..module_name
          end
       end
    end
-   for name, dest in pairs(built_modules) do
-      fs.make_dir(dir.dir_name(dest))
-      ok, err = fs.copy(name, dest)
-      if not ok then
-         return nil, "Failed installing "..name.." in "..dest..": "..err
+   for _, mods in ipairs({{ tbl = lua_modules, perms = cfg.perm_read }, { tbl = lib_modules, perms = cfg.perm_exec }}) do
+      for name, dest in pairs(mods.tbl) do
+         fs.make_dir(dir.dir_name(dest))
+         ok, err = fs.copy(name, dest, mods.perms)
+         if not ok then
+            return nil, "Failed installing "..name.." in "..dest..": "..err
+         end
       end
    end
    if fs.is_dir("lua") then
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 591a456a..9b1c5902 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -306,6 +306,8 @@ local defaults = {
    hooks_enabled = true,
    deps_mode = "one",
    check_certificates = false,
+   perm_read = "0644",
+   perm_exec = "0755",
 
    lua_modules_path = "/share/lua/"..cfg.lua_version,
    lib_modules_path = "/lib/lua/"..cfg.lua_version,
diff --git a/src/luarocks/download.lua b/src/luarocks/download.lua
index 090f49aa..6d95d8fd 100644
--- a/src/luarocks/download.lua
+++ b/src/luarocks/download.lua
@@ -11,6 +11,7 @@ local fetch = require("luarocks.fetch")
 local search = require("luarocks.search")
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
+local cfg = require("luarocks.cfg")
 
 download.help_summary = "Download a specific rock file from a rocks server."
 download.help_arguments = "[--all] [--arch=<arch> | --source | --rockspec] [<name> [<version>]]"
@@ -25,7 +26,7 @@ download.help = [[
 local function get_file(filename)
    local protocol, pathname = dir.split_url(filename)
    if protocol == "file" then
-      local ok, err = fs.copy(pathname, fs.current_dir())
+      local ok, err = fs.copy(pathname, fs.current_dir(), cfg.perm_read)
       if ok then
          return pathname
       else
diff --git a/src/luarocks/fs/lua.lua b/src/luarocks/fs/lua.lua
index 483b3e3c..a31cbb4e 100644
--- a/src/luarocks/fs/lua.lua
+++ b/src/luarocks/fs/lua.lua
@@ -255,6 +255,10 @@ function fs_lua.make_dir(directory)
          if not ok then
             return false, err
          end
+         ok, err = fs.chmod(path, cfg.perm_exec)
+         if not ok then
+            return false, err
+         end
       elseif mode ~= "directory" then
          return false, path.." is not a directory"
       end
@@ -320,12 +324,14 @@ end
 -- Assumes paths are normalized.
 -- @param src string: Pathname of source
 -- @param dest string: Pathname of destination
+-- @param perms string or nil: Optional permissions.
+-- If not given, permissions of the source are copied over to the destination.
 -- @return boolean or (boolean, string): true on success, false on failure
-local function recursive_copy(src, dest)
+local function recursive_copy(src, dest, perms)
    local srcmode = lfs.attributes(src, "mode")
 
    if srcmode == "file" then
-      local ok = fs.copy(src, dest)
+      local ok = fs.copy(src, dest, perms)
       if not ok then return false end
    elseif srcmode == "directory" then
       local subdir = dir.path(dest, dir.base_name(src))
@@ -333,7 +339,7 @@ local function recursive_copy(src, dest)
       if not ok then return nil, err end
       for file in lfs.dir(src) do
          if file ~= "." and file ~= ".." then
-            local ok = recursive_copy(dir.path(src, file), subdir)
+            local ok = recursive_copy(dir.path(src, file), subdir, perms)
             if not ok then return false end
          end
       end
@@ -344,9 +350,10 @@ end
 --- Recursively copy the contents of a directory.
 -- @param src string: Pathname of source
 -- @param dest string: Pathname of destination
+-- @param perms string or nil: Optional permissions. 
 -- @return boolean or (boolean, string): true on success, false on failure,
 -- plus an error message.
-function fs_lua.copy_contents(src, dest)
+function fs_lua.copy_contents(src, dest, perms)
    assert(src and dest)
    src = dir.normalize(src)
    dest = dir.normalize(dest)
@@ -354,7 +361,7 @@ function fs_lua.copy_contents(src, dest)
 
    for file in lfs.dir(src) do
       if file ~= "." and file ~= ".." then
-         local ok = recursive_copy(dir.path(src, file), dest)
+         local ok = recursive_copy(dir.path(src, file), dest, perms)
          if not ok then
             return false, "Failed copying "..src.." to "..dest
          end
@@ -799,14 +806,16 @@ end
 --- Move a file.
 -- @param src string: Pathname of source
 -- @param dest string: Pathname of destination
+-- @param perms string or nil: Permissions for destination file,
+-- or nil to use the source filename permissions.
 -- @return boolean or (boolean, string): true on success, false on failure,
 -- plus an error message.
-function fs_lua.move(src, dest)
+function fs_lua.move(src, dest, perms)
    assert(src and dest)
    if fs.exists(dest) and not fs.is_dir(dest) then
       return false, "File already exists: "..dest
    end
-   local ok, err = fs.copy(src, dest)
+   local ok, err = fs.copy(src, dest, perms)
    if not ok then
       return false, err
    end
diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua
index 570b26e4..e2cc825b 100644
--- a/src/luarocks/fs/unix.lua
+++ b/src/luarocks/fs/unix.lua
@@ -66,7 +66,7 @@ function unix.wrap_script(file, dest, name, version)
    local addctx = "local k,l,_=pcall(require,"..util.LQ("luarocks.loader")..") _=k and l.add_context("..util.LQ(name)..","..util.LQ(version)..")"
    wrapper:write('exec '..fs.Q(lua)..' -e '..fs.Q(ppaths)..' -e '..fs.Q(addctx)..' '..fs.Q(file)..' "$@"\n')
    wrapper:close()
-   if fs.chmod(wrapname, "0755") then
+   if fs.chmod(wrapname, cfg.perm_exec) then
       return true
    else
       return nil, "Could not make "..wrapname.." executable."
@@ -96,7 +96,7 @@ function unix.is_actual_binary(filename)
 end
 
 function unix.copy_binary(filename, dest) 
-   return fs.copy(filename, dest, "0755")
+   return fs.copy(filename, dest, cfg.perm_exec)
 end
 
 --- Move a file on top of the other.
diff --git a/src/luarocks/pack.lua b/src/luarocks/pack.lua
index c73d66ab..e4498f5a 100644
--- a/src/luarocks/pack.lua
+++ b/src/luarocks/pack.lua
@@ -53,7 +53,7 @@ function pack.pack_source_rock(rockspec_file)
    if not ok then return nil, err end
 
    fs.delete(rock_file)
-   fs.copy(rockspec_file, source_dir)
+   fs.copy(rockspec_file, source_dir, cfg.perm_read)
    if not fs.zip(rock_file, dir.base_name(rockspec_file), dir.base_name(source_file)) then
       return nil, "Failed packing "..rock_file
    end
@@ -62,7 +62,7 @@ function pack.pack_source_rock(rockspec_file)
    return rock_file
 end
 
-local function copy_back_files(name, version, file_tree, deploy_dir, pack_dir)
+local function copy_back_files(name, version, file_tree, deploy_dir, pack_dir, perms)
    local ok, err = fs.make_dir(pack_dir)
    if not ok then return nil, err end
    for file, sub in pairs(file_tree) do
@@ -74,9 +74,9 @@ local function copy_back_files(name, version, file_tree, deploy_dir, pack_dir)
       else
          local versioned = path.versioned_name(source, deploy_dir, name, version)
          if fs.exists(versioned) then
-            fs.copy(versioned, target)
+            fs.copy(versioned, target, perms)
          else
-            fs.copy(source, target)
+            fs.copy(source, target, perms)
          end
       end
    end
@@ -135,12 +135,12 @@ local function do_pack_binary_rock(name, version)
 
    local is_binary = false
    if rock_manifest.lib then
-      local ok, err = copy_back_files(name, version, rock_manifest.lib, path.deploy_lib_dir(root), dir.path(temp_dir, "lib"))
+      local ok, err = copy_back_files(name, version, rock_manifest.lib, path.deploy_lib_dir(root), dir.path(temp_dir, "lib"), cfg.perm_exec)
       if not ok then return nil, "Failed copying back files: " .. err end
       is_binary = true
    end
    if rock_manifest.lua then
-      local ok, err = copy_back_files(name, version, rock_manifest.lua, path.deploy_lua_dir(root), dir.path(temp_dir, "lua"))
+      local ok, err = copy_back_files(name, version, rock_manifest.lua, path.deploy_lua_dir(root), dir.path(temp_dir, "lua"), cfg.perm_read)
       if not ok then return nil, "Failed copying back files: " .. err end
    end
    
diff --git a/src/luarocks/repos.lua b/src/luarocks/repos.lua
index 17456593..66b1377f 100644
--- a/src/luarocks/repos.lua
+++ b/src/luarocks/repos.lua
@@ -199,9 +199,6 @@ function repos.deploy_files(name, version, wrap_bin_scripts)
 
    local function deploy_file_tree(file_tree, path_fn, deploy_dir, move_fn)
       local source_dir = path_fn(name, version)
-      if not move_fn then
-         move_fn = fs.move
-      end
       return recurse_rock_manifest_tree(file_tree, 
          function(parent_path, parent_module, file)
             local source = dir.path(source_dir, parent_path, file)
@@ -239,11 +236,16 @@ function repos.deploy_files(name, version, wrap_bin_scripts)
       local move_bin_fn = wrap_bin_scripts and install_binary or fs.copy_binary
       ok, err = deploy_file_tree(rock_manifest.bin, path.bin_dir, cfg.deploy_bin_dir, move_bin_fn)
    end
+   local function make_mover(perms)
+      return function (src, dest) 
+         return fs.move(src, dest, perms)
+      end
+   end
    if ok and rock_manifest.lua then
-      ok, err = deploy_file_tree(rock_manifest.lua, path.lua_dir, cfg.deploy_lua_dir)
+      ok, err = deploy_file_tree(rock_manifest.lua, path.lua_dir, cfg.deploy_lua_dir, make_mover(cfg.perm_read))
    end
    if ok and rock_manifest.lib then
-      ok, err = deploy_file_tree(rock_manifest.lib, path.lib_dir, cfg.deploy_lib_dir)
+      ok, err = deploy_file_tree(rock_manifest.lib, path.lib_dir, cfg.deploy_lib_dir, make_mover(cfg.perm_exec))
    end
    return ok, err
 end
diff --git a/src/luarocks/unpack.lua b/src/luarocks/unpack.lua
index a889bac5..d90f0571 100644
--- a/src/luarocks/unpack.lua
+++ b/src/luarocks/unpack.lua
@@ -10,6 +10,7 @@ local fs = require("luarocks.fs")
 local util = require("luarocks.util")
 local build = require("luarocks.build")
 local dir = require("luarocks.dir")
+local cfg = require("luarocks.cfg")
 
 unpack.help_summary = "Unpack the contents of a rock."
 unpack.help_arguments = "[--force] {<rock>|<name> [<version>]}"
@@ -128,7 +129,7 @@ local function run_unpacker(file, force)
    end
    if kind == "src" or kind == "rockspec" then
       if rockspec.source.dir ~= "." then
-         local ok = fs.copy(rockspec.local_filename, rockspec.source.dir)
+         local ok = fs.copy(rockspec.local_filename, rockspec.source.dir, cfg.perm_read)
          if not ok then
             return nil, "Failed copying unpacked rockspec into unpacked source directory."
          end
-- 
cgit v1.2.3-55-g6feb


From a8fe9e376ee4517486513b47e7be143311c96e06 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Sun, 8 May 2016 13:58:01 +0300
Subject: Fix some luacheck warnings in install.bat

---
 install.bat | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/install.bat b/install.bat
index 053fdfd6..df058585 100644
--- a/install.bat
+++ b/install.bat
@@ -55,7 +55,7 @@ local function die(message)
 	os.exit(1)
 end
 
-function split_string(str, delim, maxNb)
+local function split_string(str, delim, maxNb)
 	-- Eliminate bad cases...
 	if string.find(str, delim) == nil then
 		return { str }
@@ -543,8 +543,7 @@ local function look_for_lua_install ()
 	else
 		-- no prefix given, so use path
 		directories = (os.getenv("PATH",";") or "")
-		local i = 1
-        while i ~= 0 do directories, i = directories:gsub(";;",";") end  --remove all doubles
+		directories = directories:gsub(";+", ";")  --remove all doubles
 		directories = split_string(directories,";")
 		-- if a path element ends with "\bin\" then remove it, as the searcher will check there anyway
 		for i, val in ipairs(directories) do
@@ -651,7 +650,7 @@ local with_arg = { -- options followed by an argument, others are flags
 -- this will be damaged by the batch construction at the start of this file
 local oarg = arg  -- retain old table
 if #arg > 0 then
-	farg = table.concat(arg, " ") .. " "
+	local farg = table.concat(arg, " ") .. " "
 	arg = {}
 	farg = farg:gsub('%"', "")
 	local i = 0
@@ -672,7 +671,6 @@ if #arg > 0 then
 	end
 end
 for k,v in pairs(oarg) do if k < 1 then arg[k] = v end end -- copy 0 and negative indexes
-oarg = nil
 
 -- build config option table with name and value elements
 local i = 1
@@ -771,7 +769,6 @@ if not vars.TREE_ROOT then
   end
 end
 
-local datapath
 vars.SYSCONFDIR = vars.SYSCONFDIR or vars.PREFIX
 vars.SYSCONFFILENAME = S"config-$LUA_VERSION.lua"
 vars.CONFIG_FILE = vars.SYSCONFDIR.."\\"..vars.SYSCONFFILENAME
-- 
cgit v1.2.3-55-g6feb


From 6beb0ef346cc7fd097a4736a7b27755a84165287 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Tue, 10 May 2016 15:48:33 +0300
Subject: Shorten logging for `luarocks install`

Instead of mentioning URL twice in

    Installing URL...
    Using URL... switching to 'build' mode

simply print

    Installing URL

and don't print URL at all when it's the argument to `luarocks install`
(it's a bit redundant), only when it's a result of a search.
---
 src/luarocks/deps.lua    | 1 +
 src/luarocks/install.lua | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 812e6d18..ac294f54 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -488,6 +488,7 @@ function deps.fulfill_dependencies(rockspec, deps_mode)
             if not url then
                return nil, "Could not satisfy dependency "..deps.show_dep(dep)..": "..err
             end
+            util.printout("Installing "..url)
             local ok, err, errcode = install.run(url, deps.deps_mode_to_flag(deps_mode))
             if not ok then
                return nil, "Failed installing dependency: "..url.." - "..err, errcode
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index c938aa9f..ae162b86 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -168,7 +168,6 @@ function install.run(...)
    if not ok then return nil, err, cfg.errorcodes.PERMISSIONDENIED end
 
    if name:match("%.rockspec$") or name:match("%.src%.rock$") then
-      util.printout("Using "..name.."... switching to 'build' mode")
       local build = require("luarocks.build")
       return build.run(name, util.forward_flags(flags, "local", "keep", "deps-mode", "only-deps"))
    elseif name:match("%.rock$") then
@@ -190,7 +189,7 @@ function install.run(...)
       if not url then
          return nil, err
       end
-      util.printout("Installing "..url.."...")
+      util.printout("Installing "..url)
       return install.run(url, util.forward_flags(flags))
    end
 end
-- 
cgit v1.2.3-55-g6feb


From 4800159347ac79a30180d778ac02ee24a181e41a Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Tue, 10 May 2016 16:31:16 +0300
Subject: Use same messages for installing binary and source rocks

Move successful installation announcement into an util function.
Don't print that the rock was "built": sometimes there is nothing to
build (pure Lua rocks), and for C rocks compilation commands are printed
already.
---
 src/luarocks/build.lua   | 10 +---------
 src/luarocks/install.lua | 10 +---------
 src/luarocks/util.lua    | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index bdc3b57a..38a269dd 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -332,15 +332,7 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
    ok, err = manif.update_manifest(name, version, nil, deps_mode)
    if err then return nil, err end
 
-   local license = ""
-   if rockspec.description and rockspec.description.license then
-      license = ("(license: "..rockspec.description.license..")")
-   end
-
-   local root_dir = path.root_dir(cfg.rocks_dir)
-   util.printout(name.." "..version.." is now built and installed in "..root_dir.." "..license)
-   util.printout()
-   
+   util.announce_install(rockspec)
    util.remove_scheduled_function(rollback)
    return name, version
 end
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index ae162b86..8960c102 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -98,15 +98,7 @@ function install.install_binary_rock(rock_file, deps_mode)
    ok, err = manif.update_manifest(name, version, nil, deps_mode)
    if err then return nil, err end
    
-   local license = ""
-   if rockspec.description.license then
-      license = ("(license: "..rockspec.description.license..")")
-   end
-
-   local root_dir = path.root_dir(cfg.rocks_dir)
-   util.printout()
-   util.printout(name.." "..version.." is now installed in "..root_dir.." "..license)
-   
+   util.announce_install(rockspec)
    util.remove_scheduled_function(rollback)
    return name, version
 end
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index c06c8354..a92297ce 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -505,6 +505,20 @@ function util.see_help(command, program)
    return "See '"..util.this_program(program or "luarocks")..' help'..(command and " "..command or "").."'."
 end
 
+function util.announce_install(rockspec)
+   local cfg = require("luarocks.cfg")
+   local path = require("luarocks.path")
+
+   local suffix = ""
+   if rockspec.description and rockspec.description.license then
+      suffix = " (license: "..rockspec.description.license..")"
+   end
+
+   local root_dir = path.root_dir(cfg.rocks_dir)
+   util.printout(rockspec.name.." "..rockspec.version.." is now installed in "..root_dir..suffix)
+   util.printout()
+end
+
 -- from http://lua-users.org/wiki/SplitJoin
 -- by PhilippeLhoste
 function util.split_string(str, delim, maxNb)
-- 
cgit v1.2.3-55-g6feb


From 277b7bc9f1ce46740de1c167294e235737a6e305 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Tue, 10 May 2016 16:38:11 +0300
Subject: Don't spam 'Updating manifest for...'

Installation success message is enough and is more important
(what's a manifest and why users should care?)
---
 src/luarocks/manif.lua | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua
index 05621315..bc202be3 100644
--- a/src/luarocks/manif.lua
+++ b/src/luarocks/manif.lua
@@ -432,8 +432,6 @@ function manif.update_manifest(name, version, repo, deps_mode)
    
    if deps_mode == "none" then deps_mode = cfg.deps_mode end
 
-   util.printout("Updating manifest for "..repo)
-
    local manifest, err = manif.load_manifest(repo)
    if not manifest then
       util.printerr("No existing manifest. Attempting to rebuild...")
-- 
cgit v1.2.3-55-g6feb


From a26862545e0eccbbc5fba15edd2a00dedf069a3f Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Tue, 10 May 2016 17:33:44 +0300
Subject: Announce each missing dep before its install

Instead of lising all missing deps before installing all of them,
announce each missing dep right before installing it.
Also show current rock versions for missing deps.
---
 src/luarocks/deps.lua | 72 ++++++++++++++++++++++-----------------------------
 1 file changed, 31 insertions(+), 41 deletions(-)

diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index ac294f54..73eab2c2 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -449,53 +449,43 @@ function deps.fulfill_dependencies(rockspec, deps_mode)
       end
    end
 
-   local _, missing, no_upgrade = deps.match_deps(rockspec, nil, deps_mode)
+   local first_missing_dep = true
 
-   if next(no_upgrade) then
-      util.printerr("Missing dependencies for "..rockspec.name.." "..rockspec.version..":")
-      for _, dep in pairs(no_upgrade) do
-         util.printerr(deps.show_dep(dep))
-      end
-      if next(missing) then
-         for _, dep in pairs(missing) do
-            util.printerr(deps.show_dep(dep))
+   for _, dep in ipairs(rockspec.dependencies) do
+      if not match_dep(dep, nil, deps_mode) then
+         if first_missing_dep then
+            util.printout()
+            first_missing_dep = false
          end
-      end
-      util.printerr()
-      for _, dep in pairs(no_upgrade) do
-         util.printerr("This version of "..rockspec.name.." is designed for use with")
-         util.printerr(deps.show_dep(dep)..", but is configured to avoid upgrading it")
-         util.printerr("automatically. Please upgrade "..dep.name.." with")
-         util.printerr("   luarocks install "..dep.name)
-         util.printerr("or choose an older version of "..rockspec.name.." with")
-         util.printerr("   luarocks search "..rockspec.name)
-      end
-      return nil, "Failed matching dependencies."
-   end
 
-   if next(missing) then
-      util.printerr()
-      util.printerr("Missing dependencies for "..rockspec.name..":")
-      for _, dep in pairs(missing) do
-         util.printerr(deps.show_dep(dep))
-      end
-      util.printerr()
-
-      for _, dep in pairs(missing) do
-         -- Double-check in case dependency was filled during recursion.
-         if not match_dep(dep, nil, deps_mode) then
-            local url, err = search.find_suitable_rock(dep)
-            if not url then
-               return nil, "Could not satisfy dependency "..deps.show_dep(dep)..": "..err
-            end
-            util.printout("Installing "..url)
-            local ok, err, errcode = install.run(url, deps.deps_mode_to_flag(deps_mode))
-            if not ok then
-               return nil, "Failed installing dependency: "..url.." - "..err, errcode
-            end
+         local any_installed = match_dep(search.make_query(dep.name), nil, deps_mode)
+         local installation_type = cfg.rocks_provided[dep.name] and "provided by VM" or "installed"
+         local status = any_installed and any_installed.version.." "..installation_type or "missing"
+         util.printout(("%s %s depends on %s (%s)"):format(
+            rockspec.name, rockspec.version, deps.show_dep(dep), status))
+
+         if dep.constraints[1] and dep.constraints[1].no_upgrade then
+            util.printerr("This version of "..rockspec.name.." is designed for use with")
+            util.printerr(deps.show_dep(dep)..", but is configured to avoid upgrading it")
+            util.printerr("automatically. Please upgrade "..dep.name.." with")
+            util.printerr("   luarocks install "..dep.name)
+            util.printerr("or choose an older version of "..rockspec.name.." with")
+            util.printerr("   luarocks search "..rockspec.name)
+            return nil, "Failed matching dependencies"
+         end
+
+         local url, search_err = search.find_suitable_rock(dep)
+         if not url then
+            return nil, "Could not satisfy dependency "..deps.show_dep(dep)..": "..search_err
+         end
+         util.printout("Installing "..url)
+         local ok, install_err, errcode = install.run(url, deps.deps_mode_to_flag(deps_mode))
+         if not ok then
+            return nil, "Failed installing dependency: "..url.." - "..install_err, errcode
          end
       end
    end
+
    return true
 end
 
-- 
cgit v1.2.3-55-g6feb


From e4bae37cc36affe54ec011703f2e3515589948a4 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Tue, 10 May 2016 18:42:48 +0300
Subject: Fix some typos in messages

---
 src/luarocks/install.lua | 2 +-
 src/luarocks/remove.lua  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index c938aa9f..24f1accd 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -143,7 +143,7 @@ function install.install_binary_rock_deps(rock_file, deps_mode)
    if err then return nil, err, errcode end
 
    util.printout()
-   util.printout("Succesfully installed dependencies for " ..name.." "..version)
+   util.printout("Successfully installed dependencies for " ..name.." "..version)
 
    return name, version
 end
diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua
index 5d419817..04fa5be6 100644
--- a/src/luarocks/remove.lua
+++ b/src/luarocks/remove.lua
@@ -82,7 +82,7 @@ function remove.remove_search_results(results, name, deps_mode, force)
    
    local dependents = {}
    if force ~= "fast" then
-      util.printout("Checking stability of dependencies on the absence of")
+      util.printout("Checking stability of dependencies in the absence of")
       util.printout(name.." "..table.concat(util.keys(versions), ", ").."...")
       util.printout()
       dependents = check_dependents(name, versions, deps_mode)
-- 
cgit v1.2.3-55-g6feb


From b60a4134683e6fb9f325fa6d190ef418c87812c4 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Tue, 10 May 2016 18:56:25 +0300
Subject: Fix `luarocks list --outdated`

Compare latest available version with latest installed version,
not with lexicographically smallest installed version.
---
 src/luarocks/list.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/luarocks/list.lua b/src/luarocks/list.lua
index 99868028..b517d182 100644
--- a/src/luarocks/list.lua
+++ b/src/luarocks/list.lua
@@ -32,7 +32,7 @@ local function check_outdated(trees, query)
       local latest_installed
       local latest_available, latest_available_repo
 
-      for version, _ in util.sortedpairs(versions) do
+      for version, _ in util.sortedpairs(versions, deps.compare_versions) do
          latest_installed = version
          break
       end
-- 
cgit v1.2.3-55-g6feb


From 66fa084686eb344fc960ea6e4008ed1419afe5ce Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Tue, 10 May 2016 19:02:55 +0300
Subject: Refactor check_outdated() to avoid loops with unconditional breaks

---
 src/luarocks/list.lua | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/luarocks/list.lua b/src/luarocks/list.lua
index b517d182..8affc52f 100644
--- a/src/luarocks/list.lua
+++ b/src/luarocks/list.lua
@@ -29,27 +29,19 @@ local function check_outdated(trees, query)
    end
    local outdated = {}
    for name, versions in util.sortedpairs(results_installed) do
-      local latest_installed
-      local latest_available, latest_available_repo
-
-      for version, _ in util.sortedpairs(versions, deps.compare_versions) do
-         latest_installed = version
-         break
-      end
+      versions = util.keys(versions)
+      table.sort(versions, deps.compare_versions)
+      local latest_installed = versions[1]
 
       local query_available = search.make_query(name:lower())
       query.exact_name = true
       local results_available, err = search.search_repos(query_available)
       
       if results_available[name] then
-         for version, repos in util.sortedpairs(results_available[name], deps.compare_versions) do
-            latest_available = version
-            for _, repo in ipairs(repos) do
-               latest_available_repo = repo.repo
-               break
-            end
-            break
-         end
+         local available_versions = util.keys(results_available[name])
+         table.sort(available_versions, deps.compare_versions)
+         local latest_available = available_versions[1]
+         local latest_available_repo = results_available[name][latest_available][1].repo
          
          if deps.compare_versions(latest_available, latest_installed) then
             table.insert(outdated, { name = name, installed = latest_installed, available = latest_available, repo = latest_available_repo })
-- 
cgit v1.2.3-55-g6feb


From 8915604a681c997166dbb163fc6e8a0e4e1de1fe Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Tue, 10 May 2016 20:42:12 +0300
Subject: Rename broken --force=fast to --force-fast

---
 src/luarocks/build.lua   |  2 +-
 src/luarocks/install.lua |  2 +-
 src/luarocks/make.lua    |  2 +-
 src/luarocks/purge.lua   |  2 +-
 src/luarocks/remove.lua  | 14 +++++++-------
 src/luarocks/util.lua    |  1 +
 test/testing.sh          |  1 +
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index bdc3b57a..a1aeb501 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -418,7 +418,7 @@ function build.run(...)
          return name, version
       end
       if (not flags["keep"]) and not cfg.keep_other_versions then
-         local ok, err = remove.remove_other_versions(name, version, flags["force"])
+         local ok, err = remove.remove_other_versions(name, version, flags["force"], flags["force-fast"])
          if not ok then util.printerr(err) end
       end
       return name, version
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index 24f1accd..e7e6bb20 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -180,7 +180,7 @@ function install.run(...)
       if not ok then return nil, err end
       local name, version = ok, err
       if (not flags["only-deps"]) and (not flags["keep"]) and not cfg.keep_other_versions then
-         local ok, err = remove.remove_other_versions(name, version, flags["force"])
+         local ok, err = remove.remove_other_versions(name, version, flags["force"], flags["force-fast"])
          if not ok then util.printerr(err) end
       end
       return name, version
diff --git a/src/luarocks/make.lua b/src/luarocks/make.lua
index 94cf4414..78c43d91 100644
--- a/src/luarocks/make.lua
+++ b/src/luarocks/make.lua
@@ -132,7 +132,7 @@ function make.run(...)
       if not ok then return nil, err end
       local name, version = ok, err
       if (not flags["keep"]) and not cfg.keep_other_versions then
-         local ok, err = remove.remove_other_versions(name, version, flags["force"])
+         local ok, err = remove.remove_other_versions(name, version, flags["force"], flags["force-fast"])
          if not ok then util.printerr(err) end
       end
       return name, version
diff --git a/src/luarocks/purge.lua b/src/luarocks/purge.lua
index ba9b8705..bd5494f6 100644
--- a/src/luarocks/purge.lua
+++ b/src/luarocks/purge.lua
@@ -61,7 +61,7 @@ function purge.run(...)
       for version, repositories in util.sortedpairs(versions, sort) do
          if flags["old-versions"] then
             util.printout("Keeping "..package.." "..version.."...")
-            local ok, err = remove.remove_other_versions(package, version, flags["force"])
+            local ok, err = remove.remove_other_versions(package, version, flags["force"], flags["force-fast"])
             if not ok then
                util.printerr(err)
             end
diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua
index 04fa5be6..9e1ae217 100644
--- a/src/luarocks/remove.lua
+++ b/src/luarocks/remove.lua
@@ -23,7 +23,7 @@ If a version is not given, try to remove all versions at once.
 Will only perform the removal if it does not break dependencies.
 To override this check and force the removal, use --force.
 To perform a forced removal without reporting dependency issues,
-use --force=fast.
+use --force-fast.
 
 ]]..util.deps_mode_help()
 
@@ -74,14 +74,14 @@ local function delete_versions(name, versions)
    return true
 end
 
-function remove.remove_search_results(results, name, deps_mode, force) 
+function remove.remove_search_results(results, name, deps_mode, force, fast)
    local versions = results[name]
 
    local version = next(versions)
    local second = next(versions, version)
    
    local dependents = {}
-   if force ~= "fast" then
+   if not fast then
       util.printout("Checking stability of dependencies in the absence of")
       util.printout(name.." "..table.concat(util.keys(versions), ", ").."...")
       util.printout()
@@ -89,7 +89,7 @@ function remove.remove_search_results(results, name, deps_mode, force)
    end
    
    if #dependents > 0 then
-      if force then
+      if force or fast then
          util.printerr("The following packages may be broken by this forced removal:")
          for _, dependent in ipairs(dependents) do
             util.printerr(dependent.name.." "..dependent.version)
@@ -121,11 +121,11 @@ function remove.remove_search_results(results, name, deps_mode, force)
    return true
 end
 
-function remove.remove_other_versions(name, version, force)
+function remove.remove_other_versions(name, version, force, fast)
    local results = {}
    search.manifest_search(results, cfg.rocks_dir, { name = name, exact_name = true, constraints = {{ op = "~=", version = version}} })
    if results[name] then
-      return remove.remove_search_results(results, name, cfg.deps_mode, force)
+      return remove.remove_search_results(results, name, cfg.deps_mode, force, fast)
    end
    return true
 end
@@ -162,7 +162,7 @@ function remove.run(...)
       return nil, "Could not find rock '"..name..(version and " "..version or "").."' in "..path.rocks_tree_to_string(cfg.root_dir)
    end
 
-   return remove.remove_search_results(results, name, deps_mode, flags["force"])
+   return remove.remove_search_results(results, name, deps_mode, flags["force"], flags["force-fast"])
 end
 
 return remove
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index c06c8354..80f1684a 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -82,6 +82,7 @@ local supported_flags = {
    ["deps-mode"] = "<mode>",
    ["detailed"] = "\"<text>\"",
    ["force"] = true,
+   ["force-fast"] = true,
    ["from"] = "<server>",
    ["help"] = true,
    ["home"] = true,
diff --git a/test/testing.sh b/test/testing.sh
index 305168c8..5269e42a 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -458,6 +458,7 @@ test_purge_oldversions() { $luarocks purge --old-versions --tree="$testing_sys_t
 
 test_remove() { $luarocks build abelhas ${version_abelhas} && $luarocks remove abelhas ${version_abelhas}; }
 test_remove_force() { need_luasocket; $luarocks build lualogging && $luarocks remove --force luasocket; }
+test_remove_force_fast() { need_luasocket; $luarocks build lualogging && $luarocks remove --force-fast luasocket; }
 fail_remove_deps() { need_luasocket; $luarocks build lualogging && $luarocks remove luasocket; }
 fail_remove_missing() { $luarocks remove missing_rock; }
 fail_remove_invalid_name() { $luarocks remove invalid.rock; }
-- 
cgit v1.2.3-55-g6feb


From 0a56441600eda3d68b0f84039664a282bf407361 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Tue, 10 May 2016 20:28:00 +0300
Subject: Allow passing --force and --force-fast to `luarocks install` in all
 cases

When installing an old version of a rock that breaks existing
dependencies, removing previously installed version fails,
and --force is suggested. However, when installing using a rockspec
or a source rock --force and --force-fast are not forwarded to build command.
---
 src/luarocks/install.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index e7e6bb20..b6af43cc 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -170,7 +170,7 @@ function install.run(...)
    if name:match("%.rockspec$") or name:match("%.src%.rock$") then
       util.printout("Using "..name.."... switching to 'build' mode")
       local build = require("luarocks.build")
-      return build.run(name, util.forward_flags(flags, "local", "keep", "deps-mode", "only-deps"))
+      return build.run(name, util.forward_flags(flags, "local", "keep", "deps-mode", "only-deps", "force", "force-fast"))
    elseif name:match("%.rock$") then
       if flags["only-deps"] then
          ok, err = install.install_binary_rock_deps(name, deps.get_deps_mode(flags))
-- 
cgit v1.2.3-55-g6feb


From 92d0b50361d6f1962ce5c073a0918d2061f389a6 Mon Sep 17 00:00:00 2001
From: Hisham <hisham@gobolinux.org>
Date: Tue, 10 May 2016 16:19:43 -0300
Subject: --force-fast in help summary.

---
 src/luarocks/remove.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua
index 9e1ae217..4aff3946 100644
--- a/src/luarocks/remove.lua
+++ b/src/luarocks/remove.lua
@@ -16,7 +16,7 @@ local manif = require("luarocks.manif")
 local fs = require("luarocks.fs")
 
 remove.help_summary = "Uninstall a rock."
-remove.help_arguments = "[--force[=fast]] <name> [<version>]"
+remove.help_arguments = "[--force|--force-fast] <name> [<version>]"
 remove.help = [[
 Argument is the name of a rock to be uninstalled.
 If a version is not given, try to remove all versions at once.
-- 
cgit v1.2.3-55-g6feb


From 2b02e999c5b04148fd88a67a2be93378c7225956 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Sat, 14 May 2016 19:09:15 +0300
Subject: Return missing deps listing in `luarocks install` output

---
 src/luarocks/deps.lua | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 73eab2c2..3c580623 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -410,6 +410,13 @@ local function values_set(tbl)
    return set
 end
 
+local function rock_status(name, deps_mode)
+   local search = require("luarocks.search")
+   local installed = match_dep(search.make_query(name), nil, deps_mode)
+   local installation_type = cfg.rocks_provided[name] and "provided by VM" or "installed"
+   return installed and installed.version.." "..installation_type or "not installed"
+end
+
 --- Check dependencies of a rock and attempt to install any missing ones.
 -- Packages are installed using the LuaRocks "install" command.
 -- Aborts the program if a dependency could not be fulfilled.
@@ -451,6 +458,19 @@ function deps.fulfill_dependencies(rockspec, deps_mode)
 
    local first_missing_dep = true
 
+   for _, dep in ipairs(rockspec.dependencies) do
+      if not match_dep(dep, nil, deps_mode) then
+         if first_missing_dep then
+            util.printout(("Missing dependencies for %s %s:"):format(rockspec.name, rockspec.version))
+            first_missing_dep = false
+         end
+
+         util.printout(("   %s (%s)"):format(deps.show_dep(dep), rock_status(dep.name, deps_mode)))
+      end
+   end
+
+   first_missing_dep = true
+
    for _, dep in ipairs(rockspec.dependencies) do
       if not match_dep(dep, nil, deps_mode) then
          if first_missing_dep then
@@ -458,11 +478,8 @@ function deps.fulfill_dependencies(rockspec, deps_mode)
             first_missing_dep = false
          end
 
-         local any_installed = match_dep(search.make_query(dep.name), nil, deps_mode)
-         local installation_type = cfg.rocks_provided[dep.name] and "provided by VM" or "installed"
-         local status = any_installed and any_installed.version.." "..installation_type or "missing"
          util.printout(("%s %s depends on %s (%s)"):format(
-            rockspec.name, rockspec.version, deps.show_dep(dep), status))
+            rockspec.name, rockspec.version, deps.show_dep(dep), rock_status(dep.name, deps_mode)))
 
          if dep.constraints[1] and dep.constraints[1].no_upgrade then
             util.printerr("This version of "..rockspec.name.." is designed for use with")
-- 
cgit v1.2.3-55-g6feb


From 699abc334895b5e737976d7aa6c1982a692d623b Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Mon, 16 May 2016 11:03:19 +0300
Subject: Refactor match_dep()

* Instead of applying blacklist and sorting versions
  in separate steps do a single pass over the list.
* On success return just the version instead of
  {name = name, version = version} since rock name is stored
  inside dependency table already.
---
 src/luarocks/deps.lua | 46 +++++++++++++++-------------------------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 3c580623..536b6c51 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -322,48 +322,32 @@ end
 -- @param dep table: A dependency parsed in table format.
 -- @param blacklist table: Versions that can't be accepted. Table where keys
 -- are program versions and values are 'true'.
--- @return table or nil: A table containing fields 'name' and 'version'
--- representing an installed rock which matches the given dependency,
+-- @return string or nil: latest installed version of the rock matching the dependency
 -- or nil if it could not be matched.
 local function match_dep(dep, blacklist, deps_mode)
    assert(type(dep) == "table")
 
-   local versions = cfg.rocks_provided[dep.name]
+   local versions
    if cfg.rocks_provided[dep.name] then
       -- provided rocks have higher priority than manifest's rocks
       versions = { cfg.rocks_provided[dep.name] }
    else
       versions = manif_core.get_versions(dep.name, deps_mode)
    end
-   if not versions then
-      return nil
-   end
-   if blacklist then
-      local i = 1
-      while versions[i] do
-         if blacklist[versions[i]] then
-            table.remove(versions, i)
-         else
-            i = i + 1
-         end
-      end
-   end
-   local candidates = {}
+
+   local latest_version
    for _, vstring in ipairs(versions) do
-      local version = deps.parse_version(vstring)
-      if deps.match_constraints(version, dep.constraints) then
-         table.insert(candidates, version)
+      if not blacklist or not blacklist[vstring] then
+         local version = deps.parse_version(vstring)
+         if deps.match_constraints(version, dep.constraints) then
+            if not latest_version or version > latest_version then
+               latest_version = version
+            end
+         end
       end
    end
-   if #candidates == 0 then
-      return nil
-   else
-      table.sort(candidates)
-      return {
-         name = dep.name,
-         version = candidates[#candidates].string
-      }
-   end
+
+   return latest_version and latest_version.string
 end
 
 --- Attempt to match dependencies of a rockspec to installed rocks.
@@ -386,7 +370,7 @@ function deps.match_deps(rockspec, blacklist, deps_mode)
       local found = match_dep(dep, blacklist and blacklist[dep.name] or nil, deps_mode)
       if found then
          if not cfg.rocks_provided[dep.name] then
-            matched[dep] = found
+            matched[dep] = {name = dep.name, version = found}
          end
       else
          if dep.constraints[1] and dep.constraints[1].no_upgrade then
@@ -414,7 +398,7 @@ local function rock_status(name, deps_mode)
    local search = require("luarocks.search")
    local installed = match_dep(search.make_query(name), nil, deps_mode)
    local installation_type = cfg.rocks_provided[name] and "provided by VM" or "installed"
-   return installed and installed.version.." "..installation_type or "not installed"
+   return installed and installed.." "..installation_type or "not installed"
 end
 
 --- Check dependencies of a rock and attempt to install any missing ones.
-- 
cgit v1.2.3-55-g6feb


From 4ac36ce3bc97d476e3f8d2a524099c38b5a0ab75 Mon Sep 17 00:00:00 2001
From: roboo <robo.karasek@gmail.com>
Date: Tue, 17 May 2016 00:27:27 +0200
Subject: Added tests for new install functionality

---
 test/testing.lua | 21 ++++++++++++++++++++-
 test/testing.sh  | 12 +++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/test/testing.lua b/test/testing.lua
index c37293ee..1a837484 100644
--- a/test/testing.lua
+++ b/test/testing.lua
@@ -459,6 +459,25 @@ local tests = {
          and assert("lua-compat-5.2" == fetch.url_to_base_dir("https://github.com/hishamhm/lua-compat-5.2.tar.bz2"))
          and assert("parser.moon" == fetch.url_to_base_dir("git://github.com/Cirru/parser.moon"))
          and assert("v0.3" == fetch.url_to_base_dir("https://github.com/hishamhm/lua-compat-5.2/archive/v0.3"))
+   end,
+
+   -- Tests for https://github.com/keplerproject/luarocks/issues/552
+   test_install_break_dependencies_warning = function()
+      need_luasocket()
+      return run "$luarocks install say ${new_version_say}"
+         and run "$luarocks install luassert"
+         and run "$luarocks install say ${old_version_say}"
+   end,
+   test_install_break_dependencies_force = function()
+      need_luasocket()
+      return run "$luarocks install say ${new_version_say}"
+         and run "$luarocks install luassert"
+         and run "$luarocks install --force say ${old_version_say}"
+   end,
+   test_install_break_dependencies_force = function()
+      need_luasocket()
+      return run "$luarocks install say ${new_version_say}"
+         and run "$luarocks install luassert"
+         and run "$luarocks install --force-fast say ${old_version_say}"
    end
-   
 }
diff --git a/test/testing.sh b/test/testing.sh
index 5269e42a..4f1b0b87 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -179,6 +179,9 @@ srcdir_luasocket=luasocket-3.0-rc1
 version_cprint=0.1
 verrev_cprint=0.1-2
 
+new_version_say=1.2-1
+old_version_say=1.0-1
+
 version_luacov=0.11.0
 verrev_luacov=${version_luacov}-1
 version_lxsh=0.8.6
@@ -260,6 +263,9 @@ mkdir -p "$testing_server"
    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"
+   get "$luarocks_repo/say-1.2-1.src.rock"
+   get "$luarocks_repo/say-1.0-1.src.rock"
+   get "$luarocks_repo/luassert-1.7.0-1.src.rock"
 )
 $luarocks_admin_nocov make_manifest "$testing_server"
 
@@ -558,8 +564,12 @@ test_doc_list() { $luarocks install luacov; $luarocks doc luacov --list; }
 test_doc_local() { $luarocks install luacov; $luarocks doc luacov --local; }
 test_doc_porcelain() { $luarocks install luacov; $luarocks doc luacov --porcelain; }
 
-# Driver #########################################
+# Tests for https://github.com/keplerproject/luarocks/pull/552
+test_install_break_dependencies_warning() { need_luasocket; $luarocks install say ${new_version_say} && $luarocks install luassert && $luarocks install say ${old_version_say}; }
+test_install_break_dependencies_force() { need_luasocket; $luarocks install say ${new_version_say} && $luarocks install luassert && $luarocks install --force say ${old_version_say}; }
+test_install_break_dependencies_forcefast() { need_luasocket; $luarocks install say ${new_version_say} && $luarocks install luassert && $luarocks install --force-fast say ${old_version_say}; }
 
+# Driver #########################################
 run_tests() {
    grep "^test_$1.*(" < $testing_dir/testing.sh | cut -d'(' -f1 | while read test
    do
-- 
cgit v1.2.3-55-g6feb


From bc81a0b8f0bd9f36c0d98ec728ecde864fadd197 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Wed, 18 May 2016 19:15:10 +0300
Subject: Fix luarocks.repos module mutation

Don't set repos.ok and repos.err
---
 src/luarocks/repos.lua | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/luarocks/repos.lua b/src/luarocks/repos.lua
index 66b1377f..b6d5825a 100644
--- a/src/luarocks/repos.lua
+++ b/src/luarocks/repos.lua
@@ -157,11 +157,10 @@ local function install_binary(source, target, name, version)
    assert(type(target) == "string")
    
    if fs.is_lua(source) then
-      repos.ok, repos.err = fs.wrap_script(source, target, name, version)
+      return fs.wrap_script(source, target, name, version)
    else
-      repos.ok, repos.err = fs.copy_binary(source, target)
+      return fs.copy_binary(source, target)
    end
-   return repos.ok, repos.err
 end
 
 local function resolve_conflict(target, deploy_dir, name, version)
-- 
cgit v1.2.3-55-g6feb


From 43c1a5925baf3e4003ca4bf070910b6615f5f829 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Sun, 22 May 2016 18:04:42 +0300
Subject: Fix behaviour of `luarocks write-rockspec` with two args

It accepts name, version and location. If two are given,
the first one is considered the name and the second the location,
but the version is also set to the location. Reset it to allow guessing
it or using default (scm).
---
 src/luarocks/write_rockspec.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/luarocks/write_rockspec.lua b/src/luarocks/write_rockspec.lua
index 972562c3..26a65808 100644
--- a/src/luarocks/write_rockspec.lua
+++ b/src/luarocks/write_rockspec.lua
@@ -208,6 +208,7 @@ function write_rockspec.run(...)
       name = nil
    elseif not url_or_dir then
       url_or_dir = version
+      version = nil
    end
    
    if flags["tag"] then
-- 
cgit v1.2.3-55-g6feb


From 7b09079887862de80757cce4d8746585fc1809f1 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Sun, 22 May 2016 18:16:44 +0300
Subject: Infer name and version for `luarocks write-rockspec [path]`

* Default path for `write-rockspec` is now `.`.
* Use `scm` as default version in all cases.
* Infer rock name as base directory of current path when
  passing `.` as path.

As a result, `luarocks write-rockspec` with no arguments
creates an scm rockspec.
---
 src/luarocks/write_rockspec.lua | 55 +++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/luarocks/write_rockspec.lua b/src/luarocks/write_rockspec.lua
index 26a65808..abfca322 100644
--- a/src/luarocks/write_rockspec.lua
+++ b/src/luarocks/write_rockspec.lua
@@ -12,14 +12,16 @@ local type_check = require("luarocks.type_check")
 local util = require("luarocks.util")
 
 write_rockspec.help_summary = "Write a template for a rockspec file."
-write_rockspec.help_arguments = "[--output=<file> ...] [<name>] [<version>] {<url>|<path>}"
+write_rockspec.help_arguments = "[--output=<file> ...] [<name>] [<version>] [<url>|<path>]"
 write_rockspec.help = [[
 This command writes an initial version of a rockspec file,
-based on an URL or a local path. You may use a relative path such as '.'.
-If a local path is given, name and version arguments are mandatory.
-For URLs, LuaRocks will attempt to infer name and version if not given.
-
-If a repository URL is given with no version, it creates an 'scm' rock.
+based on a name, a version, and a location (an URL or a local path).
+If only two arguments are given, the first one is considered the name and the
+second one is the location.
+If only one argument is given, it must be the location.
+If no arguments are given, current directory is used as location.
+LuaRocks will attempt to infer name and version if not given,
+using 'scm' as default version.
 
 Note that the generated file is a _starting point_ for writing a
 rockspec, and is not guaranteed to be complete or correct.
@@ -198,19 +200,17 @@ end
 
 function write_rockspec.run(...)
    local flags, name, version, url_or_dir = util.parse_flags(...)
-   
-   if not name then
-      return nil, "Missing arguments. "..util.see_help("write_rockspec")
-   end
 
-   if name and not version then
+   if not name then
+      url_or_dir = "."
+   elseif not version then
       url_or_dir = name
       name = nil
    elseif not url_or_dir then
       url_or_dir = version
       version = nil
    end
-   
+
    if flags["tag"] then
       if not version then
          version = flags["tag"]:gsub("^v", "")
@@ -218,28 +218,25 @@ function write_rockspec.run(...)
    end
 
    local protocol, pathname = dir.split_url(url_or_dir)
-   if not fetch.is_basic_protocol(protocol) then
-      if not name then
-         name = dir.base_name(url_or_dir):gsub("%.[^.]+$", "")
+   if protocol == "file" then
+      if pathname == "." then
+         name = name or dir.base_name(fs.current_dir())
       end
-      if not version then
-         version = "scm"
-      end
-   elseif protocol ~= "file" then
+   elseif fetch.is_basic_protocol(protocol) then
       local filename = dir.base_name(url_or_dir)
       local newname, newversion = filename:match("(.*)-([^-]+)")
-      if (not name) and newname then
-         name = newname
-      end
-      if (not version) and newversion then
-         version = newversion:gsub(".[a-z]+$", ""):gsub(".tar$", "")
+      if newname then
+         name = name or newname
+         version = version or newversion:gsub("%.[a-z]+$", ""):gsub("%.tar$", "")
       end
-      if not (name and version) then
-         return nil, "Missing name and version arguments. "..util.see_help("write_rockspec")
-      end
-   elseif not version then
-      return nil, "Missing name and version arguments. "..util.see_help("write_rockspec")
+   else
+      name = name or dir.base_name(url_or_dir):gsub("%.[^.]+$", "")
+   end
+
+   if not name then
+      return nil, "Could not infer rock name. "..util.see_help("write_rockspec")
    end
+   version = version or "scm"
 
    local filename = flags["output"] or dir.path(fs.current_dir(), name:lower().."-"..version.."-1.rockspec")
    
-- 
cgit v1.2.3-55-g6feb


From 3e29a935df047976cff9e1f232c716b55fdcde69 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Sun, 22 May 2016 19:04:45 +0300
Subject: Update tests for `luarocks write-rockspec`

---
 test/testing.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/testing.sh b/test/testing.sh
index 4f1b0b87..f56f2aa9 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -364,7 +364,6 @@ fail_upload_noarg() { $luarocks upload; }
 fail_remove_noarg() { $luarocks remove; }
 fail_doc_noarg() { $luarocks doc; }
 fail_new_version_noarg() { $luarocks new_version; }
-fail_write_rockspec_noarg() { $luarocks write_rockspec; }
 
 fail_build_invalid() { $luarocks build invalid; }
 fail_download_invalid() { $luarocks download invalid; }
@@ -523,6 +522,9 @@ test_deps_mode_make_order() { $luarocks build --tree="$testing_sys_tree" lpeg &&
 test_deps_mode_make_order_sys() { $luarocks build --tree="$testing_tree" lpeg && rm -rf ./lxsh-${verrev_lxsh} && $luarocks download --source lxsh ${verrev_lxsh} && $luarocks unpack ./lxsh-${verrev_lxsh}.src.rock && cd lxsh-${verrev_lxsh}/lxsh-${version_lxsh}-1  && $luarocks make --tree="$testing_sys_tree" --deps-mode=order && cd ../.. && [ `$luarocks_noecho list --tree="$testing_tree" --porcelain lpeg | wc -l` = 1 ] && rm -rf ./lxsh-${verrev_lxsh}; }
 
 test_write_rockspec() { $luarocks write_rockspec git://github.com/keplerproject/luarocks; }
+test_write_rockspec_name() { $luarocks write_rockspec luarocks git://github.com/keplerproject/luarocks; }
+test_write_rockspec_name_version() { $luarocks write_rockspec luarocks 7.8.9 git://github.com/keplerproject/luarocks; }
+test_write_rockspec_current_dir() { $luarocks write_rockspec; }
 test_write_rockspec_tag() { $luarocks write_rockspec git://github.com/keplerproject/luarocks --tag=v2.3.0; }
 test_write_rockspec_lib() { $luarocks write_rockspec git://github.com/mbalmer/luafcgi --lib=fcgi --license="3-clause BSD" --lua-version=5.1,5.2; }
 test_write_rockspec_format() { $luarocks write_rockspec git://github.com/keplerproject/luarocks --rockspec-format=1.1 --lua-version=5.1,5.2; }
-- 
cgit v1.2.3-55-g6feb


From 26ea986b8322dc3bd1e82cf6d819082c57a69024 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Sat, 7 May 2016 13:52:08 +0300
Subject: Add fs.quiet_stderr function

---
 src/luarocks/fs/unix.lua        | 7 +++++++
 src/luarocks/fs/unix/tools.lua  | 6 +++---
 src/luarocks/fs/win32.lua       | 7 +++++++
 src/luarocks/fs/win32/tools.lua | 6 +++---
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua
index e2cc825b..520b3e99 100644
--- a/src/luarocks/fs/unix.lua
+++ b/src/luarocks/fs/unix.lua
@@ -16,6 +16,13 @@ function unix.quiet(cmd)
    return cmd.." 1> /dev/null 2> /dev/null"
 end
 
+--- Annotate command string for execution with quiet stderr.
+-- @param cmd string: A command-line string.
+-- @return string: The command-line, with stderr silencing annotation.
+function unix.quiet_stderr(cmd)
+   return cmd.." 2> /dev/null"
+end
+
 --- Return an absolute pathname from a potentially relative one.
 -- @param pathname string: pathname to convert.
 -- @param relative_to string or nil: path to prepend when making
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index ab55897e..d75d9795 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -21,7 +21,7 @@ end
 function tools.current_dir()
    local current = cfg.cache_pwd
    if not current then
-      local pipe = io.popen(fs.Q(vars.PWD).." 2> /dev/null")
+      local pipe = io.popen(fs.quiet_stderr(fs.Q(vars.PWD)))
       current = pipe:read("*l")
       pipe:close()
       cfg.cache_pwd = current
@@ -183,7 +183,7 @@ function tools.find(at)
       return {}
    end
    local result = {}
-   local pipe = io.popen(command_at(at, vars.FIND.." * 2>/dev/null"))
+   local pipe = io.popen(command_at(at, fs.quiet_stderr(vars.FIND.." *")))
    for file in pipe:lines() do
       table.insert(result, file)
    end
@@ -268,7 +268,7 @@ function tools.use_downloader(url, filename, cache)
       if cfg.connection_timeout and cfg.connection_timeout > 0 then
         curl_cmd = curl_cmd .. "--connect-timeout "..tonumber(cfg.connection_timeout).." " 
       end
-      ok = fs.execute_string(curl_cmd..fs.Q(url).." 2> /dev/null 1> "..fs.Q(filename))
+      ok = fs.execute_string(fs.quiet_stderr(curl_cmd..fs.Q(url).." > "..fs.Q(filename)))
    end
    if ok then
       return true, filename
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua
index c14c421b..74f3ed69 100644
--- a/src/luarocks/fs/win32.lua
+++ b/src/luarocks/fs/win32.lua
@@ -27,6 +27,13 @@ function win32.quiet(cmd)
    return cmd.." 2> NUL 1> NUL"
 end
 
+--- Annotate command string for execution with quiet stderr.
+-- @param cmd string: A command-line string.
+-- @return string: The command-line, with stderr silencing annotation.
+function win32.quiet_stderr(cmd)
+   return cmd.." 2> NUL"
+end
+
 local drive_letter = "[%.a-zA-Z]?:?[\\/]"
 
 local win_escape_chars = {
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index b9dce85c..39aa4ba1 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -39,7 +39,7 @@ end
 function tools.current_dir()
    local current = cfg.cache_pwd
    if not current then
-      local pipe = io.popen(fs.Q(vars.PWD).. " 2> NUL")
+      local pipe = io.popen(fs.quiet_stderr(fs.Q(vars.PWD)))
       current = pipe:read("*l")
       pipe:close()
       cfg.cache_pwd = current
@@ -196,7 +196,7 @@ function tools.find(at)
       return {}
    end
    local result = {}
-   local pipe = io.popen(command_at(at, fs.Q(vars.FIND).." 2> NUL"))
+   local pipe = io.popen(command_at(at, fs.quiet_stderr(fs.Q(vars.FIND))))
    for file in pipe:lines() do
       -- Windows find is a bit different
       local first_two = file:sub(1,2)
@@ -278,7 +278,7 @@ function tools.use_downloader(url, filename, cache)
       if cfg.connection_timeout and cfg.connection_timeout > 0 then
         curl_cmd = curl_cmd .. "--connect-timeout "..tonumber(cfg.connection_timeout).." " 
       end
-      ok = fs.execute_string(curl_cmd..fs.Q(url).." 2> NUL 1> "..fs.Q(filename))
+      ok = fs.execute_string(fs.quiet_stderr(curl_cmd..fs.Q(url).." > "..fs.Q(filename)))
    end
    if ok then
       return true, filename
-- 
cgit v1.2.3-55-g6feb


From 472e74d582055992cf1f5c75821e083131a895ac Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Sat, 7 May 2016 14:01:31 +0300
Subject: Move common implementation of fs.use_downloader into fs.tools module

---
 Makefile.setup.inc              |  2 +-
 src/luarocks/fs.lua             |  5 +++-
 src/luarocks/fs/tools.lua       | 56 +++++++++++++++++++++++++++++++++++++++++
 src/luarocks/fs/unix/tools.lua  | 45 ---------------------------------
 src/luarocks/fs/win32/tools.lua | 45 ---------------------------------
 5 files changed, 61 insertions(+), 92 deletions(-)
 create mode 100644 src/luarocks/fs/tools.lua

diff --git a/Makefile.setup.inc b/Makefile.setup.inc
index 0a049bc4..092d0423 100644
--- a/Makefile.setup.inc
+++ b/Makefile.setup.inc
@@ -5,7 +5,7 @@ BINDIR ?= $(PREFIX)/bin
 LUADIR ?= $(PREFIX)/share/lua/$(LUA_VERSION)/
 
 BIN_FILES = luarocks luarocks-admin
-LUAROCKS_FILES = fs/unix/tools.lua fs/unix.lua fs/win32/tools.lua fs/win32.lua \
+LUAROCKS_FILES = fs/tools.lua fs/unix/tools.lua fs/unix.lua fs/win32/tools.lua fs/win32.lua \
 fs/lua.lua persist.lua list.lua require.lua repos.lua dir.lua make_manifest.lua \
 command_line.lua config_cmd.lua install.lua build/command.lua build/cmake.lua \
 build/make.lua build/builtin.lua fetch/cvs.lua fetch/git.lua fetch/sscm.lua \
diff --git a/src/luarocks/fs.lua b/src/luarocks/fs.lua
index 57302c7f..f3d86a13 100644
--- a/src/luarocks/fs.lua
+++ b/src/luarocks/fs.lua
@@ -68,7 +68,10 @@ load_fns(fs_lua)
 
 -- Load platform-specific fallbacks for missing Lua modules
 local ok, fs_plat_tools = pcall(require, "luarocks.fs."..loaded_platform..".tools")
-if ok and fs_plat_tools then load_fns(fs_plat_tools) end
+if ok and fs_plat_tools then
+   load_fns(fs_plat_tools)
+   load_fns(require("luarocks.fs.tools"))
+end
 
 
 return fs
diff --git a/src/luarocks/fs/tools.lua b/src/luarocks/fs/tools.lua
new file mode 100644
index 00000000..0283d8f7
--- /dev/null
+++ b/src/luarocks/fs/tools.lua
@@ -0,0 +1,56 @@
+
+--- Common fs operations implemented with third-party tools.
+local tools = {}
+
+local fs = require("luarocks.fs")
+local dir = require("luarocks.dir")
+local cfg = require("luarocks.cfg")
+
+local vars = cfg.variables
+
+--- Download a remote file.
+-- @param url string: URL to be fetched.
+-- @param filename string or nil: this function attempts to detect the
+-- resulting local filename of the remote file as the basename of the URL;
+-- if that is not correct (due to a redirection, for example), the local
+-- filename can be given explicitly as this second argument.
+-- @return (boolean, string): true and the filename on success,
+-- false and the error message on failure.
+function tools.use_downloader(url, filename, cache)
+   assert(type(url) == "string")
+   assert(type(filename) == "string" or not filename)
+
+   filename = fs.absolute_name(filename or dir.base_name(url))
+
+   local ok
+   if cfg.downloader == "wget" then
+      local wget_cmd = fs.Q(vars.WGET).." "..vars.WGETNOCERTFLAG.." --no-cache --user-agent=\""..cfg.user_agent.." via wget\" --quiet "
+      if cfg.connection_timeout and cfg.connection_timeout > 0 then
+        wget_cmd = wget_cmd .. "--timeout="..tonumber(cfg.connection_timeout).." --tries=1 "
+      end
+      if cache then
+         -- --timestamping is incompatible with --output-document,
+         -- but that's not a problem for our use cases.
+         fs.change_dir(dir.dir_name(filename))
+         ok = fs.execute_quiet(wget_cmd.." --timestamping ", url)
+         fs.pop_dir()
+      elseif filename then
+         ok = fs.execute_quiet(wget_cmd.." --output-document ", filename, url)
+      else
+         ok = fs.execute_quiet(wget_cmd, url)
+      end
+   elseif cfg.downloader == "curl" then
+      local curl_cmd = fs.Q(vars.CURL).." "..vars.CURLNOCERTFLAG.." -f -L --user-agent \""..cfg.user_agent.." via curl\" "
+      if cfg.connection_timeout and cfg.connection_timeout > 0 then
+        curl_cmd = curl_cmd .. "--connect-timeout "..tonumber(cfg.connection_timeout).." "
+      end
+      ok = fs.execute_string(fs.quiet_stderr(curl_cmd..fs.Q(url).." > "..fs.Q(filename)))
+   end
+   if ok then
+      return true, filename
+   else
+      return false
+   end
+end
+
+return tools
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index d75d9795..8eaa9361 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -232,51 +232,6 @@ function tools.is_file(file)
    return fs.execute(vars.TEST, "-f", file)
 end
 
---- Download a remote file.
--- @param url string: URL to be fetched.
--- @param filename string or nil: this function attempts to detect the
--- resulting local filename of the remote file as the basename of the URL;
--- if that is not correct (due to a redirection, for example), the local
--- filename can be given explicitly as this second argument.
--- @return (boolean, string): true and the filename on success,
--- false and the error message on failure.
-function tools.use_downloader(url, filename, cache)
-   assert(type(url) == "string")
-   assert(type(filename) == "string" or not filename)
-
-   filename = fs.absolute_name(filename or dir.base_name(url))
-
-   local ok
-   if cfg.downloader == "wget" then
-      local wget_cmd = fs.Q(vars.WGET).." "..vars.WGETNOCERTFLAG.." --no-cache --user-agent='"..cfg.user_agent.." via wget' --quiet "
-      if cfg.connection_timeout and cfg.connection_timeout > 0 then
-        wget_cmd = wget_cmd .. "--timeout="..tonumber(cfg.connection_timeout).." --tries=1 " 
-      end
-      if cache then
-         -- --timestamping is incompatible with --output-document,
-         -- but that's not a problem for our use cases.
-         fs.change_dir(dir.dir_name(filename))
-         ok = fs.execute_quiet(wget_cmd.." --timestamping ", url)
-         fs.pop_dir()
-      elseif filename then
-         ok = fs.execute_quiet(wget_cmd.." --output-document ", filename, url)
-      else
-         ok = fs.execute_quiet(wget_cmd, url)
-      end
-   elseif cfg.downloader == "curl" then
-      local curl_cmd = fs.Q(vars.CURL).." "..vars.CURLNOCERTFLAG.." -f -L --user-agent '"..cfg.user_agent.." via curl' "
-      if cfg.connection_timeout and cfg.connection_timeout > 0 then
-        curl_cmd = curl_cmd .. "--connect-timeout "..tonumber(cfg.connection_timeout).." " 
-      end
-      ok = fs.execute_string(fs.quiet_stderr(curl_cmd..fs.Q(url).." > "..fs.Q(filename)))
-   end
-   if ok then
-      return true, filename
-   else
-      return false
-   end
-end
-
 function tools.chmod(pathname, mode)
    if mode then 
       return fs.execute(vars.CHMOD, mode, pathname)
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index 39aa4ba1..cc0da0e9 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -242,51 +242,6 @@ function tools.is_file(file)
    return fs.execute(fs.Q(vars.TEST).." -f", file)
 end
 
---- Download a remote file.
--- @param url string: URL to be fetched.
--- @param filename string or nil: this function attempts to detect the
--- resulting local filename of the remote file as the basename of the URL;
--- if that is not correct (due to a redirection, for example), the local
--- filename can be given explicitly as this second argument.
--- @return (boolean, string): true and the filename on success,
--- false and the error message on failure.
-function tools.use_downloader(url, filename, cache)
-   assert(type(url) == "string")
-   assert(type(filename) == "string" or not filename)
-
-   filename = fs.absolute_name(filename or dir.base_name(url))
-
-   local ok   
-   if cfg.downloader == "wget" then
-      local wget_cmd = fs.Q(vars.WGET).." "..vars.WGETNOCERTFLAG.." --no-cache --user-agent=\""..cfg.user_agent.." via wget\" --quiet "
-      if cfg.connection_timeout and cfg.connection_timeout > 0 then
-        wget_cmd = wget_cmd .. "--timeout="..tonumber(cfg.connection_timeout).." --tries=1 " 
-      end
-      if cache then
-         -- --timestamping is incompatible with --output-document,
-         -- but that's not a problem for our use cases.
-         fs.change_dir(dir.dir_name(filename))
-         ok = fs.execute_quiet(wget_cmd.." --timestamping ", url)
-         fs.pop_dir()
-      elseif filename then
-         ok = fs.execute_quiet(wget_cmd.." --output-document ", filename, url)
-      else
-         ok = fs.execute_quiet(wget_cmd, url)
-      end
-   elseif cfg.downloader == "curl" then
-      local curl_cmd = fs.Q(vars.CURL).." "..vars.CURLNOCERTFLAG.." -f -L --user-agent \""..cfg.user_agent.." via curl\" "
-      if cfg.connection_timeout and cfg.connection_timeout > 0 then
-        curl_cmd = curl_cmd .. "--connect-timeout "..tonumber(cfg.connection_timeout).." " 
-      end
-      ok = fs.execute_string(fs.quiet_stderr(curl_cmd..fs.Q(url).." > "..fs.Q(filename)))
-   end
-   if ok then
-      return true, filename
-   else
-      return false
-   end
-end
-
 --- Uncompress gzip file.
 -- @param archive string: Filename of archive.
 -- @return boolean : success status
-- 
cgit v1.2.3-55-g6feb


From c79ce50f956d8d9f1454ec871dc7b0469f194c07 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Sat, 7 May 2016 14:06:35 +0300
Subject: fs.tools: move common directory stack functions

---
 src/luarocks/fs/tools.lua       | 47 +++++++++++++++++++++++++++++++++++++++++
 src/luarocks/fs/unix/tools.lua  | 46 ----------------------------------------
 src/luarocks/fs/win32/tools.lua | 47 -----------------------------------------
 3 files changed, 47 insertions(+), 93 deletions(-)

diff --git a/src/luarocks/fs/tools.lua b/src/luarocks/fs/tools.lua
index 0283d8f7..08fa74a4 100644
--- a/src/luarocks/fs/tools.lua
+++ b/src/luarocks/fs/tools.lua
@@ -8,6 +8,53 @@ local cfg = require("luarocks.cfg")
 
 local vars = cfg.variables
 
+local dir_stack = {}
+
+--- Obtain current directory.
+-- Uses the module's internal directory stack.
+-- @return string: the absolute pathname of the current directory.
+function tools.current_dir()
+   local current = cfg.cache_pwd
+   if not current then
+      local pipe = io.popen(fs.quiet_stderr(fs.Q(vars.PWD)))
+      current = pipe:read("*l")
+      pipe:close()
+      cfg.cache_pwd = current
+   end
+   for _, directory in ipairs(dir_stack) do
+      current = fs.absolute_name(directory, current)
+   end
+   return current
+end
+
+--- Change the current directory.
+-- Uses the module's internal directory stack. This does not have exact
+-- semantics of chdir, as it does not handle errors the same way,
+-- but works well for our purposes for now.
+-- @param directory string: The directory to switch to.
+-- @return boolean or (nil, string): true if successful, (nil, error message) if failed.
+function tools.change_dir(directory)
+   assert(type(directory) == "string")
+   if fs.is_dir(directory) then
+      table.insert(dir_stack, directory)
+      return true
+   end
+   return nil, "directory not found: "..directory
+end
+
+--- Change directory to root.
+-- Allows leaving a directory (e.g. for deleting it) in
+-- a crossplatform way.
+function tools.change_dir_to_root()
+   table.insert(dir_stack, "/")
+end
+
+--- Change working directory to the previous in the directory stack.
+function tools.pop_dir()
+   local directory = table.remove(dir_stack)
+   return directory ~= nil
+end
+
 --- Download a remote file.
 -- @param url string: URL to be fetched.
 -- @param filename string or nil: this function attempts to detect the
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index 8eaa9361..2b5280d6 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -7,31 +7,12 @@ local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local cfg = require("luarocks.cfg")
 
-local dir_stack = {}
-
 local vars = cfg.variables
 
 local function command_at(directory, cmd)
    return "cd " .. fs.Q(fs.absolute_name(directory)) .. " && " .. cmd
 end
 
---- Obtain current directory.
--- Uses the module's internal directory stack.
--- @return string: the absolute pathname of the current directory.
-function tools.current_dir()
-   local current = cfg.cache_pwd
-   if not current then
-      local pipe = io.popen(fs.quiet_stderr(fs.Q(vars.PWD)))
-      current = pipe:read("*l")
-      pipe:close()
-      cfg.cache_pwd = current
-   end
-   for _, directory in ipairs(dir_stack) do
-      current = fs.absolute_name(directory, current)
-   end
-   return current
-end
-
 --- Run the given command.
 -- The command is executed in the current directory in the directory stack.
 -- @param cmd string: No quoting/escaping is applied to the command.
@@ -48,33 +29,6 @@ function tools.execute_string(cmd)
    end
 end
 
---- Change the current directory.
--- Uses the module's internal directory stack. This does not have exact
--- semantics of chdir, as it does not handle errors the same way,
--- but works well for our purposes for now.
--- @param directory string: The directory to switch to.
-function tools.change_dir(directory)
-   assert(type(directory) == "string")
-   if fs.is_dir(directory) then
-      table.insert(dir_stack, directory)
-      return true
-   end
-   return nil, "directory not found: "..directory
-end
-
---- Change directory to root.
--- Allows leaving a directory (e.g. for deleting it) in
--- a crossplatform way.
-function tools.change_dir_to_root()
-   table.insert(dir_stack, "/")
-end
-
---- Change working directory to the previous in the directory stack.
-function tools.pop_dir()
-   local directory = table.remove(dir_stack)
-   return directory ~= nil
-end
-
 --- Create a directory if it does not already exist.
 -- If any of the higher levels in the path name does not exist
 -- too, they are created as well.
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index cc0da0e9..19038e1f 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -9,8 +9,6 @@ local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local cfg = require("luarocks.cfg")
 
-local dir_stack = {}
-
 local vars = cfg.variables
 
 --- Strip the last extension of a filename.
@@ -33,23 +31,6 @@ local function command_at(directory, cmd)
    return cmd
 end
 
---- Obtain current directory.
--- Uses the module's internal directory stack.
--- @return string: the absolute pathname of the current directory.
-function tools.current_dir()
-   local current = cfg.cache_pwd
-   if not current then
-      local pipe = io.popen(fs.quiet_stderr(fs.Q(vars.PWD)))
-      current = pipe:read("*l")
-      pipe:close()
-      cfg.cache_pwd = current
-   end
-   for _, directory in ipairs(dir_stack) do
-      current = fs.absolute_name(directory, current)
-   end
-   return current
-end
-
 --- Run the given command.
 -- The command is executed in the current directory in the directory stack.
 -- @param cmd string: No quoting/escaping is applied to the command.
@@ -67,34 +48,6 @@ function tools.execute_string(cmd)
    end
 end
 
---- Change the current directory.
--- Uses the module's internal directory stack. This does not have exact
--- semantics of chdir, as it does not handle errors the same way,
--- but works well for our purposes for now.
--- @param directory string: The directory to switch to.
--- @return boolean or (nil, string): true if successful, (nil, error message) if failed.
-function tools.change_dir(directory)
-   assert(type(directory) == "string")
-   if fs.is_dir(directory) then
-      table.insert(dir_stack, directory)
-      return true
-   end
-   return nil, "directory not found: "..directory
-end
-
---- Change directory to root.
--- Allows leaving a directory (e.g. for deleting it) in
--- a crossplatform way.
-function tools.change_dir_to_root()
-   table.insert(dir_stack, "/")
-end
-
---- Change working directory to the previous in the directory stack.
-function tools.pop_dir()
-   local directory = table.remove(dir_stack)
-   return directory ~= nil
-end
-
 --- Create a directory if it does not already exist.
 -- If any of the higher levels in the path name does not exist
 -- too, they are created as well.
-- 
cgit v1.2.3-55-g6feb


From 1cb6bb91efe3af86335453221b0f7cdcd2cb3be5 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Sat, 7 May 2016 14:12:16 +0300
Subject: fs.tools: move common 'get_md5' function

---
 src/luarocks/fs/tools.lua       | 22 ++++++++++++++++++++++
 src/luarocks/fs/unix/tools.lua  | 22 ----------------------
 src/luarocks/fs/win32/tools.lua | 22 ----------------------
 3 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/src/luarocks/fs/tools.lua b/src/luarocks/fs/tools.lua
index 08fa74a4..76b90383 100644
--- a/src/luarocks/fs/tools.lua
+++ b/src/luarocks/fs/tools.lua
@@ -100,4 +100,26 @@ function tools.use_downloader(url, filename, cache)
    end
 end
 
+local md5_cmd = {
+   md5sum = fs.Q(vars.MD5SUM),
+   openssl = fs.Q(vars.OPENSSL).." md5",
+   md5 = fs.Q(vars.MD5),
+}
+
+--- Get the MD5 checksum for a file.
+-- @param file string: The file to be computed.
+-- @return string: The MD5 checksum or nil + message
+function tools.get_md5(file)
+   local cmd = md5_cmd[cfg.md5checker]
+   if not cmd then return nil, "no MD5 checker command configured" end
+   local pipe = io.popen(cmd.." "..fs.Q(fs.absolute_name(file)))
+   local computed = pipe:read("*a")
+   pipe:close()
+   if computed then
+      computed = computed:match("("..("%x"):rep(32)..")")
+   end
+   if computed then return computed end
+   return nil, "Failed to compute MD5 hash for file "..tostring(fs.absolute_name(file))
+end
+
 return tools
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index 2b5280d6..904dd0aa 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -228,28 +228,6 @@ function tools.unpack_archive(archive)
    return true
 end
 
-local md5_cmd = {
-   md5sum = vars.MD5SUM,
-   openssl = vars.OPENSSL.." md5",
-   md5 = vars.MD5,
-}
-
---- Get the MD5 checksum for a file.
--- @param file string: The file to be computed.
--- @return string: The MD5 checksum
-function tools.get_md5(file)
-   local cmd = md5_cmd[cfg.md5checker]
-   if not cmd then return nil, "no MD5 checker command configured" end
-   local pipe = io.popen(cmd.." "..fs.Q(fs.absolute_name(file)))
-   local computed = pipe:read("*a")
-   pipe:close()
-   if computed then
-      computed = computed:match("("..("%x"):rep(32)..")")
-   end
-   if computed then return computed end
-   return nil, "Failed to compute MD5 hash for file "..tostring(fs.absolute_name(file))
-end
-
 function tools.get_permissions(filename)
    local pipe = io.popen(vars.STAT.." "..vars.STATFLAG.." "..fs.Q(filename))
    local ret = pipe:read("*l")
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index 19038e1f..f112ea3e 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -242,28 +242,6 @@ function tools.unpack_archive(archive)
    return true
 end
 
-local md5_cmd = {
-   md5sum = fs.Q(vars.MD5SUM),
-   openssl = fs.Q(vars.OPENSSL).." md5",
-   md5 = fs.Q(vars.MD5),
-}
-
---- Get the MD5 checksum for a file.
--- @param file string: The file to be computed.
--- @return string: The MD5 checksum or nil + message
-function tools.get_md5(file)
-   local cmd = md5_cmd[cfg.md5checker]
-   if not cmd then return nil, "no MD5 checker command configured" end
-   local pipe = io.popen(cmd.." "..fs.Q(fs.absolute_name(file)))
-   local computed = pipe:read("*a")
-   pipe:close()
-   if computed then
-      computed = computed:match("("..("%x"):rep(32)..")")
-   end
-   if computed then return computed end
-   return nil, "Failed to compute MD5 hash for file "..tostring(fs.absolute_name(file))
-end
-
 --- Test for existance of a file.
 -- @param file string: filename to test
 -- @return boolean: true if file exists, false otherwise.
-- 
cgit v1.2.3-55-g6feb


From 319f8f619c9457c8ba426d8bbe0b1d2d74c02e5d Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Sat, 7 May 2016 14:14:08 +0300
Subject: fs.win32.tools: move a local function closer to its usage

---
 src/luarocks/fs/win32/tools.lua | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index f112ea3e..aa405e14 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -11,17 +11,6 @@ local cfg = require("luarocks.cfg")
 
 local vars = cfg.variables
 
---- Strip the last extension of a filename.
--- Example: "foo.tar.gz" becomes "foo.tar".
--- If filename has no dots, returns it unchanged.
--- @param filename string: The file name to strip.
--- @return string: The stripped name.
-local function strip_extension(filename)
-   assert(type(filename) == "string")
-
-   return (filename:gsub("%.[^.]+$", "")) or filename
-end
-
 local function command_at(directory, cmd)
    local drive = directory:match("^([A-Za-z]:)")
    cmd = "cd " .. fs.Q(directory) .. " & " .. cmd
@@ -195,6 +184,16 @@ function tools.is_file(file)
    return fs.execute(fs.Q(vars.TEST).." -f", file)
 end
 
+--- Strip the last extension of a filename.
+-- Example: "foo.tar.gz" becomes "foo.tar".
+-- If filename has no dots, returns it unchanged.
+-- @param filename string: The file name to strip.
+-- @return string: The stripped name.
+local function strip_extension(filename)
+   assert(type(filename) == "string")
+   return (filename:gsub("%.[^.]+$", "")) or filename
+end
+
 --- Uncompress gzip file.
 -- @param archive string: Filename of archive.
 -- @return boolean : success status
-- 
cgit v1.2.3-55-g6feb


From 470ca122e9120caac00cae44b472965a8828afb4 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Sat, 7 May 2016 14:21:36 +0300
Subject: Expose tools.command_at function

---
 src/luarocks/fs/unix/tools.lua  | 12 ++++++++----
 src/luarocks/fs/win32/tools.lua | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index 904dd0aa..807f8057 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -9,7 +9,11 @@ local cfg = require("luarocks.cfg")
 
 local vars = cfg.variables
 
-local function command_at(directory, cmd)
+--- Adds prefix to command to make it run from a directory.
+-- @param directory string: Path to a directory.
+-- @param cmd string: A command-line string.
+-- @return string: The command-line with prefix.
+function tools.command_at(directory, cmd)
    return "cd " .. fs.Q(fs.absolute_name(directory)) .. " && " .. cmd
 end
 
@@ -21,7 +25,7 @@ end
 function tools.execute_string(cmd)
    local current = fs.current_dir()
    if not current then return false end
-   local code, err = os.execute(command_at(current, cmd))
+   local code, err = os.execute(fs.command_at(current, cmd))
    if code == 0 or code == true then
       return true
    else
@@ -114,7 +118,7 @@ end
 -- @param at string: directory to list
 -- @return nil
 function tools.dir_iterator(at)
-   local pipe = io.popen(command_at(at, vars.LS))
+   local pipe = io.popen(fs.command_at(at, vars.LS))
    for file in pipe:lines() do
       if file ~= "." and file ~= ".." then
          coroutine.yield(file)
@@ -137,7 +141,7 @@ function tools.find(at)
       return {}
    end
    local result = {}
-   local pipe = io.popen(command_at(at, fs.quiet_stderr(vars.FIND.." *")))
+   local pipe = io.popen(fs.command_at(at, fs.quiet_stderr(vars.FIND.." *")))
    for file in pipe:lines() do
       table.insert(result, file)
    end
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index aa405e14..f2d62f32 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -11,7 +11,11 @@ local cfg = require("luarocks.cfg")
 
 local vars = cfg.variables
 
-local function command_at(directory, cmd)
+--- Adds prefix to command to make it run from a directory.
+-- @param directory string: Path to a directory.
+-- @param cmd string: A command-line string.
+-- @return string: The command-line with prefix.
+function tools.command_at(directory, cmd)
    local drive = directory:match("^([A-Za-z]:)")
    cmd = "cd " .. fs.Q(directory) .. " & " .. cmd
    if drive then
@@ -28,7 +32,7 @@ end
 function tools.execute_string(cmd)
    local current = fs.current_dir()
    if not current then return false end
-   cmd = command_at(current, cmd)
+   cmd = fs.command_at(current, cmd)
    local code = os.execute(cmd)
    if code == 0 or code == true then
       return true
@@ -115,7 +119,7 @@ end
 -- @param at string: directory to list
 -- @return nil
 function tools.dir_iterator(at)
-   local pipe = io.popen(command_at(at, fs.Q(vars.LS)))
+   local pipe = io.popen(fs.command_at(at, fs.Q(vars.LS)))
    for file in pipe:lines() do
       if file ~= "." and file ~= ".." then
          coroutine.yield(file)
@@ -138,7 +142,7 @@ function tools.find(at)
       return {}
    end
    local result = {}
-   local pipe = io.popen(command_at(at, fs.quiet_stderr(fs.Q(vars.FIND))))
+   local pipe = io.popen(fs.command_at(at, fs.quiet_stderr(fs.Q(vars.FIND))))
    for file in pipe:lines() do
       -- Windows find is a bit different
       local first_two = file:sub(1,2)
-- 
cgit v1.2.3-55-g6feb


From 8630313d665904e21edcc954e4ca0d043b217665 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Sat, 7 May 2016 14:22:59 +0300
Subject: Move common implementation of tools.execute_string

---
 src/luarocks/fs/tools.lua       | 17 +++++++++++++++++
 src/luarocks/fs/unix/tools.lua  | 16 ----------------
 src/luarocks/fs/win32/tools.lua | 17 -----------------
 3 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/src/luarocks/fs/tools.lua b/src/luarocks/fs/tools.lua
index 76b90383..6caa07f3 100644
--- a/src/luarocks/fs/tools.lua
+++ b/src/luarocks/fs/tools.lua
@@ -55,6 +55,23 @@ function tools.pop_dir()
    return directory ~= nil
 end
 
+--- Run the given command.
+-- The command is executed in the current directory in the directory stack.
+-- @param cmd string: No quoting/escaping is applied to the command.
+-- @return boolean: true if command succeeds (status code 0), false
+-- otherwise.
+function tools.execute_string(cmd)
+   local current = fs.current_dir()
+   if not current then return false end
+   cmd = fs.command_at(current, cmd)
+   local code = os.execute(cmd)
+   if code == 0 or code == true then
+      return true
+   else
+      return false
+   end
+end
+
 --- Download a remote file.
 -- @param url string: URL to be fetched.
 -- @param filename string or nil: this function attempts to detect the
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index 807f8057..1bc307a4 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -17,22 +17,6 @@ function tools.command_at(directory, cmd)
    return "cd " .. fs.Q(fs.absolute_name(directory)) .. " && " .. cmd
 end
 
---- Run the given command.
--- The command is executed in the current directory in the directory stack.
--- @param cmd string: No quoting/escaping is applied to the command.
--- @return boolean: true if command succeeds (status code 0), false
--- otherwise.
-function tools.execute_string(cmd)
-   local current = fs.current_dir()
-   if not current then return false end
-   local code, err = os.execute(fs.command_at(current, cmd))
-   if code == 0 or code == true then
-      return true
-   else
-      return false
-   end
-end
-
 --- Create a directory if it does not already exist.
 -- If any of the higher levels in the path name does not exist
 -- too, they are created as well.
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index f2d62f32..f54ec9a5 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -24,23 +24,6 @@ function tools.command_at(directory, cmd)
    return cmd
 end
 
---- Run the given command.
--- The command is executed in the current directory in the directory stack.
--- @param cmd string: No quoting/escaping is applied to the command.
--- @return boolean: true if command succeeds (status code 0), false
--- otherwise.
-function tools.execute_string(cmd)
-   local current = fs.current_dir()
-   if not current then return false end
-   cmd = fs.command_at(current, cmd)
-   local code = os.execute(cmd)
-   if code == 0 or code == true then
-      return true
-   else
-      return false
-   end
-end
-
 --- Create a directory if it does not already exist.
 -- If any of the higher levels in the path name does not exist
 -- too, they are created as well.
-- 
cgit v1.2.3-55-g6feb


From 69a6aff477fd794b3b594bc7b9f20775b8e07986 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Sat, 7 May 2016 14:25:56 +0300
Subject: Move common implementation of tools.dir_iterator

---
 src/luarocks/fs/tools.lua       | 14 ++++++++++++++
 src/luarocks/fs/unix/tools.lua  | 14 --------------
 src/luarocks/fs/win32/tools.lua | 14 --------------
 3 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/src/luarocks/fs/tools.lua b/src/luarocks/fs/tools.lua
index 6caa07f3..ed51b545 100644
--- a/src/luarocks/fs/tools.lua
+++ b/src/luarocks/fs/tools.lua
@@ -72,6 +72,20 @@ function tools.execute_string(cmd)
    end
 end
 
+--- Internal implementation function for fs.dir.
+-- Yields a filename on each iteration.
+-- @param at string: directory to list
+-- @return nil
+function tools.dir_iterator(at)
+   local pipe = io.popen(fs.command_at(at, fs.Q(vars.LS)))
+   for file in pipe:lines() do
+      if file ~= "." and file ~= ".." then
+         coroutine.yield(file)
+      end
+   end
+   pipe:close()
+end
+
 --- Download a remote file.
 -- @param url string: URL to be fetched.
 -- @param filename string or nil: this function attempts to detect the
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index 1bc307a4..84bd53fd 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -97,20 +97,6 @@ function tools.delete(arg)
    fs.execute_quiet(vars.RM, "-rf", arg)
 end
 
---- Internal implementation function for fs.dir.
--- Yields a filename on each iteration.
--- @param at string: directory to list
--- @return nil
-function tools.dir_iterator(at)
-   local pipe = io.popen(fs.command_at(at, vars.LS))
-   for file in pipe:lines() do
-      if file ~= "." and file ~= ".." then
-         coroutine.yield(file)
-      end
-   end
-   pipe:close()
-end
-
 --- Recursively scan the contents of a directory.
 -- @param at string or nil: directory to scan (will be the current
 -- directory if none is given).
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index f54ec9a5..9cb6d47a 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -97,20 +97,6 @@ function tools.delete(arg)
    fs.execute_quiet("if exist "..fs.Q(arg.."\\").." ( RMDIR /S /Q "..fs.Q(arg).." ) else ( DEL /Q /F "..fs.Q(arg).." )")
 end
 
---- Internal implementation function for fs.dir.
--- Yields a filename on each iteration.
--- @param at string: directory to list
--- @return nil
-function tools.dir_iterator(at)
-   local pipe = io.popen(fs.command_at(at, fs.Q(vars.LS)))
-   for file in pipe:lines() do
-      if file ~= "." and file ~= ".." then
-         coroutine.yield(file)
-      end
-   end
-   pipe:close()
-end
-
 --- Recursively scan the contents of a directory.
 -- @param at string or nil: directory to scan (will be the current
 -- directory if none is given).
-- 
cgit v1.2.3-55-g6feb


From 11b65a6c324359134bd75bad37f102ea98337d3e Mon Sep 17 00:00:00 2001
From: Xpol Wan <xpolife@gmail.com>
Date: Mon, 23 May 2016 11:51:20 +0800
Subject: Fallback to vcvarsall.bat if compiler specific bat not found.

---
 install.bat | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/install.bat b/install.bat
index 8e89aafe..46308eb1 100644
--- a/install.bat
+++ b/install.bat
@@ -525,6 +525,14 @@ local function get_msvc_env_setup_cmd()
 				return ('call "%s"'):format(full_path)
 			end
 		end
+
+		-- try vcvarsall.bat in case MS changes the undocumented bat files above.
+		-- but this way we don't konw if specified compiler is installed...
+		local vcvarsall = vcdir .. 'vcvarsall.bat'
+		if exists(vcvarsall) then
+			local vcvarsall_args = { x86 = "", x86_64 = " amd64" }
+			return ('call "%s"%s'):format(vcvarsall, vcvarsall_args[vars.UNAME_M])
+		end
 	end
 
 	-- 2. try for Windows SDKs command line tools.
-- 
cgit v1.2.3-55-g6feb


From b5ee7f79b2d0e54209d714a5eca640d338e17ac6 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Sun, 22 May 2016 19:45:57 +0300
Subject: write-rockspec: infer git and hg urls from local repos

---
 src/luarocks/write_rockspec.lua | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/luarocks/write_rockspec.lua b/src/luarocks/write_rockspec.lua
index abfca322..9b6593b6 100644
--- a/src/luarocks/write_rockspec.lua
+++ b/src/luarocks/write_rockspec.lua
@@ -3,6 +3,7 @@
 local write_rockspec = {}
 package.loaded["luarocks.write_rockspec"] = write_rockspec
 
+local cfg = require("luarocks.cfg")
 local dir = require("luarocks.dir")
 local fetch = require("luarocks.fetch")
 local fs = require("luarocks.fs")
@@ -111,6 +112,32 @@ local function detect_mit_license(data)
    return sum == 78656
 end
 
+local simple_scm_protocols = {
+   git = true, ["git+http"] = true, ["git+https"] = true,
+   hg = true, ["hg+http"] = true, ["hg+https"] = true
+}
+
+local function detect_url_from_command(program, args, directory)
+   local command = fs.Q(cfg.variables[program:upper()]).. " "..args
+   local pipe = io.popen(fs.command_at(directory, fs.quiet_stderr(command)))
+   if not pipe then return nil end
+   local url = pipe:read("*a"):match("^([^\r\n]+)")
+   pipe:close()
+   if not url then return nil end
+   if not util.starts_with(url, program.."://") then
+      url = program.."+"..url
+   end
+
+   if simple_scm_protocols[dir.split_url(url)] then
+      return url
+   end
+end
+
+local function detect_scm_url(directory)
+   return detect_url_from_command("git", "config --get remote.origin.url", directory) or
+      detect_url_from_command("hg", "paths default", directory)
+end
+
 local function show_license(rockspec)
    local fd = open_file("COPYING") or open_file("LICENSE") or open_file("MIT-LICENSE.txt")
    if not fd then return nil end
@@ -290,6 +317,8 @@ function write_rockspec.run(...)
       else
          local_dir = nil
       end
+   else
+      rockspec.source.url = detect_scm_url(local_dir) or rockspec.source.url
    end
    
    if not local_dir then
-- 
cgit v1.2.3-55-g6feb


From 24fa7d2c2c8f9032b66a290be0d2d2623c6904b4 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Mon, 23 May 2016 14:01:37 +0300
Subject: write-rockspec: improve homepage detection

* Perform detection later to take into account URL inferred from
  local scm repo.
* Support more protocols instead of just 'git://'.
* Support Bitbucket and Gitlab in addition to Github.
* Strip trailing '.git'.
---
 src/luarocks/write_rockspec.lua | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/luarocks/write_rockspec.lua b/src/luarocks/write_rockspec.lua
index 9b6593b6..213d1b01 100644
--- a/src/luarocks/write_rockspec.lua
+++ b/src/luarocks/write_rockspec.lua
@@ -266,10 +266,6 @@ function write_rockspec.run(...)
    version = version or "scm"
 
    local filename = flags["output"] or dir.path(fs.current_dir(), name:lower().."-"..version.."-1.rockspec")
-   
-   if not flags["homepage"] and url_or_dir:match("^git://github.com") then
-      flags["homepage"] = "http://"..url_or_dir:match("^[^:]+://(.*)")
-   end
 
    local rockspec = {
       rockspec_format = flags["rockspec-format"],
@@ -324,6 +320,19 @@ function write_rockspec.run(...)
    if not local_dir then
       local_dir = "."
    end
+
+   if not flags["homepage"] then
+      local url_protocol, url_path = dir.split_url(rockspec.source.url)
+
+      if simple_scm_protocols[url_protocol] then
+         for _, domain in ipairs({"github.com", "bitbucket.org", "gitlab.com"}) do
+            if util.starts_with(url_path, domain) then
+               rockspec.description.homepage = "https://"..url_path:gsub("%.git$", "")
+               break
+            end
+         end
+      end
+   end
    
    local libs = nil
    if flags["lib"] then
-- 
cgit v1.2.3-55-g6feb


From 6217339cd4ba6d7ee7f08aa86443032ede033752 Mon Sep 17 00:00:00 2001
From: Hisham <hisham@gobolinux.org>
Date: Wed, 25 May 2016 01:22:09 -0300
Subject: Fixes #465 ensuring the binaries are +x.

---
 Makefile.install.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.install.inc b/Makefile.install.inc
index 20d96a12..02d40735 100644
--- a/Makefile.install.inc
+++ b/Makefile.install.inc
@@ -8,6 +8,7 @@ install_bins:
 	for f in $(BIN_FILES); \
 	do \
 	   cp "$$f" "$(DESTDIR)$(BINDIR)/$$f-$$luaver"; \
+	   chmod +x "$(DESTDIR)$(BINDIR)/$$f-$$luaver"; \
 	   ln -nfs "$$f-$$luaver" "$(DESTDIR)$(BINDIR)/$$f"; \
 	done
 
-- 
cgit v1.2.3-55-g6feb


From 5f896c909c2c0bbe6bee2ab7577f632692c975d7 Mon Sep 17 00:00:00 2001
From: Hisham <hisham@gobolinux.org>
Date: Wed, 25 May 2016 03:13:39 -0300
Subject: Ensure entries are readable.

---
 Makefile             | 4 ++--
 Makefile.install.inc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 81d24d24..dc9079b0 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ build_bins: cleanup_bins
 	   echo "#!$(LUA_BINDIR)/lua$(LUA_SUFFIX)" > src/bin/$$f ;\
 	   echo "package.path = [[$(LUADIR)/?.lua;]]..package.path" | sed "s,//,/,g" >> src/bin/$$f ;\
 	   cat src/bin/$$f.bak >> src/bin/$$f ;\
-	   chmod +x src/bin/$$f ;\
+	   chmod +rx src/bin/$$f ;\
 	   rm -f src/bin/$$f.bak ;\
 	done
 
@@ -117,7 +117,7 @@ cleanup_bins:
 	do \
 	   mv src/bin/$$f src/bin/$$f.bak ;\
 	   sed "s,^#!.*lua.*,#!/usr/bin/env lua,;/^package.path/d" < src/bin/$$f.bak > src/bin/$$f ;\
-	   chmod +x src/bin/$$f ;\
+	   chmod +rx src/bin/$$f ;\
 	   rm -f src/bin/$$f.bak ;\
 	done
 
diff --git a/Makefile.install.inc b/Makefile.install.inc
index 02d40735..621d7cb2 100644
--- a/Makefile.install.inc
+++ b/Makefile.install.inc
@@ -8,7 +8,7 @@ install_bins:
 	for f in $(BIN_FILES); \
 	do \
 	   cp "$$f" "$(DESTDIR)$(BINDIR)/$$f-$$luaver"; \
-	   chmod +x "$(DESTDIR)$(BINDIR)/$$f-$$luaver"; \
+	   chmod +rx "$(DESTDIR)$(BINDIR)/$$f-$$luaver"; \
 	   ln -nfs "$$f-$$luaver" "$(DESTDIR)$(BINDIR)/$$f"; \
 	done
 
-- 
cgit v1.2.3-55-g6feb


From f41e1da03b2c2aaf4c145ff83d10dfa07c2395ca Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Wed, 25 May 2016 11:09:15 +0300
Subject: luarocks make: move rockspec picking into an util function

---
 src/luarocks/make.lua | 59 ++++------------------------------------------
 src/luarocks/util.lua | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 55 deletions(-)

diff --git a/src/luarocks/make.lua b/src/luarocks/make.lua
index 78c43d91..5058da79 100644
--- a/src/luarocks/make.lua
+++ b/src/luarocks/make.lua
@@ -49,33 +49,6 @@ To install rocks, you'll normally want to use the "install" and
 
 ]]
 
---- Collect rockspecs located in a subdirectory.
--- @param versions table: A table mapping rock names to newest rockspec versions.
--- @param paths table: A table mapping rock names to newest rockspec paths.
--- @param unnamed_paths table: An array of rockspec paths that don't contain rock
--- name and version in regular format.
--- @param subdir string: path to subdirectory.
-local function collect_rockspecs(versions, paths, unnamed_paths, subdir)
-   if fs.is_dir(subdir) then
-      for file in fs.dir(subdir) do
-         file = dir.path(subdir, file)
-
-         if file:match("rockspec$") and fs.is_file(file) then
-            local rock, version = path.parse_name(file)
-
-            if rock then
-               if not versions[rock] or deps.compare_versions(version, versions[rock]) then
-                  versions[rock] = version
-                  paths[rock] = file
-               end
-            else
-               table.insert(unnamed_paths, file)
-            end
-         end
-      end
-   end
-end
-
 --- Driver function for "make" command.
 -- @param name string: A local rockspec.
 -- @return boolean or (nil, string, exitcode): True if build was successful; nil and an
@@ -85,34 +58,10 @@ function make.run(...)
    assert(type(rockspec) == "string" or not rockspec)
    
    if not rockspec then
-      -- Try to infer default rockspec name.
-      local versions, paths, unnamed_paths = {}, {}, {}
-      -- Look for rockspecs in some common locations.
-      collect_rockspecs(versions, paths, unnamed_paths, ".")
-      collect_rockspecs(versions, paths, unnamed_paths, "rockspec")
-      collect_rockspecs(versions, paths, unnamed_paths, "rockspecs")
-
-      if #unnamed_paths > 0 then
-         -- There are rockspecs not following "name-version.rockspec" format.
-         -- More than one are ambiguous.
-         if #unnamed_paths > 1 then
-            return nil, "Please specify which rockspec file to use."
-         else
-            rockspec = unnamed_paths[1]
-         end
-      else
-         local rock = next(versions)
-
-         if rock then
-            -- If there are rockspecs for multiple rocks it's ambiguous.
-            if next(versions, rock) then
-               return nil, "Please specify which rockspec file to use."
-            else
-               rockspec = paths[rock]
-            end
-         else
-            return nil, "Argument missing: please specify a rockspec to use on current directory."
-         end
+      local err
+      rockspec, err = util.get_default_rockspec()
+      if not rockspec then
+         return nil, err
       end
    end
    if not rockspec:match("rockspec$") then
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index 520625c0..2f419a3d 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -520,6 +520,71 @@ function util.announce_install(rockspec)
    util.printout()
 end
 
+--- Collect rockspecs located in a subdirectory.
+-- @param versions table: A table mapping rock names to newest rockspec versions.
+-- @param paths table: A table mapping rock names to newest rockspec paths.
+-- @param unnamed_paths table: An array of rockspec paths that don't contain rock
+-- name and version in regular format.
+-- @param subdir string: path to subdirectory.
+local function collect_rockspecs(versions, paths, unnamed_paths, subdir)
+   local fs = require("luarocks.fs")
+   local dir = require("luarocks.dir")
+   local path = require("luarocks.path")
+   local deps = require("luarocks.deps")
+
+   if fs.is_dir(subdir) then
+      for file in fs.dir(subdir) do
+         file = dir.path(subdir, file)
+
+         if file:match("rockspec$") and fs.is_file(file) then
+            local rock, version = path.parse_name(file)
+
+            if rock then
+               if not versions[rock] or deps.compare_versions(version, versions[rock]) then
+                  versions[rock] = version
+                  paths[rock] = file
+               end
+            else
+               table.insert(unnamed_paths, file)
+            end
+         end
+      end
+   end
+end
+
+--- Get default rockspec name for commands that take optional rockspec name.
+-- @return string or (nil, string): path to the rockspec or nil and error message.
+function util.get_default_rockspec()
+   local versions, paths, unnamed_paths = {}, {}, {}
+   -- Look for rockspecs in some common locations.
+   collect_rockspecs(versions, paths, unnamed_paths, ".")
+   collect_rockspecs(versions, paths, unnamed_paths, "rockspec")
+   collect_rockspecs(versions, paths, unnamed_paths, "rockspecs")
+
+   if #unnamed_paths > 0 then
+      -- There are rockspecs not following "name-version.rockspec" format.
+      -- More than one are ambiguous.
+      if #unnamed_paths > 1 then
+         return nil, "Please specify which rockspec file to use."
+      else
+         return unnamed_paths[1]
+      end
+   else
+      local rock = next(versions)
+
+      if rock then
+         -- If there are rockspecs for multiple rocks it's ambiguous.
+         if next(versions, rock) then
+            return nil, "Please specify which rockspec file to use."
+         else
+            return paths[rock]
+         end
+      else
+         return nil, "Argument missing: please specify a rockspec to use on current directory."
+      end
+   end
+end
+
 -- from http://lua-users.org/wiki/SplitJoin
 -- by PhilippeLhoste
 function util.split_string(str, delim, maxNb)
-- 
cgit v1.2.3-55-g6feb


From 22c8993ebe5f509ee55b8af6b7a8be147b3884e6 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Wed, 25 May 2016 11:17:14 +0300
Subject: luarocks new-version: make rockspec arg optional

Infer it same way `luarocks make` does.
---
 src/luarocks/new_version.lua | 13 +++++++++----
 test/testing.sh              |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/luarocks/new_version.lua b/src/luarocks/new_version.lua
index 6969d4b2..3382b85c 100644
--- a/src/luarocks/new_version.lua
+++ b/src/luarocks/new_version.lua
@@ -11,13 +11,14 @@ local fs = require("luarocks.fs")
 local type_check = require("luarocks.type_check")
 
 new_version.help_summary = "Auto-write a rockspec for a new version of a rock."
-new_version.help_arguments = "[--tag=<tag>] {<package>|<rockspec>} [<new_version>] [<new_url>]"
+new_version.help_arguments = "[--tag=<tag>] [<package>|<rockspec>] [<new_version>] [<new_url>]"
 new_version.help = [[
 This is a utility function that writes a new rockspec, updating data
 from a previous one.
 
 If a package name is given, it downloads the latest rockspec from the
-default server. If a rockspec is given, it uses it instead.
+default server. If a rockspec is given, it uses it instead. If no argument
+is given, it looks for a rockspec same way 'luarocks make' does.
 
 If the version number is not given and tag is passed using --tag,
 it is used as the version, with 'v' removed from beginning.
@@ -125,12 +126,16 @@ end
 function new_version.run(...)
    local flags, input, version, url = util.parse_flags(...)
    if not input then
-      return nil, "Missing argument: expected package or rockspec. "..util.see_help("new_version")
+      local err
+      input, err = util.get_default_rockspec()
+      if not input then
+         return nil, err
+      end
    end
    assert(type(input) == "string")
    
    local filename = input
-   if not input:match(".rockspec$") then
+   if not input:match("rockspec$") then
       local err
       filename, err = download.download("rockspec", input)
       if not filename then
diff --git a/test/testing.sh b/test/testing.sh
index f56f2aa9..cb10441c 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -363,7 +363,6 @@ fail_unpack_noarg() { $luarocks unpack; }
 fail_upload_noarg() { $luarocks upload; }
 fail_remove_noarg() { $luarocks remove; }
 fail_doc_noarg() { $luarocks doc; }
-fail_new_version_noarg() { $luarocks new_version; }
 
 fail_build_invalid() { $luarocks build invalid; }
 fail_download_invalid() { $luarocks download invalid; }
@@ -446,6 +445,7 @@ test_make_pack_binary_rock() { rm -rf ./lxsh-${verrev_lxsh} &&  $luarocks downlo
 test_new_version() { $luarocks download --rockspec luacov ${version_luacov} &&  $luarocks new_version ./luacov-${version_luacov}-1.rockspec 0.2 && rm ./luacov-0.*; }
 test_new_version_url() { $luarocks download --rockspec abelhas 1.0 && $luarocks new_version ./abelhas-1.0-1.rockspec 1.1 https://github.com/downloads/ittner/abelhas/abelhas-1.1.tar.gz && rm ./abelhas-*; }
 test_new_version_tag() { $luarocks download --rockspec luacov ${version_luacov} && $luarocks new_version ./luacov-${version_luacov}-1.rockspec --tag v0.3 && rm ./luacov-0.3-1.rockspec; }
+test_new_version_tag_without_arg() { rm -rf ./*rockspec && $luarocks download --rockspec luacov ${version_luacov} && $luarocks new_version --tag v0.3 && rm ./luacov-0.3-1.rockspec; }
 
 test_pack() { $luarocks list && $luarocks pack luacov && rm ./luacov-*.rock; }
 test_pack_src() { $luarocks install $luasec && $luarocks download --rockspec luasocket && $luarocks pack ./luasocket-${verrev_luasocket}.rockspec && rm ./luasocket-${version_luasocket}-*.rock; }
-- 
cgit v1.2.3-55-g6feb


From 3d21d6c12585109ef041a3389f8da1c05347aa09 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Mon, 30 May 2016 22:15:14 +0300
Subject: luarocks.persist: put pairs with number values on one line

Instead of pairs with number keys. Keeps parsed version representation
compact but puts items in regular arrays each on its own line.
---
 src/luarocks/persist.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/luarocks/persist.lua b/src/luarocks/persist.lua
index 354b17c3..9407b2a4 100644
--- a/src/luarocks/persist.lua
+++ b/src/luarocks/persist.lua
@@ -147,7 +147,7 @@ write_table = function(out, tbl, level, field_order)
       end
 
       write_value(out, v, level, sub_order)
-      if type(k) == "number" then
+      if type(v) == "number" then
          sep = ", "
          indent = false
       else
-- 
cgit v1.2.3-55-g6feb


From 2cfc2c252304626ace9ad1700d056640a20770d2 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Tue, 31 May 2016 16:09:01 +0300
Subject: Remove unused imports in luarocks.make

---
 src/luarocks/make.lua | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/luarocks/make.lua b/src/luarocks/make.lua
index 5058da79..6a74f6fe 100644
--- a/src/luarocks/make.lua
+++ b/src/luarocks/make.lua
@@ -9,8 +9,6 @@ package.loaded["luarocks.make"] = make
 
 local build = require("luarocks.build")
 local fs = require("luarocks.fs")
-local dir = require("luarocks.dir")
-local path = require("luarocks.path")
 local util = require("luarocks.util")
 local cfg = require("luarocks.cfg")
 local fetch = require("luarocks.fetch")
-- 
cgit v1.2.3-55-g6feb


From d524b515c67ceded00a15c2617283f81a2f21f7c Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Tue, 31 May 2016 16:31:28 +0300
Subject: Remove commented module() calls

---
 src/luarocks/add.lua            | 1 -
 src/luarocks/admin_remove.lua   | 1 -
 src/luarocks/build.lua          | 1 -
 src/luarocks/build/builtin.lua  | 1 -
 src/luarocks/build/cmake.lua    | 1 -
 src/luarocks/build/command.lua  | 1 -
 src/luarocks/build/make.lua     | 1 -
 src/luarocks/cache.lua          | 1 -
 src/luarocks/command_line.lua   | 1 -
 src/luarocks/deps.lua           | 1 -
 src/luarocks/dir.lua            | 1 -
 src/luarocks/doc.lua            | 1 -
 src/luarocks/download.lua       | 1 -
 src/luarocks/fetch.lua          | 1 -
 src/luarocks/fetch/cvs.lua      | 1 -
 src/luarocks/fetch/git.lua      | 1 -
 src/luarocks/fetch/git_file.lua | 1 -
 src/luarocks/fetch/git_http.lua | 1 -
 src/luarocks/fetch/hg.lua       | 1 -
 src/luarocks/fetch/sscm.lua     | 1 -
 src/luarocks/fetch/svn.lua      | 1 -
 src/luarocks/fs.lua             | 1 -
 src/luarocks/fs/unix.lua        | 1 -
 src/luarocks/fs/unix/tools.lua  | 1 -
 src/luarocks/fs/win32.lua       | 1 -
 src/luarocks/fs/win32/tools.lua | 1 -
 src/luarocks/help.lua           | 1 -
 src/luarocks/index.lua          | 1 -
 src/luarocks/install.lua        | 1 -
 src/luarocks/lint.lua           | 1 -
 src/luarocks/list.lua           | 1 -
 src/luarocks/make.lua           | 1 -
 src/luarocks/make_manifest.lua  | 1 -
 src/luarocks/manif.lua          | 1 -
 src/luarocks/manif_core.lua     | 1 -
 src/luarocks/pack.lua           | 1 -
 src/luarocks/path.lua           | 1 -
 src/luarocks/persist.lua        | 1 -
 src/luarocks/purge.lua          | 1 -
 src/luarocks/refresh_cache.lua  | 1 -
 src/luarocks/remove.lua         | 1 -
 src/luarocks/repos.lua          | 1 -
 src/luarocks/search.lua         | 1 -
 src/luarocks/show.lua           | 1 -
 src/luarocks/tools/patch.lua    | 1 -
 src/luarocks/tools/tar.lua      | 1 -
 src/luarocks/type_check.lua     | 1 -
 src/luarocks/unpack.lua         | 1 -
 src/luarocks/util.lua           | 1 -
 src/luarocks/validate.lua       | 1 -
 src/luarocks/write_rockspec.lua | 1 -
 51 files changed, 51 deletions(-)

diff --git a/src/luarocks/add.lua b/src/luarocks/add.lua
index ccd303e6..bea2d861 100644
--- a/src/luarocks/add.lua
+++ b/src/luarocks/add.lua
@@ -1,7 +1,6 @@
 
 --- Module implementing the luarocks-admin "add" command.
 -- Adds a rock or rockspec to a rocks server.
---module("luarocks.add", package.seeall)
 local add = {}
 package.loaded["luarocks.add"] = add
 
diff --git a/src/luarocks/admin_remove.lua b/src/luarocks/admin_remove.lua
index 5a1cf20b..59ca4975 100644
--- a/src/luarocks/admin_remove.lua
+++ b/src/luarocks/admin_remove.lua
@@ -1,7 +1,6 @@
 
 --- Module implementing the luarocks-admin "remove" command.
 -- Removes a rock or rockspec from a rocks server.
---module("luarocks.admin_remove", package.seeall)
 local admin_remove = {}
 package.loaded["luarocks.admin_remove"] = admin_remove
 
diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index c62e4694..edf4efb4 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -1,7 +1,6 @@
 
 --- Module implementing the LuaRocks "build" command.
 -- Builds a rock, compiling its C parts if any.
---module("luarocks.build", package.seeall)
 local build = {}
 package.loaded["luarocks.build"] = build
 
diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
index b6062bd7..b6f53271 100644
--- a/src/luarocks/build/builtin.lua
+++ b/src/luarocks/build/builtin.lua
@@ -1,6 +1,5 @@
 
 --- A builtin build system: back-end to provide a portable way of building C-based Lua modules.
---module("luarocks.build.builtin", package.seeall)
 local builtin = {}
 
 local unpack = unpack or table.unpack
diff --git a/src/luarocks/build/cmake.lua b/src/luarocks/build/cmake.lua
index 7b16fa51..da5a31f1 100644
--- a/src/luarocks/build/cmake.lua
+++ b/src/luarocks/build/cmake.lua
@@ -1,6 +1,5 @@
 
 --- Build back-end for CMake-based modules.
---module("luarocks.build.cmake", package.seeall)
 local cmake = {}
 
 local fs = require("luarocks.fs")
diff --git a/src/luarocks/build/command.lua b/src/luarocks/build/command.lua
index 650e3236..62dbc282 100644
--- a/src/luarocks/build/command.lua
+++ b/src/luarocks/build/command.lua
@@ -1,6 +1,5 @@
 
 --- Build back-end for raw listing of commands in rockspec files.
---module("luarocks.build.command", package.seeall)
 local command = {}
 
 local fs = require("luarocks.fs")
diff --git a/src/luarocks/build/make.lua b/src/luarocks/build/make.lua
index 0da183e9..69e73c2e 100644
--- a/src/luarocks/build/make.lua
+++ b/src/luarocks/build/make.lua
@@ -1,6 +1,5 @@
 
 --- Build back-end for using Makefile-based packages.
---module("luarocks.build.make", package.seeall)
 local make = {}
 
 local unpack = unpack or table.unpack
diff --git a/src/luarocks/cache.lua b/src/luarocks/cache.lua
index fb6344d8..4a95f70e 100644
--- a/src/luarocks/cache.lua
+++ b/src/luarocks/cache.lua
@@ -1,7 +1,6 @@
 
 --- Module handling the LuaRocks local cache.
 -- Adds a rock or rockspec to a rocks server.
---module("luarocks.cache", package.seeall)
 local cache = {}
 package.loaded["luarocks.cache"] = cache
 
diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua
index a016fc72..b3284534 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/command_line.lua
@@ -1,6 +1,5 @@
 
 --- Functions for command-line scripts.
---module("luarocks.command_line", package.seeall)
 local command_line = {}
 
 local unpack = unpack or table.unpack
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index 536b6c51..44998220 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -11,7 +11,6 @@
 -- comparison criteria is the source code of this module, but the
 -- test/test_deps.lua file included with LuaRocks provides some
 -- insights on what these criteria are.
---module("luarocks.deps", package.seeall)
 local deps = {}
 package.loaded["luarocks.deps"] = deps
 
diff --git a/src/luarocks/dir.lua b/src/luarocks/dir.lua
index 2ef9881e..f72ebd6c 100644
--- a/src/luarocks/dir.lua
+++ b/src/luarocks/dir.lua
@@ -1,6 +1,5 @@
 
 --- Generic utilities for handling pathnames.
---module("luarocks.dir", package.seeall)
 local dir = {}
 package.loaded["luarocks.dir"] = dir
 
diff --git a/src/luarocks/doc.lua b/src/luarocks/doc.lua
index 53ed0116..62e80232 100644
--- a/src/luarocks/doc.lua
+++ b/src/luarocks/doc.lua
@@ -1,7 +1,6 @@
 
 --- Module implementing the LuaRocks "doc" command.
 -- Shows documentation for an installed rock.
---module("luarocks.doc", package.seeall)
 local doc = {}
 package.loaded["luarocks.doc"] = doc
 
diff --git a/src/luarocks/download.lua b/src/luarocks/download.lua
index 6d95d8fd..181aca75 100644
--- a/src/luarocks/download.lua
+++ b/src/luarocks/download.lua
@@ -1,7 +1,6 @@
 
 --- Module implementing the luarocks "download" command.
 -- Download a rock from the repository.
---module("luarocks.download", package.seeall)
 local download = {}
 package.loaded["luarocks.download"] = download
 
diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua
index 2c028771..dfa6f191 100644
--- a/src/luarocks/fetch.lua
+++ b/src/luarocks/fetch.lua
@@ -1,6 +1,5 @@
 
 --- Functions related to fetching and loading local and remote files.
---module("luarocks.fetch", package.seeall)
 local fetch = {}
 package.loaded["luarocks.fetch"] = fetch
 
diff --git a/src/luarocks/fetch/cvs.lua b/src/luarocks/fetch/cvs.lua
index ccf928c4..ece711b6 100644
--- a/src/luarocks/fetch/cvs.lua
+++ b/src/luarocks/fetch/cvs.lua
@@ -1,6 +1,5 @@
 
 --- Fetch back-end for retrieving sources from CVS.
---module("luarocks.fetch.cvs", package.seeall)
 local cvs = {}
 
 local unpack = unpack or table.unpack
diff --git a/src/luarocks/fetch/git.lua b/src/luarocks/fetch/git.lua
index a635f190..f61d89e9 100644
--- a/src/luarocks/fetch/git.lua
+++ b/src/luarocks/fetch/git.lua
@@ -1,6 +1,5 @@
 
 --- Fetch back-end for retrieving sources from GIT.
---module("luarocks.fetch.git", package.seeall)
 local git = {}
 
 local unpack = unpack or table.unpack
diff --git a/src/luarocks/fetch/git_file.lua b/src/luarocks/fetch/git_file.lua
index 0144bc2e..8d46bbca 100644
--- a/src/luarocks/fetch/git_file.lua
+++ b/src/luarocks/fetch/git_file.lua
@@ -1,6 +1,5 @@
 
 --- Fetch back-end for retrieving sources from local Git repositories.
---module("luarocks.fetch.git_file", package.seeall)
 local git_file = {}
 
 local git = require("luarocks.fetch.git")
diff --git a/src/luarocks/fetch/git_http.lua b/src/luarocks/fetch/git_http.lua
index 4ecd4816..d85e2572 100644
--- a/src/luarocks/fetch/git_http.lua
+++ b/src/luarocks/fetch/git_http.lua
@@ -7,7 +7,6 @@
 -- source = { url = "git+http://example.com/foo.git" }
 -- Prefer using the normal git:// fetch mode as it is more widely
 -- available in older versions of LuaRocks.
---module("luarocks.fetch.git_http", package.seeall)
 local git_http = {}
 
 local git = require("luarocks.fetch.git")
diff --git a/src/luarocks/fetch/hg.lua b/src/luarocks/fetch/hg.lua
index 518130b4..4cf8d028 100644
--- a/src/luarocks/fetch/hg.lua
+++ b/src/luarocks/fetch/hg.lua
@@ -1,6 +1,5 @@
 
 --- Fetch back-end for retrieving sources from HG.
---module("luarocks.fetch.hg", package.seeall)
 local hg = {}
 
 local unpack = unpack or table.unpack
diff --git a/src/luarocks/fetch/sscm.lua b/src/luarocks/fetch/sscm.lua
index 53ae86a3..5add10db 100644
--- a/src/luarocks/fetch/sscm.lua
+++ b/src/luarocks/fetch/sscm.lua
@@ -1,6 +1,5 @@
 
 --- Fetch back-end for retrieving sources from Surround SCM Server
---module("luarocks.fetch.sscm", package.seeall)
 local sscm = {}
 
 local fs = require("luarocks.fs")
diff --git a/src/luarocks/fetch/svn.lua b/src/luarocks/fetch/svn.lua
index 755e5e32..29bce1b5 100644
--- a/src/luarocks/fetch/svn.lua
+++ b/src/luarocks/fetch/svn.lua
@@ -1,6 +1,5 @@
 
 --- Fetch back-end for retrieving sources from Subversion.
---module("luarocks.fetch.svn", package.seeall)
 local svn = {}
 
 local unpack = unpack or table.unpack
diff --git a/src/luarocks/fs.lua b/src/luarocks/fs.lua
index f3d86a13..54cc7d73 100644
--- a/src/luarocks/fs.lua
+++ b/src/luarocks/fs.lua
@@ -7,7 +7,6 @@
 
 local pairs = pairs
 
---module("luarocks.fs", package.seeall)
 local fs = {}
 package.loaded["luarocks.fs"] = fs
 
diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua
index 520b3e99..5c6b542c 100644
--- a/src/luarocks/fs/unix.lua
+++ b/src/luarocks/fs/unix.lua
@@ -1,6 +1,5 @@
 
 --- Unix implementation of filesystem and platform abstractions.
---module("luarocks.fs.unix", package.seeall)
 local unix = {}
 
 local fs = require("luarocks.fs")
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index 84bd53fd..7a67fb22 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -1,6 +1,5 @@
 
 --- fs operations implemented with third-party tools for Unix platform abstractions.
---module("luarocks.fs.unix.tools", package.seeall)
 local tools = {}
 
 local fs = require("luarocks.fs")
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua
index 74f3ed69..8debaeef 100644
--- a/src/luarocks/fs/win32.lua
+++ b/src/luarocks/fs/win32.lua
@@ -1,7 +1,6 @@
 --- Windows implementation of filesystem and platform abstractions.
 -- Download http://unxutils.sourceforge.net/ for Windows GNU utilities
 -- used by this module.
---module("luarocks.fs.win32", package.seeall)
 local win32 = {}
 
 local fs = require("luarocks.fs")
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index 9cb6d47a..1d47fa59 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -2,7 +2,6 @@
 --- fs operations implemented with third-party tools for Windows platform abstractions.
 -- Download http://unxutils.sourceforge.net/ for Windows GNU utilities
 -- used by this module.
---module("luarocks.fs.win32.tools", package.seeall)
 local tools = {}
 
 local fs = require("luarocks.fs")
diff --git a/src/luarocks/help.lua b/src/luarocks/help.lua
index 5a2681a3..0f66f64b 100644
--- a/src/luarocks/help.lua
+++ b/src/luarocks/help.lua
@@ -4,7 +4,6 @@
 -- uses a global table called "commands" to find commands
 -- to show help for; each command should be represented by a
 -- table containing "help" and "help_summary" fields.
---module("luarocks.help", package.seeall)
 local help = {}
 
 local util = require("luarocks.util")
diff --git a/src/luarocks/index.lua b/src/luarocks/index.lua
index 116bdfd2..e1f563ef 100644
--- a/src/luarocks/index.lua
+++ b/src/luarocks/index.lua
@@ -1,6 +1,5 @@
 
 --- Module which builds the index.html page to be used in rocks servers.
---module("luarocks.index", package.seeall)
 local index = {}
 package.loaded["luarocks.index"] = index
 
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index e3ab6fac..f78c6a0d 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -1,6 +1,5 @@
 --- Module implementing the LuaRocks "install" command.
 -- Installs binary rocks.
---module("luarocks.install", package.seeall)
 local install = {}
 package.loaded["luarocks.install"] = install
 
diff --git a/src/luarocks/lint.lua b/src/luarocks/lint.lua
index 091c8de4..81d8bab2 100644
--- a/src/luarocks/lint.lua
+++ b/src/luarocks/lint.lua
@@ -1,7 +1,6 @@
 
 --- Module implementing the LuaRocks "lint" command.
 -- Utility function that checks syntax of the rockspec.
---module("luarocks.lint", package.seeall)
 local lint = {}
 package.loaded["luarocks.lint"] = lint
 
diff --git a/src/luarocks/list.lua b/src/luarocks/list.lua
index 8affc52f..09fa9ad7 100644
--- a/src/luarocks/list.lua
+++ b/src/luarocks/list.lua
@@ -1,7 +1,6 @@
 
 --- Module implementing the LuaRocks "list" command.
 -- Lists currently installed rocks.
---module("luarocks.list", package.seeall)
 local list = {}
 package.loaded["luarocks.list"] = list
 
diff --git a/src/luarocks/make.lua b/src/luarocks/make.lua
index 6a74f6fe..9d675884 100644
--- a/src/luarocks/make.lua
+++ b/src/luarocks/make.lua
@@ -3,7 +3,6 @@
 -- Builds sources in the current directory, but unlike "build",
 -- it does not fetch sources, etc., assuming everything is 
 -- available in the current directory.
---module("luarocks.make", package.seeall)
 local make = {}
 package.loaded["luarocks.make"] = make
 
diff --git a/src/luarocks/make_manifest.lua b/src/luarocks/make_manifest.lua
index b6e65bf8..3d9a6bac 100644
--- a/src/luarocks/make_manifest.lua
+++ b/src/luarocks/make_manifest.lua
@@ -1,7 +1,6 @@
 
 --- Module implementing the luarocks-admin "make_manifest" command.
 -- Compile a manifest file for a repository.
---module("luarocks.make_manifest", package.seeall)
 local make_manifest = {}
 package.loaded["luarocks.make_manifest"] = make_manifest
 
diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua
index bc202be3..e30c2a33 100644
--- a/src/luarocks/manif.lua
+++ b/src/luarocks/manif.lua
@@ -2,7 +2,6 @@
 -- Manifest files describe the contents of a LuaRocks tree or server.
 -- They are loaded into manifest tables, which are then used for
 -- performing searches, matching dependencies, etc.
---module("luarocks.manif", package.seeall)
 local manif = {}
 package.loaded["luarocks.manif"] = manif
 
diff --git a/src/luarocks/manif_core.lua b/src/luarocks/manif_core.lua
index 610f9860..5c8928d4 100644
--- a/src/luarocks/manif_core.lua
+++ b/src/luarocks/manif_core.lua
@@ -1,7 +1,6 @@
 
 --- Core functions for querying manifest files.
 -- This module requires no specific 'fs' functionality.
---module("luarocks.manif_core", package.seeall)
 local manif_core = {}
 package.loaded["luarocks.manif_core"] = manif_core
 
diff --git a/src/luarocks/pack.lua b/src/luarocks/pack.lua
index e4498f5a..685b84bd 100644
--- a/src/luarocks/pack.lua
+++ b/src/luarocks/pack.lua
@@ -1,7 +1,6 @@
 
 --- Module implementing the LuaRocks "pack" command.
 -- Creates a rock, packing sources or binaries.
---module("luarocks.pack", package.seeall)
 local pack = {}
 package.loaded["luarocks.pack"] = pack
 
diff --git a/src/luarocks/path.lua b/src/luarocks/path.lua
index bc7ab63b..dafc64e7 100644
--- a/src/luarocks/path.lua
+++ b/src/luarocks/path.lua
@@ -2,7 +2,6 @@
 --- LuaRocks-specific path handling functions.
 -- All paths are configured in this module, making it a single
 -- point where the layout of the local installation is defined in LuaRocks.
---module("luarocks.path", package.seeall)
 local path = {}
 
 local dir = require("luarocks.dir")
diff --git a/src/luarocks/persist.lua b/src/luarocks/persist.lua
index 9407b2a4..c2adb570 100644
--- a/src/luarocks/persist.lua
+++ b/src/luarocks/persist.lua
@@ -3,7 +3,6 @@
 -- saving tables into files.
 -- Implemented separately to avoid interdependencies,
 -- as it is used in the bootstrapping stage of the cfg module.
---module("luarocks.persist", package.seeall)
 local persist = {}
 package.loaded["luarocks.persist"] = persist
 
diff --git a/src/luarocks/purge.lua b/src/luarocks/purge.lua
index bd5494f6..0be6ef21 100644
--- a/src/luarocks/purge.lua
+++ b/src/luarocks/purge.lua
@@ -1,7 +1,6 @@
 
 --- Module implementing the LuaRocks "purge" command.
 -- Remove all rocks from a given tree.
---module("luarocks.purge", package.seeall)
 local purge = {}
 package.loaded["luarocks.purge"] = purge
 
diff --git a/src/luarocks/refresh_cache.lua b/src/luarocks/refresh_cache.lua
index 193e5994..cc5b9c33 100644
--- a/src/luarocks/refresh_cache.lua
+++ b/src/luarocks/refresh_cache.lua
@@ -1,6 +1,5 @@
 
 --- Module implementing the luarocks-admin "refresh_cache" command.
---module("luarocks.refresh_cache", package.seeall)
 local refresh_cache = {}
 package.loaded["luarocks.refresh_cache"] = refresh_cache
 
diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua
index 4aff3946..7a559f8f 100644
--- a/src/luarocks/remove.lua
+++ b/src/luarocks/remove.lua
@@ -1,7 +1,6 @@
 
 --- Module implementing the LuaRocks "remove" command.
 -- Uninstalls rocks.
---module("luarocks.remove", package.seeall)
 local remove = {}
 package.loaded["luarocks.remove"] = remove
 
diff --git a/src/luarocks/repos.lua b/src/luarocks/repos.lua
index b6d5825a..86126a13 100644
--- a/src/luarocks/repos.lua
+++ b/src/luarocks/repos.lua
@@ -1,6 +1,5 @@
 
 --- Functions for managing the repository on disk.
---module("luarocks.repos", package.seeall)
 local repos = {}
 package.loaded["luarocks.repos"] = repos
 
diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua
index 6c0020c0..4ec0c65e 100644
--- a/src/luarocks/search.lua
+++ b/src/luarocks/search.lua
@@ -1,7 +1,6 @@
 
 --- Module implementing the LuaRocks "search" command.
 -- Queries LuaRocks servers.
---module("luarocks.search", package.seeall)
 local search = {}
 package.loaded["luarocks.search"] = search
 
diff --git a/src/luarocks/show.lua b/src/luarocks/show.lua
index ae41a513..1dc01cc0 100644
--- a/src/luarocks/show.lua
+++ b/src/luarocks/show.lua
@@ -1,6 +1,5 @@
 --- Module implementing the LuaRocks "show" command.
 -- Shows information about an installed rock.
---module("luarocks.show", package.seeall)
 local show = {}
 package.loaded["luarocks.show"] = show
 
diff --git a/src/luarocks/tools/patch.lua b/src/luarocks/tools/patch.lua
index debaf636..44d00ef8 100644
--- a/src/luarocks/tools/patch.lua
+++ b/src/luarocks/tools/patch.lua
@@ -8,7 +8,6 @@
 --   Project home: http://code.google.com/p/python-patch/ .
 --   Version 0.1
 
---module("luarocks.tools.patch", package.seeall)
 local patch = {}
 
 local fs = require("luarocks.fs")
diff --git a/src/luarocks/tools/tar.lua b/src/luarocks/tools/tar.lua
index b2bd930a..637a6c95 100644
--- a/src/luarocks/tools/tar.lua
+++ b/src/luarocks/tools/tar.lua
@@ -1,6 +1,5 @@
 
 --- A pure-Lua implementation of untar (unpacking .tar archives)
---module("luarocks.tools.tar", package.seeall)
 local tar = {}
 
 local fs = require("luarocks.fs")
diff --git a/src/luarocks/type_check.lua b/src/luarocks/type_check.lua
index 65b4fc15..82763401 100644
--- a/src/luarocks/type_check.lua
+++ b/src/luarocks/type_check.lua
@@ -1,7 +1,6 @@
 --- Type-checking functions.
 -- Functions and definitions for doing a basic lint check on files
 -- loaded by LuaRocks.
---module("luarocks.type_check", package.seeall)
 local type_check = {}
 package.loaded["luarocks.type_check"] = type_check
 
diff --git a/src/luarocks/unpack.lua b/src/luarocks/unpack.lua
index d90f0571..4afe4547 100644
--- a/src/luarocks/unpack.lua
+++ b/src/luarocks/unpack.lua
@@ -1,7 +1,6 @@
 
 --- Module implementing the LuaRocks "unpack" command.
 -- Unpack the contents of a rock.
---module("luarocks.unpack", package.seeall)
 local unpack = {}
 package.loaded["luarocks.unpack"] = unpack
 
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index 2f419a3d..f7e9b1ae 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -4,7 +4,6 @@
 -- inside specific functions) to avoid interdependencies,
 -- as this is used in the bootstrapping stage of luarocks.cfg.
 
---module("luarocks.util", package.seeall)
 local util = {}
 
 local unpack = unpack or table.unpack
diff --git a/src/luarocks/validate.lua b/src/luarocks/validate.lua
index e6e09c33..24c6f835 100644
--- a/src/luarocks/validate.lua
+++ b/src/luarocks/validate.lua
@@ -1,6 +1,5 @@
 
 --- Sandboxed test of build/install of all packages in a repository (unfinished and disabled).
---module("luarocks.validate", package.seeall)
 local validate = {}
 package.loaded["luarocks.validate"] = validate
 
diff --git a/src/luarocks/write_rockspec.lua b/src/luarocks/write_rockspec.lua
index 213d1b01..79902bb4 100644
--- a/src/luarocks/write_rockspec.lua
+++ b/src/luarocks/write_rockspec.lua
@@ -1,5 +1,4 @@
 
---module("luarocks.write_rockspec", package.seeall)
 local write_rockspec = {}
 package.loaded["luarocks.write_rockspec"] = write_rockspec
 
-- 
cgit v1.2.3-55-g6feb


From d55041dbc477000d0aa8a1585824958b0ade66a1 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Fri, 3 Jun 2016 11:16:55 +0300
Subject: Refactor CLI to avoid double args parsing

New command module interface: instead of 'run' function
they must have 'command' function that accepts flags table
and other arguments. For compatibility a new util function
is called on all command modules: it adds 'run' function
that parses command-line args before passing them to 'command'.
---
 src/luarocks/add.lua            |  6 +++---
 src/luarocks/admin_remove.lua   |  6 +++---
 src/luarocks/build.lua          |  4 ++--
 src/luarocks/command_line.lua   | 37 ++++++-------------------------------
 src/luarocks/config_cmd.lua     |  5 ++---
 src/luarocks/doc.lua            |  4 ++--
 src/luarocks/download.lua       |  5 ++---
 src/luarocks/help.lua           |  5 ++---
 src/luarocks/install.lua        |  4 ++--
 src/luarocks/lint.lua           |  5 ++---
 src/luarocks/list.lua           |  4 ++--
 src/luarocks/make.lua           |  4 ++--
 src/luarocks/make_manifest.lua  |  5 ++---
 src/luarocks/new_version.lua    |  4 ++--
 src/luarocks/pack.lua           |  4 ++--
 src/luarocks/path_cmd.lua       |  4 ++--
 src/luarocks/purge.lua          |  5 ++---
 src/luarocks/refresh_cache.lua  |  4 ++--
 src/luarocks/remove.lua         |  5 ++---
 src/luarocks/search.lua         |  5 ++---
 src/luarocks/show.lua           |  5 +++--
 src/luarocks/unpack.lua         |  5 ++---
 src/luarocks/upload.lua         |  4 ++--
 src/luarocks/util.lua           |  7 +++++++
 src/luarocks/validate.lua       |  4 ++--
 src/luarocks/write_rockspec.lua |  5 ++---
 26 files changed, 64 insertions(+), 91 deletions(-)

diff --git a/src/luarocks/add.lua b/src/luarocks/add.lua
index bea2d861..f37d334d 100644
--- a/src/luarocks/add.lua
+++ b/src/luarocks/add.lua
@@ -12,6 +12,7 @@ local index = require("luarocks.index")
 local fs = require("luarocks.fs")
 local cache = require("luarocks.cache")
 
+util.add_run_function(add)
 add.help_summary = "Add a rock or rockspec to a rocks server."
 add.help_arguments = "[--server=<server>] [--no-refresh] {<rockspec>|<rock>...}"
 add.help = [[
@@ -107,9 +108,8 @@ local function add_files_to_server(refresh, rockfiles, server, upload_server)
    return true
 end
 
-function add.run(...)
-   local files = { util.parse_flags(...) }
-   local flags = table.remove(files, 1)
+function add.command(flags, ...)
+   local files = {...}
    if #files < 1 then
       return nil, "Argument missing. "..util.see_help("add", "luarocks-admin")
    end
diff --git a/src/luarocks/admin_remove.lua b/src/luarocks/admin_remove.lua
index 59ca4975..621f1317 100644
--- a/src/luarocks/admin_remove.lua
+++ b/src/luarocks/admin_remove.lua
@@ -12,6 +12,7 @@ local index = require("luarocks.index")
 local fs = require("luarocks.fs")
 local cache = require("luarocks.cache")
 
+util.add_run_function(admin_remove)
 admin_remove.help_summary = "Remove a rock or rockspec from a rocks server."
 admin_remove.help_arguments = "[--server=<server>] [--no-refresh] {<rockspec>|<rock>...}"
 admin_remove.help = [[
@@ -77,9 +78,8 @@ local function remove_files_from_server(refresh, rockfiles, server, upload_serve
    return true
 end
 
-function admin_remove.run(...)
-   local files = { util.parse_flags(...) }
-   local flags = table.remove(files, 1)
+function admin_remove.command(flags, ...)
+   local files = {...}
    if #files < 1 then
       return nil, "Argument missing. "..util.see_help("remove", "luarocks-admin")
    end
diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index edf4efb4..0e72ca85 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -16,6 +16,7 @@ local manif = require("luarocks.manif")
 local remove = require("luarocks.remove")
 local cfg = require("luarocks.cfg")
 
+util.add_run_function(build)
 build.help_summary = "Build/compile a rock."
 build.help_arguments = "[--pack-binary-rock] [--keep] {<rockspec>|<rock>|<name> [<version>]}"
 build.help = [[
@@ -390,8 +391,7 @@ end
 -- also be given.
 -- @return boolean or (nil, string, exitcode): True if build was successful; nil and an
 -- error message otherwise. exitcode is optionally returned.
-function build.run(...)
-   local flags, name, version = util.parse_flags(...)
+function build.command(flags, name, version)
    if type(name) ~= "string" then
       return nil, "Argument missing. "..util.see_help("build")
    end
diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua
index b3284534..1a8c0fe7 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/command_line.lua
@@ -27,20 +27,9 @@ local function die(message, exitcode)
    os.exit(exitcode or cfg.errorcodes.UNSPECIFIED)
 end
 
-local function replace_tree(flags, args, tree)
+local function replace_tree(flags, tree)
    tree = dir.normalize(tree)
    flags["tree"] = tree
-   local added = false
-   for i = 1, #args do
-      if args[i]:match("%-%-tree=") then
-         args[i] = "--tree="..tree
-         added = true
-         break
-      end
-   end
-   if not added then
-      args[#args + 1] = "--tree="..tree
-   end
    path.use_tree(tree)
 end
 
@@ -78,7 +67,6 @@ function command_line.run_command(...)
    if flags["to"] then flags["tree"] = flags["to"] end
    if flags["nodeps"] then
       flags["deps-mode"] = "none"
-      table.insert(args, "--deps-mode=none")
    end
    
    cfg.flags = flags
@@ -106,15 +94,8 @@ function command_line.run_command(...)
       os.exit(cfg.errorcodes.OK)
    elseif flags["help"] or #nonflags == 0 then
       command = "help"
-      args = nonflags
    else
-      command = nonflags[1]
-      for i, arg in ipairs(args) do
-         if arg == command then
-            table.remove(args, i)
-            break
-         end
-      end
+      command = table.remove(nonflags, 1)
    end
    command = command:gsub("-", "_")
    
@@ -137,14 +118,14 @@ function command_line.run_command(...)
             if not tree.root then
                die("Configuration error: tree '"..tree.name.."' has no 'root' field.")
             end
-            replace_tree(flags, args, tree.root)
+            replace_tree(flags, tree.root)
             named = true
             break
          end
       end
       if not named then
          local root_dir = fs.absolute_name(flags["tree"])
-         replace_tree(flags, args, root_dir)
+         replace_tree(flags, root_dir)
       end
    elseif flags["local"] then
       if not cfg.home_tree then
@@ -152,7 +133,7 @@ function command_line.run_command(...)
              "You are running as a superuser, which is intended for system-wide operation.\n"..
              "To force using the superuser's home, use --tree explicitly.")
       end
-      replace_tree(flags, args, cfg.home_tree)
+      replace_tree(flags, cfg.home_tree)
    else
       local trees = cfg.rocks_trees
       path.use_tree(trees[#trees])
@@ -195,14 +176,8 @@ function command_line.run_command(...)
    end
    
    if commands[command] then
-      -- TODO the interface of run should be modified, to receive the
-      -- flags table and the (possibly unpacked) nonflags arguments.
-      -- This would remove redundant parsing of arguments.
-      -- I'm not changing this now to avoid messing with the run()
-      -- interface, which I know some people use (even though
-      -- I never published it as a public API...)
       local cmd = require(commands[command])
-      local xp, ok, err, exitcode = xpcall(function() return cmd.run(unpack(args)) end, function(err)
+      local xp, ok, err, exitcode = xpcall(function() return cmd.command(flags, unpack(nonflags)) end, function(err)
          die(debug.traceback("LuaRocks "..cfg.program_version
             .." bug (please report at https://github.com/keplerproject/luarocks/issues).\n"
             ..err, 2), cfg.errorcodes.CRASH)
diff --git a/src/luarocks/config_cmd.lua b/src/luarocks/config_cmd.lua
index bf282a7a..fe3cc637 100644
--- a/src/luarocks/config_cmd.lua
+++ b/src/luarocks/config_cmd.lua
@@ -6,6 +6,7 @@ local cfg = require("luarocks.cfg")
 local util = require("luarocks.util")
 local dir = require("luarocks.dir")
 
+util.add_run_function(config_cmd)
 config_cmd.help_summary = "Query information about the LuaRocks configuration."
 config_cmd.help_arguments = "<flag>"
 config_cmd.help = [[
@@ -33,9 +34,7 @@ end
 
 --- Driver function for "config" command.
 -- @return boolean: True if succeeded, nil on errors.
-function config_cmd.run(...)
-   local flags = util.parse_flags(...)
-   
+function config_cmd.command(flags)
    if flags["lua-incdir"] then
       print(cfg.variables.LUA_INCDIR)
       return true
diff --git a/src/luarocks/doc.lua b/src/luarocks/doc.lua
index 62e80232..ec2b1110 100644
--- a/src/luarocks/doc.lua
+++ b/src/luarocks/doc.lua
@@ -12,6 +12,7 @@ local fetch = require("luarocks.fetch")
 local fs = require("luarocks.fs")
 local download = require("luarocks.download")
 
+util.add_run_function(doc)
 doc.help_summary = "Show documentation for an installed rock."
 
 doc.help = [[
@@ -57,8 +58,7 @@ end
 -- @param name or nil: an existing package name.
 -- @param version string or nil: a version may also be passed.
 -- @return boolean: True if succeeded, nil on errors.
-function doc.run(...)
-   local flags, name, version = util.parse_flags(...)
+function doc.command(flags, name, version)
    if not name then
       return nil, "Argument missing. "..util.see_help("doc")
    end
diff --git a/src/luarocks/download.lua b/src/luarocks/download.lua
index 181aca75..2e434b03 100644
--- a/src/luarocks/download.lua
+++ b/src/luarocks/download.lua
@@ -12,6 +12,7 @@ local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 local cfg = require("luarocks.cfg")
 
+util.add_run_function(download)
 download.help_summary = "Download a specific rock file from a rocks server."
 download.help_arguments = "[--all] [--arch=<arch> | --source | --rockspec] [<name> [<version>]]"
 
@@ -84,9 +85,7 @@ end
 -- version may also be passed.
 -- @return boolean or (nil, string): true if successful or nil followed
 -- by an error message.
-function download.run(...)
-   local flags, name, version = util.parse_flags(...)
-   
+function download.command(flags, name, version)
    assert(type(version) == "string" or not version)
    if type(name) ~= "string" and not flags["all"] then
       return nil, "Argument missing, see help."
diff --git a/src/luarocks/help.lua b/src/luarocks/help.lua
index 0f66f64b..28f97702 100644
--- a/src/luarocks/help.lua
+++ b/src/luarocks/help.lua
@@ -12,6 +12,7 @@ local dir = require("luarocks.dir")
 
 local program = util.this_program("luarocks")
 
+util.add_run_function(help)
 help.help_summary = "Help on commands. Type '"..program.." help <command>' for more."
 
 help.help_arguments = "[<command>]"
@@ -40,9 +41,7 @@ end
 -- given, help summaries for all commands are shown.
 -- @return boolean or (nil, string): true if there were no errors
 -- or nil and an error message if an invalid command was requested.
-function help.run(...)
-   local flags, command = util.parse_flags(...)
-
+function help.command(flags, command)
    if not command then
       local conf = cfg.which_config()
       print_banner()
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index f78c6a0d..d961f525 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -13,6 +13,7 @@ local manif = require("luarocks.manif")
 local remove = require("luarocks.remove")
 local cfg = require("luarocks.cfg")
 
+util.add_run_function(install)
 install.help_summary = "Install a rock."
 
 install.help_arguments = "{<rock>|<name> [<version>]}"
@@ -149,8 +150,7 @@ end
 -- may also be given.
 -- @return boolean or (nil, string, exitcode): True if installation was
 -- successful, nil and an error message otherwise. exitcode is optionally returned.
-function install.run(...)
-   local flags, name, version = util.parse_flags(...)
+function install.command(flags, name, version)
    if type(name) ~= "string" then
       return nil, "Argument missing. "..util.see_help("install")
    end
diff --git a/src/luarocks/lint.lua b/src/luarocks/lint.lua
index 81d8bab2..d5cc48d0 100644
--- a/src/luarocks/lint.lua
+++ b/src/luarocks/lint.lua
@@ -8,6 +8,7 @@ local util = require("luarocks.util")
 local download = require("luarocks.download")
 local fetch = require("luarocks.fetch")
 
+util.add_run_function(lint)
 lint.help_summary = "Check syntax of a rockspec."
 lint.help_arguments = "<rockspec>"
 lint.help = [[
@@ -17,9 +18,7 @@ It returns success or failure if the text of a rockspec is
 syntactically correct.
 ]]
 
-function lint.run(...)
-   local flags, input = util.parse_flags(...)
-   
+function lint.command(flags, input)
    if not input then
       return nil, "Argument missing. "..util.see_help("lint")
    end
diff --git a/src/luarocks/list.lua b/src/luarocks/list.lua
index 09fa9ad7..c65e058f 100644
--- a/src/luarocks/list.lua
+++ b/src/luarocks/list.lua
@@ -10,6 +10,7 @@ local cfg = require("luarocks.cfg")
 local util = require("luarocks.util")
 local path = require("luarocks.path")
 
+util.add_run_function(list)
 list.help_summary = "List currently installed rocks."
 list.help_arguments = "[--porcelain] <filter>"
 list.help = [[
@@ -69,8 +70,7 @@ end
 -- @param filter string or nil: A substring of a rock name to filter by.
 -- @param version string or nil: a version may also be passed.
 -- @return boolean: True if succeeded, nil on errors.
-function list.run(...)
-   local flags, filter, version = util.parse_flags(...)
+function list.command(flags, filter, version)
    local query = search.make_query(filter and filter:lower() or "", version)
    query.exact_name = false
    local trees = cfg.rocks_trees
diff --git a/src/luarocks/make.lua b/src/luarocks/make.lua
index 9d675884..1464def7 100644
--- a/src/luarocks/make.lua
+++ b/src/luarocks/make.lua
@@ -15,6 +15,7 @@ local pack = require("luarocks.pack")
 local remove = require("luarocks.remove")
 local deps = require("luarocks.deps")
 
+util.add_run_function(make)
 make.help_summary = "Compile package in current directory using a rockspec."
 make.help_arguments = "[--pack-binary-rock] [<rockspec>]"
 make.help = [[
@@ -50,8 +51,7 @@ To install rocks, you'll normally want to use the "install" and
 -- @param name string: A local rockspec.
 -- @return boolean or (nil, string, exitcode): True if build was successful; nil and an
 -- error message otherwise. exitcode is optionally returned.
-function make.run(...)
-   local flags, rockspec = util.parse_flags(...)
+function make.command(flags, rockspec)
    assert(type(rockspec) == "string" or not rockspec)
    
    if not rockspec then
diff --git a/src/luarocks/make_manifest.lua b/src/luarocks/make_manifest.lua
index 3d9a6bac..c39c2939 100644
--- a/src/luarocks/make_manifest.lua
+++ b/src/luarocks/make_manifest.lua
@@ -12,6 +12,7 @@ local deps = require("luarocks.deps")
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
 
+util.add_run_function(make_manifest)
 make_manifest.help_summary = "Compile a manifest file for a repository."
 
 make_manifest.help = [[
@@ -26,9 +27,7 @@ make_manifest.help = [[
 -- the default local repository configured as cfg.rocks_dir is used.
 -- @return boolean or (nil, string): True if manifest was generated,
 -- or nil and an error message.
-function make_manifest.run(...)
-   local flags, repo = util.parse_flags(...)
-
+function make_manifest.command(flags, repo)
    assert(type(repo) == "string" or not repo)
    repo = repo or cfg.rocks_dir
   
diff --git a/src/luarocks/new_version.lua b/src/luarocks/new_version.lua
index 3382b85c..bd73e308 100644
--- a/src/luarocks/new_version.lua
+++ b/src/luarocks/new_version.lua
@@ -10,6 +10,7 @@ local persist = require("luarocks.persist")
 local fs = require("luarocks.fs")
 local type_check = require("luarocks.type_check")
 
+util.add_run_function(new_version)
 new_version.help_summary = "Auto-write a rockspec for a new version of a rock."
 new_version.help_arguments = "[--tag=<tag>] [<package>|<rockspec>] [<new_version>] [<new_url>]"
 new_version.help = [[
@@ -123,8 +124,7 @@ local function update_source_section(out_rs, url, tag, old_ver, new_ver)
    return true
 end
  
-function new_version.run(...)
-   local flags, input, version, url = util.parse_flags(...)
+function new_version.command(flags, input, version, url)
    if not input then
       local err
       input, err = util.get_default_rockspec()
diff --git a/src/luarocks/pack.lua b/src/luarocks/pack.lua
index 685b84bd..277cf246 100644
--- a/src/luarocks/pack.lua
+++ b/src/luarocks/pack.lua
@@ -16,6 +16,7 @@ local dir = require("luarocks.dir")
 local manif = require("luarocks.manif")
 local search = require("luarocks.search")
 
+util.add_run_function(pack)
 pack.help_summary = "Create a rock, packing sources or binaries."
 pack.help_arguments = "{<rockspec>|<name> [<version>]}"
 pack.help = [[
@@ -191,8 +192,7 @@ end
 -- version may also be passed.
 -- @return boolean or (nil, string): true if successful or nil followed
 -- by an error message.
-function pack.run(...)
-   local flags, arg, version = util.parse_flags(...)
+function pack.command(flags, arg, version)
    assert(type(version) == "string" or not version)
    if type(arg) ~= "string" then
       return nil, "Argument missing. "..util.see_help("pack")
diff --git a/src/luarocks/path_cmd.lua b/src/luarocks/path_cmd.lua
index ecd6d4b1..15fb9ca2 100644
--- a/src/luarocks/path_cmd.lua
+++ b/src/luarocks/path_cmd.lua
@@ -7,6 +7,7 @@ local util = require("luarocks.util")
 local deps = require("luarocks.deps")
 local cfg = require("luarocks.cfg")
 
+util.add_run_function(path_cmd)
 path_cmd.help_summary = "Return the currently configured package path."
 path_cmd.help_arguments = ""
 path_cmd.help = [[
@@ -33,8 +34,7 @@ And on Windows:
 
 --- Driver function for "path" command.
 -- @return boolean This function always succeeds.
-function path_cmd.run(...)
-   local flags = util.parse_flags(...)
+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"])
diff --git a/src/luarocks/purge.lua b/src/luarocks/purge.lua
index 0be6ef21..1ce46c0f 100644
--- a/src/luarocks/purge.lua
+++ b/src/luarocks/purge.lua
@@ -14,6 +14,7 @@ local manif = require("luarocks.manif")
 local cfg = require("luarocks.cfg")
 local remove = require("luarocks.remove")
 
+util.add_run_function(purge)
 purge.help_summary = "Remove all installed rocks from a tree."
 purge.help_arguments = "--tree=<tree> [--old-versions]"
 purge.help = [[
@@ -30,9 +31,7 @@ assume a default tree.
                 overridden with the flag --force.
 ]]
 
-function purge.run(...)
-   local flags = util.parse_flags(...)
-   
+function purge.command(flags)
    local tree = flags["tree"]
 
    if type(tree) ~= "string" then
diff --git a/src/luarocks/refresh_cache.lua b/src/luarocks/refresh_cache.lua
index cc5b9c33..bbfd1f4d 100644
--- a/src/luarocks/refresh_cache.lua
+++ b/src/luarocks/refresh_cache.lua
@@ -7,6 +7,7 @@ local util = require("luarocks.util")
 local cfg = require("luarocks.cfg")
 local cache = require("luarocks.cache")
 
+util.add_run_function(refresh_cache)
 refresh_cache.help_summary = "Refresh local cache of a remote rocks server."
 refresh_cache.help_arguments = "[--from=<server>]"
 refresh_cache.help = [[
@@ -15,8 +16,7 @@ If not given, the default server set in the upload_server variable
 from the configuration file is used instead.
 ]]
 
-function refresh_cache.run(...)
-   local flags = util.parse_flags(...)
+function refresh_cache.command(flags)
    local server, upload_server = cache.get_upload_server(flags["server"])
    if not server then return nil, upload_server end
    local download_url = cache.get_server_urls(server, upload_server)
diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua
index 7a559f8f..38851d36 100644
--- a/src/luarocks/remove.lua
+++ b/src/luarocks/remove.lua
@@ -14,6 +14,7 @@ local cfg = require("luarocks.cfg")
 local manif = require("luarocks.manif")
 local fs = require("luarocks.fs")
 
+util.add_run_function(remove)
 remove.help_summary = "Uninstall a rock."
 remove.help_arguments = "[--force|--force-fast] <name> [<version>]"
 remove.help = [[
@@ -136,9 +137,7 @@ end
 -- may also be given.
 -- @return boolean or (nil, string, exitcode): True if removal was
 -- successful, nil and an error message otherwise. exitcode is optionally returned.
-function remove.run(...)
-   local flags, name, version = util.parse_flags(...)
-   
+function remove.command(flags, name, version)
    if type(name) ~= "string" then
       return nil, "Argument missing, see help."
    end
diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua
index 4ec0c65e..eaa321d5 100644
--- a/src/luarocks/search.lua
+++ b/src/luarocks/search.lua
@@ -11,6 +11,7 @@ local deps = require("luarocks.deps")
 local cfg = require("luarocks.cfg")
 local util = require("luarocks.util")
 
+util.add_run_function(search)
 search.help_summary = "Query the LuaRocks servers."
 search.help_arguments = "[--source] [--binary] { <name> [<version>] | --all }"
 search.help = [[
@@ -420,9 +421,7 @@ end
 -- @param version string or nil: a version may also be passed.
 -- @return boolean or (nil, string): True if build was successful; nil and an
 -- error message otherwise.
-function search.run(...)
-   local flags, name, version = util.parse_flags(...)
-   
+function search.command(flags, name, version)
    if flags["all"] then
       name, version = "", nil
    end
diff --git a/src/luarocks/show.lua b/src/luarocks/show.lua
index 1dc01cc0..01860e78 100644
--- a/src/luarocks/show.lua
+++ b/src/luarocks/show.lua
@@ -10,6 +10,8 @@ local path = require("luarocks.path")
 local deps = require("luarocks.deps")
 local fetch = require("luarocks.fetch")
 local manif = require("luarocks.manif")
+
+util.add_run_function(show)
 show.help_summary = "Show information about an installed rock."
 
 show.help = [[
@@ -103,8 +105,7 @@ end
 -- @param name or nil: an existing package name.
 -- @param version string or nil: a version may also be passed.
 -- @return boolean: True if succeeded, nil on errors.
-function show.run(...)
-   local flags, name, version = util.parse_flags(...)
+function show.command(flags, name, version)
    if not name then
       return nil, "Argument missing. "..util.see_help("show")
    end
diff --git a/src/luarocks/unpack.lua b/src/luarocks/unpack.lua
index 4afe4547..2face005 100644
--- a/src/luarocks/unpack.lua
+++ b/src/luarocks/unpack.lua
@@ -11,6 +11,7 @@ local build = require("luarocks.build")
 local dir = require("luarocks.dir")
 local cfg = require("luarocks.cfg")
 
+util.add_run_function(unpack)
 unpack.help_summary = "Unpack the contents of a rock."
 unpack.help_arguments = "[--force] {<rock>|<name> [<version>]}"
 unpack.help = [[
@@ -149,9 +150,7 @@ end
 -- version may also be passed.
 -- @return boolean or (nil, string): true if successful or nil followed
 -- by an error message.
-function unpack.run(...)
-   local flags, name, version = util.parse_flags(...)
-
+function unpack.command(flags, name, version)
    assert(type(version) == "string" or not version)
    if type(name) ~= "string" then
       return nil, "Argument missing. "..util.see_help("unpack")
diff --git a/src/luarocks/upload.lua b/src/luarocks/upload.lua
index 19ddee8d..3adc1704 100644
--- a/src/luarocks/upload.lua
+++ b/src/luarocks/upload.lua
@@ -7,6 +7,7 @@ local pack = require("luarocks.pack")
 local cfg = require("luarocks.cfg")
 local Api = require("luarocks.upload.api")
 
+util.add_run_function(upload)
 upload.help_summary = "Upload a rockspec to the public rocks repository."
 upload.help_arguments = "[--skip-pack] [--api-key=<key>] [--force] <rockspec>"
 upload.help = [[
@@ -20,8 +21,7 @@ upload.help = [[
                  increment the revision number instead.
 ]]
 
-function upload.run(...)
-   local flags, fname = util.parse_flags(...)
+function upload.command(flags, fname)
    if not fname then
       return nil, "Missing rockspec. "..util.see_help("upload")
    end
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index f7e9b1ae..6aff5324 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -228,6 +228,13 @@ function util.forward_flags(flags, ...)
    return unpack(out)
 end
 
+-- Adds legacy 'run' function to a command module.
+-- @param command table: command module with 'command' function,
+-- the added 'run' function calls it after parseing command-line arguments.
+function util.add_run_function(command)
+   command.run = function(...) return command.command(util.parse_flags(...)) end
+end
+
 --- Merges contents of src on top of dst's contents.
 -- @param dst Destination table, which will receive src's contents.
 -- @param src Table which provides new contents to dst.
diff --git a/src/luarocks/validate.lua b/src/luarocks/validate.lua
index 24c6f835..c4570aa4 100644
--- a/src/luarocks/validate.lua
+++ b/src/luarocks/validate.lua
@@ -11,6 +11,7 @@ local build = require("luarocks.build")
 local install = require("luarocks.install")
 local util = require("luarocks.util")
 
+util.add_run_function(validate)
 validate.help_summary = "Sandboxed test of build/install of all packages in a repository."
 
 validate.help = [[
@@ -74,8 +75,7 @@ local function validate_rock(file)
    return ok, err, errcode
 end
 
-function validate.run(...)
-   local flags, repo = util.parse_flags(...)
+function validate.command(flags, repo)
    repo = repo or cfg.rocks_dir
 
    util.printout("Verifying contents of "..repo)
diff --git a/src/luarocks/write_rockspec.lua b/src/luarocks/write_rockspec.lua
index 79902bb4..33edeb1b 100644
--- a/src/luarocks/write_rockspec.lua
+++ b/src/luarocks/write_rockspec.lua
@@ -11,6 +11,7 @@ local persist = require("luarocks.persist")
 local type_check = require("luarocks.type_check")
 local util = require("luarocks.util")
 
+util.add_run_function(write_rockspec)
 write_rockspec.help_summary = "Write a template for a rockspec file."
 write_rockspec.help_arguments = "[--output=<file> ...] [<name>] [<version>] [<url>|<path>]"
 write_rockspec.help = [[
@@ -224,9 +225,7 @@ local function rockspec_cleanup(rockspec)
    rockspec.name = nil
 end
 
-function write_rockspec.run(...)
-   local flags, name, version, url_or_dir = util.parse_flags(...)
-
+function write_rockspec.command(flags, name, version, url_or_dir)
    if not name then
       url_or_dir = "."
    elseif not version then
-- 
cgit v1.2.3-55-g6feb


From a84d179f18b51190a27f6528aa016c6746c2c6c0 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Fri, 3 Jun 2016 12:07:54 +0300
Subject: Get rid of util.forward_flags

Use 'commands' functions directly.
---
 src/luarocks/install.lua |  4 ++--
 src/luarocks/util.lua    | 32 --------------------------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index d961f525..acbf584a 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -160,7 +160,7 @@ function install.command(flags, name, version)
 
    if name:match("%.rockspec$") or name:match("%.src%.rock$") then
       local build = require("luarocks.build")
-      return build.run(name, util.forward_flags(flags, "local", "keep", "deps-mode", "only-deps", "force", "force-fast"))
+      return build.command(flags, name)
    elseif name:match("%.rock$") then
       if flags["only-deps"] then
          ok, err = install.install_binary_rock_deps(name, deps.get_deps_mode(flags))
@@ -181,7 +181,7 @@ function install.command(flags, name, version)
          return nil, err
       end
       util.printout("Installing "..url)
-      return install.run(url, util.forward_flags(flags))
+      return install.command(flags, url)
    end
 end
 
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index 6aff5324..532bea8b 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -196,38 +196,6 @@ function util.parse_flags(...)
    return flags, unpack(out)
 end
 
---- Build a sequence of flags for forwarding from one command to
--- another (for example, from "install" to "build").
--- @param flags table: A table of parsed flags
--- @param ... string...: A variable number of flags to be checked
--- in the flags table. If no flags are passed as varargs, the
--- entire flags table is forwarded.
--- @return string... A variable number of strings
-function util.forward_flags(flags, ...)
-   assert(type(flags) == "table")
-   local out = {}
-   local filter = select('#', ...)
-   local function add_flag(flagname)
-      if flags[flagname] then
-         if flags[flagname] == true then
-            table.insert(out, "--"..flagname)
-         else
-            table.insert(out, "--"..flagname.."="..flags[flagname])
-         end
-      end
-   end
-   if filter > 0 then
-      for i = 1, filter do
-         add_flag(select(i, ...))
-      end
-   else
-      for flagname, _ in pairs(flags) do
-         add_flag(flagname)
-      end
-   end
-   return unpack(out)
-end
-
 -- Adds legacy 'run' function to a command module.
 -- @param command table: command module with 'command' function,
 -- the added 'run' function calls it after parseing command-line arguments.
-- 
cgit v1.2.3-55-g6feb


From f3caf86759df85f5967b2a6258b000b097813264 Mon Sep 17 00:00:00 2001
From: Hisham <hisham@gobolinux.org>
Date: Tue, 7 Jun 2016 03:37:19 -0300
Subject: Check external_dependencies before dependencies. This allows us to
 fail quicker before installing a bunch of other rocks.

---
 src/luarocks/build.lua | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index edf4efb4..65f44a64 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -176,6 +176,14 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
       return nil, "Rockspec error: build type not specified"
    end
 
+   if not build_only_deps then
+      local ok
+      ok, err, errcode = deps.check_external_deps(rockspec, "build")
+      if err then
+         return nil, err, errcode
+      end
+   end
+
    if deps_mode == "none" then
       util.printerr("Warning: skipping dependency checks.")
    else
@@ -192,12 +200,6 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
       return name, version
    end   
 
-   local ok
-   ok, err, errcode = deps.check_external_deps(rockspec, "build")
-   if err then
-      return nil, err, errcode
-   end
-
    if repos.is_installed(name, version) then
       repos.delete_version(name, version)
    end
-- 
cgit v1.2.3-55-g6feb


From 305cc93b7194ca0bc546ebd520ab907043334647 Mon Sep 17 00:00:00 2001
From: Peter Melnichenko <mpeterval@gmail.com>
Date: Thu, 9 Jun 2016 18:19:42 +0300
Subject: Use utils.see_help() consistently for all commands

---
 src/luarocks/download.lua | 2 +-
 src/luarocks/remove.lua   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/luarocks/download.lua b/src/luarocks/download.lua
index 181aca75..47aa6d8d 100644
--- a/src/luarocks/download.lua
+++ b/src/luarocks/download.lua
@@ -89,7 +89,7 @@ function download.run(...)
    
    assert(type(version) == "string" or not version)
    if type(name) ~= "string" and not flags["all"] then
-      return nil, "Argument missing, see help."
+      return nil, "Argument missing. "..util.see_help("download")
    end
    if not name then name, version = "", "" end
 
diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua
index 7a559f8f..df3a49eb 100644
--- a/src/luarocks/remove.lua
+++ b/src/luarocks/remove.lua
@@ -140,7 +140,7 @@ function remove.run(...)
    local flags, name, version = util.parse_flags(...)
    
    if type(name) ~= "string" then
-      return nil, "Argument missing, see help."
+      return nil, "Argument missing. "..util.see_help("remove")
    end
    
    local deps_mode = flags["deps-mode"] or cfg.deps_mode
-- 
cgit v1.2.3-55-g6feb