foreman 0.26.1 → 0.27.0

data/lib/foreman.rb

@@ -4,5 +4,10 @@ module Foreman
 
   class AppDoesNotExist < Exception; end
 
+  # load contents of env_file into ENV
+  def self.load_env!(env_file = './.env')
+    require 'foreman/engine'
+    Foreman::Engine.load_env!(env_file)
+  end
 end
 

data/lib/foreman/engine.rb

@@ -12,7 +12,6 @@ class Foreman::Engine
 
   attr_reader :procfile
   attr_reader :directory
-  attr_reader :environment
   attr_reader :options
 
   extend Term::ANSIColor
@@ -26,6 +25,11 @@ class Foreman::Engine
     @environment = read_environment_files(options[:env])
   end
 
+  def self.load_env!(env_file)
+    @environment = read_environment_files(env_file)
+    apply_environment!
+  end
+
   def start
     proctitle "ruby: foreman master"
     termtitle "#{File.basename(@directory)} - foreman (#{processes.size} processes)"
@@ -73,7 +77,7 @@ private ######################################################################
   end
 
   def fork_individual(process, num, port)
-    @environment.each { |k,v| ENV[k] = v }
+    apply_environment!
 
     ENV["PORT"] = port.to_s
     ENV["PS"]   = "#{process.name}.#{num}"
@@ -175,27 +179,37 @@ private ######################################################################
     @current_color >= COLORS.length ? "" : COLORS[@current_color]
   end
 
-  def read_environment_files(filenames)
-    environment = {}
+  module Env
+    attr_reader :environment
 
-    (filenames || "").split(",").map(&:strip).each do |filename|
-      error "No such file: #{filename}" unless File.exists?(filename)
-      environment.merge!(read_environment(filename))
-    end
+    def read_environment_files(filenames)
+      environment = {}
 
-    environment.merge!(read_environment(".env")) unless filenames
-    environment
-  end
+      (filenames || "").split(",").map(&:strip).each do |filename|
+        error "No such file: #{filename}" unless File.exists?(filename)
+        environment.merge!(read_environment(filename))
+      end
 
-  def read_environment(filename)
-    return {} unless File.exists?(filename)
+      environment.merge!(read_environment(".env")) unless filenames
+      environment
+    end
+
+    def read_environment(filename)
+      return {} unless File.exists?(filename)
 
-    File.read(filename).split("\n").inject({}) do |hash, line|
-      if line =~ /\A([A-Za-z_0-9]+)=(.*)\z/
-        hash[$1] = $2
+      File.read(filename).split("\n").inject({}) do |hash, line|
+        if line =~ /\A([A-Za-z_0-9]+)=(.*)\z/
+          hash[$1] = $2
+        end
+        hash
       end
-      hash
+    end
+
+    def apply_environment!
+      @environment.each { |k,v| ENV[k] = v }
     end
   end
 
+  include Env
+  extend  Env
 end

data/lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.26.1"
+  VERSION = "0.27.0"
 
 end

data/spec/foreman_spec.rb

@@ -8,4 +8,26 @@ describe Foreman do
     it { should be_a String }
   end
 
+  describe "::load_env!(env_file)" do
+    before do
+      FakeFS.activate!
+    end
+
+    after do
+      FakeFS.deactivate!
+      ENV['FOO'] = nil
+    end
+
+    it "should load env_file into ENV" do
+      File.open("/tmp/env1", "w") { |f| f.puts("FOO=bar") }
+      Foreman.load_env!("/tmp/env1")
+      ENV['FOO'].should == 'bar'
+    end 
+
+    it "should assume env_file in ./.env" do
+      File.open("./.env", "w") { |f| f.puts("FOO=bar") }
+      Foreman.load_env!
+      ENV['FOO'].should == 'bar'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.27.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000Z
+date: 2011-12-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70198523224520 !ruby/object:Gem::Requirement
+  requirement: &70283570808260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70198523224520
+  version_requirements: *70283570808260
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70198523222660 !ruby/object:Gem::Requirement
+  requirement: &70283570807760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 0.13.6
   type: :runtime
   prerelease: false
-  version_requirements: *70198523222660
+  version_requirements: *70283570807760
 description: Process manager for applications with multiple components
 email: ddollar@gmail.com
 executables:
@@ -104,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1174772449169708218
+      hash: -3613490576676930257
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1174772449169708218
+      hash: -3613490576676930257
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10