admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

emoji: remove hack required for Ruby 1.8.7

Browse Source 
Since this hack is no longer required, and `Emoji.tick` and `.cross` are
only called in one place, I think it's better to just inline them there
rather than having methods on `Emoji` that just return a one-character
String.
This commit is contained in:
Alyssa Ross 2017-01-20 12:27:49 +00:00
parent 2c1fbe1693
commit 13488183bd
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/emoji.rb
View File

@ -1,17 +1,7 @@
module Emoji module Emoji
class << self class << self
def tick
# necessary for 1.8.7 unicode handling since many installs are on 1.8.7
@tick ||= ["2714".hex].pack("U*")
end
def cross
# necessary for 1.8.7 unicode handling since many installs are on 1.8.7
@cross ||= ["2718".hex].pack("U*")
end
def install_badge def install_badge
ENV["HOMEBREW_INSTALL_BADGE"] || "\xf0\x9f\x8d\xba" ENV["HOMEBREW_INSTALL_BADGE"] || "🍺"
end end
def enabled? def enabled?

4
Library/Homebrew/utils.rb
View File

@ -106,7 +106,7 @@ def pretty_installed(f)
if !$stdout.tty? if !$stdout.tty?
f.to_s f.to_s
elsif Emoji.enabled? elsif Emoji.enabled?
"#{Tty.bold}#{f} #{Formatter.success(Emoji.tick)}#{Tty.reset}" "#{Tty.bold}#{f} #{Formatter.success("✔")}#{Tty.reset}"
else else
Formatter.success("#{Tty.bold}#{f} (installed)#{Tty.reset}") Formatter.success("#{Tty.bold}#{f} (installed)#{Tty.reset}")
end end
@ -116,7 +116,7 @@ def pretty_uninstalled(f)
if !$stdout.tty? if !$stdout.tty?
f.to_s f.to_s
elsif Emoji.enabled? elsif Emoji.enabled?
"#{Tty.bold}#{f} #{Formatter.error(Emoji.cross)}#{Tty.reset}" "#{Tty.bold}#{f} #{Formatter.error("✘")}#{Tty.reset}"
else else
Formatter.error("#{Tty.bold}#{f} (uninstalled)#{Tty.reset}") Formatter.error("#{Tty.bold}#{f} (uninstalled)#{Tty.reset}")
end end