allow color to be forced on

This commit is contained in:
David Dollar
2012-06-17 22:02:00 -04:00
parent 87f65e489c
commit 43428175c3
2 changed files with 6 additions and 7 deletions

View File

@@ -15,6 +15,7 @@ class Foreman::CLI < Thor
desc "start [PROCESS]", "Start the application (or a specific PROCESS)"
method_option :color, :type => :boolean, :aliases => "-c", :desc => "Force color to be enabled"
method_option :env, :type => :string, :aliases => "-e", :desc => "Specify an environment file to load, defaults to .env"
method_option :formation, :type => :string, :aliases => "-m", :banner => '"alpha=5,bar=3"'
method_option :port, :type => :numeric, :aliases => "-p"
@@ -83,11 +84,7 @@ class Foreman::CLI < Thor
def engine
@engine ||= begin
engine_class = Foreman::Engine::CLI
engine = engine_class.new(
:formation => options[:formation],
:port => options[:port],
:root => options[:root]
)
engine = engine_class.new(options)
engine
end
end

View File

@@ -24,11 +24,13 @@ class Foreman::Engine::CLI < Foreman::Engine
:bright_white => 37,
}
def self.enable(io)
def self.enable(io, force=false)
io.extend(self)
@@color_force = force
end
def color?
return true if @@color_force
return false unless self.respond_to?(:isatty)
self.isatty && ENV["TERM"]
end
@@ -51,7 +53,7 @@ class Foreman::Engine::CLI < Foreman::Engine
def output(name, data)
data.to_s.chomp.split("\n").each do |message|
Color.enable($stdout) unless $stdout.respond_to?(:color?)
Color.enable($stdout, options[:color]) unless $stdout.respond_to?(:color?)
output = ""
output += $stdout.color(@colors[name.split(".").first].to_sym)
output += "#{Time.now.strftime("%H:%M:%S")} #{pad_process_name(name)} | "