deprecate colon-less syntax, add check command
This commit is contained in:
@@ -25,7 +25,7 @@ end
|
|||||||
Rspec::Core::RakeTask.new("rcov:build") do |t|
|
Rspec::Core::RakeTask.new("rcov:build") do |t|
|
||||||
t.pattern = 'spec/**/*_spec.rb'
|
t.pattern = 'spec/**/*_spec.rb'
|
||||||
t.rcov = true
|
t.rcov = true
|
||||||
t.rcov_opts = [ "--exclude", Gem.default_dir , "--exclude", "spec" ]
|
t.rcov_opts = [ "--exclude", ".bundle", "--exclude", "spec" ]
|
||||||
end
|
end
|
||||||
|
|
||||||
desc 'Build the manual'
|
desc 'Build the manual'
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
ticker ./ticker $PORT
|
ticker: ./ticker $PORT
|
||||||
error ./error
|
error : ./error
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
ticker ./ticker $PORT
|
||||||
|
error ./error
|
||||||
@@ -48,6 +48,14 @@ class Foreman::CLI < Thor
|
|||||||
error ex.message
|
error ex.message
|
||||||
end
|
end
|
||||||
|
|
||||||
|
desc "check", "Validate your application's Procfile"
|
||||||
|
|
||||||
|
def check
|
||||||
|
processes = engine.processes_in_order.map { |p| p.first }
|
||||||
|
error "no processes defined" unless processes.length > 0
|
||||||
|
display "valid procfile detected (#{processes.join(', ')})"
|
||||||
|
end
|
||||||
|
|
||||||
private ######################################################################
|
private ######################################################################
|
||||||
|
|
||||||
def check_procfile!
|
def check_procfile!
|
||||||
@@ -64,6 +72,10 @@ private ######################################################################
|
|||||||
|
|
||||||
private ######################################################################
|
private ######################################################################
|
||||||
|
|
||||||
|
def display(message)
|
||||||
|
puts message
|
||||||
|
end
|
||||||
|
|
||||||
def error(message)
|
def error(message)
|
||||||
puts "ERROR: #{message}"
|
puts "ERROR: #{message}"
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
+13
-1
@@ -25,7 +25,11 @@ class Foreman::Engine
|
|||||||
@order = []
|
@order = []
|
||||||
procfile.split("\n").inject({}) do |hash, line|
|
procfile.split("\n").inject({}) do |hash, line|
|
||||||
next if line.strip == ""
|
next if line.strip == ""
|
||||||
name, command = line.split(/:? +/, 2)
|
name, command = line.split(/ *: +/, 2)
|
||||||
|
unless command
|
||||||
|
warn_deprecated_procfile!
|
||||||
|
name, command = line.split(/ +/, 2)
|
||||||
|
end
|
||||||
process = Foreman::Process.new(name, command)
|
process = Foreman::Process.new(name, command)
|
||||||
process.color = next_color
|
process.color = next_color
|
||||||
@order << process.name
|
@order << process.name
|
||||||
@@ -178,4 +182,12 @@ private ######################################################################
|
|||||||
@current_color >= COLORS.length ? "" : COLORS[@current_color]
|
@current_color >= COLORS.length ? "" : COLORS[@current_color]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def warn_deprecated_procfile!
|
||||||
|
return if @already_warned_deprecated
|
||||||
|
@already_warned_deprecated = true
|
||||||
|
puts "!!! This format of Procfile is deprecated, and will not work starting in v0.12"
|
||||||
|
puts "!!! Use a colon to separate the process name from the command"
|
||||||
|
puts "!!! e.g. web: thin start"
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -115,6 +115,10 @@ to run it.
|
|||||||
web: bundle exec thin start
|
web: bundle exec thin start
|
||||||
job: bundle exec rake jobs:work
|
job: bundle exec rake jobs:work
|
||||||
|
|
||||||
|
You can validate your Procfile format using the `check` command
|
||||||
|
|
||||||
|
$ foreman check
|
||||||
|
|
||||||
## EXAMPLES
|
## EXAMPLES
|
||||||
|
|
||||||
Start one instance of each process type, interleave the output on stdout:
|
Start one instance of each process type, interleave the output on stdout:
|
||||||
|
|||||||
@@ -58,4 +58,27 @@ describe "Foreman::CLI" do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "check" do
|
||||||
|
describe "with a valid Procfile" do
|
||||||
|
before { write_procfile }
|
||||||
|
|
||||||
|
it "displays the jobs" do
|
||||||
|
mock(subject).display("valid procfile detected (alpha, bravo)")
|
||||||
|
subject.check
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "with a blank Procfile" do
|
||||||
|
before do
|
||||||
|
FileUtils.touch("Procfile")
|
||||||
|
end
|
||||||
|
|
||||||
|
it "displays an error" do
|
||||||
|
mock_error(subject, "no processes defined") do
|
||||||
|
subject.check
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -12,12 +12,26 @@ describe "Foreman::Engine" do
|
|||||||
end
|
end
|
||||||
|
|
||||||
describe "with a Procfile" do
|
describe "with a Procfile" do
|
||||||
|
before { write_procfile }
|
||||||
|
|
||||||
it "reads the processes" do
|
it "reads the processes" do
|
||||||
write_procfile
|
|
||||||
subject.processes["alpha"].command.should == "./alpha"
|
subject.processes["alpha"].command.should == "./alpha"
|
||||||
subject.processes["bravo"].command.should == "./bravo"
|
subject.processes["bravo"].command.should == "./bravo"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "with a deprecated Procfile" do
|
||||||
|
before do
|
||||||
|
File.open("Procfile", "w") do |file|
|
||||||
|
file.puts "name command"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
it "should print a deprecation warning" do
|
||||||
|
mock(subject).warn_deprecated_procfile!
|
||||||
|
subject.processes.length.should == 1
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "start" do
|
describe "start" do
|
||||||
|
|||||||
+1
-1
@@ -26,7 +26,7 @@ end
|
|||||||
|
|
||||||
def write_procfile(procfile="Procfile")
|
def write_procfile(procfile="Procfile")
|
||||||
File.open(procfile, "w") do |file|
|
File.open(procfile, "w") do |file|
|
||||||
file.puts "alpha ./alpha"
|
file.puts "alpha: ./alpha"
|
||||||
file.puts "bravo: ./bravo"
|
file.puts "bravo: ./bravo"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user