Compare commits
2 Commits
v0.28.0.pr
...
v0.28.0.pr
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dcff4da220 | ||
|
|
888520ee99 |
@@ -1,7 +1,7 @@
|
||||
PATH
|
||||
remote: .
|
||||
specs:
|
||||
foreman (0.28.0.pre1)
|
||||
foreman (0.28.0.pre2)
|
||||
term-ansicolor (~> 1.0.5)
|
||||
thor (>= 0.13.6)
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ class Foreman::Process
|
||||
def run(pipe, basedir, environment)
|
||||
Dir.chdir(basedir) do
|
||||
with_environment(environment.merge("PORT" => port.to_s)) do
|
||||
run_process entry.command
|
||||
run_process entry.command, pipe
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -27,7 +27,7 @@ class Foreman::Process
|
||||
|
||||
private
|
||||
|
||||
def run_process(command)
|
||||
def run_process(command, pipe)
|
||||
io = IO.popen([Foreman.runner, replace_command_env(command)], "w+")
|
||||
@pid = io.pid
|
||||
trap("SIGTERM") { "got sigterm for %d" % @pid }
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
module Foreman
|
||||
|
||||
VERSION = "0.28.0.pre1"
|
||||
VERSION = "0.28.0.pre2"
|
||||
|
||||
end
|
||||
|
||||
@@ -24,8 +24,8 @@ describe "Foreman::Engine" do
|
||||
describe "start" do
|
||||
it "forks the processes" do
|
||||
write_procfile
|
||||
mock.instance_of(Foreman::Process).run_process("./alpha")
|
||||
mock.instance_of(Foreman::Process).run_process("./bravo")
|
||||
mock.instance_of(Foreman::Process).run_process("./alpha", is_a(IO))
|
||||
mock.instance_of(Foreman::Process).run_process("./bravo", is_a(IO))
|
||||
mock(subject).watch_for_output
|
||||
mock(subject).watch_for_termination
|
||||
subject.start
|
||||
@@ -34,8 +34,8 @@ describe "Foreman::Engine" do
|
||||
it "handles concurrency" do
|
||||
write_procfile
|
||||
engine = Foreman::Engine.new("Procfile",:concurrency => "alpha=2")
|
||||
mock.instance_of(Foreman::Process).run_process("./alpha").twice
|
||||
mock.instance_of(Foreman::Process).run_process("./bravo")
|
||||
mock.instance_of(Foreman::Process).run_process("./alpha", is_a(IO)).twice
|
||||
mock.instance_of(Foreman::Process).run_process("./bravo", is_a(IO))
|
||||
mock(engine).watch_for_output
|
||||
mock(engine).watch_for_termination
|
||||
engine.start
|
||||
|
||||
Reference in New Issue
Block a user