Merge pull request #183 from technomancy/app_root

Look for .env and app_root in the same dir as the Procfile.
ddollar · Apr 23, 2012 · 55f2745 · 55f2745
2 parents 865cabb + 66f76c2
commit 55f2745
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/foreman/cli.rb b/lib/foreman/cli.rb
@@ -79,7 +79,10 @@ def check_procfile!
   end
 
   def engine
-    @engine ||= Foreman::Engine.new(procfile, options)
+    root = File.expand_path(File.dirname(procfile))
+    env = File.expand_path(File.join(root, ".env"))
+    @engine ||= Foreman::Engine.new(procfile, options.merge({:app_root => root,
+                                                             :env => env}))
   end
 
   def procfile

diff --git a/lib/foreman/engine.rb b/lib/foreman/engine.rb
@@ -22,7 +22,7 @@ class Foreman::Engine
 
   def initialize(procfile, options={})
     @procfile  = Foreman::Procfile.new(procfile)
-    @directory = options[:app_root] || File.expand_path(File.dirname(procfile))
+    @directory = options[:app_root]
     @options = options.dup
     @environment = read_environment_files(options[:env])
     @output_mutex = Mutex.new
@@ -214,7 +214,6 @@ def read_environment_files(filenames)
       environment.merge!(Foreman::Engine.read_environment(filename))
     end
 
-    environment.merge!(Foreman::Engine.read_environment(".env")) unless filenames
     environment
   end
 end