From 0b0324fed9c675c309ea3bfdfb5ced385c79b4bf Mon Sep 17 00:00:00 2001 From: Koen Van der Auwera Date: Fri, 11 May 2012 14:17:03 +0200 Subject: [PATCH 1/2] set port from .env if specified --- lib/foreman/engine.rb | 2 +- spec/foreman/engine_spec.rb | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/foreman/engine.rb b/lib/foreman/engine.rb index 0b74a75..c5b3d7b 100644 --- a/lib/foreman/engine.rb +++ b/lib/foreman/engine.rb @@ -84,7 +84,7 @@ private ###################################################################### end def base_port - options[:port] || 5000 + options[:port] || environment["PORT"] || 5000 end def kill_all(signal="SIGTERM") diff --git a/spec/foreman/engine_spec.rb b/spec/foreman/engine_spec.rb index 6188e8e..e14344f 100644 --- a/spec/foreman/engine_spec.rb +++ b/spec/foreman/engine_spec.rb @@ -100,6 +100,13 @@ describe "Foreman::Engine", :fakefs do engine.start end + it "should set port from .env if specified" do + File.open(".env", "w") { |f| f.puts("PORT=8017") } + engine = Foreman::Engine.new("Procfile") + engine.send(:base_port).should == "8017" + engine.start + end + it "should be loaded relative to the Procfile" do FileUtils.mkdir_p "/some/app" File.open("/some/app/.env", "w") { |f| f.puts("FOO=qoo") } From 9b2987c3f0427b0d80b000ba4f171a67ec33675f Mon Sep 17 00:00:00 2001 From: Koen Van der Auwera Date: Wed, 16 May 2012 23:59:09 +0200 Subject: [PATCH 2/2] make 'PORT=5000 foreman start' work --- lib/foreman/engine.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/foreman/engine.rb b/lib/foreman/engine.rb index c5b3d7b..429ed87 100644 --- a/lib/foreman/engine.rb +++ b/lib/foreman/engine.rb @@ -84,7 +84,7 @@ private ###################################################################### end def base_port - options[:port] || environment["PORT"] || 5000 + options[:port] || environment["PORT"] || ENV["PORT"] || 5000 end def kill_all(signal="SIGTERM")