From d84b8cf2885b79854221ad5968d8ec03955a9969 Mon Sep 17 00:00:00 2001 From: Adam Vandenberg Date: Thu, 17 Jun 2010 10:45:16 -0700 Subject: [PATCH] Extract search_brews method --- Library/Homebrew/brew.h.rb | 11 +++++++++++ bin/brew | 11 +---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb index bd4153b16b..24f51108f1 100644 --- a/Library/Homebrew/brew.h.rb +++ b/Library/Homebrew/brew.h.rb @@ -399,6 +399,17 @@ def outdated_brews return results end +def search_brews text + require "formula" + formulae = Formulary.names with_aliases=true + if text =~ /^\/(.*)\/$/ + return formulae.grep(Regexp.new($1)) + else + search_term = Regexp.escape(text || "") + return formulae.grep(/.*#{search_term}.*/) + end +end + ########################################################## class PrettyListing class PrettyListing def initialize path diff --git a/bin/brew b/bin/brew index 01d95f85d1..b65b38e474 100755 --- a/bin/brew +++ b/bin/brew @@ -130,16 +130,7 @@ begin when 'search', '-S' check_for_blacklisted_formula(ARGV.named) - - require "formula" - formulae = Formulary.names with_aliases=true - - if ARGV.first =~ /^\/(.*)\/$/ - puts_columns formulae.grep(Regexp.new($1)) - else - search_term = Regexp.escape(ARGV.first || "") - puts_columns formulae.grep(/.*#{search_term}.*/) - end + puts_columns search_brews(ARGV.first) when 'edit' if ARGV.named.empty?