From 2e8030dbd4fc539b77bd6b854ec40b17b73817b4 Mon Sep 17 00:00:00 2001
From: Chris Continanza <christopher.continanza@gmail.com>
Date: Mon, 5 Dec 2011 12:36:23 -0800
Subject: [PATCH] refactor load_env to apply_environment

---
 lib/foreman.rb        | 2 +-
 lib/foreman/engine.rb | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/foreman.rb b/lib/foreman.rb
index 77ef69c..422bdd4 100644
--- a/lib/foreman.rb
+++ b/lib/foreman.rb
@@ -7,7 +7,7 @@ module Foreman
   # load contents of env_file into ENV
   def self.load_env!(env_file = './.env')
     require 'foreman/engine'
-    Foreman::Engine.load_env(env_file)
+    Foreman::Engine.load_env!(env_file)
   end
 end
 
diff --git a/lib/foreman/engine.rb b/lib/foreman/engine.rb
index b217644..b4140d5 100644
--- a/lib/foreman/engine.rb
+++ b/lib/foreman/engine.rb
@@ -25,9 +25,9 @@ class Foreman::Engine
     @environment = read_environment_files(options[:env])
   end
 
-  def self.load_env(env_file)
+  def self.load_env!(env_file)
     @environment = read_environment_files(env_file)
-    load_env!
+    apply_environment!
   end
 
   def start
@@ -77,7 +77,7 @@ private ######################################################################
   end
 
   def fork_individual(process, num, port)
-    load_env!
+    apply_environment!
 
     ENV["PORT"] = port.to_s
     ENV["PS"]   = "#{process.name}.#{num}"
@@ -205,7 +205,7 @@ private ######################################################################
       end
     end
 
-    def load_env!
+    def apply_environment!
       @environment.each { |k,v| ENV[k] = v }
     end
   end