13 files changed, 104 insertions, 47 deletions

diff --git a/src/luarocks/add.lua b/src/luarocks/add.lua
index 54991291..f1142d2a 100644
--- a/src/luarocks/add.lua
+++ b/src/luarocks/add.lua
@@ -68,6 +68,9 @@ local function add_files_to_server(refresh, rockfiles, server, upload_server)
 
    util.printout("Updating manifest...")
    manif.make_manifest(local_cache, "one", true)
+   
+   manif.zip_manifests()
+   
    util.printout("Updating index.html...")
    index.make_index(local_cache)
 
@@ -80,15 +83,17 @@ local function add_files_to_server(refresh, rockfiles, server, upload_server)
 
    table.insert(files, "index.html")
    table.insert(files, "manifest")
-   table.insert(files, "manifest-5.1")
-   table.insert(files, "manifest-5.2")
+   for ver in util.lua_versions() do
+      table.insert(files, "manifest-"..ver)
+      table.insert(files, "manifest-"..ver..".zip")
+   end
 
    -- TODO abstract away explicit 'curl' call
 
    local cmd
    if protocol == "rsync" then
       local srv, path = server_path:match("([^/]+)(/.+)")
-      cmd = cfg.variables.RSYNC.." --exclude=.git -Oavz -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/"
+      cmd = cfg.variables.RSYNC.." "..cfg.variables.RSYNCFLAGS.." -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/"
    elseif upload_server and upload_server.sftp then
       local part1, part2 = upload_server.sftp:match("^([^/]*)/(.*)$")
       cmd = cfg.variables.SCP.." "..table.concat(files, " ").." "..user.."@"..part1..":/"..part2
diff --git a/src/luarocks/admin_remove.lua b/src/luarocks/admin_remove.lua
index 31325a30..d429ce59 100644
--- a/src/luarocks/admin_remove.lua
+++ b/src/luarocks/admin_remove.lua
@@ -13,10 +13,10 @@ local fs = require("luarocks.fs")
 local cache = require("luarocks.cache")
 
 help_summary = "Remove a rock or rockspec from a rocks server."
