replace term-ansicolor with built-in colorization

This commit is contained in:
David Dollar
2012-03-16 16:34:14 -04:00
parent bb3377407a
commit 2f982ff9c7
5 changed files with 81 additions and 21 deletions
+40
View File
@@ -0,0 +1,40 @@
require "foreman"
module Foreman::Color
ANSI = {
:reset => 0,
:black => 30,
:red => 31,
:green => 32,
:yellow => 33,
:blue => 34,
:magenta => 35,
:cyan => 36,
:white => 37,
:bright_black => 30,
:bright_red => 31,
:bright_green => 32,
:bright_yellow => 33,
:bright_blue => 34,
:bright_magenta => 35,
:bright_cyan => 36,
:bright_white => 37,
}
def self.enable(io)
io.extend(self)
end
def color?
return false unless self.respond_to?(:isatty)
self.isatty && ENV["TERM"]
end
def color(name)
return "" unless color?
return "" unless ansi = ANSI[name.to_sym]
"\e[#{ansi}m"
end
end
+9 -17
View File
@@ -1,10 +1,10 @@
require "foreman"
require "foreman/color"
require "foreman/process"
require "foreman/procfile"
require "foreman/utils"
require "tempfile"
require "timeout"
require "term/ansicolor"
require "fileutils"
require "thread"
@@ -15,11 +15,10 @@ class Foreman::Engine
attr_reader :directory
attr_reader :options
extend Term::ANSIColor
COLORS = %w( cyan yellow green magenta red blue intense_cyan intense_yellow
intense_green intense_magenta intense_red, intense_blue )
COLORS = [ cyan, yellow, green, magenta, red, blue,
intense_cyan, intense_yellow, intense_green, intense_magenta,
intense_red, intense_blue ]
Foreman::Color.enable($stdout)
def initialize(procfile, options={})
@procfile = Foreman::Procfile.new(procfile)
@@ -128,11 +127,11 @@ private ######################################################################
rescue Errno::ECHILD
end
def info(message, name="system", color=Term::ANSIColor.white)
def info(message, name="system", color=:white)
output = ""
output += color
output += $stdout.color(color)
output += "#{Time.now.strftime("%H:%M:%S")} #{pad_process_name(name)} | "
output += Term::ANSIColor.reset
output += $stdout.color(:reset)
output += message.chomp
puts output
end
@@ -182,8 +181,8 @@ private ######################################################################
end
def assign_colors
procfile.entries.each do |entry|
colors[entry.name] = next_color
procfile.entries.each_with_index do |entry, idx|
colors[entry.name] = COLORS[idx % COLORS.length]
end
end
@@ -191,13 +190,6 @@ private ######################################################################
readers.invert[reader]
end
def next_color
@current_color ||= -1
@current_color += 1
@current_color = 0 if COLORS.length < @current_color
COLORS[@current_color]
end
def read_environment_files(filenames)
environment = {}