Merge pull request #823 from reitermarkus/refactoring-tty

Refactor Tty.

4 files changed, 11 insertions, 10 deletions

diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 89f32dc25..0fcd3a74d 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -42,9 +42,9 @@ module Homebrew
       next if out.nil? || out.empty?
       if first_warning
         $stderr.puts <<-EOS.undent
-            #{Tty.white}Please note that these warnings are just used to help the Homebrew maintainers
-            with debugging if you file an issue. If everything you use Homebrew for is
-            working fine: please don't worry and just ignore them. Thanks!#{Tty.reset}
+          #{Tty.bold}Please note that these warnings are just used to help the Homebrew maintainers
+          with debugging if you file an issue. If everything you use Homebrew for is
+          working fine: please don't worry and just ignore them. Thanks!#{Tty.reset}
         EOS
       end
 
diff --git a/Library/Homebrew/cmd/help.rb b/Library/Homebrew/cmd/help.rb
index 2a814b90b..c8845b086 100644
--- a/Library/Homebrew/cmd/help.rb
+++ b/Library/Homebrew/cmd/help.rb
@@ -79,9 +79,10 @@ module Homebrew
     else
       help_lines.map do |line|
         line.slice(2..-1)
-            .sub(/^  \* /, "#{Tty.highlight}brew#{Tty.reset} ")
-            .gsub(/`(.*?)`/, "#{Tty.highlight}\\1#{Tty.reset}")
-            .gsub(/<(.*?)>/, "#{Tty.em}\\1#{Tty.reset}")
+            .sub(/^  \* /, "#{Tty.bold}brew#{Tty.reset} ")
+            .gsub(/`(.*?)`/, "#{Tty.bold}\\1#{Tty.reset}")
+            .gsub(%r{<([^\s]+?://[^\s]+?)>}) { |url| Formatter.url(url) }
+            .gsub(/<(.*?)>/, "#{Tty.underline}\\1#{Tty.reset}")
             .gsub("@hide_from_man_page", "")
       end.join.strip
     end
diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb
index 6f242039c..2cfb89ea5 100644
--- a/Library/Homebrew/cmd/info.rb
+++ b/Library/Homebrew/cmd/info.rb
@@ -117,7 +117,7 @@ module Homebrew
 
     puts "#{f.full_name}: #{specs * ", "}#{" [#{attrs * ", "}]" unless attrs.empty?}"
     puts f.desc if f.desc
-    puts "#{Tty.em}#{f.homepage}#{Tty.reset}" if f.homepage
+    puts Formatter.url(f.homepage) if f.homepage
 
     conflicts = f.conflicts.map(&:name).sort!
     puts "Conflicts with: #{conflicts*", "}" unless conflicts.empty?
@@ -133,7 +133,7 @@ module Homebrew
       end
     end
 
-    puts "From: #{Tty.em}#{github_info(f)}#{Tty.reset}"
+    puts "From: #{Formatter.url(github_info(f))}"
 
     unless f.deps.empty?
       ohai "Dependencies"
diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb
index 18f2f370c..f97191bda 100644
--- a/Library/Homebrew/cmd/update-report.rb
+++ b/Library/Homebrew/cmd/update-report.rb
@@ -282,13 +282,13 @@ module Homebrew
     EOS
   rescue => e
     ofail <<-EOS.undent
-      #{Tty.white}Failed to migrate HOMEBREW_REPOSITORY to #{new_homebrew_repository}!
+      #{Tty.bold}Failed to migrate HOMEBREW_REPOSITORY to #{new_homebrew_repository}!#{Tty.reset}
       The error was:
         #{e}
       Please try to resolve this error yourself and then run `brew update` again to
       complete the migration. If you need help please +1 an existing error or comment
       with your new error in issue:
-        #{Tty.em}https://github.com/Homebrew/brew/issues/987#{Tty.reset}
+        #{Formatter.url("https://github.com/Homebrew/brew/issues/987")}
     EOS
     $stderr.puts e.backtrace
   end