Compare commits

..

3 Commits

Author SHA1 Message Date
David Dollar
356c61f471 0.29.0 2011-12-22 01:03:11 -05:00
David Dollar
dcff4da220 0.28.0.pre2 2011-12-08 17:59:40 -08:00
David Dollar
888520ee99 fix pipe error 2011-12-08 17:59:27 -08:00
4 changed files with 8 additions and 8 deletions

View File

@@ -1,7 +1,7 @@
PATH
remote: .
specs:
foreman (0.28.0.pre1)
foreman (0.29.0)
term-ansicolor (~> 1.0.5)
thor (>= 0.13.6)

View File

@@ -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 }

View File

@@ -1,5 +1,5 @@
module Foreman
VERSION = "0.28.0.pre1"
VERSION = "0.29.0"
end

View File

@@ -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