-help_arguments = "[--from=<server>] [--no-refresh] {<rockspec>|<rock>...}"
+help_arguments = "[--server=<server>] [--no-refresh] {<rockspec>|<rock>...}"
 help = [[
 Arguments are local files, which may be rockspecs or rocks.
-The flag --from indicates which server to use.
+The flag --server indicates which server to use.
 If not given, the default server set in the upload_server variable
 from the configuration file is used instead.
 The flag --no-refresh indicates the local cache should not be refreshed
@@ -68,7 +68,7 @@ local function remove_files_from_server(refresh, rockfiles, server, upload_serve
    index.make_index(local_cache)
 
    local srv, path = server_path:match("([^/]+)(/.+)")
-   local cmd = "rsync -Oavz --delete -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/"
+   local cmd = cfg.variables.RSYNC.." "..cfg.variables.RSYNCFLAGS.." --delete -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/"
 
    util.printout(cmd)
    fs.execute(cmd)
diff --git a/src/luarocks/cache.lua b/src/luarocks/cache.lua
index 6ea6e82a..a3dfe8b1 100644
--- a/src/luarocks/cache.lua
+++ b/src/luarocks/cache.lua
@@ -74,7 +74,7 @@ function refresh_local_cache(server, url, user, password)
    local ok = false
    if protocol == "rsync" then
       local srv, path = server_path:match("([^/]+)(/.+)")
-      ok = fs.execute(cfg.variables.RSYNC.." -avz -e ssh "..user.."@"..srv..":"..path.."/ "..local_cache.."/")
+      ok = fs.execute(cfg.variables.RSYNC.." "..cfg.variables.RSYNCFLAGS.." -e ssh "..user.."@"..srv..":"..path.."/ "..local_cache.."/")
    else 
       local login_info = ""
       if user then login_info = " --user="..user end
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 62c69597..8e26bb46 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -250,6 +250,7 @@ local defaults = {
       CMAKE = "cmake",
       SEVENZ = "7z",
 
+      RSYNCFLAGS = "--exclude=.git -Ocavz",
       STATFLAG = "-c '%a'",
    },
 
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index e0b8a42d..f24dc507 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -360,6 +360,11 @@ local function match_dep(dep, blacklist, deps_mode)
    end
 end
 
+local whitelist = {}
+if cfg.lua_version == "5.2" then
+   whitelist["bit32"] = true
+end
+
 --- Attempt to match dependencies of a rockspec to installed rocks.
 -- @param rockspec table: The rockspec loaded as a table.
 -- @param blacklist table or nil: Program versions to not use as valid matches.
@@ -367,24 +372,28 @@ end
 -- are program versions and values are 'true'.
 -- @return table, table: A table where keys are dependencies parsed
 -- in table format and values are tables containing fields 'name' and
--- version' representing matches, and a table of missing dependencies
--- parsed as tables.
+-- version' representing matches; a table of missing dependencies
+-- parsed as tables; and a table of "no-upgrade" missing dependencies
+-- (to be used in plugin modules so that a plugin does not force upgrade of
+-- its parent application).
 function match_deps(rockspec, blacklist, deps_mode)
    assert(type(rockspec) == "table")
    assert(type(blacklist) == "table" or not blacklist)
    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)
-      if found then
-         if dep.name ~= "lua" then 
-            matched[dep] = found
-         end
-      else
-         if dep.constraints[1] and dep.constraints[1].no_upgrade then
-            no_upgrade[dep.name] = dep
+      if not whitelist[dep.name] then
+         local found = match_dep(dep, blacklist and blacklist[dep.name] or nil, deps_mode)
+         if found then
+            if dep.name ~= "lua" then 
+               matched[dep] = found
+            end
          else
-            missing[dep.name] = dep
+            if dep.constraints[1] and dep.constraints[1].no_upgrade then
+               no_upgrade[dep.name] = dep
+            else
+               missing[dep.name] = dep
+            end
          end
       end
    end
@@ -441,7 +450,7 @@ function fulfill_dependencies(rockspec, deps_mode)
       end
    end
 
-   local matched, missing, no_upgrade = match_deps(rockspec, nil, deps_mode)
+   local _, missing, no_upgrade = match_deps(rockspec, nil, deps_mode)
 
    if next(no_upgrade) then
       util.printerr("Missing dependencies for "..rockspec.name.." "..rockspec.version..":")
diff --git a/src/luarocks/dir.lua b/src/luarocks/dir.lua
index b496c962..3c7465bb 100644
--- a/src/luarocks/dir.lua
+++ b/src/luarocks/dir.lua
@@ -17,13 +17,12 @@ end
 
 --- Strip the name off a path+filename.
 -- @param pathname string: A path+name, such as "/a/b/c".
--- @return string: The filename without its path, such as "/a/b/".
--- For entries such as "/a/b/", "/a/" is returned. If there are
+-- @return string: The filename without its path, such as "/a/b".
+-- For entries such as "/a/b/", "/a" is returned. If there are
 -- no directory separators in input, "" is returned.
 function dir_name(pathname)
    assert(type(pathname) == "string")
-
-   return (pathname:gsub("/*$", ""):match("(.*/)[^/]*")) or ""
+   return (pathname:gsub("/*$", ""):match("(.*)[/]+[^/]*")) or ""
 end
 
 --- Describe a path in a cross-platform way.
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index 64992b91..9e4acf73 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -206,7 +206,7 @@ end
 -- @return boolean: true on success, false on failure.
 function unzip(zipfile)
    assert(zipfile)
-   return fs.execute(vars.UNZIP, zipfile)
+   return fs.execute_string(fs.quiet(vars.UNZIP.." "..fs.Q(zipfile)))
 end
 
 --- Test is file/directory exists
diff --git a/src/luarocks/help.lua b/src/luarocks/help.lua
index 2944dfd8..d9be46fc 100644
--- a/src/luarocks/help.lua
+++ b/src/luarocks/help.lua
@@ -80,6 +80,7 @@ function run(...)
          util.printout("\t", command.help_summary)
       end
       print_section("CONFIGURATION")
+      util.printout("\tLua version: " .. cfg.lua_version)
       util.printout("\tSystem configuration file: ".. sys_file .. " (" .. get_status(sys_ok) ..")")
       if home_file then
          util.printout("\tUser configuration file: ".. home_file .. " (" .. get_status(home_ok) ..")\n")
diff --git a/src/luarocks/index.lua b/src/luarocks/index.lua
index 6147a4d2..e0785d9c 100644
--- a/src/luarocks/index.lua
+++ b/src/luarocks/index.lua
@@ -66,7 +66,7 @@ Lua modules available from this location for use with <a href="http://www.luaroc
 <table class="main">
 ]]
 
