Refactor the blacklists

Also don't abort searches if the query matches a blacklist. Eg.
`brew search vim` should return macvim and the information that vim itself is
not packaged.

1 files changed, 14 insertions, 7 deletions

diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb
index b6a0e971d..ccbf784d4 100644
--- a/Library/Homebrew/cmd/search.rb
+++ b/Library/Homebrew/cmd/search.rb
@@ -1,4 +1,5 @@
 require "formula"
+require "blacklist"
 
 module Homebrew extend self
   def search
@@ -6,14 +7,20 @@ module Homebrew extend self
       exec "open", "http://www.macports.org/ports.php?by=name&substr=#{ARGV.next}"
     elsif ARGV.include? '--fink'
       exec "open", "http://pdb.finkproject.org/pdb/browse.php?summary=#{ARGV.next}"
-    end
-
-    require 'cmd/install' # for blacklisted? function
-    blacklisted? ARGV.named do |msg, _|
-      abort msg
-    end unless ARGV.force?
+    else
+      query = ARGV.first
+      search_results = search_brews query
+      puts_columns search_results
 
-    puts_columns search_brews(ARGV.first)
+      if $stdout.tty? and msg = blacklisted?(query)
+        unless search_results.empty?
+          puts
+          puts "If you meant `#{query}' precisely:"
+          puts
+        end
+        puts msg
+      end
+    end
   end
 
   def search_brews text