11 files changed, 213 insertions, 39 deletions

diff --git a/.travis.yml b/.travis.yml
index 69ec28f3..f946bb99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,5 +9,6 @@ env:
     - LUA_VER=5.1.5
     - LUA_VER=5.2.4
     - LUA_VER=5.3.1
+    - LUA_VER=jit-2.0.4
 
 script: cd test && ./testing.sh --travis --lua $LUA_VER
diff --git a/src/luarocks/build/cmake.lua b/src/luarocks/build/cmake.lua
index 7b16fa51..34f6ada0 100644
--- a/src/luarocks/build/cmake.lua
+++ b/src/luarocks/build/cmake.lua
@@ -6,6 +6,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.
@@ -53,13 +54,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 e3d6e74b..4fb1b23b 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -387,7 +387,8 @@ local defaults = {
       include = "include"
    },
 
-   rocks_provided = {}
+   rocks_provided = {},
+   rocks_provided_3_0 = {},
 }
 
 if cfg.platforms.windows then
@@ -591,8 +592,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:
@@ -609,6 +610,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/deps.lua b/src/luarocks/deps.lua
index 0e3265b5..3f7eb4d2 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -159,6 +159,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
@@ -318,16 +327,20 @@ 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 table or nil: A table containing fields 'name' and 'version'
 -- representing an installed rock which matches the given 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")
-
-   local versions = cfg.rocks_provided[dep.name]
-   if cfg.rocks_provided[dep.name] then
+   assert(type(rocks_provided) == "table")
+  
+   local versions
+   local provided = rocks_provided[dep.name]
+   if provided then
       -- provided rocks have higher priority than manifest's rocks
-      versions = { cfg.rocks_provided[dep.name] }
+      versions = { provided }
    else
       versions = manif_core.get_versions(dep.name, deps_mode)
    end
@@ -379,9 +392,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] = found
          end
       else
@@ -479,7 +492,7 @@ function deps.fulfill_dependencies(rockspec, deps_mode)
 
       for _, dep in pairs(missing) do
          -- Double-check in case dependency was filled during recursion.
-         if not match_dep(dep, nil, deps_mode) then
+         if not match_dep(dep, nil, deps_mode, rockspec.rocks_provided) then
             local rock = search.find_suitable_rock(dep)
             if not rock then
                return nil, "Could not satisfy dependency: "..deps.show_dep(dep)
@@ -699,7 +712,7 @@ 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 = {} }
    end
    local matched, failures = deps.match_deps(rockspec, nil, deps_mode)
    results[name] = results
diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua
index e92aeddf..e1cad11b 100644
--- a/src/luarocks/fetch.lua
+++ b/src/luarocks/fetch.lua
@@ -247,8 +247,16 @@ function fetch.load_local_rockspec(filename, quick)
    local base = fetch.url_to_base_dir(filebase)
    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])
diff --git a/src/luarocks/fetch/git.lua b/src/luarocks/fetch/git.lua
index a635f190..aa735b3f 100644
--- a/src/luarocks/fetch/git.lua
+++ b/src/luarocks/fetch/git.lua
@@ -7,20 +7,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.
@@ -77,12 +105,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/tools/tar.lua b/src/luarocks/tools/tar.lua
index b2bd930a..cedcceee 100644
--- a/src/luarocks/tools/tar.lua
+++ b/src/luarocks/tools/tar.lua
@@ -57,10 +57,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))
@@ -94,13 +95,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 65b4fc15..83091a29 100644
--- a/src/luarocks/type_check.lua
+++ b/src/luarocks/type_check.lua
@@ -8,7 +8,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/test/testfiles/luajit-fail-1.0-1.rockspec b/test/testfiles/luajit-fail-1.0-1.rockspec
new file mode 100644
index 00000000..f8204600
--- /dev/null
+++ b/test/testfiles/luajit-fail-1.0-1.rockspec
@@ -0,0 +1,22 @@
+package = "luajit-fail"
+version = "1.0-1"
+source = {
+   url = "https://raw.githubusercontent.com/keplerproject/luarocks/master/test/testing.lua",
+}
+description = {
+   summary = "Test luajit dependency fail",
+   detailed = [[
+Fail luajit dependency when running with rockspec_format < 3.0.
+]],
+   homepage = "http://luarocks.org/",
+   license = "MIT/X license"
+}
+dependencies = {
+   "luajit >= 2.0"
+}
+build = {
+   type = "builtin",
+   modules = {
+      testing = "testing.lua"
+   }
+}
diff --git a/test/testfiles/luajit-success-1.0-1.rockspec b/test/testfiles/luajit-success-1.0-1.rockspec
new file mode 100644
index 00000000..31c930c3
--- /dev/null
+++ b/test/testfiles/luajit-success-1.0-1.rockspec
@@ -0,0 +1,23 @@
+rockspec_format = "3.0"
+package = "luajit-success"
+version = "1.0-1"
+source = {
+   url = "https://raw.githubusercontent.com/keplerproject/luarocks/master/test/testing.lua",
+}
+description = {
+   summary = "Test luajit dependency fail",
+   detailed = [[
+Use luajit dependency when running with rockspec_format >= 3.0.
+]],
+   homepage = "http://luarocks.org/",
+   license = "MIT/X license"
+}
+dependencies = {
+   "luajit >= 2.0"
+}
+build = {
+   type = "builtin",
+   modules = {
+      testing = "testing.lua"
+   }
+}
diff --git a/test/testing.sh b/test/testing.sh
index 26bdde5f..abda18d4 100755
--- a/test/testing.sh
+++ b/test/testing.sh
@@ -30,7 +30,15 @@ then
    shift
 fi
 
