Compare commits
4
Commits
master
...
v0.48.0.pre2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9b704ad852 | ||
|
|
43428175c3 | ||
|
|
87f65e489c | ||
|
|
e5521f2cbb |
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
PATH
|
PATH
|
||||||
remote: .
|
remote: .
|
||||||
specs:
|
specs:
|
||||||
foreman (0.48.0.pre1)
|
foreman (0.48.0.pre2)
|
||||||
thor (>= 0.13.6)
|
thor (>= 0.13.6)
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
@@ -39,7 +39,7 @@ GEM
|
|||||||
multi_json (~> 1.0.3)
|
multi_json (~> 1.0.3)
|
||||||
simplecov-html (~> 0.5.3)
|
simplecov-html (~> 0.5.3)
|
||||||
simplecov-html (0.5.3)
|
simplecov-html (0.5.3)
|
||||||
thor (0.14.6)
|
thor (0.15.2)
|
||||||
timecop (0.3.5)
|
timecop (0.3.5)
|
||||||
win32console (1.3.0-x86-mingw32)
|
win32console (1.3.0-x86-mingw32)
|
||||||
xml-simple (1.0.15)
|
xml-simple (1.0.15)
|
||||||
|
|||||||
+2
-5
@@ -15,6 +15,7 @@ class Foreman::CLI < Thor
|
|||||||
|
|
||||||
desc "start [PROCESS]", "Start the application (or a specific PROCESS)"
|
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 :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 :formation, :type => :string, :aliases => "-m", :banner => '"alpha=5,bar=3"'
|
||||||
method_option :port, :type => :numeric, :aliases => "-p"
|
method_option :port, :type => :numeric, :aliases => "-p"
|
||||||
@@ -83,11 +84,7 @@ class Foreman::CLI < Thor
|
|||||||
def engine
|
def engine
|
||||||
@engine ||= begin
|
@engine ||= begin
|
||||||
engine_class = Foreman::Engine::CLI
|
engine_class = Foreman::Engine::CLI
|
||||||
engine = engine_class.new(
|
engine = engine_class.new(options)
|
||||||
:formation => options[:formation],
|
|
||||||
:port => options[:port],
|
|
||||||
:root => options[:root]
|
|
||||||
)
|
|
||||||
engine
|
engine
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -24,11 +24,13 @@ class Foreman::Engine::CLI < Foreman::Engine
|
|||||||
:bright_white => 37,
|
:bright_white => 37,
|
||||||
}
|
}
|
||||||
|
|
||||||
def self.enable(io)
|
def self.enable(io, force=false)
|
||||||
io.extend(self)
|
io.extend(self)
|
||||||
|
@@color_force = force
|
||||||
end
|
end
|
||||||
|
|
||||||
def color?
|
def color?
|
||||||
|
return true if @@color_force
|
||||||
return false unless self.respond_to?(:isatty)
|
return false unless self.respond_to?(:isatty)
|
||||||
self.isatty && ENV["TERM"]
|
self.isatty && ENV["TERM"]
|
||||||
end
|
end
|
||||||
@@ -51,14 +53,17 @@ class Foreman::Engine::CLI < Foreman::Engine
|
|||||||
|
|
||||||
def output(name, data)
|
def output(name, data)
|
||||||
data.to_s.chomp.split("\n").each do |message|
|
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 = ""
|
||||||
output += $stdout.color(@colors[name.split(".").first].to_sym)
|
output += $stdout.color(@colors[name.split(".").first].to_sym)
|
||||||
output += "#{Time.now.strftime("%H:%M:%S")} #{pad_process_name(name)} | "
|
output += "#{Time.now.strftime("%H:%M:%S")} #{pad_process_name(name)} | "
|
||||||
output += $stdout.color(:reset)
|
output += $stdout.color(:reset)
|
||||||
output += message
|
output += message
|
||||||
$stdout.puts output
|
$stdout.puts output
|
||||||
|
$stdout.flush
|
||||||
end
|
end
|
||||||
|
rescue Errno::EPIPE
|
||||||
|
terminate_gracefully
|
||||||
end
|
end
|
||||||
|
|
||||||
def shutdown
|
def shutdown
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
module Foreman
|
module Foreman
|
||||||
|
|
||||||
VERSION = "0.48.0.pre1"
|
VERSION = "0.48.0.pre2"
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user