From 46422a6e5207ba57a0023e74d0011982cf34d3d6 Mon Sep 17 00:00:00 2001
From: Adam Vandenberg
Date: Sun, 18 May 2014 15:33:31 -0700
Subject: always use a top-level array for info JSON

Closes #29318.
---
 Library/Contributions/manpages/brew.1.md | 9 ++++-----
 Library/Homebrew/cmd/info.rb             | 6 +-----
 2 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'Library')

diff --git a/Library/Contributions/manpages/brew.1.md b/Library/Contributions/manpages/brew.1.md
index 22d8dbf8f..f3b86747d 100644
--- a/Library/Contributions/manpages/brew.1.md
+++ b/Library/Contributions/manpages/brew.1.md
@@ -160,16 +160,15 @@ Note that these flags should only appear after a command.
 
     To view formula history locally: `brew log -p <formula>`.
 
-  * `info --json=<version>` (--all|--installed|<formula>):
-    Print a JSON representation of <formula>. Currently the only accepted value
+  * `info --json=<version>` (--all|--installed|<formulae>):
+    Print a JSON representation of <formulae>. Currently the only accepted value
     for <version> is `v1`.
 
     Pass `--all` to get information on all formulae, or `--installed` to get
     information on all installed formulae.
 
-    If a single formula is specified, a single JSON object is displayed.
-    If multiple formulae are specified, or `--installed` or `--all` are used,
-    a JSON array is displayed, even if the array would only contain one object.
+    See the wiki for examples of using the JSON:
+    <https://github.com/Homebrew/homebrew/wiki/Querying-Brew>
 
   * `install [--debug] [--env=<std|super>] [--ignore-dependencies] [--only-dependencies] [--cc=<compiler>] [--build-from-source] [--devel|--HEAD]` <formula>:
     Install <formula>.
diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb
index ef8e2ac52..7063fd60c 100644
--- a/Library/Homebrew/cmd/info.rb
+++ b/Library/Homebrew/cmd/info.rb
@@ -49,11 +49,7 @@ module Homebrew extend self
            ARGV.formulae
          end
     json = ff.map {|f| f.to_hash}
-    if json.size == 1
-      puts Utils::JSON.dump(json.pop)
-    else
-      puts Utils::JSON.dump(json)
-    end
+    puts Utils::JSON.dump(json)
   end
 
   def github_fork
-- 
cgit v1.2.3