Merge branch 'master' into multitree

6 files changed, 34 insertions, 41 deletions

diff --git a/src/luarocks/download.lua b/src/luarocks/download.lua
index ae835bf2..0012cb18 100644
--- a/src/luarocks/download.lua
+++ b/src/luarocks/download.lua
@@ -50,9 +50,7 @@ function download(arch, name, version, all)
          return all_ok, any_err
       else
          util.printerr("Multiple search results were returned.")
-         util.printout()
-         util.printout("Search results:")
-         util.printout("---------------")
+         util.title("Search results:")
          search.print_results(results)
          return nil, "Please narrow your query or use --all."
       end
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index a940d356..0ffb95ef 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -146,9 +146,7 @@ function run(...)
       else
          util.printout()
          util.printerr("Could not determine which rock to install.")
-         util.printout()
-         util.printout("Search results:")
-         util.printout("---------------")
+         util.title("Search results:")
          search.print_results(results)
          return nil, (next(results) and "Please narrow your query." or "No results found.")
       end
diff --git a/src/luarocks/list.lua b/src/luarocks/list.lua
index 1943f932..f56fc7e9 100644
--- a/src/luarocks/list.lua
+++ b/src/luarocks/list.lua
@@ -26,10 +26,7 @@ function run(...)
    for _, tree in ipairs(cfg.rocks_trees) do
       search.manifest_search(results, path.rocks_dir(tree), query)
    end
-   util.printout()
-   util.printout("Installed rocks:")
-   util.printout("----------------")
-   util.printout()
-   search.print_results(results, false)
+   util.title("Installed rocks:", flags["porcelain"])
+   search.print_results(results, flags["porcelain"])
    return true
 end
diff --git a/src/luarocks/search.lua b/src/luarocks/search.lua
index 692004ae..7db88d74 100644
--- a/src/luarocks/search.lua
+++ b/src/luarocks/search.lua
@@ -282,25 +282,27 @@ end
 --- Print a list of rocks/rockspecs on standard output.
 -- @param results table: A table where keys are package names and versions
 -- are tables matching version strings to an array of rocks servers.
--- @param show_repo boolean or nil: Whether to show repository
-function print_results(results, show_repo)
+-- @param porcelain boolean or nil: A flag to force machine-friendly output.
+function print_results(results, porcelain)
    assert(type(results) == "table")
-   assert(type(show_repo) == "boolean" or not show_repo)
-   -- Force display of repo location for the time being
-   show_repo = true -- show_repo == nil and true or show_repo
+   assert(type(porcelain) == "boolean" or not porcelain)
    
    for package, versions in util.sortedpairs(results) do
-      util.printout(package)
-      for version, repositories in util.sortedpairs(versions, deps.compare_versions) do
-         if show_repo then
-            for _, repo in ipairs(repositories) do
+      if not porcelain then
+         util.printout(package)
+      end
+      for version, repos in util.sortedpairs(versions, deps.compare_versions) do
+         for _, repo in ipairs(repos) do
+            if porcelain then
+               util.printout(package, version, repo.arch, repo.repo)
+            else
                util.printout("   "..version.." ("..repo.arch..") - "..repo.repo)
             end
-         else
-            util.printout("   "..version)
          end
       end
-      util.printout()
+      if not porcelain then
+         util.printout()
+      end
    end
 end
 
@@ -369,22 +371,16 @@ function run(...)
    local query = make_query(name:lower(), version)
    query.exact_name = false
    local results, err = search_repos(query)
-   util.printout()
-   util.printout("Search results:")
-   util.printout("===============")
-   util.printout()
+   local porcelain = flags["porcelain"]
+   util.title("Search results:", porcelain, "=")
    local sources, binaries = split_source_and_binary_results(results)
    if next(sources) and not flags["binary"] then
-      util.printout("Rockspecs and source rocks:")
-      util.printout("---------------------------")
-      util.printout()
-      print_results(sources, true)
+      util.title("Rockspecs and source rocks:", porcelain)
+      print_results(sources, porcelain)
    end
    if next(binaries) and not flags["source"] then    
-      util.printout("Binary and pure-Lua rocks:")
-      util.printout("--------------------------")
-      util.printout()
-      print_results(binaries, true)
+      util.title("Binary and pure-Lua rocks:", porcelain)
+      print_results(binaries, porcelain)
    end
    return true
 end
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index 67a3778a..c6e0c592 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -299,6 +299,14 @@ function warning(msg)
    printerr("Warning: "..msg)
 end
 
+function title(msg, porcelain, underline)
+   if porcelain then return end
+   printout()
+   printout(msg)
+   printout((underline or "-"):rep(#msg))
+   printout()
+end
+
 -- from http://lua-users.org/wiki/SplitJoin
 -- by PhilippeLhoste
 function split_string(str, delim, maxNb)
diff --git a/src/luarocks/validate.lua b/src/luarocks/validate.lua
index fb6a78ad..1e1e69e1 100644
--- a/src/luarocks/validate.lua
+++ b/src/luarocks/validate.lua
@@ -124,9 +124,7 @@ local function validate(repo, flags)
       fs.delete(sandbox)
    end
    restore_settings(settings)
-   util.printout()
-   util.printout("Results:")
-   util.printout("--------")
+   util.title("Results:")
    util.printout("OK: "..tostring(#results.ok))
    for _, entry in ipairs(results.ok) do
       util.printout(entry.file)
@@ -141,9 +139,7 @@ local function validate(repo, flags)
       end
    end
 
-   util.printout()
-   util.printout("Summary:")
-   util.printout("--------")
+   util.title("Summary:")
    local total = 0
    for errcode, errors in pairs(results) do
       util.printout(errcode..": "..tostring(#errors))