diff options
| -rw-r--r-- | Library/Homebrew/cmd/desc.rb | 5 | ||||
| -rw-r--r-- | Library/Homebrew/descriptions.rb | 16 |
2 files changed, 4 insertions, 17 deletions
diff --git a/Library/Homebrew/cmd/desc.rb b/Library/Homebrew/cmd/desc.rb index dab18fc91..df228d643 100644 --- a/Library/Homebrew/cmd/desc.rb +++ b/Library/Homebrew/cmd/desc.rb @@ -10,7 +10,10 @@ module Homebrew if search_type.empty? raise FormulaUnspecifiedError if ARGV.named.empty? - Descriptions.named(ARGV.formulae.map(&:full_name)).print + desc = {} + ARGV.formulae.each { |f| desc[f.full_name] = f.desc } + results = Descriptions.new(desc) + results.print elsif search_type.size > 1 odie "Pick one, and only one, of -s/--search, -n/--name, or -d/--description." else diff --git a/Library/Homebrew/descriptions.rb b/Library/Homebrew/descriptions.rb index 09ea7ed56..e66e388eb 100644 --- a/Library/Homebrew/descriptions.rb +++ b/Library/Homebrew/descriptions.rb @@ -106,22 +106,6 @@ class Descriptions end end - # Given an array of formula names, return a {Descriptions} object mapping - # those names to their descriptions. - def self.named(names) - self.ensure_cache - - results = {} - unless names.empty? - results = names.inject({}) do |accum, name| - accum[name] = @cache[name] - accum - end - end - - new(results) - end - # Given a regex, find all formulae whose specified fields contain a match. def self.search(regex, field = :either) self.ensure_cache |