9 files changed, 92 insertions, 67 deletions

diff --git a/rockspec b/rockspec
index 6b6f0374..a4bc3df4 100644
--- a/rockspec
+++ b/rockspec
@@ -1,5 +1,5 @@
 package = "LuaRocks"
-local VER = "2.0.4.1"
+local VER = "2.0.5"
 local REV = "1"
 version = VER.."-"..REV
 
diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index 5bb3c3f7..77dd1dad 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -14,33 +14,39 @@ local manif = require("luarocks.manif")
 local cfg = require("luarocks.cfg")
 
 help_summary = "Build/compile a rock."
-help_arguments = "{<rockspec>|<rock>|<name> [<version>]}"
+help_arguments = "[--pack-binary-rock] {<rockspec>|<rock>|<name> [<version>]}"
 help = [[
-Build a rock, compiling its C parts if any.
+Build and install a rock, compiling its C parts if any.
 Argument may be a rockspec file, a source rock file
 or the name of a rock to be fetched from a repository.
+
+If --pack-binary-rock is passed, the rock is not installed;
+instead, a .rock file with the contents of compilation is produced
+in the current directory.
 ]]
 
 --- Install files to a given location.
 -- Takes a table where the array part is a list of filenames to be copied.
--- In the hash part, other keys are identifiers in Lua module format,
--- to indicate which subdirectory the file should be copied to. For example,
--- install_files({["foo.bar"] = "src/bar.lua"}, "boo") will copy src/bar.lua
--- to boo/foo.
+-- In the hash part, other keys, if is_module_path is set, are identifiers
+-- in Lua module format, to indicate which subdirectory the file should be
+-- copied to. For example, install_files({["foo.bar"] = "src/bar.lua"}, "boo")
+-- will copy src/bar.lua to boo/foo.
 -- @param files table or nil: A table containing a list of files to copy in
 -- the format described above. If nil is passed, this function is a no-op.
 -- Directories should be delimited by forward slashes as in internet URLs.
 -- @param location string: The base directory files should be copied to.
+-- @param is_module_path boolean: True if string keys in files should be
+-- interpreted as dotted module paths.
 -- @return boolean or (nil, string): True if succeeded or 
 -- nil and an error message.
-local function install_files(files, location) 
+local function install_files(files, location, is_module_path)
    assert(type(files) == "table" or not files)
    assert(type(location) == "string")
    if files then
       for k, file in pairs(files) do
          local dest = location
          if type(k) == "string" then
-            dest = dir.path(location, path.module_to_path(k))
+            dest = is_module_path and dir.path(location, path.module_to_path(k)) or k
          end
          fs.make_dir(dest)
          local ok = fs.copy(dir.path(file), dest)
@@ -143,14 +149,14 @@ function build_rockspec(rockspec_file, need_to_fetch, minimal_mode)
    end
    
    local dirs = {
-      lua = path.lua_dir(name, version),
-      lib = path.lib_dir(name, version),
-      conf = path.conf_dir(name, version),
-      bin = path.bin_dir(name, version),
+      lua = { name = path.lua_dir(name, version), is_module_path = true },
+      lib = { name = path.lib_dir(name, version), is_module_path = true },
+      conf = { name = path.conf_dir(name, version), is_module_path = false },
+      bin = { name = path.bin_dir(name, version), is_module_path = false },
    }
    
    for _, d in pairs(dirs) do
