aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorAdam Vandenberg2014-05-18 15:33:31 -0700
committerAdam Vandenberg2014-05-18 15:33:43 -0700
commit48a7981c78fb99cc3e878c60a02e076430ab9d37 (patch)
tree753fcc25791a1105bc16e25627acb41f78fb63fc /Library
parent16c073a1531057c7f8244a2694d0923986b79d74 (diff)
downloadbrew-48a7981c78fb99cc3e878c60a02e076430ab9d37.tar.bz2
always use a top-level array for info JSON
Closes Homebrew/homebrew#29318.
Diffstat (limited to 'Library')
-rw-r--r--Library/Contributions/manpages/brew.1.md9
-rw-r--r--Library/Homebrew/cmd/info.rb6
2 files changed, 5 insertions, 10 deletions
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