-luashortversion=`echo $luaversion | cut -d. -f 1-2`
+is_jit=`[ "${luaversion::3}" = "jit" ] && echo 1 || echo 0`
+
+if [ "$is_jit" = 1 ]
+then
+   luashortversion=5.1
+   luajitversion=${luaversion:4}
+else
+   luashortversion=`echo $luaversion | cut -d. -f 1-2`
+fi
 
 testing_dir="$PWD"
 
@@ -147,13 +155,27 @@ then
    if [ ! -e "$luadir/bin/lua" ]
    then
       mkdir -p lua
-      echo "Downloading lua $luaversion..."
-      wget "http://www.lua.org/ftp/lua-$luaversion.tar.gz" &> /dev/null
-      tar zxpf "lua-$luaversion.tar.gz"
-      cd "lua-$luaversion"
-      echo "Building lua $luaversion..."
-      make linux INSTALL_TOP="$luadir" &> /dev/null
-      make install INSTALL_TOP="$luadir" &> /dev/null
+      cd lua
+      if [ "$is_jit" = 1 ]
+      then
+         echo "Downloading LuaJIT $luajitversion..."
+         #rm -f "LuaJIT-$luajitversion.tar.gz"
+         wget -c "http://luajit.org/download/LuaJIT-$luajitversion.tar.gz" &> /dev/null
+         tar zxpf "LuaJIT-$luajitversion.tar.gz"
+         cd "LuaJIT-$luajitversion"
+         echo "Building LuaJIT $luajitversion..."
+         make PREFIX="$luadir" &> /dev/null
+         make install PREFIX="$luadir" &> /dev/null
+      else
+         echo "Downloading Lua $luaversion..."
+         #rm -f "lua-$luaversion.tar.gz"
+         wget -c "http://www.lua.org/ftp/lua-$luaversion.tar.gz" &> /dev/null
+         tar zxpf "lua-$luaversion.tar.gz"
+         cd "lua-$luaversion"
+         echo "Building Lua $luaversion..."
+         make linux INSTALL_TOP="$luadir" &> /dev/null
+         make install INSTALL_TOP="$luadir" &> /dev/null
+      fi
    fi
    popd
    [ -e ~/.ssh/id_rsa.pub ] || ssh-keygen -t rsa -P "" -f ~/.ssh/id_rsa
@@ -161,7 +183,13 @@ then
    chmod og-wx ~/.ssh/authorized_keys
    ssh-keyscan localhost >> ~/.ssh/known_hosts
 else
-   luadir="/Programs/Lua/Current"
+   if [ "$is_jit" = 1 ]
+   then
+      luadir="/Programs/LuaJIT/$luajitversion"
+echo HELLO $luadir
+   else
+      luadir="/Programs/Lua/$luaversion"
+   fi
    if [ ! -e "$luadir" ]
    then
       luadir="/usr/local"
@@ -175,7 +203,13 @@ else
    platform="linux-x86_64"
 fi
 
-lua="$luadir/bin/lua"
+if [ "$is_jit" = 1 ]
+then
+   lua="$luadir/bin/luajit"
+   luarocks_configure_extra_args="--lua-suffix=jit --with-lua-include=$luadir/include/luajit-2.0"
+else
+   lua="$luadir/bin/lua"
+fi
 
 version_luasocket=3.0rc1
 verrev_luasocket=${version_luasocket}-1
@@ -196,7 +230,7 @@ verrev_abelhas=${version_abelhas}-1
 luasec=luasec
 
 cd ..
-./configure --with-lua="$luadir" --prefix="$testing_lrprefix"
+./configure --with-lua="$luadir" --prefix="$testing_lrprefix" $luarocks_configure_extra_args
 make clean
 make src/luarocks/site_config.lua
 make dev
@@ -224,6 +258,7 @@ luarocks_noecho="run_lua --noecho luarocks"
 luarocks_noecho_nocov="run_lua --noecho --nocov luarocks"
 luarocks_admin="run_lua luarocks-admin"
 luarocks_admin_nocov="run_lua --nocov luarocks-admin"
+luajit_luarocks="luajit -e require('luacov.runner')('$testing_dir/luacov.config') $basedir/bin/luarocks"
 
 ###################################################
 
@@ -242,7 +277,7 @@ mkdir -p "$testing_server"
    get "$luarocks_repo/stdlib-41.0.0-1.src.rock"
    get "$luarocks_repo/luarepl-0.4-1.src.rock"
    get "$luarocks_repo/validate-args-1.5.4-1.rockspec"
-   get "$luarocks_repo/luasec-0.5-2.rockspec"
+   get "https://raw.githubusercontent.com/brunoos/luasec/master/luasec-0.6alpha-2.rockspec"
    get "$luarocks_repo/luabitop-1.0.2-1.rockspec"
    get "$luarocks_repo/lpty-1.0.1-1.src.rock"
    get "$luarocks_repo/cprint-${verrev_cprint}.src.rock"
@@ -524,6 +559,19 @@ test_fetch_base_dir() { $lua <<EOF
 EOF
 }
 
+test_luajit_dependency() {
+   if [ "$is_jit" = 1 ]
+   then $luarocks build "$testing_dir/testfiles/luajit-success-1.0-1.rockspec"
+   else true
+   fi
+}
+fail_luajit_dependency() { 
+   if [ "$is_jit" = 1 ]
+   then $luarocks build "$testing_dir/testfiles/luajit-fail-1.0-1.rockspec"
+   else false
+   fi
+}
+
 test_doc() { $luarocks install luarepl; $luarocks doc luarepl; }
 
 # Driver #########################################