0.23.1

Eliminate dead code

Gemfile.lock

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

lib/foreman/engine.rb

@@ -22,7 +22,7 @@ class Foreman::Engine
     @procfile  = read_procfile(procfile)
     @directory = File.expand_path(File.dirname(procfile))
     @options = options
-    @environment = read_environment(options[:env])
+    @environment = read_environment_files(options[:env])
   end
 
   def processes
@@ -202,24 +202,27 @@ private ######################################################################
     puts "!!! e.g.   web: thin start"
   end
 
-  def read_environment(filename)
-    error "No such file: #{filename}" if filename && !File.exists?(filename)
-    filename ||= ".env"
+  def read_environment_files(filenames)
     environment = {}
 
-    if File.exists?(filename)
-      File.read(filename).split("\n").each do |line|
-        if line =~ /\A([A-Za-z_]+)=(.*)\z/
-          environment[$1] = $2
-        end
-      end
+    (filenames || "").split(",").map(&:strip).each do |filename|
+      error "No such file: #{filename}" unless File.exists?(filename)
+      environment.merge!(read_environment(filename))
     end
 
+    environment.merge!(read_environment(".env")) unless filenames
     environment
   end
 
-  def runner
-    File.expand_path("../../../bin/foreman-runner", __FILE__)
+  def read_environment(filename)
+    return {} unless File.exists?(filename)
+
+    File.read(filename).split("\n").inject({}) do |hash, line|
+      if line =~ /\A([A-Za-z_]+)=(.*)\z/
+        hash[$1] = $2
+      end
+      hash
+    end
   end
 
   def terminate_gracefully

lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.22.0"
+  VERSION = "0.23.1"
 
 end

man/foreman.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FOREMAN" "1" "September 2011" "Foreman 0.21.0" "Foreman Manual"
+.TH "FOREMAN" "1" "September 2011" "Foreman 0.23.0" "Foreman Manual"
 .
 .SH "NAME"
 \fBforeman\fR \- manage Procfile\-based applications
@@ -69,7 +69,7 @@ These options control all modes of foreman\'s operation\.
 .
 .TP
 \fB\-e\fR, \fB\-\-env\fR
-Specify an alternate environment file\.
+Specify an alternate environment file\. You can specify more than one file by using: \fB\-\-env file1,file2\fR\.
 .
 .TP
 \fB\-f\fR, \fB\-\-procfile\fR
@@ -165,7 +165,7 @@ If a \fB\.foreman\fR file exists in the current directory, default options will
 .
 .nf
 
-concurrency: alpha=0
+concurrency: alpha=0,bravo=1
 port: 15000
 .
 .fi

man/foreman.1.ronn

@@ -67,7 +67,8 @@ The following options control how the application is run:
 These options control all modes of foreman's operation.
 
   * `-e`, `--env`:
-    Specify an alternate environment file.
+    Specify an alternate environment file. You can specify more than one
+    file by using: `--env file1,file2`.
 
   * `-f`, `--procfile`:
     Specify an alternate location for the application's Procfile. This file's
@@ -131,7 +132,7 @@ If a `.foreman` file exists in the current directory, default options will
 be read from it. This file should be in YAML format with the long option
 name as keys. Example:
 
-    concurrency: alpha=0
+    concurrency: alpha=0,bravo=1
     port: 15000
 
 ## EXAMPLES

spec/foreman/engine_spec.rb

@@ -79,6 +79,16 @@ describe "Foreman::Engine" do
       engine.execute("alpha")
     end
 
+    it "should read more than one if specified" do
+      File.open("/tmp/env1", "w") { |f| f.puts("FOO=bar") }
+      File.open("/tmp/env2", "w") { |f| f.puts("BAZ=qux") }
+      engine = Foreman::Engine.new("Procfile", :env => "/tmp/env1,/tmp/env2")
+      stub(engine).info
+      mock(engine).watch_for_termination
+      engine.environment.should == { "FOO"=>"bar", "BAZ"=>"qux" }
+      engine.execute("alpha")
+    end
+
     it "should fail if specified and doesnt exist" do
       mock.instance_of(Foreman::Engine).error("No such file: /tmp/env")
       engine = Foreman::Engine.new("Procfile", :env => "/tmp/env")