34 files changed, 228 insertions, 74 deletions

diff --git a/src/luarocks/add.lua b/src/luarocks/add.lua
index f37d334d..66f7504f 100644
--- a/src/luarocks/add.lua
+++ b/src/luarocks/add.lua
@@ -12,7 +12,6 @@ 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 = [[
diff --git a/src/luarocks/admin_remove.lua b/src/luarocks/admin_remove.lua
index 621f1317..be1e7cbc 100644
--- a/src/luarocks/admin_remove.lua
+++ b/src/luarocks/admin_remove.lua
@@ -12,7 +12,6 @@ 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 = [[
diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index f87b2f1b..2d29e23f 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -16,7 +16,6 @@ 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 = [[
@@ -151,6 +150,31 @@ local function install_default_docs(name, version)
    end
 end
 
+local function check_macosx_deployment_target(rockspec)
+   local target = rockspec.build.macosx_deployment_target
+   local function minor(version) 
+      return tonumber(version and version:match("^[^.]+%.([^.]+)"))
+   end
+   local function patch_variable(var, target)
+      if rockspec.variables[var]:match("MACOSX_DEPLOYMENT_TARGET") then
+         rockspec.variables[var] = (rockspec.variables[var]):gsub("MACOSX_DEPLOYMENT_TARGET=[^ ]*", "MACOSX_DEPLOYMENT_TARGET="..target)
+      else
+         rockspec.variables[var] = "env MACOSX_DEPLOYMENT_TARGET="..target.." "..rockspec.variables[var]
+      end
+   end
+   if cfg.platforms.macosx and deps.format_is_at_least(rockspec, "3.0") and target then
+      local version = util.popen_read("sw_vers -productVersion")
+      local versionminor = minor(version)
+      local targetminor = minor(target)
+      if targetminor > versionminor then
+         return nil, ("This rock requires Mac OSX 10.%d, and you are running 10.%d."):format(targetminor, versionminor)
+      end
+      patch_variable("CC", target)
+      patch_variable("LD", target)
+   end
+   return true
+end
+
 --- Build and install a rock given a rockspec.
 -- @param rockspec_file string: local or remote filename of a rockspec.
 -- @param need_to_fetch boolean: true if sources need to be fetched,
@@ -248,6 +272,11 @@ function build.build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_m
       end
    end
    
+   ok, err = check_macosx_deployment_target(rockspec)
+   if not ok then
+      return nil, err
+   end
+   
    if build_spec.type ~= "none" then
 
       -- Temporary compatibility
diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
index b6f53271..81fa8b13 100644
--- a/src/luarocks/build/builtin.lua
+++ b/src/luarocks/build/builtin.lua
@@ -49,7 +49,7 @@ end
 -- nil and an error message otherwise.
 function builtin.run(rockspec)
    assert(type(rockspec) == "table")
-   local compile_object, compile_library, compile_wrapper_binary --TODO EXEWRAPPER
+   local compile_object, compile_library, compile_static_library, compile_wrapper_binary --TODO EXEWRAPPER
 
    local build = rockspec.build
    local variables = rockspec.variables
@@ -82,6 +82,13 @@ function builtin.run(rockspec)
          local ok = execute(variables.LD.." "..variables.LIBFLAG, "-o", library, unpack(extras))
          return ok
       end
+      compile_static_library = function(library, objects, libraries, libdirs, name)
+         local ok = execute(variables.AR, "rc", library, unpack(objects))
+         if ok then
+            ok = execute(variables.RANLIB, library)
+         end
+         return ok
+      end
       compile_wrapper_binary = function(fullname, name)
          --TODO EXEWRAPPER
          local fullbasename = fullname:gsub("%.lua$", ""):gsub("/", "\\")
@@ -128,6 +135,10 @@ function builtin.run(rockspec)
          end
          return ok
       end
+      compile_static_library = function(library, objects, libraries, libdirs, name)
+         local ok = execute(variables.AR, "-out:"..library, unpack(objects))
+         return ok
+      end
       compile_wrapper_binary = function(fullname, name)
          --TODO EXEWRAPPER
          local fullbasename = fullname:gsub("%.lua$", ""):gsub("/", "\\")
@@ -169,6 +180,13 @@ function builtin.run(rockspec)
          end
          return execute(variables.LD.." "..variables.LIBFLAG, "-o", library, "-L"..variables.LUA_LIBDIR, unpack(extras))
       end
+      compile_static_library = function(library, objects, libraries, libdirs, name)
+         local ok = execute(variables.AR, "rc", library, unpack(objects))
+         if ok then
+            ok = execute(variables.RANLIB, library)
+         end
+         return ok
+      end
       compile_wrapper_binary = function(_, name) return true, name end
       --TODO EXEWRAPPER
    end
@@ -247,6 +265,15 @@ function builtin.run(rockspec)
          if not ok then
             return nil, "Failed compiling module "..module_name
          end
+         module_name = name:match("([^.]*)$").."."..util.matchquote(cfg.static_lib_extension)
+         if moddir ~= "" then
+            module_name = dir.path(moddir, module_name)
+         end
+         lib_modules[module_name] = dir.path(libdir, module_name)
+         ok = compile_static_library(module_name, objects, info.libraries, info.libdirs, name)
+         if not ok then
+            return nil, "Failed compiling static library "..module_name
+         end
       end
    end
    for _, mods in ipairs({{ tbl = lua_modules, perms = cfg.perm_read }, { tbl = lib_modules, perms = cfg.perm_exec }}) do
diff --git a/src/luarocks/build/cmake.lua b/src/luarocks/build/cmake.lua
index da5a31f1..c2712bb2 100644
--- a/src/luarocks/build/cmake.lua
+++ b/src/luarocks/build/cmake.lua
@@ -5,6 +5,7 @@ local cmake = {}
 local fs = require("luarocks.fs")
 local util = require("luarocks.util")
 local cfg = require("luarocks.cfg")
+local deps = require("luarocks.deps")
 
 --- Driver function for the "cmake" build back-end.
 -- @param rockspec table: the loaded rockspec.
@@ -52,13 +53,26 @@ function cmake.run(rockspec)
       return nil, "Failed cmake."
    end
 
-   if not fs.execute_string(rockspec.variables.CMAKE.." --build build.luarocks --config Release") then
-      return nil, "Failed building."
+   local do_build, do_install
+   if deps.format_is_at_least(rockspec, "3.0") then
+      do_build   = (build.build_pass   == nil) and true or build.build_pass
+      do_install = (build.install_pass == nil) and true or build.install_pass
+   else
+      do_build = true
+      do_install = true
    end
 
-   if not fs.execute_string(rockspec.variables.CMAKE.." --build build.luarocks --target install --config Release") then
-      return nil, "Failed installing."
+   if do_build then
+      if not fs.execute_string(rockspec.variables.CMAKE.." --build build.luarocks --config Release") then
+         return nil, "Failed building."
+      end
    end
+   if do_install then
+      if not fs.execute_string(rockspec.variables.CMAKE.." --build build.luarocks --target install --config Release") then
+         return nil, "Failed installing."
+      end
+   end
+   
    return true
 end
 
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 9b1c5902..53387276 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -76,8 +76,8 @@ end
 -- so that this detection does not run every time. When it is
 -- performed, we use the Unix way to identify the system,
 -- even on Windows (assuming UnxUtils or Cygwin).
-local system = site_config.LUAROCKS_UNAME_S or io.popen("uname -s"):read("*l")
-local proc = site_config.LUAROCKS_UNAME_M or io.popen("uname -m"):read("*l")
+local system = site_config.LUAROCKS_UNAME_S or util.popen_read("uname -s")
+local proc = site_config.LUAROCKS_UNAME_M or util.popen_read("uname -m")
 if proc:match("i[%d]86") then
    cfg.target_cpu = "x86"
 elseif proc:match("amd64") or proc:match("x86_64") then
@@ -343,6 +343,8 @@ local defaults = {
       MAKE = "make",
       CC = "cc",
       LD = "ld",
+      AR = "ar",
+      RANLIB = "ranlib",
 
       CVS = "cvs",
       GIT = "git",
@@ -398,7 +400,8 @@ local defaults = {
       include = "include"
    },
 
-   rocks_provided = {}
+   rocks_provided = {},
+   rocks_provided_3_0 = {},
 }
 
 if cfg.platforms.windows then
@@ -410,6 +413,7 @@ if cfg.platforms.windows then
    defaults.arch = "win32-"..cfg.target_cpu 
    defaults.lib_extension = "dll"
    defaults.external_lib_extension = "dll"
+   defaults.static_lib_extension = "lib"
    defaults.obj_extension = "obj"
    defaults.external_deps_dirs = { "c:/external/" }
    defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR and site_config.LUA_BINDIR:gsub("\\", "/") or "c:/lua"..cfg.lua_version.."/bin"
@@ -423,6 +427,7 @@ if cfg.platforms.windows then
    defaults.variables.WRAPPER = full_prefix.."\\rclauncher.c"
    defaults.variables.LD = "link"
    defaults.variables.MT = "mt"
+   defaults.variables.AR = "lib"
    defaults.variables.LUALIB = "lua"..cfg.lua_version..".lib"
    defaults.variables.CFLAGS = "/nologo /MD /O2"
    defaults.variables.LIBFLAG = "/nologo /dll"
@@ -462,11 +467,14 @@ end
 
 if cfg.platforms.mingw32 then
    defaults.obj_extension = "o"
+   defaults.static_lib_extension = "a"
    defaults.cmake_generator = "MinGW Makefiles"
    defaults.variables.MAKE = "mingw32-make"
    defaults.variables.CC = "mingw32-gcc"
    defaults.variables.RC = "windres"
    defaults.variables.LD = "mingw32-gcc"
+   defaults.variables.AR = "ar"
+   defaults.variables.RANLIB = "ranlib"
    defaults.variables.CFLAGS = "-O2"
    defaults.variables.LIBFLAG = "-shared"
    defaults.external_deps_patterns = {
@@ -486,6 +494,7 @@ end
 
 if cfg.platforms.unix then
    defaults.lib_extension = "so"
+   defaults.static_lib_extension = "a"
    defaults.external_lib_extension = "so"
    defaults.obj_extension = "o"
    defaults.external_deps_dirs = { "/usr/local", "/usr" }
@@ -558,7 +567,7 @@ if cfg.platforms.macosx then
    defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load"
    defaults.variables.STAT = "/usr/bin/stat"
    defaults.variables.STATFLAG = "-f '%A'"
-   local version = io.popen("sw_vers -productVersion"):read("*l")
+   local version = util.popen_read("sw_vers -productVersion")
    version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3
    if version >= 10 then
       version = 8
@@ -617,8 +626,8 @@ end
 if package.loaded.jit then
    -- LuaJIT
    local lj_version = package.loaded.jit.version:match("LuaJIT (.*)"):gsub("%-","")
-   --defaults.rocks_provided["luajit"] = lj_version.."-1"
    defaults.rocks_provided["luabitop"] = lj_version.."-1"
+   defaults.rocks_provided_3_0["luajit"] = lj_version.."-1"
 end
 
 -- Use defaults:
@@ -635,6 +644,7 @@ for _, entry in ipairs({"variables", "rocks_provided"}) do
       end
    end
 end
+setmetatable(defaults.rocks_provided_3_0, { __index = cfg.rocks_provided })
 
 -- For values not set in the config file, use values from the 'defaults' table.
 local cfg_mt = {
diff --git a/src/luarocks/config_cmd.lua b/src/luarocks/config_cmd.lua
index fe3cc637..9e73d228 100644
--- a/src/luarocks/config_cmd.lua
+++ b/src/luarocks/config_cmd.lua
@@ -6,7 +6,6 @@ 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 = [[
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index f8deff3c..0d85d33e 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -158,6 +158,15 @@ function deps.compare_versions(a, b)
    return deps.parse_version(a) > deps.parse_version(b)
 end
 
+--- Check if rockspec format version satisfies version requirement.
+-- @param rockspec table: The rockspec table.
+-- @param version string: required version.
+-- @return boolean: true if rockspec format matches version or is newer, false otherwise.
+function deps.format_is_at_least(rockspec, version)
+   local rockspec_format = rockspec.rockspec_format or "1.0"
+   return deps.parse_version(rockspec_format) >= deps.parse_version(version)
+end
+
 --- Consumes a constraint from a string, converting it to table format.
 -- For example, a string ">= 1.0, > 2.0" is converted to a table in the
 -- format {op = ">=", version={1,0}} and the rest, "> 2.0", is returned
@@ -321,15 +330,19 @@ 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'.
+-- @param provided table: A table of auto-dependencies provided 
+-- by this Lua implementation for 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)
+local function match_dep(dep, blacklist, deps_mode, rocks_provided)
    assert(type(dep) == "table")
-
+   assert(type(rocks_provided) == "table")
+  
    local versions
-   if cfg.rocks_provided[dep.name] then
-      -- provided rocks have higher priority than manifest's rocks
-      versions = { cfg.rocks_provided[dep.name] }
+   local provided = rocks_provided[dep.name]
+   if provided then
+      -- Provided rocks have higher priority than manifest's rocks.
+      versions = { provided }
    else
       versions = manif_core.get_versions(dep.name, deps_mode)
    end
@@ -366,9 +379,9 @@ function deps.match_deps(rockspec, blacklist, deps_mode)
    local matched, missing, no_upgrade = {}, {}, {}
    
    for _, dep in ipairs(rockspec.dependencies) do
-      local found = match_dep(dep, blacklist and blacklist[dep.name] or nil, deps_mode)
+      local found = match_dep(dep, blacklist and blacklist[dep.name] or nil, deps_mode, rockspec.rocks_provided)
       if found then
-         if not cfg.rocks_provided[dep.name] then
+         if not rockspec.rocks_provided[dep.name] then
             matched[dep] = {name = dep.name, version = found}
          end
       else
@@ -393,10 +406,10 @@ local function values_set(tbl)
    return set
 end
 
-local function rock_status(name, deps_mode)
+local function rock_status(name, deps_mode, rocks_provided)
    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"
+   local installed = match_dep(search.make_query(name), nil, deps_mode, rocks_provided)
+   local installation_type = rocks_provided[name] and "provided by VM" or "installed"
    return installed and installed.." "..installation_type or "not installed"
 end
 
@@ -442,27 +455,27 @@ 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 not match_dep(dep, nil, deps_mode, rockspec.rocks_provided) 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)))
+         util.printout(("   %s (%s)"):format(deps.show_dep(dep), rock_status(dep.name, deps_mode, rockspec.rocks_provided)))
       end
    end
 
    first_missing_dep = true
 
    for _, dep in ipairs(rockspec.dependencies) do
-      if not match_dep(dep, nil, deps_mode) then
+      if not match_dep(dep, nil, deps_mode, rockspec.rocks_provided) then
          if first_missing_dep then
             util.printout()
             first_missing_dep = false
          end
 
          util.printout(("%s %s depends on %s (%s)"):format(
-            rockspec.name, rockspec.version, deps.show_dep(dep), rock_status(dep.name, deps_mode)))
+            rockspec.name, rockspec.version, deps.show_dep(dep), rock_status(dep.name, deps_mode, rockspec.rocks_provided)))
 
          if dep.constraints[1] and dep.constraints[1].no_upgrade then
             util.printerr("This version of "..rockspec.name.." is designed for use with")
@@ -709,7 +722,10 @@ function deps.scan_deps(results, missing, manifest, name, version, deps_mode)
       end
       dependencies_name[version] = rockspec.dependencies
    else
-      rockspec = { dependencies = deplist }
+      rockspec = {
+         dependencies = deplist,
+         rocks_provided = setmetatable({}, { __index = cfg.rocks_provided_3_0 })
+      }
    end
    local matched, failures = deps.match_deps(rockspec, nil, deps_mode)
    results[name] = results
@@ -744,8 +760,4 @@ function deps.get_deps_mode(flags)
    end
 end
 
-function deps.deps_mode_to_flag(deps_mode)
-   return "--deps-mode="..deps_mode
-end
-
 return deps
diff --git a/src/luarocks/doc.lua b/src/luarocks/doc.lua
index ec2b1110..758fd9c5 100644
--- a/src/luarocks/doc.lua
+++ b/src/luarocks/doc.lua
@@ -12,7 +12,6 @@ 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 = [[
diff --git a/src/luarocks/download.lua b/src/luarocks/download.lua
index 18573ae4..d793cab7 100644
--- a/src/luarocks/download.lua
+++ b/src/luarocks/download.lua
@@ -12,7 +12,6 @@ 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>]]"
 
diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua
index 824a3731..2590afd4 100644
--- a/src/luarocks/fetch.lua
+++ b/src/luarocks/fetch.lua
@@ -244,10 +244,19 @@ function fetch.load_local_rockspec(filename, quick)
    rockspec.local_filename = filename
    local filebase = rockspec.source.file or rockspec.source.url
    local base = fetch.url_to_base_dir(filebase)
+   rockspec.source.dir_set = rockspec.source.dir ~= nil
    rockspec.source.dir = rockspec.source.dir
                       or rockspec.source.module
-                      or ((filebase:match("%.lua$") or filebase:match("%.c$")) and ".")
+                      or ( (filebase:match("%.lua$") or filebase:match("%.c$"))
+                           and (deps.format_is_at_least(rockspec, "3.0")
+                                and (fetch.is_basic_protocol(protocol) and "." or base)
+                                or  ".") )
                       or base
+
+   rockspec.rocks_provided = (deps.format_is_at_least(rockspec, "3.0")
+                              and cfg.rocks_provided_3_0
+                              or  cfg.rocks_provided)
+
    if rockspec.dependencies then
       for i = 1, #rockspec.dependencies do
          local parsed, err = deps.parse_dep(rockspec.dependencies[i])
@@ -347,7 +356,29 @@ function fetch.get_sources(rockspec, extract, dest_dir)
       ok, err = fs.unpack_archive(rockspec.source.file)
       if not ok then return nil, err end
       if not fs.exists(rockspec.source.dir) then
-         return nil, "Directory "..rockspec.source.dir.." not found inside archive "..rockspec.source.file, "source.dir", source_file, store_dir
+
+         -- If rockspec.source.dir can't be found, see if we only have one
+         -- directory in store_dir.  If that's the case, assume it's what
+         -- we're looking for.
+         -- We only do this if the rockspec source.dir was not set, and only
+         -- with rockspecs newer than 3.0.
+         local dir_count, found_dir = 0
+
+         if not rockspec.source.dir_set and deps.format_is_at_least(rockspec, "3.0") then
+            local files = fs.list_dir()
+            for _, f in ipairs(files) do
+               if fs.is_dir(f) then
+                  dir_count = dir_count + 1
+                  found_dir = f
+               end
+            end
+         end
+
+         if dir_count == 1 then
+            rockspec.source.dir = found_dir
+         else
+            return nil, "Directory "..rockspec.source.dir.." not found inside archive "..rockspec.source.file, "source.dir", source_file, store_dir
+         end
       end
       fs.pop_dir()
    end
diff --git a/src/luarocks/fetch/git.lua b/src/luarocks/fetch/git.lua
index f61d89e9..eaba7ffd 100644
--- a/src/luarocks/fetch/git.lua
+++ b/src/luarocks/fetch/git.lua
@@ -6,20 +6,48 @@ local unpack = unpack or table.unpack
 
 local fs = require("luarocks.fs")
 local dir = require("luarocks.dir")
+local deps = require("luarocks.deps")
 local util = require("luarocks.util")
 
+local cached_git_version
+
+--- Get git version.
+-- @param git_cmd string: name of git command.
+-- @return table: git version as returned by luarocks.deps.parse_version.
+local function git_version(git_cmd)
+   if not cached_git_version then
+      local version_line = io.popen(fs.Q(git_cmd)..' --version'):read()
+      local version_string = version_line:match('%d-%.%d+%.?%d*')
+      cached_git_version = deps.parse_version(version_string)
+   end
+
+   return cached_git_version
+end
+
+--- Check if git satisfies version requirement.
+-- @param git_cmd string: name of git command.
+-- @param version string: required version.
+-- @return boolean: true if git matches version or is newer, false otherwise.
+local function git_is_at_least(git_cmd, version)
+   return git_version(git_cmd) >= deps.parse_version(version)
+end
+
 --- Git >= 1.7.10 can clone a branch **or tag**, < 1.7.10 by branch only. We
 -- need to know this in order to build the appropriate command; if we can't
 -- clone by tag then we'll have to issue a subsequent command to check out the
 -- given tag.
+-- @param git_cmd string: name of git command.
 -- @return boolean: Whether Git can clone by tag.
 local function git_can_clone_by_tag(git_cmd)
-   local version_string = io.popen(fs.Q(git_cmd)..' --version'):read()
-   local major, minor, tiny = version_string:match('(%d-)%.(%d+)%.?(%d*)')
-   major, minor, tiny = tonumber(major), tonumber(minor), tonumber(tiny) or 0
-   local value = major > 1 or (major == 1 and (minor > 7 or (minor == 7 and tiny >= 10)))
-   git_can_clone_by_tag = function() return value end
-   return value
+   return git_is_at_least(git_cmd, "1.7.10")
+end
+
+--- Git >= 1.8.4 can fetch submodules shallowly, saving bandwidth and time for
+-- submodules with large history.
+-- @param git_cmd string: name of git command.
+-- @return boolean: Whether Git can fetch submodules shallowly.
+local function git_supports_shallow_submodules(git_cmd)
+   return git_is_at_least(git_cmd, "1.8.4")
 end
 
 --- Download sources for building a rock, using git.
@@ -76,12 +104,25 @@ function git.get_sources(rockspec, extract, dest_dir, depth)
    ok, err = fs.change_dir(module)
    if not ok then return nil, err end
    if tag_or_branch and not git_can_clone_by_tag() then
-      local checkout_command = {fs.Q(git_cmd), "checkout", tag_or_branch}
-      if not fs.execute(unpack(checkout_command)) then
+      if not fs.execute(fs.Q(git_cmd), "checkout", tag_or_branch) then
          return nil, 'Failed to check out the "' .. tag_or_branch ..'" tag or branch.'
       end
    end
 
+   -- Fetching git submodules is supported only when rockspec format is >= 3.0.
+   if deps.format_is_at_least(rockspec, "3.0") then
+      command = {fs.Q(git_cmd), "submodule", "update", "--init", "--recursive"}
+
+      if git_supports_shallow_submodules(git_cmd) then
+         -- Fetch only the last commit of each submodule.
+         table.insert(command, 5, "--depth=1")
+      end
+
+      if not fs.execute(unpack(command)) then
+         return nil, 'Failed to fetch submodules.'
+      end
+   end
+
    fs.delete(dir.path(store_dir, module, ".git"))
    fs.delete(dir.path(store_dir, module, ".gitignore"))
    fs.pop_dir()
diff --git a/src/luarocks/help.lua b/src/luarocks/help.lua
index 28f97702..5bac77ce 100644
--- a/src/luarocks/help.lua
+++ b/src/luarocks/help.lua
@@ -12,7 +12,6 @@ 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>]"
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index acbf584a..10d57f37 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -13,7 +13,6 @@ 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>]}"
diff --git a/src/luarocks/lint.lua b/src/luarocks/lint.lua
index d5cc48d0..4c30804b 100644
--- a/src/luarocks/lint.lua
+++ b/src/luarocks/lint.lua
@@ -8,7 +8,6 @@ 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 = [[
diff --git a/src/luarocks/list.lua b/src/luarocks/list.lua
index c65e058f..8c9c5107 100644
--- a/src/luarocks/list.lua
+++ b/src/luarocks/list.lua
@@ -10,7 +10,6 @@ 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 = [[
diff --git a/src/luarocks/make.lua b/src/luarocks/make.lua
index 1464def7..476150eb 100644
--- a/src/luarocks/make.lua
+++ b/src/luarocks/make.lua
@@ -15,7 +15,6 @@ 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 = [[
diff --git a/src/luarocks/make_manifest.lua b/src/luarocks/make_manifest.lua
index c39c2939..b89ba47f 100644
--- a/src/luarocks/make_manifest.lua
+++ b/src/luarocks/make_manifest.lua
@@ -12,7 +12,6 @@ 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 = [[
diff --git a/src/luarocks/new_version.lua b/src/luarocks/new_version.lua
index bd73e308..eb5dea25 100644
--- a/src/luarocks/new_version.lua
+++ b/src/luarocks/new_version.lua
@@ -10,7 +10,6 @@ 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 = [[
diff --git a/src/luarocks/pack.lua b/src/luarocks/pack.lua
index 277cf246..3a163e92 100644
--- a/src/luarocks/pack.lua
+++ b/src/luarocks/pack.lua
@@ -16,7 +16,6 @@ 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 = [[
diff --git a/src/luarocks/path.lua b/src/luarocks/path.lua
index dafc64e7..6219d8c6 100644
--- a/src/luarocks/path.lua
+++ b/src/luarocks/path.lua
@@ -250,6 +250,11 @@ function path.path_to_module(file)
       name = file:match("(.*)%."..cfg.lib_extension.."$")
       if name then
          name = name:gsub(dir.separator, ".")
+      else
+         name = file:match("(.*)%."..cfg.static_lib_extension.."$")
+         if name then
+            name = name:gsub(dir.separator, ".")
+         end
       end
    end
    if not name then name = file end
diff --git a/src/luarocks/path_cmd.lua b/src/luarocks/path_cmd.lua
index 15fb9ca2..c0329977 100644
--- a/src/luarocks/path_cmd.lua
+++ b/src/luarocks/path_cmd.lua
@@ -7,7 +7,6 @@ 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 = [[
diff --git a/src/luarocks/purge.lua b/src/luarocks/purge.lua
index 1ce46c0f..18043cc3 100644
--- a/src/luarocks/purge.lua
+++ b/src/luarocks/purge.lua
@@ -14,7 +14,6 @@ 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 = [[
diff --git a/src/luarocks/refresh_cache.lua b/src/luarocks/refresh_cache.lua
index bbfd1f4d..1261044f 100644
--- a/src/luarocks/refresh_cache.lua
+++ b/src/luarocks/refresh_cache.lua
@@ -3,11 +3,9 @@
 local refresh_cache = {}
 package.loaded["luarocks.refresh_cache"] = refresh_cache
 
-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 = [[
diff --git a/src/luarocks/remove.lua b/src/luarocks/remove.lua
index d72fabaf..3f62e89e 100644
--- a/src/luarocks/remove.lua
+++ b/src/luarocks/remove.lua
@@ -14,7 +14,6 @@ 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 = [[
diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua
index eaa321d5..c3f00a7c 100644
--- a/src/luarocks/search.lua
+++ b/src/luarocks/search.lua
@@ -11,7 +11,6 @@ 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 = [[
diff --git a/src/luarocks/show.lua b/src/luarocks/show.lua
index 01860e78..df992f5c 100644
--- a/src/luarocks/show.lua
+++ b/src/luarocks/show.lua
@@ -11,7 +11,6 @@ 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 = [[
diff --git a/src/luarocks/tools/tar.lua b/src/luarocks/tools/tar.lua
index 637a6c95..ae5c83e2 100644
--- a/src/luarocks/tools/tar.lua
+++ b/src/luarocks/tools/tar.lua
@@ -56,10 +56,11 @@ end
 local function read_header_block(block)
    local header = {}
    header.name = nullterm(block:sub(1,100))
-   header.mode = nullterm(block:sub(101,108))
+   header.mode = nullterm(block:sub(101,108)):gsub(" ", "")
    header.uid = octal_to_number(nullterm(block:sub(109,116)))
    header.gid = octal_to_number(nullterm(block:sub(117,124)))
    header.size = octal_to_number(nullterm(block:sub(125,136)))
+print("{"..block:sub(125,136).."}", "{"..nullterm(block:sub(125,136)).."}", "{"..octal_to_number(nullterm(block:sub(125,136))).."}", header.size)
    header.mtime = octal_to_number(nullterm(block:sub(137,148)))
    header.chksum = octal_to_number(nullterm(block:sub(149,156)))
    header.typeflag = get_typeflag(block:sub(157,157))
@@ -93,13 +94,14 @@ function tar.untar(filename, destdir)
    local long_name, long_link_name
    while true do
       local block
-      repeat 
+      repeat
          block = tar_handle:read(blocksize)
       until (not block) or checksum_header(block) > 256
       if not block then break end
       local header, err = read_header_block(block)
       if not header then
          util.printerr(err)
+         return nil, err
       end
 
       local file_data = tar_handle:read(math.ceil(header.size / blocksize) * blocksize):sub(1,header.size)
diff --git a/src/luarocks/type_check.lua b/src/luarocks/type_check.lua
index 82763401..287d8151 100644
--- a/src/luarocks/type_check.lua
+++ b/src/luarocks/type_check.lua
@@ -7,7 +7,7 @@ package.loaded["luarocks.type_check"] = type_check
 local cfg = require("luarocks.cfg")
 local deps = require("luarocks.deps")
 
-type_check.rockspec_format = "1.1"
+type_check.rockspec_format = "3.0"
 
 local string_1 = { _type = "string" }
 local number_1 = { _type = "number" }
diff --git a/src/luarocks/unpack.lua b/src/luarocks/unpack.lua
index 2face005..4e4d9a06 100644
--- a/src/luarocks/unpack.lua
+++ b/src/luarocks/unpack.lua
@@ -11,7 +11,6 @@ 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 = [[
diff --git a/src/luarocks/upload.lua b/src/luarocks/upload.lua
index 3adc1704..5031b1ef 100644
--- a/src/luarocks/upload.lua
+++ b/src/luarocks/upload.lua
@@ -7,7 +7,6 @@ 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 = [[
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index 532bea8b..d27710c1 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -8,6 +8,20 @@ local util = {}
 
 local unpack = unpack or table.unpack
 
+--- Run a process and read a its output.
+-- Equivalent to io.popen(cmd):read("*l"), except that it 
+-- closes the fd right away.
+-- @param cmd string: The command to execute
+-- @param spec string: "*l" by default, to read a single line.
+-- May be used to read more, passing, for instance, "*a".
+-- @return string: the output of the program.
+function util.popen_read(cmd, spec)
+   local fd = io.popen(cmd)
+   local out = fd:read(spec or "*l")
+   fd:close()
+   return out
+end
+
 local scheduled_functions = {}
 local debug = require("debug")
 
@@ -196,13 +210,6 @@ function util.parse_flags(...)
    return flags, 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 c4570aa4..f0452bbd 100644
--- a/src/luarocks/validate.lua
+++ b/src/luarocks/validate.lua
@@ -11,7 +11,6 @@ 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 = [[
diff --git a/src/luarocks/write_rockspec.lua b/src/luarocks/write_rockspec.lua
index 33edeb1b..68c00cce 100644
--- a/src/luarocks/write_rockspec.lua
+++ b/src/luarocks/write_rockspec.lua
@@ -11,7 +11,6 @@ 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 = [[