diff --git a/lib/hub.rb b/lib/hub.rb index 8040a34951ad3b581d6f1dbdfa32e6618d37fff6..cece1e850ba45b8124a10d8a4d16e5e45fbd0e88 100644 --- a/lib/hub.rb +++ b/lib/hub.rb @@ -3,4 +3,3 @@ require 'hub/args' require 'hub/commands' require 'hub/runner' require 'hub/standalone' -require 'hub/colors' diff --git a/lib/hub/colors.rb b/lib/hub/colors.rb deleted file mode 100644 index ab2efede018e60c66eb3d9a8e0b8148149f94b8f..0000000000000000000000000000000000000000 --- a/lib/hub/colors.rb +++ /dev/null @@ -1,79 +0,0 @@ -# http://github.com/defunkt/colored -module Colored - extend self - - COLORS = { - 'black' => 30, - 'red' => 31, - 'green' => 32, - 'yellow' => 33, - 'blue' => 34, - 'magenta' => 35, - 'cyan' => 36, - 'white' => 37 - } - - EXTRAS = { - 'clear' => 0, - 'bold' => 1, - 'underline' => 4, - 'reversed' => 7 - } - - COLORS.each do |color, value| - define_method(color) do - colorize(self, :foreground => color) - end - - define_method("on_#{color}") do - colorize(self, :background => color) - end - - COLORS.each do |highlight, value| - next if color == highlight - define_method("#{color}_on_#{highlight}") do - colorize(self, :foreground => color, :background => highlight) - end - end - end - - EXTRAS.each do |extra, value| - next if extra == 'clear' - define_method(extra) do - colorize(self, :extra => extra) - end - end - - define_method(:to_eol) do - tmp = sub(/^(\e\[[\[\e0-9;m]+m)/, "\\1\e[2K") - if tmp == self - return "\e[2K" << self - end - tmp - end - - def colorize(string, options = {}) - return string unless $stdout.tty? - colored = [color(options[:foreground]), color("on_#{options[:background]}"), extra(options[:extra])].compact * '' - colored << string - colored << extra(:clear) - end - - def colors - @@colors ||= COLORS.keys.sort - end - - def extra(extra_name) - extra_name = extra_name.to_s - "\e[#{EXTRAS[extra_name]}m" if EXTRAS[extra_name] - end - - def color(color_name) - background = color_name.to_s =~ /on_/ - color_name = color_name.to_s.sub('on_', '') - return unless color_name && COLORS[color_name] - "\e[#{COLORS[color_name] + (background ? 10 : 0)}m" - end -end unless Object.const_defined? :Colored - -String.send(:include, Colored)