-      fs.make_dir(d)
+      fs.make_dir(d.name)
    end
    local rollback = util.schedule_function(function()
       fs.delete(path.install_dir(name, version))
@@ -188,7 +194,7 @@ function build_rockspec(rockspec_file, need_to_fetch, minimal_mode)
 
    if build.install then
       for id, install_dir in pairs(dirs) do
-         ok, err = install_files(build.install[id], install_dir)
+         ok, err = install_files(build.install[id], install_dir.name, install_dir.is_module_path)
          if not ok then 
             return nil, err
          end
@@ -206,7 +212,7 @@ function build_rockspec(rockspec_file, need_to_fetch, minimal_mode)
    end
 
    for _, d in pairs(dirs) do
-      fs.remove_dir_if_empty(d)
+      fs.remove_dir_if_empty(d.name)
    end
 
    fs.pop_dir()
@@ -267,6 +273,42 @@ function build_rock(rock_file, need_to_fetch)
    return ok, err, errcode
 end
 
+local function do_build(name, version)
+   if name:match("%.rockspec$") then
+      return build_rockspec(name, true)
+   elseif name:match("%.src%.rock$") then
+      return build_rock(name, false)
+   elseif name:match("%.all%.rock$") then
+      local install = require("luarocks.install")
+      return install.install_binary_rock(name)
+   elseif name:match("%.rock$") then
+      return build_rock(name, true)
+   elseif not name:match(dir.separator) then
+      local search = require("luarocks.search")
+      return search.act_on_src_or_rockspec(run, name:lower(), version)
+   end
+   return nil, "Don't know what to do with "..name
+end
+
+local function pack_binary_rock(name, version)
+   local temp_dir = fs.make_temp_dir("luarocks-build-pack-"..dir.base_name(name))
+   if not temp_dir then
+      return nil, "Failed creating temporary directory."
+   end
+   util.schedule_function(fs.delete, temp_dir)
+
+   path.use_tree(temp_dir)
+   local ok, err = do_build(name, version)
+   if not ok then
+      return nil, err
+   end
+   local rname, rversion = path.parse_name(name)
+   if not rname then
+      rname, rversion = name, version
+   end
+   return pack.pack_binary_rock(rname, rversion)
+end
+
 --- Driver function for "build" command.
 -- @param name string: A local or remote rockspec or rock file.
 -- If a package name is given, forwards the request to "search" and,
@@ -284,19 +326,10 @@ function run(...)
 
    local ok, err = fs.check_command_permissions(flags)
    if not ok then return nil, err end
-
-   if name:match("%.rockspec$") then
-      return build_rockspec(name, true)
-   elseif name:match("%.src%.rock$") then
-      return build_rock(name, false)
-   elseif name:match("%.all%.rock$") then
-      local install = require("luarocks.install")
-      return install.install_binary_rock(name)
-   elseif name:match("%.rock$") then
-      return build_rock(name, true)
-   elseif not name:match(dir.separator) then
-      local search = require("luarocks.search")
-      return search.act_on_src_or_rockspec(run, name:lower(), version)
+   
+   if flags["pack-binary-rock"] then
+      return pack_binary_rock(name, version)
+   else
+      return do_build(name, version)
    end
-   return nil, "Don't know what to do with "..name
 end
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 43f10e6b..2b48d576 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -24,7 +24,7 @@ end
 
 _M.config = config
 
-program_version = "2.0.4.1"
+program_version = "2.0.5"
 user_agent = "LuaRocks/"..program_version
 
 local persist = require("luarocks.persist")
diff --git a/src/luarocks/command_line.lua b/src/luarocks/command_line.lua
index 50502257..02793c5a 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/command_line.lua
@@ -15,7 +15,7 @@ local function die(message)
 
    local ok, err = pcall(util.run_scheduled_functions)
    if not ok then
-      util.printerr("\nLuaRocks "..cfg.program_version.." internal bug (please report at luarocks-developers@lists.luaforge.net):\n"..err)
+      util.printerr("\nLuaRocks "..cfg.program_version.." internal bug (please report at luarocks-developers@lists.sourceforge.net):\n"..err)
    end
    util.printerr("\nError: "..message)
    os.exit(1)
@@ -33,14 +33,6 @@ local function is_writable(tree)
   end
 end
 
-local function use_tree(tree)
-   cfg.root_dir = tree
-   cfg.rocks_dir = path.rocks_dir(tree)
-   cfg.deploy_bin_dir = path.deploy_bin_dir(tree)
-   cfg.deploy_lua_dir = path.deploy_lua_dir(tree)
-   cfg.deploy_lib_dir = path.deploy_lib_dir(tree)
-end
-
 --- Main command-line processor.
 -- Parses input arguments and calls the appropriate driver function
 -- to execute the action requested on the command-line, forwarding
@@ -97,12 +89,12 @@ function run_command(...)
          die("Argument error: use --to=<path>")
       end
       local root_dir = fs.absolute_name(flags["to"])
-      use_tree(root_dir)
+      path.use_tree(root_dir)
    elseif flags["local"] then
-      use_tree(cfg.home_tree)
+      path.use_tree(cfg.home_tree)
    else
       local trees = cfg.rocks_trees
-      use_tree(trees[#trees])
+      path.use_tree(trees[#trees])
    end
 
    if type(cfg.root_dir) == "string" then
@@ -142,7 +134,7 @@ function run_command(...)
    if commands[command] then
       local xp, ok, err = xpcall(function() return commands[command].run(unpack(args)) end, function(err)
          die(debug.traceback("LuaRocks "..cfg.program_version
-            .." bug (please report at luarocks-developers@lists.luaforge.net).\n"
+            .." bug (please report at luarocks-developers@lists.sourceforge.net).\n"
             ..err, 2))
       end)
       if xp and (not ok) then
diff --git a/src/luarocks/fs/lua.lua b/src/luarocks/fs/lua.lua
index 0a748b0e..1a7e4eff 100644
--- a/src/luarocks/fs/lua.lua
+++ b/src/luarocks/fs/lua.lua
@@ -159,8 +159,7 @@ end
 -- a crossplatform way.
 function change_dir_to_root()
    table.insert(dir_stack, lfs.currentdir())
-   -- TODO Does this work on Windows?
-   lfs.chdir("/")
+   lfs.chdir("/")       -- works on Windows too
 end
 
 --- Change working directory to the previous in the dir stack.
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index d7d87192..e99b4ce0 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -28,7 +28,7 @@ or a filename of a locally available rock.
 function install_binary_rock(rock_file)
    assert(type(rock_file) == "string")
 
-   local name, version, arch = path.parse_rock_name(rock_file)
+   local name, version, arch = path.parse_name(rock_file)
    if not name then
       return nil, "Filename "..rock_file.." does not match format 'name-version-revision.arch.rock'."
    end
diff --git a/src/luarocks/pack.lua b/src/luarocks/pack.lua
index e22bdc38..b85b7460 100644
--- a/src/luarocks/pack.lua
+++ b/src/luarocks/pack.lua
@@ -80,7 +80,7 @@ end
 -- @param version string or nil: A version number may also be passed.
 -- @return string or (nil, string): The filename of the resulting
 -- .src.rock file; or nil and an error message.
-local function pack_binary_rock(name, version)
+function pack_binary_rock(name, version)
    assert(type(name) == "string")
    assert(type(version) == "string" or not version)
 
diff --git a/src/luarocks/path.lua b/src/luarocks/path.lua
index fe241aa5..8c795e8b 100644
--- a/src/luarocks/path.lua
+++ b/src/luarocks/path.lua
@@ -193,22 +193,18 @@ function bin_dir(name, version, repo)
    return dir.path(rocks_dir(repo), name, version, "bin")
 end
 
---- Extract name, version and arch of a rock filename.
--- @param rock_file string: pathname of a rock
+--- Extract name, version and arch of a rock filename,
+-- or name, version and "rockspec" from a rockspec name.
+-- @param file_name string: pathname of a rock or rockspec
 -- @return (string, string, string) or nil: name, version and arch
--- of rock, or nil if name could not be parsed
-function parse_rock_name(rock_file)
-   assert(type(rock_file) == "string")
-   return dir.base_name(rock_file):match("(.*)-([^-]+-%d+)%.([^.]+)%.rock$")
-end
-
---- Extract name and version of a rockspec filename.
--- @param rockspec_file string: pathname of a rockspec
--- @return (string, string) or nil: name and version
--- of rockspec, or nil if name could not be parsed
-function parse_rockspec_name(rockspec_file)
-   assert(type(rockspec_file) == "string")
-   return dir.base_name(rockspec_file):match("(.*)-([^-]+-%d+)%.(rockspec)")
+-- or nil if name could not be parsed
+function parse_name(file_name)
+   assert(type(file_name) == "string")
+   if file_name:match("%.rock$") then
+      return dir.base_name(file_name):match("(.*)-([^-]+-%d+)%.([^.]+)%.rock$")
+   else
+      return dir.base_name(file_name):match("(.*)-([^-]+-%d+)%.(rockspec)")
+   end
 end
 
 --- Make a rockspec or rock URL.
@@ -301,6 +297,14 @@ function versioned_name(file, prefix, name, version)
    return dir.path(prefix, name_version.."-"..rest)
 end
 
+function use_tree(tree)
+   cfg.root_dir = tree
+   cfg.rocks_dir = rocks_dir(tree)
+   cfg.deploy_bin_dir = deploy_bin_dir(tree)
+   cfg.deploy_lua_dir = deploy_lua_dir(tree)
+   cfg.deploy_lib_dir = deploy_lib_dir(tree)
+end
+
 --- Driver function for "path" command.
 -- @return boolean This function always succeeds.
 function run(...)
diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua
index 493c2f45..127bba19 100644
--- a/src/luarocks/search.lua
+++ b/src/luarocks/search.lua
@@ -138,10 +138,7 @@ function disk_search(repo, query, results)
    
    for _, name in pairs(fs.list_dir(repo)) do
       local pathname = dir.path(repo, name)
-      local rname, rversion, rarch = path.parse_rock_name(name)
-      if not rname then
-         rname, rversion, rarch = path.parse_rockspec_name(name)
-      end
+      local rname, rversion, rarch = path.parse_name(name)
       if fs.is_dir(pathname) then
          for _, version in pairs(fs.list_dir(pathname)) do
             if version:match("-%d+$") then