-local index_package_start = [[
+local index_package_begin = [[
 <td class="package">
 <p><a name="$anchor"></a><a href="#$anchor" class="pkg"><b>$package</b></a> - $summary<br/>
 </p><blockquote><p>$detailed<br/>
@@ -81,10 +81,15 @@ local index_package_end = [[
 <tr><td colspan="2" class="spacer"></td></tr>
 ]]
 
-local index_footer = [[
+local index_footer_begin = [[
 </table>
 <p class="manifest">
-<a href="manifest">manifest file</a> &bull; <a href="manifest-5.1">Lua 5.1 manifest file</a> &bull; <a href="manifest-5.2">Lua 5.2 manifest file</a>
+<a href="manifest">manifest file</a>
+]]
+local index_manifest_ver = [[
+&bull; <a href="manifest-$VER">Lua $VER manifest file</a> (<a href="manifest-$VER.zip">zip</a>) 
+]]
+local index_footer_end = [[
 </p>
 </body>
 </html>
@@ -128,7 +133,7 @@ function make_index(repo)
    out:write(index_header)
    for package, version_list in util.sortedpairs(manifest.repository) do
       local latest_rockspec = nil
-      local output = index_package_start
+      local output = index_package_begin
       for version, data in util.sortedpairs(version_list, deps.compare_versions) do
          local versions = {}
          output = output..version..':&nbsp;'
@@ -170,6 +175,10 @@ function make_index(repo)
       end
       out:write(output)
    end
-   out:write(index_footer)
+   out:write(index_footer_begin)
+   for ver in util.lua_versions() do
+      out:write((index_manifest_ver:gsub("$VER", ver)))
+   end
+   out:write(index_footer_end)
    out:close()
 end
diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua
index d0bd5e04..03377d52 100644
--- a/src/luarocks/manif.lua
+++ b/src/luarocks/manif.lua
@@ -103,26 +103,40 @@ function load_manifest(repo_url)
    if manif_core.manifest_cache[repo_url] then
       return manif_core.manifest_cache[repo_url]
    end
-
-   local vmanifest = "manifest-"..cfg.lua_version
-
-   local protocol, pathname = dir.split_url(repo_url)
+   
+   local filenames = {
+      "manifest-"..cfg.lua_version..".zip",
+      "manifest-"..cfg.lua_version,
+      "manifest",
+   }
+
+   local protocol, repodir = dir.split_url(repo_url)
+   local pathname
    if protocol == "file" then
-      local file = dir.path(pathname, vmanifest)
-      if fs.exists(file) then
-         pathname = file
-      else
-         pathname = dir.path(pathname, "manifest")
+      for _, filename in ipairs(filenames) do
+         pathname = dir.path(repodir, filename)
+         if fs.exists(pathname) then
+            break
+         end
       end
    else
-      local file, err = fetch_manifest_from(repo_url, vmanifest)
-      if not file then
-         file, err = fetch_manifest_from(repo_url, "manifest")
+      local err
+      for _, filename in ipairs(filenames) do
+         pathname, err = fetch_manifest_from(repo_url, filename)
+         if pathname then
+            break
+         end
       end
-      if not file then 
+      if not pathname then 
          return nil, err
       end
-      pathname = file
+   end
+   if pathname:match(".*%.zip$") then
+      local dir = dir.dir_name(pathname)
+      fs.change_dir(dir)
+      fs.unzip(pathname)
+      fs.pop_dir()
+      pathname = pathname:match("(.*)%.zip$")
    end
    return manif_core.manifest_loader(pathname, repo_url)
 end
@@ -343,7 +357,7 @@ function make_manifest(repo, deps_mode, versioned)
    if not ok then return nil, err end
 
    if versioned then
-      for _, luaver in ipairs({"5.1", "5.2"}) do
+      for luaver in util.lua_versions() do
          local vmanifest = { repository = {}, modules = {}, commands = {} }
          local ok, err = store_results(results, vmanifest, deps_mode, repo, luaver, cache)
          save_table(repo, "manifest-"..luaver, vmanifest)
@@ -397,6 +411,15 @@ function update_manifest(name, version, repo, deps_mode)
    return save_table(repo, "manifest", manifest)
 end
 
+function zip_manifests()
+   for ver in util.lua_versions() do
+      local file = "manifest-"..ver
+      local zip = file..".zip"
+      fs.delete(dir.path(fs.current_dir(), zip))
+      fs.zip(zip, file)
+   end
+end
+
 local function find_providers(file, root)
    assert(type(file) == "string")
    root = root or cfg.root_dir
diff --git a/src/luarocks/persist.lua b/src/luarocks/persist.lua
index 208aee02..376a242a 100644
--- a/src/luarocks/persist.lua
+++ b/src/luarocks/persist.lua
@@ -20,7 +20,7 @@ function load_into_table(filename, tbl)
 
    local result, chunk, ran, err
    local result = tbl or {}
-   if setfenv then -- Lua 5.1
+   if _VERSION == "Lua 5.1" then -- Lua 5.1
       chunk, err = loadfile(filename)
       if chunk then
          setfenv(chunk, result)
diff --git a/src/luarocks/unpack.lua b/src/luarocks/unpack.lua
index 2e6166ca..70c116fd 100644
--- a/src/luarocks/unpack.lua
+++ b/src/luarocks/unpack.lua
@@ -37,10 +37,11 @@ local function unpack_rockspec(rockspec_file, dir_name)
    if not ok then
       return nil, sources_dir
    end
-   ok, err = fs.change_dir(dir_name)
+   ok, err = fs.change_dir(sources_dir)
    if not ok then return nil, err end
    build.apply_patches(rockspec)
    fs.pop_dir()
+   fs.pop_dir()
    return rockspec
 end
 
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index ba20acfa..e3260359 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -319,6 +319,15 @@ function sortedpairs(tbl, sort_function)
    return coroutine.wrap(function() sortedpairs_iterator(tbl, sort_function) end)
 end
 
+function lua_versions()
+   local versions = { "5.1", "5.2" }
+   local i = 0
+   return function()
+      i = i + 1
+      return versions[i]
+   end
+end
+
 function starts_with(s, prefix)
    return s:sub(1,#prefix) == prefix
 end