From bf2315b1f4ae0cb7c9bb80b651ef6389f66020b2 Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Mon, 7 Dec 2015 13:11:34 +0000
Subject: Use `(installed)` and emoji ticks consistently.

Across info, search and update.

Closes Homebrew/homebrew#45131.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
---
 Library/Homebrew/cmd/info.rb   | 18 +-----------------
 Library/Homebrew/cmd/search.rb |  5 ++---
 Library/Homebrew/cmd/update.rb | 28 +++++++++-------------------
 3 files changed, 12 insertions(+), 39 deletions(-)

(limited to 'Library/Homebrew/cmd')

diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb
index 68e4c5425..a11044d5c 100644
--- a/Library/Homebrew/cmd/info.rb
+++ b/Library/Homebrew/cmd/info.rb
@@ -147,24 +147,8 @@ module Homebrew
   end
 
   def decorate_dependencies(dependencies)
-    # necessary for 1.8.7 unicode handling since many installs are on 1.8.7
-    tick = ["2714".hex].pack("U*")
-    cross = ["2718".hex].pack("U*")
-
     deps_status = dependencies.collect do |dep|
-      if dep.installed?
-        color = Tty.green
-        symbol = tick
-      else
-        color = Tty.red
-        symbol = cross
-      end
-      if ENV["HOMEBREW_NO_EMOJI"]
-        colored_dep = "#{color}#{dep}"
-      else
-        colored_dep = "#{dep} #{color}#{symbol}"
-      end
-      "#{colored_dep}#{Tty.reset}"
+      dep.installed? ? pretty_installed(dep) : pretty_uninstalled(dep)
     end
     deps_status * ", "
   end
diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb
index 3bf25a4b6..1bd942094 100644
--- a/Library/Homebrew/cmd/search.rb
+++ b/Library/Homebrew/cmd/search.rb
@@ -42,8 +42,7 @@ module Homebrew
       query = ARGV.first
       rx = query_regexp(query)
       local_results = search_formulae(rx)
-      local_results_installed = local_results.select { |f| f.end_with? "(installed)" }
-      puts_columns(local_results, local_results_installed)
+      puts_columns(local_results)
       tap_results = search_taps(rx)
       puts_columns(tap_results)
 
@@ -157,7 +156,7 @@ module Homebrew
       if aliases.include?(name) && results.include?(canonical_full_name)
         next
       elsif (HOMEBREW_CELLAR/canonical_name).directory?
-        "#{name} (installed)"
+        pretty_installed(name)
       else
         name
       end
diff --git a/Library/Homebrew/cmd/update.rb b/Library/Homebrew/cmd/update.rb
index 6ee2726a9..f4cd9d712 100644
--- a/Library/Homebrew/cmd/update.rb
+++ b/Library/Homebrew/cmd/update.rb
@@ -455,30 +455,20 @@ class Report
   end
 
   def dump_formula_report(key, title)
-    formula = select_formula(key)
-    unless formula.empty?
-      # Determine list item indices of installed formulae.
-      formula_installed_index = formula.each_index.select do |index|
-        name, newname = formula[index]
-        installed?(name) || (newname && installed?(newname))
-      end
-
-      # Format list items of renamed formulae.
+    formula = select_formula(key).map do |name, new_name|
+      # Format list items of renamed formulae
       if key == :R
-        formula.map! { |oldname, newname| "#{oldname} -> #{newname}" }
-      end
-
-      # Append suffix '(installed)' to list items of installed formulae.
-      formula_installed_index.each do |index|
-        formula[index] += " (installed)"
+        new_name = pretty_installed(new_name) if installed?(name)
+        "#{name} -> #{new_name}"
+      else
+        installed?(name) ? pretty_installed(name) : name
       end
+    end
 
-      # Fetch list items of installed formulae for highlighting.
-      formula_installed = formula.values_at(*formula_installed_index)
-
+    unless formula.empty?
       # Dump formula list.
       ohai title
-      puts_columns(formula, formula_installed)
+      puts_columns(formula)
     end
   end
 
-- 
cgit v1.2.3