cache, index, add, refresh_cache, remove, show, upload

14 files changed, 1085 insertions, 121 deletions

diff --git a/src/luarocks/admin/cache.lua b/src/luarocks/admin/cache.lua
index 48551f7a..11bcc818 100644
--- a/src/luarocks/admin/cache.lua
+++ b/src/luarocks/admin/cache.lua
@@ -12,7 +12,7 @@ local util = require("luarocks.util")
 function cache.get_upload_server(server)
    if not server then server = cfg.upload_server end
    if not server then
-      return nil, "No server specified and no default configured with upload_server."
+      return nil, nil, "No server specified and no default configured with upload_server."
    end
    return server, cfg.upload_servers and cfg.upload_servers[server]
 end
diff --git a/src/luarocks/admin/cmd/add-original.lua b/src/luarocks/admin/cmd/add-original.lua
new file mode 100644
index 00000000..aa444c50
--- /dev/null
+++ b/src/luarocks/admin/cmd/add-original.lua
@@ -0,0 +1,134 @@
+
+--- Module implementing the luarocks-admin "add" command.
+-- Adds a rock or rockspec to a rocks server.
+local add = {}
+
+local cfg = require("luarocks.core.cfg")
+local util = require("luarocks.util")
+local dir = require("luarocks.dir")
+local writer = require("luarocks.manif.writer")
+local fs = require("luarocks.fs")
+local cache = require("luarocks.admin.cache")
+local index = require("luarocks.admin.index")
+
+function add.add_to_parser(parser)
+   local cmd = parser:command("add", "Add a rock or rockspec to a rocks server.", util.see_also())
+
+   cmd:argument("rock", "A local rockspec or rock file.")
+      :args("+")
+
+   cmd:option("--server", "The server to use. If not given, the default server "..
+      "set in the upload_server variable from the configuration file is used instead.")
+      :target("add_server")
+   cmd:flag("--no-refresh", "Do not refresh the local cache prior to "..
+      "generation of the updated manifest.")
+   cmd:flag("--index", "Produce an index.html file for the manifest. This "..
+      "flag is automatically set if an index.html file already exists.")
+end
+
+local 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 add_files_to_server(refresh, rockfiles, server, upload_server, do_index)
+   assert(type(refresh) == "boolean" or not refresh)
+   assert(type(rockfiles) == "table")
+   assert(type(server) == "string")
+   assert(type(upload_server) == "table" or not upload_server)
+
+   local download_url, login_url = cache.get_server_urls(server, upload_server)
+   local at = fs.current_dir()
+   local refresh_fn = refresh and cache.refresh_local_cache or cache.split_server_url
+
+   local local_cache, protocol, server_path, user, password = refresh_fn(download_url, cfg.upload_user, cfg.upload_password)
+   if not local_cache then
+      return nil, protocol
+   end
+
+   if not login_url then
+      login_url = protocol.."://"..server_path
+   end
+
+   local ok, err = fs.change_dir(at)
+   if not ok then return nil, err end
+
+   local files = {}
+   for _, rockfile in ipairs(rockfiles) do
+      if fs.exists(rockfile) then
+         util.printout("Copying file "..rockfile.." to "..local_cache.."...")
+         local absolute = fs.absolute_name(rockfile)
+         fs.copy(absolute, local_cache, "read")
+         table.insert(files, dir.base_name(absolute))
+      else
+         util.printerr("File "..rockfile.." not found")
+      end
+   end
+   if #files == 0 then
+      return nil, "No files found"
+   end
+
+   local ok, err = fs.change_dir(local_cache)
+   if not ok then return nil, err end
+
+   util.printout("Updating manifest...")
+   writer.make_manifest(local_cache, "one", true)
+
+   zip_manifests()
+
+   if fs.exists("index.html") then
+      do_index = true
+   end
+
+   if do_index then
+      util.printout("Updating index.html...")
+      index.make_index(local_cache)
+   end
+
+   local login_info = ""
+   if user then login_info = " -u "..user end
+   if password then login_info = login_info..":"..password end
+   if not login_url:match("/$") then
+      login_url = login_url .. "/"
+   end
+
+   if do_index then
+      table.insert(files, "index.html")
+   end
+   table.insert(files, "manifest")
+   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.." "..cfg.variables.RSYNCFLAGS.." -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/"
+   elseif protocol == "file" then
+      return fs.copy_contents(local_cache, server_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
+   else
+      cmd = cfg.variables.CURL.." "..login_info.." -T '{"..table.concat(files, ",").."}' "..login_url
+   end
+
+   util.printout(cmd)
+   return fs.execute(cmd)
+end
+
+function add.command(args)
+   local server, server_table = cache.get_upload_server(args.add_server or args.server)
+   if not server then return nil, server_table end
+   return add_files_to_server(not args.no_refresh, args.rock, server, server_table, args.index)
+end
+
+
+return add
diff --git a/src/luarocks/admin/cmd/add.lua b/src/luarocks/admin/cmd/add.lua
index aa444c50..29b9e705 100644
--- a/src/luarocks/admin/cmd/add.lua
+++ b/src/luarocks/admin/cmd/add.lua
@@ -1,8 +1,9 @@
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table
+
 
---- Module implementing the luarocks-admin "add" command.
--- Adds a rock or rockspec to a rocks server.
 local add = {}
 
+
 local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 local dir = require("luarocks.dir")
@@ -11,35 +12,37 @@ local fs = require("luarocks.fs")
 local cache = require("luarocks.admin.cache")
 local index = require("luarocks.admin.index")
 
+local argparse = require("luarocks.vendor.argparse")
+
+
+
+
+
 function add.add_to_parser(parser)
    local cmd = parser:command("add", "Add a rock or rockspec to a rocks server.", util.see_also())
 
-   cmd:argument("rock", "A local rockspec or rock file.")
-      :args("+")
+   cmd:argument("rocks", "A local rockspec or rock file."):
+   args("+")
 
-   cmd:option("--server", "The server to use. If not given, the default server "..
-      "set in the upload_server variable from the configuration file is used instead.")
-      :target("add_server")
-   cmd:flag("--no-refresh", "Do not refresh the local cache prior to "..
-      "generation of the updated manifest.")
-   cmd:flag("--index", "Produce an index.html file for the manifest. This "..
-      "flag is automatically set if an index.html file already exists.")
+   cmd:option("--server", "The server to use. If not given, the default server " ..
+   "set in the upload_server variable from the configuration file is used instead."):
+   target("add_server")
+   cmd:flag("--no-refresh", "Do not refresh the local cache prior to " ..
+   "generation of the updated manifest.")
+   cmd:flag("--index", "Produce an index.html file for the manifest. This " ..
+   "flag is automatically set if an index.html file already exists.")
 end
 
 local function zip_manifests()
    for ver in util.lua_versions() do
-      local file = "manifest-"..ver
-      local zip = file..".zip"
+      local file = "manifest-" .. ver
+      local zip = file .. ".zip"
       fs.delete(dir.path(fs.current_dir(), zip))
       fs.zip(zip, file)
    end
 end
 
 local function add_files_to_server(refresh, rockfiles, server, upload_server, do_index)
-   assert(type(refresh) == "boolean" or not refresh)
-   assert(type(rockfiles) == "table")
-   assert(type(server) == "string")
-   assert(type(upload_server) == "table" or not upload_server)
 
    local download_url, login_url = cache.get_server_urls(server, upload_server)
    local at = fs.current_dir()
@@ -51,7 +54,7 @@ local function add_files_to_server(refresh, rockfiles, server, upload_server, do
    end
 
    if not login_url then
-      login_url = protocol.."://"..server_path
+      login_url = protocol .. "://" .. server_path
    end
 
    local ok, err = fs.change_dir(at)
@@ -60,12 +63,12 @@ local function add_files_to_server(refresh, rockfiles, server, upload_server, do
    local files = {}
    for _, rockfile in ipairs(rockfiles) do
       if fs.exists(rockfile) then
-         util.printout("Copying file "..rockfile.." to "..local_cache.."...")
+         util.printout("Copying file " .. rockfile .. " to " .. local_cache .. "...")
          local absolute = fs.absolute_name(rockfile)
          fs.copy(absolute, local_cache, "read")
          table.insert(files, dir.base_name(absolute))
       else
-         util.printerr("File "..rockfile.." not found")
+         util.printerr("File " .. rockfile .. " not found")
       end
    end
    if #files == 0 then
@@ -90,8 +93,8 @@ local function add_files_to_server(refresh, rockfiles, server, upload_server, do
    end
 
    local login_info = ""
-   if user then login_info = " -u "..user end
-   if password then login_info = login_info..":"..password end
+   if user then login_info = " -u " .. user end
+   if password then login_info = login_info .. ":" .. password end
    if not login_url:match("/$") then
       login_url = login_url .. "/"
    end
@@ -101,23 +104,23 @@ local function add_files_to_server(refresh, rockfiles, server, upload_server, do
    end
    table.insert(files, "manifest")
    for ver in util.lua_versions() do
-      table.insert(files, "manifest-"..ver)
-      table.insert(files, "manifest-"..ver..".zip")
+      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.." "..cfg.variables.RSYNCFLAGS.." -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/"
+      cmd = cfg.variables.RSYNC .. " " .. cfg.variables.RSYNCFLAGS .. " -e ssh " .. local_cache .. "/ " .. user .. "@" .. srv .. ":" .. path .. "/"
    elseif protocol == "file" then
       return fs.copy_contents(local_cache, server_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
+      cmd = cfg.variables.SCP .. " " .. table.concat(files, " ") .. " " .. user .. "@" .. part1 .. ":/" .. part2
    else
-      cmd = cfg.variables.CURL.." "..login_info.." -T '{"..table.concat(files, ",").."}' "..login_url
+      cmd = cfg.variables.CURL .. " " .. login_info .. " -T '{" .. table.concat(files, ",") .. "}' " .. login_url
    end
 
    util.printout(cmd)
@@ -125,9 +128,9 @@ local function add_files_to_server(refresh, rockfiles, server, upload_server, do
 end
 
 function add.command(args)
-   local server, server_table = cache.get_upload_server(args.add_server or args.server)
-   if not server then return nil, server_table end
-   return add_files_to_server(not args.no_refresh, args.rock, server, server_table, args.index)
+   local server, server_table, err = cache.get_upload_server(args.add_server or args.server)
+   if not server then return nil, err end
+   return add_files_to_server(not args.no_refresh, args.rocks, server, server_table, args.index)
 end
 
 
diff --git a/src/luarocks/admin/cmd/refresh_cache-original.lua b/src/luarocks/admin/cmd/refresh_cache-original.lua
new file mode 100644
index 00000000..f8d51893
--- /dev/null
+++ b/src/luarocks/admin/cmd/refresh_cache-original.lua
@@ -0,0 +1,31 @@
+
+--- Module implementing the luarocks-admin "refresh_cache" command.
+local refresh_cache = {}
+
+local cfg = require("luarocks.core.cfg")
+local util = require("luarocks.util")
+local cache = require("luarocks.admin.cache")
+
+function refresh_cache.add_to_parser(parser)
+   local cmd = parser:command("refresh_cache", "Refresh local cache of a remote rocks server.", util.see_also())
+
+   cmd:option("--from", "The server to use. If not given, the default server "..
+      "set in the upload_server variable from the configuration file is used instead.")
+      :argname("<server>")
+end
+
+function refresh_cache.command(args)
+   local server, upload_server = cache.get_upload_server(args.server)
+   if not server then return nil, upload_server end
+   local download_url = cache.get_server_urls(server, upload_server)
+
+   local ok, err = cache.refresh_local_cache(download_url, cfg.upload_user, cfg.upload_password)
+   if not ok then
+      return nil, err
+   else
+      return true
+   end
+end
+
+
+return refresh_cache
diff --git a/src/luarocks/admin/cmd/refresh_cache.lua b/src/luarocks/admin/cmd/refresh_cache.lua
index f8d51893..9565be45 100644
--- a/src/luarocks/admin/cmd/refresh_cache.lua
+++ b/src/luarocks/admin/cmd/refresh_cache.lua
@@ -1,22 +1,29 @@
 
---- Module implementing the luarocks-admin "refresh_cache" command.
+
 local refresh_cache = {}
 
+
 local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 local cache = require("luarocks.admin.cache")
 
+local argparse = require("luarocks.vendor.argparse")
+
+
+
+
+
 function refresh_cache.add_to_parser(parser)
    local cmd = parser:command("refresh_cache", "Refresh local cache of a remote rocks server.", util.see_also())
 
-   cmd:option("--from", "The server to use. If not given, the default server "..
-      "set in the upload_server variable from the configuration file is used instead.")
-      :argname("<server>")
+   cmd:option("--from", "The server to use. If not given, the default server " ..
+   "set in the upload_server variable from the configuration file is used instead."):
+   argname("<server>")
 end
 
 function refresh_cache.command(args)
-   local server, upload_server = cache.get_upload_server(args.server)
-   if not server then return nil, upload_server end
+   local server, upload_server, err = cache.get_upload_server(args.server)
+   if not server then return nil, err end
    local download_url = cache.get_server_urls(server, upload_server)
 
    local ok, err = cache.refresh_local_cache(download_url, cfg.upload_user, cfg.upload_password)
diff --git a/src/luarocks/admin/cmd/remove-original.lua b/src/luarocks/admin/cmd/remove-original.lua
new file mode 100644
index 00000000..ed7644e0
--- /dev/null
+++ b/src/luarocks/admin/cmd/remove-original.lua
@@ -0,0 +1,95 @@
+
+--- Module implementing the luarocks-admin "remove" command.
+-- Removes a rock or rockspec from a rocks server.
+local admin_remove = {}
+
+local cfg = require("luarocks.core.cfg")
+local util = require("luarocks.util")
+local dir = require("luarocks.dir")
+local writer = require("luarocks.manif.writer")
+local fs = require("luarocks.fs")
+local cache = require("luarocks.admin.cache")
+local index = require("luarocks.admin.index")
+
+function admin_remove.add_to_parser(parser)
+   local cmd = parser:command("remove", "Remove a rock or rockspec from a rocks server.", util.see_also())
+
+   cmd:argument("rock", "A local rockspec or rock file.")
+      :args("+")
+
+   cmd:option("--server", "The server to use. If not given, the default server "..
+      "set in the upload_server variable from the configuration file is used instead.")
+   cmd:flag("--no-refresh", "Do not refresh the local cache prior to "..
+      "generation of the updated manifest.")
+end
+
+local function remove_files_from_server(refresh, rockfiles, server, upload_server)
+   assert(type(refresh) == "boolean" or not refresh)
+   assert(type(rockfiles) == "table")
+   assert(type(server) == "string")
+   assert(type(upload_server) == "table" or not upload_server)
+
+   local download_url, login_url = cache.get_server_urls(server, upload_server)
+   local at = fs.current_dir()
+   local refresh_fn = refresh and cache.refresh_local_cache or cache.split_server_url
+
+   local local_cache, protocol, server_path, user, password = refresh_fn(download_url, cfg.upload_user, cfg.upload_password)
+   if not local_cache then
+      return nil, protocol
+   end
+
+   local ok, err = fs.change_dir(at)
+   if not ok then return nil, err end
+
+   local nr_files = 0
+   for _, rockfile in ipairs(rockfiles) do
+      local basename = dir.base_name(rockfile)
+      local file = dir.path(local_cache, basename)
+      util.printout("Removing file "..file.."...")
+      fs.delete(file)
+      if not fs.exists(file) then
+         nr_files = nr_files + 1
+      else
+         util.printerr("Failed removing "..file)
+      end
+   end
+   if nr_files == 0 then
+      return nil, "No files removed."
+   end
+
+   local ok, err = fs.change_dir(local_cache)
+   if not ok then return nil, err end
+
+   util.printout("Updating manifest...")
+   writer.make_manifest(local_cache, "one", true)
+   util.printout("Updating index.html...")
+   index.make_index(local_cache)
+
+   if protocol == "file" then
+       local cmd = cfg.variables.RSYNC.." "..cfg.variables.RSYNCFLAGS.." --delete "..local_cache.."/ ".. server_path.."/"
+       util.printout(cmd)
+       fs.execute(cmd)
+       return true
+   end
+
+   if protocol ~= "rsync" then
+      return nil, "This command requires 'rsync', check your configuration."
+   end
+
+   local srv, path = server_path:match("([^/]+)(/.+)")
+   local cmd = cfg.variables.RSYNC.." "..cfg.variables.RSYNCFLAGS.." --delete -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/"
+
+   util.printout(cmd)
+   fs.execute(cmd)
+
+   return true
+end
+
+function admin_remove.command(args)
+   local server, server_table = cache.get_upload_server(args.server)
+   if not server then return nil, server_table end
+   return remove_files_from_server(not args.no_refresh, args.rock, server, server_table)
+end
+
+
+return admin_remove
diff --git a/src/luarocks/admin/cmd/remove.lua b/src/luarocks/admin/cmd/remove.lua
index ed7644e0..619a7354 100644
--- a/src/luarocks/admin/cmd/remove.lua
+++ b/src/luarocks/admin/cmd/remove.lua
@@ -1,8 +1,9 @@
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs
+
 
---- Module implementing the luarocks-admin "remove" command.
--- Removes a rock or rockspec from a rocks server.
 local admin_remove = {}
 
+
 local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
 local dir = require("luarocks.dir")
@@ -11,23 +12,25 @@ local fs = require("luarocks.fs")
 local cache = require("luarocks.admin.cache")
 local index = require("luarocks.admin.index")
 
+local argparse = require("luarocks.vendor.argparse")
+
+
+
+
+
 function admin_remove.add_to_parser(parser)
    local cmd = parser:command("remove", "Remove a rock or rockspec from a rocks server.", util.see_also())
 
-   cmd:argument("rock", "A local rockspec or rock file.")
-      :args("+")
+   cmd:argument("rocks", "A local rockspec or rock file."):
+   args("+")
 
-   cmd:option("--server", "The server to use. If not given, the default server "..
-      "set in the upload_server variable from the configuration file is used instead.")
-   cmd:flag("--no-refresh", "Do not refresh the local cache prior to "..
-      "generation of the updated manifest.")
+   cmd:option("--server", "The server to use. If not given, the default server " ..
+   "set in the upload_server variable from the configuration file is used instead.")
+   cmd:flag("--no-refresh", "Do not refresh the local cache prior to " ..
+   "generation of the updated manifest.")
 end
 
 local function remove_files_from_server(refresh, rockfiles, server, upload_server)
-   assert(type(refresh) == "boolean" or not refresh)
-   assert(type(rockfiles) == "table")
-   assert(type(server) == "string")
-   assert(type(upload_server) == "table" or not upload_server)
 
    local download_url, login_url = cache.get_server_urls(server, upload_server)
    local at = fs.current_dir()
@@ -45,12 +48,12 @@ local function remove_files_from_server(refresh, rockfiles, server, upload_serve
    for _, rockfile in ipairs(rockfiles) do
       local basename = dir.base_name(rockfile)
       local file = dir.path(local_cache, basename)
-      util.printout("Removing file "..file.."...")
+      util.printout("Removing file " .. file .. "...")
       fs.delete(file)
       if not fs.exists(file) then
          nr_files = nr_files + 1
       else
-         util.printerr("Failed removing "..file)
+         util.printerr("Failed removing " .. file)
       end
    end
    if nr_files == 0 then
@@ -66,10 +69,10 @@ local function remove_files_from_server(refresh, rockfiles, server, upload_serve
    index.make_index(local_cache)
 
    if protocol == "file" then
-       local cmd = cfg.variables.RSYNC.." "..cfg.variables.RSYNCFLAGS.." --delete "..local_cache.."/ ".. server_path.."/"
-       util.printout(cmd)
-       fs.execute(cmd)
-       return true
+      local cmd = cfg.variables.RSYNC .. " " .. cfg.variables.RSYNCFLAGS .. " --delete " .. local_cache .. "/ " .. server_path .. "/"
+      util.printout(cmd)
+      fs.execute(cmd)
+      return true
    end
 
    if protocol ~= "rsync" then
@@ -77,7 +80,7 @@ local function remove_files_from_server(refresh, rockfiles, server, upload_serve
    end
 
    local srv, path = server_path:match("([^/]+)(/.+)")
-   local cmd = cfg.variables.RSYNC.." "..cfg.variables.RSYNCFLAGS.." --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)
@@ -86,9 +89,9 @@ local function remove_files_from_server(refresh, rockfiles, server, upload_serve
 end
 
 function admin_remove.command(args)
-   local server, server_table = cache.get_upload_server(args.server)
-   if not server then return nil, server_table end
-   return remove_files_from_server(not args.no_refresh, args.rock, server, server_table)
+   local server, server_table, err = cache.get_upload_server(args.server)
+   if not server then return nil, err end
+   return remove_files_from_server(not args.no_refresh, args.rocks, server, server_table)
 end
 
 
diff --git a/src/luarocks/admin/index-original.lua b/src/luarocks/admin/index-original.lua
new file mode 100644
index 00000000..64c8c1eb
--- /dev/null
+++ b/src/luarocks/admin/index-original.lua
@@ -0,0 +1,185 @@
+
+--- Module which builds the index.html page to be used in rocks servers.
+local index = {}
+
+local util = require("luarocks.util")
+local fs = require("luarocks.fs")
+local vers = require("luarocks.core.vers")
+local persist = require("luarocks.persist")
+local dir = require("luarocks.dir")
+local manif = require("luarocks.manif")
+
+local ext_url_target = ' target="_blank"'
+
+local index_header = [[
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>Available rocks</title>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+<style>
+body {
+   background-color: white;
+   font-family: "bitstream vera sans", "verdana", "sans";
+   font-size: 14px;
+}
+a {
+   color: #0000c0;
+   text-decoration: none;
+}
+a.pkg {
+   color: black;
+}
+a:hover {
+   text-decoration: underline;
+}
+td.main {
+   border-style: none;
+}
+blockquote {
+   font-size: 12px;
+}
+td.package {
+   background-color: #f0f0f0;
+   vertical-align: top;
+}
+td.spacer {
+   height: 5px;
+}
+td.version {
+   background-color: #d0d0d0;
+   vertical-align: top;
+   text-align: left;
+   padding: 5px;
+   width: 100px;
+}
+p.manifest {
+   font-size: 8px;
+}
+</style>
+</head>
+<body>
+<h1>Available rocks</h1>
+<p>
+Lua modules available from this location for use with <a href="http://www.luarocks.org">LuaRocks</a>:
+</p>
+<table class="main">
+]]
+
+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/>
+$externaldependencies
+<font size="-1"><a href="$original">latest sources</a> $homepage | License: $license</font></p>
+</blockquote></a></td>
+<td class="version">
+]]
+
+local index_package_end = [[
+</td></tr>
+<tr><td colspan="2" class="spacer"></td></tr>
+]]
+
+local index_footer_begin = [[
+</table>
+<p class="manifest">
+<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>
+]]
+
+function index.format_external_dependencies(rockspec)
+   if rockspec.external_dependencies then
+      local deplist = {}
+      local listed_set = {}
+      local plats = nil
+      for name, desc in util.sortedpairs(rockspec.external_dependencies) do
+         if name ~= "platforms" then
+            table.insert(deplist, name:lower())
+            listed_set[name] = true
+         else
+            plats = desc
+         end
+      end
+      if plats then
+         for plat, entries in util.sortedpairs(plats) do
+            for name, desc in util.sortedpairs(entries) do
+               if not listed_set[name] then
+                  table.insert(deplist, name:lower() .. " (on "..plat..")")
+               end
+            end
+         end
+      end
+      return '<p><b>External dependencies:</b> ' .. table.concat(deplist, ',&nbsp;').. '</p>'
+   else
+      return ""
+   end
+end
+
+function index.make_index(repo)
+   if not fs.is_dir(repo) then
+      return nil, "Cannot access repository at "..repo
+   end
+   local manifest = manif.load_manifest(repo)
+   local out = io.open(dir.path(repo, "index.html"), "w")
+
+   out:write(index_header)
+   for package, version_list in util.sortedpairs(manifest.repository) do
+      local latest_rockspec = nil
+      local output = index_package_begin
+      for version, data in util.sortedpairs(version_list, vers.compare_versions) do
+         local versions = {}
+         output = output..version..':&nbsp;'
+         table.sort(data, function(a,b) return a.arch < b.arch end)
+         for _, item in ipairs(data) do
+            local file
+            if item.arch == 'rockspec' then
+               file = ("%s-%s.rockspec"):format(package, version)
+               if not latest_rockspec then latest_rockspec = file end
+            else
+               file = ("%s-%s.%s.rock"):format(package, version, item.arch)
+            end
+            table.insert(versions, '<a href="'..file..'">'..item.arch..'</a>')
+         end
+         output = output .. table.concat(versions, ',&nbsp;') .. '<br/>'
+      end
+      output = output .. index_package_end
+      if latest_rockspec then
+         local rockspec = persist.load_into_table(dir.path(repo, latest_rockspec))
+         local descript = rockspec.description or {}
+         local vars = {
+            anchor = package,
+            package = rockspec.package,
+            original = rockspec.source.url,
+            summary = descript.summary or "",
+            detailed = descript.detailed or "",
+            license = descript.license or "N/A",
+            homepage = descript.homepage and ('| <a href="'..descript.homepage..'"'..ext_url_target..'>project homepage</a>') or "",
+            externaldependencies = index.format_external_dependencies(rockspec)
+         }
+         vars.detailed = vars.detailed:gsub("\n\n", "</p><p>"):gsub("%s+", " ")
+         vars.detailed = vars.detailed:gsub("(https?://[a-zA-Z0-9%.%%-_%+%[%]=%?&/$@;:]+)", '<a href="%1"'..ext_url_target..'>%1</a>')
+         output = output:gsub("$(%w+)", vars)
+      else
+         output = output:gsub("$anchor", package)
+         output = output:gsub("$package", package)
+         output = output:gsub("$(%w+)", "")
+      end
+      out:write(output)
+   end
+   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
+
+return index
diff --git a/src/luarocks/admin/index.lua b/src/luarocks/admin/index.lua
index 64c8c1eb..8fec0f6f 100644
--- a/src/luarocks/admin/index.lua
+++ b/src/luarocks/admin/index.lua
@@ -1,7 +1,8 @@
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local io = _tl_compat and _tl_compat.io or io; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local package = _tl_compat and _tl_compat.package or package; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table
 
---- Module which builds the index.html page to be used in rocks servers.
 local index = {}
 
+
 local util = require("luarocks.util")
 local fs = require("luarocks.fs")
 local vers = require("luarocks.core.vers")
@@ -9,6 +10,11 @@ local persist = require("luarocks.persist")
 local dir = require("luarocks.dir")
 local manif = require("luarocks.manif")
 
+
+
+
+
+
 local ext_url_target = ' target="_blank"'
 
 local index_header = [[
@@ -112,12 +118,12 @@ function index.format_external_dependencies(rockspec)
          for plat, entries in util.sortedpairs(plats) do
             for name, desc in util.sortedpairs(entries) do
                if not listed_set[name] then
-                  table.insert(deplist, name:lower() .. " (on "..plat..")")
+                  table.insert(deplist, name:lower() .. " (on " .. plat .. ")")
                end
             end
          end
       end
-      return '<p><b>External dependencies:</b> ' .. table.concat(deplist, ',&nbsp;').. '</p>'
+      return '<p><b>External dependencies:</b> ' .. table.concat(deplist, ',&nbsp;') .. '</p>'
    else
       return ""
    end
@@ -125,7 +131,7 @@ end
 
 function index.make_index(repo)
    if not fs.is_dir(repo) then
-      return nil, "Cannot access repository at "..repo
+      return nil, "Cannot access repository at " .. repo
    end
    local manifest = manif.load_manifest(repo)
    local out = io.open(dir.path(repo, "index.html"), "w")
@@ -136,8 +142,8 @@ function index.make_index(repo)
       local output = index_package_begin
       for version, data in util.sortedpairs(version_list, vers.compare_versions) do
          local versions = {}
-         output = output..version..':&nbsp;'
-         table.sort(data, function(a,b) return a.arch < b.arch end)
+         output = output .. version .. ':&nbsp;'
+         table.sort(data, function(a, b) return a.arch < b.arch end)
          for _, item in ipairs(data) do
             local file
             if item.arch == 'rockspec' then
@@ -146,7 +152,7 @@ function index.make_index(repo)
             else
                file = ("%s-%s.%s.rock"):format(package, version, item.arch)
             end
-            table.insert(versions, '<a href="'..file..'">'..item.arch..'</a>')
+            table.insert(versions, '<a href="' .. file .. '">' .. item.arch .. '</a>')
          end
          output = output .. table.concat(versions, ',&nbsp;') .. '<br/>'
       end
@@ -161,11 +167,11 @@ function index.make_index(repo)
             summary = descript.summary or "",
             detailed = descript.detailed or "",
             license = descript.license or "N/A",
-            homepage = descript.homepage and ('| <a href="'..descript.homepage..'"'..ext_url_target..'>project homepage</a>') or "",
-            externaldependencies = index.format_external_dependencies(rockspec)
+            homepage = descript.homepage and ('| <a href="' .. descript.homepage .. '"' .. ext_url_target .. '>project homepage</a>') or "",
+            externaldependencies = index.format_external_dependencies(rockspec),
          }
          vars.detailed = vars.detailed:gsub("\n\n", "</p><p>"):gsub("%s+", " ")
-         vars.detailed = vars.detailed:gsub("(https?://[a-zA-Z0-9%.%%-_%+%[%]=%?&/$@;:]+)", '<a href="%1"'..ext_url_target..'>%1</a>')
+         vars.detailed = vars.detailed:gsub("(https?://[a-zA-Z0-9%.%%-_%+%[%]=%?&/$@;:]+)", '<a href="%1"' .. ext_url_target .. '>%1</a>')
          output = output:gsub("$(%w+)", vars)
       else
          output = output:gsub("$anchor", package)
diff --git a/src/luarocks/cmd/show-original.lua b/src/luarocks/cmd/show-original.lua
new file mode 100644
index 00000000..88cbbada
--- /dev/null
+++ b/src/luarocks/cmd/show-original.lua
@@ -0,0 +1,314 @@
+--- Module implementing the LuaRocks "show" command.
+-- Shows information about an installed rock.
+local show = {}
+
+local queries = require("luarocks.queries")
+local search = require("luarocks.search")
+local dir = require("luarocks.core.dir")
+local fs = require("luarocks.fs")
+local cfg = require("luarocks.core.cfg")
+local util = require("luarocks.util")
+local path = require("luarocks.path")
+local fetch = require("luarocks.fetch")
+local manif = require("luarocks.manif")
+local repos = require("luarocks.repos")
+
+function show.add_to_parser(parser)
+   local cmd = parser:command("show", [[
+Show information about an installed rock.
+
+Without any flags, show all module information.
+With flags, return only the desired information.]], util.see_also())
+      :summary("Show information about an installed rock.")
+
+   cmd:argument("rock", "Name of an installed rock.")
+      :action(util.namespaced_name_action)
+   cmd:argument("version", "Rock version.")
+      :args("?")
+
+   cmd:flag("--home", "Show home page of project.")
+   cmd:flag("--modules", "Show all modules provided by the package as used by require().")
+   cmd:flag("--deps", "Show packages the package depends on.")
+   cmd:flag("--build-deps", "Show build-only dependencies for the package.")
+   cmd:flag("--test-deps", "Show dependencies for testing the package.")
+   cmd:flag("--rockspec", "Show the full path of the rockspec file.")
+   cmd:flag("--mversion", "Show the package version.")
+   cmd:flag("--rock-tree", "Show local tree where rock is installed.")
+   cmd:flag("--rock-namespace", "Show rock namespace.")
+   cmd:flag("--rock-dir", "Show data directory of the installed rock.")
+   cmd:flag("--rock-license", "Show rock license.")
+   cmd:flag("--issues", "Show URL for project's issue tracker.")
+   cmd:flag("--labels", "List the labels of the rock.")
+   cmd:flag("--porcelain", "Produce machine-friendly output.")
+end
+
+local friendly_template = [[
+          :
+?namespace:${namespace}/${package} ${version} - ${summary}
+!namespace:${package} ${version} - ${summary}
+          :
+*detailed :${detailed}
+?detailed :
+?license  :License:      \t${license}
+?homepage :Homepage:     \t${homepage}
+?issues   :Issues:       \t${issues}
+?labels   :Labels:       \t${labels}
+?location :Installed in: \t${location}
+?commands :
+?commands :Commands:
+*commands :\t${name} (${file})
+?modules  :
+?modules  :Modules:
+*modules  :\t${name} (${file})
+?bdeps    :
+?bdeps    :Has build dependency on:
+*bdeps    :\t${name} (${label})
+?tdeps    :
+?tdeps    :Tests depend on:
+*tdeps    :\t${name} (${label})
+?deps     :
+?deps     :Depends on:
+*deps     :\t${name} (${label})
+?ideps    :
+?ideps    :Indirectly pulling:
+*ideps    :\t${name} (${label})
+          :
+]]
+
+local porcelain_template = [[
+?namespace:namespace\t${namespace}
+?package  :package\t${package}
+?version  :version\t${version}
+?summary  :summary\t${summary}
+*detailed :detailed\t${detailed}
+?license  :license\t${license}
+?homepage :homepage\t${homepage}
+?issues   :issues\t${issues}
+?labels   :labels\t${labels}
+?location :location\t${location}
+*commands :command\t${name}\t${file}
+*modules  :module\t${name}\t${file}
+*bdeps    :build_dependency\t${name}\t${label}
+*tdeps    :test_dependency\t${name}\t${label}
+*deps     :dependency\t${name}\t${label}
+*ideps    :indirect_dependency\t${name}\t${label}
+]]
+
+local function keys_as_string(t, sep)
+   local keys = util.keys(t)
+   table.sort(keys)
+   return table.concat(keys, sep or " ")
+end
+
+local function word_wrap(line)
+   local width = tonumber(os.getenv("COLUMNS")) or 80
+   if width > 80 then width = 80 end
+   if #line > width then
+      local brk = width
+      while brk > 0 and line:sub(brk, brk) ~= " " do
+         brk = brk - 1
+      end
+      if brk > 0 then
+         return line:sub(1, brk-1) .. "\n" .. word_wrap(line:sub(brk+1))
+      end
+   end
+   return line
+end
+
+local function format_text(text)
+   text = text:gsub("^%s*",""):gsub("%s$", ""):gsub("\n[ \t]+","\n"):gsub("([^\n])\n([^\n])","%1 %2")
+   local paragraphs = util.split_string(text, "\n\n")
+   for n, line in ipairs(paragraphs) do
+      paragraphs[n] = word_wrap(line)
+   end
+   return (table.concat(paragraphs, "\n\n"):gsub("%s$", ""))
+end
+
+local function installed_rock_label(dep, tree)
+   local installed, version
+   local rocks_provided = util.get_rocks_provided()
+   if rocks_provided[dep.name] then
+      installed, version = true, rocks_provided[dep.name]
+   else
+      installed, version = search.pick_installed_rock(dep, tree)
+   end
+   return installed and "using "..version or "missing"
+end
+
+local function render(template, data)
+   local out = {}
+   for cmd, var, line in template:gmatch("(.)([a-z]*)%s*:([^\n]*)\n") do
+      line = line:gsub("\\t", "\t")
+      local d = data[var]
+      if cmd == " " then
+         table.insert(out, line)
+      elseif cmd == "?" or cmd == "*" or cmd == "!" then
+         if (cmd == "!" and d == nil)
+             or (cmd ~= "!" and (type(d) == "string"
+                                 or (type(d) == "table" and next(d)))) then
+            local n = cmd == "*" and #d or 1
+            for i = 1, n do
+               local tbl = cmd == "*" and d[i] or data
+               if type(tbl) == "string" then
+                  tbl = tbl:gsub("%%", "%%%%")
+               end
+               table.insert(out, (line:gsub("${([a-z]+)}", tbl)))
+            end
+         end
+      end
+   end
+   return table.concat(out, "\n")
+end
+
+local function adjust_path(name, version, basedir, pathname, suffix)
+   pathname = dir.path(basedir, pathname)
+   local vpathname = path.versioned_name(pathname, basedir, name, version)
+   return (fs.exists(vpathname)
+          and vpathname
+          or pathname) .. (suffix or "")
+end
+
+local function modules_to_list(name, version, repo)
+   local ret = {}
+   local rock_manifest = manif.load_rock_manifest(name, version, repo)
+
+   local lua_dir = path.deploy_lua_dir(repo)
+   local lib_dir = path.deploy_lib_dir(repo)
+   repos.recurse_rock_manifest_entry(rock_manifest.lua, function(pathname)
+      table.insert(ret, {
+         name = path.path_to_module(pathname),
+         file = adjust_path(name, version, lua_dir, pathname),
+      })
+   end)
+   repos.recurse_rock_manifest_entry(rock_manifest.lib, function(pathname)
+      table.insert(ret, {
+         name = path.path_to_module(pathname),
+         file = adjust_path(name, version, lib_dir, pathname),
+      })
+   end)
+   table.sort(ret, function(a, b)
+      if a.name == b.name then
+         return a.file < b.file
+      end
+      return a.name < b.name
+   end)
+   return ret
+end
+
+local function commands_to_list(name, version, repo)
+   local ret = {}
+   local rock_manifest = manif.load_rock_manifest(name, version, repo)
+
+   local bin_dir = path.deploy_bin_dir(repo)
+   repos.recurse_rock_manifest_entry(rock_manifest.bin, function(pathname)
+      table.insert(ret, {
+         name = name,
+         file = adjust_path(name, version, bin_dir, pathname, cfg.wrapper_suffix),
+      })
+   end)
+   table.sort(ret, function(a, b)
+      if a.name == b.name then
+         return a.file < b.file
+      end
+      return a.name < b.name
+   end)
+   return ret
+end
+
+local function deps_to_list(dependencies, tree)
+   local ret = {}
+   for _, dep in ipairs(dependencies or {}) do
+      table.insert(ret, { name = tostring(dep), label = installed_rock_label(dep, tree) })
+   end
+   return ret
+end
+
+local function indirect_deps(mdeps, rdeps, tree)
+   local ret = {}
+   local direct_deps = {}
+   for _, dep in ipairs(rdeps) do
+      direct_deps[dep] = true
+   end
+   for dep_name in util.sortedpairs(mdeps or {}) do
+      if not direct_deps[dep_name] then
+         table.insert(ret, { name = tostring(dep_name), label = installed_rock_label(queries.new(dep_name), tree) })
+      end
+   end
+   return ret
+end
+
+local function show_rock(template, namespace, name, version, rockspec, repo, minfo, tree)
+   local desc = rockspec.description or {}
+   local data = {
+      namespace = namespace,
+      package = rockspec.package,
+      version = rockspec.version,
+      summary = desc.summary or "",
+      detailed = desc.detailed and util.split_string(format_text(desc.detailed), "\n"),
+      license = desc.license,
+      homepage = desc.homepage,
+      issues = desc.issues_url,
+      labels = desc.labels and table.concat(desc.labels, ", "),
+      location = path.rocks_tree_to_string(repo),
+      commands = commands_to_list(name, version, repo),
+      modules = modules_to_list(name, version, repo),
+      bdeps = deps_to_list(rockspec.build_dependencies, tree),
+      tdeps = deps_to_list(rockspec.test_dependencies, tree),
+      deps = deps_to_list(rockspec.dependencies, tree),
+      ideps = indirect_deps(minfo.dependencies, rockspec.dependencies, tree),
+   }
+   util.printout(render(template, data))
+end
+
+--- Driver function for "show" command.
+-- @return boolean: True if succeeded, nil on errors.
+function show.command(args)
+   local query = queries.new(args.rock, args.namespace, args.version, true)
+
+   local name, version, repo, repo_url = search.pick_installed_rock(query, args.tree)
+   if not name then
+      return nil, version
+   end
+   local tree = path.rocks_tree_to_string(repo)
+   local directory = path.install_dir(name, version, repo)
+   local namespace = path.read_namespace(name, version, tree)
+   local rockspec_file = path.rockspec_file(name, version, repo)
+   local rockspec, err = fetch.load_local_rockspec(rockspec_file)
+   if not rockspec then return nil,err end
+
+   local descript = rockspec.description or {}
+   local manifest, err = manif.load_manifest(repo_url)
+   if not manifest then return nil,err end
+   local minfo = manifest.repository[name][version][1]
+
+   if args.rock_tree then util.printout(tree)
+   elseif args.rock_namespace then util.printout(namespace)
+   elseif args.rock_dir then util.printout(directory)
+   elseif args.home then util.printout(descript.homepage)
+   elseif args.rock_license then util.printout(descript.license)
+   elseif args.issues then util.printout(descript.issues_url)
+   elseif args.labels then util.printout(descript.labels and table.concat(descript.labels, "\n"))
+   elseif args.modules then util.printout(keys_as_string(minfo.modules, "\n"))
+   elseif args.deps then
+      for _, dep in ipairs(rockspec.dependencies) do
+         util.printout(tostring(dep))
+      end
+   elseif args.build_deps then
+      for _, dep in ipairs(rockspec.build_dependencies) do
+         util.printout(tostring(dep))
+      end
+   elseif args.test_deps then
+      for _, dep in ipairs(rockspec.test_dependencies) do
+         util.printout(tostring(dep))
+      end
+   elseif args.rockspec then util.printout(rockspec_file)
+   elseif args.mversion then util.printout(version)
+   elseif args.porcelain then
+      show_rock(porcelain_template, namespace, name, version, rockspec, repo, minfo, args.tree)
+   else
+      show_rock(friendly_template, namespace, name, version, rockspec, repo, minfo, args.tree)
+   end
+   return true
+end
+
+return show
diff --git a/src/luarocks/cmd/show.lua b/src/luarocks/cmd/show.lua
index 88cbbada..0ae5cbc6 100644
--- a/src/luarocks/cmd/show.lua
+++ b/src/luarocks/cmd/show.lua
@@ -1,6 +1,12 @@
---- Module implementing the LuaRocks "show" command.
--- Shows information about an installed rock.
-local show = {}
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local math = _tl_compat and _tl_compat.math or math; local os = _tl_compat and _tl_compat.os or os; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table
+
+local show = {Return = {}, }
+
+
+
+
+
+
 
 local queries = require("luarocks.queries")
 local search = require("luarocks.search")
@@ -13,18 +19,38 @@ local fetch = require("luarocks.fetch")
 local manif = require("luarocks.manif")
 local repos = require("luarocks.repos")
 
+
+
+
+local argparse = require("luarocks.vendor.argparse")
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 function show.add_to_parser(parser)
    local cmd = parser:command("show", [[
 Show information about an installed rock.
 
 Without any flags, show all module information.
-With flags, return only the desired information.]], util.see_also())
-      :summary("Show information about an installed rock.")
+With flags, return only the desired information.]], util.see_also()):
+   summary("Show information about an installed rock.")
 
-   cmd:argument("rock", "Name of an installed rock.")
-      :action(util.namespaced_name_action)
-   cmd:argument("version", "Rock version.")
-      :args("?")
+   cmd:argument("rock", "Name of an installed rock."):
+   action(util.namespaced_name_action)
+   cmd:argument("version", "Rock version."):
+   args("?")
 
    cmd:flag("--home", "Show home page of project.")
    cmd:flag("--modules", "Show all modules provided by the package as used by require().")
@@ -101,7 +127,7 @@ local function keys_as_string(t, sep)
 end
 
 local function word_wrap(line)
-   local width = tonumber(os.getenv("COLUMNS")) or 80
+   local width = math.tointeger(os.getenv("COLUMNS")) or 80
    if width > 80 then width = 80 end
    if #line > width then
       local brk = width
@@ -109,14 +135,14 @@ local function word_wrap(line)
          brk = brk - 1
       end
       if brk > 0 then
-         return line:sub(1, brk-1) .. "\n" .. word_wrap(line:sub(brk+1))
+         return line:sub(1, brk - 1) .. "\n" .. word_wrap(line:sub(brk + 1))
       end
    end
    return line
 end
 
 local function format_text(text)
-   text = text:gsub("^%s*",""):gsub("%s$", ""):gsub("\n[ \t]+","\n"):gsub("([^\n])\n([^\n])","%1 %2")
+   text = text:gsub("^%s*", ""):gsub("%s$", ""):gsub("\n[ \t]+", "\n"):gsub("([^\n])\n([^\n])", "%1 %2")
    local paragraphs = util.split_string(text, "\n\n")
    for n, line in ipairs(paragraphs) do
       paragraphs[n] = word_wrap(line)
@@ -130,9 +156,11 @@ local function installed_rock_label(dep, tree)
    if rocks_provided[dep.name] then
       installed, version = true, rocks_provided[dep.name]
    else
-      installed, version = search.pick_installed_rock(dep, tree)
+      local name
+      name, version = search.pick_installed_rock(dep, tree)
+      installed = name ~= nil
    end
-   return installed and "using "..version or "missing"
+   return installed and "using " .. version or "missing"
 end
 
 local function render(template, data)
@@ -143,12 +171,15 @@ local function render(template, data)
       if cmd == " " then
          table.insert(out, line)
       elseif cmd == "?" or cmd == "*" or cmd == "!" then
-         if (cmd == "!" and d == nil)
-             or (cmd ~= "!" and (type(d) == "string"
-                                 or (type(d) == "table" and next(d)))) then
-            local n = cmd == "*" and #d or 1
+         if (cmd == "!" and d == nil) or
+            (cmd ~= "!" and (type(d) == "string" or
+            (type(d) == "table" and next(d) ~= nil))) then
+            local n = type(d) == "table" and #d or 1
+            if cmd ~= "*" then
+               n = 1
+            end
             for i = 1, n do
-               local tbl = cmd == "*" and d[i] or data
+               local tbl = cmd == "*" and type(d) == "table" and d[i] or data
                if type(tbl) == "string" then
                   tbl = tbl:gsub("%%", "%%%%")
                end
@@ -163,9 +194,9 @@ end
 local function adjust_path(name, version, basedir, pathname, suffix)
    pathname = dir.path(basedir, pathname)
    local vpathname = path.versioned_name(pathname, basedir, name, version)
-   return (fs.exists(vpathname)
-          and vpathname
-          or pathname) .. (suffix or "")
+   return (fs.exists(vpathname) and
+   vpathname or
+   pathname) .. (suffix or "")
 end
 
 local function modules_to_list(name, version, repo)
@@ -217,7 +248,7 @@ end
 
 local function deps_to_list(dependencies, tree)
    local ret = {}
-   for _, dep in ipairs(dependencies or {}) do
+   for _, dep in ipairs(dependencies.queries or {}) do
       table.insert(ret, { name = tostring(dep), label = installed_rock_label(dep, tree) })
    end
    return ret
@@ -260,8 +291,8 @@ local function show_rock(template, namespace, name, version, rockspec, repo, min
    util.printout(render(template, data))
 end
 
---- Driver function for "show" command.
--- @return boolean: True if succeeded, nil on errors.
+
+
 function show.command(args)
    local query = queries.new(args.rock, args.namespace, args.version, true)
 
@@ -274,11 +305,11 @@ function show.command(args)
    local namespace = path.read_namespace(name, version, tree)
    local rockspec_file = path.rockspec_file(name, version, repo)
    local rockspec, err = fetch.load_local_rockspec(rockspec_file)
-   if not rockspec then return nil,err end
+   if not rockspec then return nil, err end
 
    local descript = rockspec.description or {}
    local manifest, err = manif.load_manifest(repo_url)
-   if not manifest then return nil,err end
+   if not manifest then return nil, err end
    local minfo = manifest.repository[name][version][1]
 
    if args.rock_tree then util.printout(tree)
diff --git a/src/luarocks/cmd/upload-original.lua b/src/luarocks/cmd/upload-original.lua
new file mode 100644
index 00000000..6b84e452
--- /dev/null
+++ b/src/luarocks/cmd/upload-original.lua
@@ -0,0 +1,128 @@
+
+local upload = {}
+
+local signing = require("luarocks.signing")
+local util = require("luarocks.util")
+local fetch = require("luarocks.fetch")
+local pack = require("luarocks.pack")
+local cfg = require("luarocks.core.cfg")
+local Api = require("luarocks.upload.api")
+
+function upload.add_to_parser(parser)
+   local cmd = parser:command("upload", "Pack a source rock file (.src.rock extension) "..
+      "and upload it and the rockspec to the public rocks repository.", util.see_also())
+      :summary("Upload a rockspec to the public rocks repository.")
+
+   cmd:argument("rockspec", "Rockspec for the rock to upload.")
+   cmd:argument("src-rock", "A corresponding .src.rock file; if not given it will be generated.")
+      :args("?")
+
+   cmd:flag("--skip-pack", "Do not pack and send source rock.")
+   cmd:option("--api-key", "Pass an API key. It will be stored for subsequent uses.")
+      :argname("<key>")
+   cmd:option("--temp-key", "Use the given a temporary API key in this "..
+      "invocation only. It will not be stored.")
+      :argname("<key>")
+   cmd:flag("--force", "Replace existing rockspec if the same revision of a "..
+      "module already exists. This should be used only in case of upload "..
+      "mistakes: when updating a rockspec, increment the revision number "..
+      "instead.")
+   cmd:flag("--sign", "Upload a signature file alongside each file as well.")
+   cmd:flag("--debug"):hidden(true)
+end
+
+local function is_dev_version(version)
+   return version:match("^dev") or version:match("^scm")
+end
+
+function upload.command(args)
+   local api, err = Api.new(args)
+   if not api then
+      return nil, err
+   end
+   if cfg.verbose then
+      api.debug = true
+   end
+
+   local rockspec, err, errcode = fetch.load_rockspec(args.rockspec)
+   if err then
+      return nil, err, errcode
+   end
+
+   util.printout("Sending " .. tostring(args.rockspec) .. " ...")
+   local res, err = api:method("check_rockspec", {
+      package = rockspec.package,
+      version = rockspec.version
+   })
+   if not res then return nil, err end
+
+   if not res.module then
+      util.printout("Will create new module (" .. tostring(rockspec.package) .. ")")
+   end
+   if res.version and not args.force then
+      return nil, "Revision "..rockspec.version.." already exists on the server. "..util.see_help("upload")
+   end
+
+   local sigfname
+   local rock_sigfname
+
+   if args.sign then
+      sigfname, err = signing.sign_file(args.rockspec)
+      if err then
+         return nil, "Failed signing rockspec: " .. err
+      end
+      util.printout("Signed rockspec: "..sigfname)
+   end
+
+   local rock_fname
+   if args.src_rock then
+      rock_fname = args.src_rock
+   elseif not args.skip_pack and not is_dev_version(rockspec.version) then
+      util.printout("Packing " .. tostring(rockspec.package))
+      rock_fname, err = pack.pack_source_rock(args.rockspec)
+      if not rock_fname then
+         return nil, err
+      end
+   end
+
+   if rock_fname and args.sign then
+      rock_sigfname, err = signing.sign_file(rock_fname)
+      if err then
+         return nil, "Failed signing rock: " .. err
+      end
+      util.printout("Signed packed rock: "..rock_sigfname)
+   end
+
+   local multipart = require("luarocks.upload.multipart")
+
+   res, err = api:method("upload", nil, {
+     rockspec_file = multipart.new_file(args.rockspec),
+     rockspec_sig = sigfname and multipart.new_file(sigfname),
+   })
+   if not res then return nil, err end
+
+   if res.is_new and #res.manifests == 0 then
+      util.printerr("Warning: module not added to root manifest due to name taken.")
+   end
+
+   local module_url = res.module_url
+
+   if rock_fname then
+      if (not res.version) or (not res.version.id) then
+         return nil, "Invalid response from server."
+      end
+      util.printout(("Sending " .. tostring(rock_fname) .. " ..."))
+      res, err = api:method("upload_rock/" .. ("%d"):format(res.version.id), nil, {
+         rock_file = multipart.new_file(rock_fname),
+         rock_sig = rock_sigfname and multipart.new_file(rock_sigfname),
+      })
+      if not res then return nil, err end
+   end
+
+   util.printout()
+   util.printout("Done: " .. tostring(module_url))
+   util.printout()
+   return true
+end
+
+return upload
diff --git a/src/luarocks/cmd/upload.lua b/src/luarocks/cmd/upload.lua
index 6b84e452..576fdc65 100644
--- a/src/luarocks/cmd/upload.lua
+++ b/src/luarocks/cmd/upload.lua
@@ -1,5 +1,15 @@
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local string = _tl_compat and _tl_compat.string or string
+local upload = {Response = {version = {}, }, }
+
+
+
+
+
+
+
+
+
 
-local upload = {}
 
 local signing = require("luarocks.signing")
 local util = require("luarocks.util")
@@ -8,25 +18,33 @@ local pack = require("luarocks.pack")
 local cfg = require("luarocks.core.cfg")
 local Api = require("luarocks.upload.api")
 
+
+
+local argparse = require("luarocks.vendor.argparse")
+
+
+
+
+
 function upload.add_to_parser(parser)
-   local cmd = parser:command("upload", "Pack a source rock file (.src.rock extension) "..
-      "and upload it and the rockspec to the public rocks repository.", util.see_also())
-      :summary("Upload a rockspec to the public rocks repository.")
+   local cmd = parser:command("upload", "Pack a source rock file (.src.rock extension) " ..
+   "and upload it and the rockspec to the public rocks repository.", util.see_also()):
+   summary("Upload a rockspec to the public rocks repository.")
 
    cmd:argument("rockspec", "Rockspec for the rock to upload.")
-   cmd:argument("src-rock", "A corresponding .src.rock file; if not given it will be generated.")
-      :args("?")
+   cmd:argument("src-rock", "A corresponding .src.rock file; if not given it will be generated."):
+   args("?")
 
    cmd:flag("--skip-pack", "Do not pack and send source rock.")
-   cmd:option("--api-key", "Pass an API key. It will be stored for subsequent uses.")
-      :argname("<key>")
-   cmd:option("--temp-key", "Use the given a temporary API key in this "..
-      "invocation only. It will not be stored.")
-      :argname("<key>")
-   cmd:flag("--force", "Replace existing rockspec if the same revision of a "..
-      "module already exists. This should be used only in case of upload "..
-      "mistakes: when updating a rockspec, increment the revision number "..
-      "instead.")
+   cmd:option("--api-key", "Pass an API key. It will be stored for subsequent uses."):
+   argname("<key>")
+   cmd:option("--temp-key", "Use the given a temporary API key in this " ..
+   "invocation only. It will not be stored."):
+   argname("<key>")
+   cmd:flag("--force", "Replace existing rockspec if the same revision of a " ..
+   "module already exists. This should be used only in case of upload " ..
+   "mistakes: when updating a rockspec, increment the revision number " ..
+   "instead.")
    cmd:flag("--sign", "Upload a signature file alongside each file as well.")
    cmd:flag("--debug"):hidden(true)
 end
@@ -52,7 +70,7 @@ function upload.command(args)
    util.printout("Sending " .. tostring(args.rockspec) .. " ...")
    local res, err = api:method("check_rockspec", {
       package = rockspec.package,
-      version = rockspec.version
+      version = rockspec.version,
    })
    if not res then return nil, err end
 
@@ -60,7 +78,7 @@ function upload.command(args)
       util.printout("Will create new module (" .. tostring(rockspec.package) .. ")")
    end
    if res.version and not args.force then
-      return nil, "Revision "..rockspec.version.." already exists on the server. "..util.see_help("upload")
+      return nil, "Revision " .. rockspec.version .. " already exists on the server. " .. util.see_help("upload")
    end
 
    local sigfname
@@ -71,7 +89,7 @@ function upload.command(args)
       if err then
          return nil, "Failed signing rockspec: " .. err
       end
-      util.printout("Signed rockspec: "..sigfname)
+      util.printout("Signed rockspec: " .. sigfname)
    end
 
    local rock_fname
@@ -90,14 +108,14 @@ function upload.command(args)
       if err then
          return nil, "Failed signing rock: " .. err
       end
-      util.printout("Signed packed rock: "..rock_sigfname)
+      util.printout("Signed packed rock: " .. rock_sigfname)
    end
 
    local multipart = require("luarocks.upload.multipart")
 
    res, err = api:method("upload", nil, {
-     rockspec_file = multipart.new_file(args.rockspec),
-     rockspec_sig = sigfname and multipart.new_file(sigfname),
+      rockspec_file = multipart.new_file(args.rockspec),
+      rockspec_sig = sigfname and multipart.new_file(sigfname),
    })
    if not res then return nil, err end
 
diff --git a/src/luarocks/cmd/upload.tl b/src/luarocks/cmd/upload.tl
index 19b8f6ef..db62a9e9 100644
--- a/src/luarocks/cmd/upload.tl
+++ b/src/luarocks/cmd/upload.tl
@@ -1,6 +1,13 @@
 
 local record upload
    record Response
+      module: string
+      is_new: boolean
+      module_url: boolean
+      manifests: {string}
+      record version
+         id: string
+      end
    end
 end
 
@@ -11,6 +18,8 @@ local pack = require("luarocks.pack")
 local cfg = require("luarocks.core.cfg")
 local Api = require("luarocks.upload.api")
 
+local type Response = upload.Response
+
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
@@ -62,7 +71,7 @@ function upload.command(args: Args): boolean, string, string
    local res, err = api:method("check_rockspec", {
       package = rockspec.package,
       version = rockspec.version
-   })
+   }) as (Response, string)
    if not res then return nil, err end
 
    if not res.module then
@@ -107,7 +116,7 @@ function upload.command(args: Args): boolean, string, string
    res, err = api:method("upload", nil, {
      rockspec_file = multipart.new_file(args.rockspec),
      rockspec_sig = sigfname and multipart.new_file(sigfname),
-   })
+   }) as (Response, string)
    if not res then return nil, err end
 
    if res.is_new and #res.manifests == 0 then
@@ -124,7 +133,7 @@ function upload.command(args: Args): boolean, string, string
       res, err = api:method("upload_rock/" .. ("%d"):format(res.version.id), nil, {
          rock_file = multipart.new_file(rock_fname),
          rock_sig = rock_sigfname and multipart.new_file(rock_sigfname),
-      })
+      }) as (Response, string)
       if not res then return nil, err end
    end