Merge branch 'master' into multitree

author: Hisham Muhammad <hisham@gobolinux.org> 2012-10-17 17:39:43 -0300
committer: Hisham Muhammad <hisham@gobolinux.org> 2012-10-17 17:39:43 -0300
commit: 1f27702935b9bba1c0c3240a52a7ecaeca0ea81c (patch)
tree: 9c717ad2f5f7629ac3b1520d1e600936547e0ed1 /src
parent: 330ef7b69185a0e8a13edf6c2a401bd775567022 (diff)
parent: 960c8b1f79837ea305ef93cb128b22ed96565c18 (diff)
download: luarocks-1f27702935b9bba1c0c3240a52a7ecaeca0ea81c.tar.gz
luarocks-1f27702935b9bba1c0c3240a52a7ecaeca0ea81c.tar.bz2
luarocks-1f27702935b9bba1c0c3240a52a7ecaeca0ea81c.zip
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.title("Search results:")
-         util.printout("Search results:")
-         util.printout("---------------")
         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.title("Search results:")
-         util.printout("Search results:")
-         util.printout("---------------")
         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.title("Installed rocks:", flags["porcelain"])
-   util.printout("Installed rocks:")
+   search.print_results(results, flags["porcelain"])
-   util.printout("----------------")
-   util.printout()
-   search.print_results(results, false)
   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
+-- @param porcelain boolean or nil: A flag to force machine-friendly output.
-function print_results(results, show_repo)
+function print_results(results, porcelain)
   assert(type(results) == "table")
-   assert(type(show_repo) == "boolean" or not show_repo)
+   assert(type(porcelain) == "boolean" or not porcelain)
-   -- Force display of repo location for the time being
-   show_repo = true -- show_repo == nil and true or show_repo
   
   for package, versions in util.sortedpairs(results) do
-      util.printout(package)
+      if not porcelain then
-      for version, repositories in util.sortedpairs(versions, deps.compare_versions) do
+         util.printout(package)
-         if show_repo then
+      end
-            for _, repo in ipairs(repositories) do
+      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()
+   local porcelain = flags["porcelain"]
-   util.printout("Search results:")
+   util.title("Search results:", porcelain, "=")
-   util.printout("===============")
-   util.printout()
   local sources, binaries = split_source_and_binary_results(results)
   if next(sources) and not flags["binary"] then
-      util.printout("Rockspecs and source rocks:")
+      util.title("Rockspecs and source rocks:", porcelain)
-      util.printout("---------------------------")
+      print_results(sources, porcelain)
-      util.printout()
-      print_results(sources, true)
   end
   if next(binaries) and not flags["source"] then    
-      util.printout("Binary and pure-Lua rocks:")
+      util.title("Binary and pure-Lua rocks:", porcelain)
-      util.printout("--------------------------")
+      print_results(binaries, porcelain)
-      util.printout()
-      print_results(binaries, true)
   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.title("Results:")
-   util.printout("Results:")
-   util.printout("--------")
   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.title("Summary:")
-   util.printout("Summary:")
-   util.printout("--------")
   local total = 0
   for errcode, errors in pairs(results) do
      util.printout(errcode..": "..tostring(#errors))
author	Hisham Muhammad <hisham@gobolinux.org>	2012-10-17 17:39:43 -0300
committer	Hisham Muhammad <hisham@gobolinux.org>	2012-10-17 17:39:43 -0300
commit	1f27702935b9bba1c0c3240a52a7ecaeca0ea81c (patch)
tree	9c717ad2f5f7629ac3b1520d1e600936547e0ed1 /src
parent	330ef7b69185a0e8a13edf6c2a401bd775567022 (diff)
parent	960c8b1f79837ea305ef93cb128b22ed96565c18 (diff)
download	luarocks-1f27702935b9bba1c0c3240a52a7ecaeca0ea81c.tar.gz luarocks-1f27702935b9bba1c0c3240a52a7ecaeca0ea81c.tar.bz2 luarocks-1f27702935b9bba1c0c3240a52a7ecaeca0ea81c.zip