0.24.0

Eliminate dead code

.gitignore

@@ -1,8 +1,8 @@
-.bundle
+/.bundle
-coverage
+/coverage
-example/log/*
+/example/log/*
-man/*.html
+/man/*.html
-man/*.markdown
+/man/*.markdown
-pkg
+/pkg
-tags
+/tags
 

Gemfile

@@ -1,3 +1,15 @@
 source "http://rubygems.org"
 
 gemspec
+
+group :development do
+  gem 'parka'
+  gem 'rake'
+  gem 'ronn'
+  gem 'fakefs', '~> 0.2.1'
+  gem 'rcov',   '~> 0.9.8'
+  gem 'rr',     '~> 1.0.2'
+  gem 'rspec',  '~> 2.6.0'
+  gem 'aws-s3'
+  gem "rubyzip"
+end

Gemfile.lock

@@ -1,13 +1,18 @@
 PATH
   remote: .
   specs:
-    foreman (0.21.0)
+    foreman (0.24.0)
       term-ansicolor (~> 1.0.5)
       thor (>= 0.13.6)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    aws-s3 (0.6.2)
+      builder
+      mime-types
+      xml-simple
+    builder (3.0.0)
     crack (0.1.8)
     diff-lcs (1.1.2)
     fakefs (0.2.1)
@@ -36,13 +41,16 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    rubyzip (0.9.4)
     term-ansicolor (1.0.6)
     thor (0.14.6)
+    xml-simple (1.0.15)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  aws-s3
   fakefs (~> 0.2.1)
   foreman!
   parka
@@ -51,3 +59,4 @@ DEPENDENCIES
   ronn
   rr (~> 1.0.2)
   rspec (~> 2.6.0)
+  rubyzip

README.markdown

@@ -2,8 +2,18 @@
 
 ## Installation
 
+* Rubygems
+
     gem install foreman
 
+* OSX
+
+    http://assets.foreman.io/foreman/foreman.pkg
+
+* Standalone Tarball
+
+    http://assets.foreman.io/foreman/foreman.tgz
+
 ## Description
 
 http://blog.daviddollar.org/2011/05/06/introducing-foreman.html
@@ -19,11 +29,20 @@ Created by David Dollar
 Patches contributed by:
 
 * Adam Wiggins
-* clifff
 * Dan Peterson
+* Hunter Nield
 * Jay Zeschin
 * Keith Rarick
+* Khaja Minhajuddin
+* Matt Haynes
+* Michael van Rooijen
+* Mike Javorski
+* Nathan L Smith
+* Nick Zadrozny
 * Ricardo Chimal, Jr
+* Thom May
+* clifff
+* Greg Reinacker
 
 ## License
 

Rakefile

@@ -54,3 +54,115 @@ task :pages => "man:commit" do
     git checkout master
   }
 end
+
+## dist
+
+require "erb"
+require "fileutils"
+require "tmpdir"
+
+def assemble(source, target, perms=0644)
+  FileUtils.mkdir_p(File.dirname(target))
+  File.open(target, "w") do |f|
+    f.puts ERB.new(File.read(source)).result(binding)
+  end
+  File.chmod(perms, target)
+end
+
+def assemble_distribution(target_dir=Dir.pwd)
+  distribution_files.each do |source|
+    target = source.gsub(/^#{project_root}/, target_dir)
+    FileUtils.mkdir_p(File.dirname(target))
+    FileUtils.cp(source, target)
+  end
+end
+
+GEM_BLACKLIST = %w( bundler foreman )
+
+def assemble_gems(target_dir=Dir.pwd)
+  lines = %x{ bundle show }.strip.split("\n")
+  raise "error running bundler" unless $?.success?
+
+  %x{ env BUNDLE_WITHOUT="development:test" bundle show }.split("\n").each do |line|
+    if line =~ /^  \* (.*?) \((.*?)\)/
+      next if GEM_BLACKLIST.include?($1)
+      puts "vendoring: #{$1}-#{$2}"
+      gem_dir = %x{ bundle show #{$1} }.strip
+      FileUtils.mkdir_p "#{target_dir}/vendor/gems"
+      %x{ cp -R "#{gem_dir}" "#{target_dir}/vendor/gems" }
+    end
+  end.compact
+end
+
+def beta?
+  Foreman::VERSION.to_s =~ /pre/
+end
+
+def clean(file)
+  rm file if File.exists?(file)
+end
+
+def distribution_files
+  require "foreman/distribution"
+  Foreman::Distribution.files
+end
+
+def mkchdir(dir)
+  FileUtils.mkdir_p(dir)
+  Dir.chdir(dir) do |dir|
+    yield(File.expand_path(dir))
+  end
+end
+
+def pkg(filename)
+  File.expand_path("../pkg/#{filename}", __FILE__)
+end
+
+def project_root
+  File.dirname(__FILE__)
+end
+
+def resource(name)
+  File.expand_path("../dist/resources/#{name}", __FILE__)
+end
+
+def s3_connect
+  return if @s3_connected
+
+  require "aws/s3"
+
+  unless ENV["DAVID_RELEASE_ACCESS"] && ENV["DAVID_RELEASE_SECRET"]
+    puts "please set DAVID_RELEASE_ACCESS and DAVID_RELEASE_SECRET in your environment"
+    exit 1
+  end
+
+  AWS::S3::Base.establish_connection!(
+    :access_key_id => ENV["DAVID_RELEASE_ACCESS"],
+    :secret_access_key => ENV["DAVID_RELEASE_SECRET"]
+  )
+
+  @s3_connected = true
+end
+
+def store(package_file, filename, bucket="assets.foreman.io")
+  s3_connect
+  puts "storing: #{filename}"
+  AWS::S3::S3Object.store(filename, File.open(package_file), bucket, :access => :public_read)
+end
+
+def tempdir
+  Dir.mktmpdir do |dir|
+    Dir.chdir(dir) do
+      yield(dir)
+    end
+  end
+end
+
+def version
+  require "foreman/version"
+  Foreman::VERSION
+end
+
+Dir[File.expand_path("../dist/**/*.rake", __FILE__)].each do |rake|
+  import rake
+end

bin/foreman-runner

@@ -1,2 +0,0 @@
-#!/usr/bin/env ruby
-exec ARGV.join(" ")

data/example/Procfile

@@ -1,2 +1,2 @@
-ticker: ./ticker $PORT
+ticker: ruby ./ticker $PORT
-error : ./error
+error:  ruby ./error

data/example/error

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$stdout.sync = true
+
 puts "will error in 10s"
 sleep 5
 raise "Dying"

data/example/ticker

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 
-%w( SIGINT SIGTERM SIGHUP ).each do |signal|
+$stdout.sync = true
+
+%w( SIGINT SIGTERM ).each do |signal|
   trap(signal) do
     puts "received #{signal} but i'm ignoring it!"
   end

data/export/bluepill/master.pill.erb

@@ -3,7 +3,7 @@ Bluepill.application("<%= app %>", :foreground => false, :log_file => "/var/log/
   app.uid = "<%= user %>"
   app.gid = "<%= user %>"
 
-<% engine.processes.values.each do |process| %>
+<% engine.processes.each do |process| %>
 <% 1.upto(concurrency[process.name]) do |num| %>
 <% port = engine.port_for(process, num, options[:port]) %>
   app.process("<%= process.name %>-<%=num%>") do |process|
@@ -24,4 +24,4 @@ Bluepill.application("<%= app %>", :foreground => false, :log_file => "/var/log/
   end
 <% end %>
 <% end %>
-end
+end

dist/gem.rake

@@ -0,0 +1,14 @@
+file pkg("foreman-#{version}.gem") => distribution_files do |t|
+  sh "gem build foreman.gemspec"
+  sh "mv foreman-#{version}.gem #{t.name}"
+end
+
+task "gem:build" => pkg("foreman-#{version}.gem")
+
+task "gem:clean" do
+  clean pkg("foreman-#{version}.gem")
+end
+
+task "gem:release" => "gem:build" do |t|
+  sh "parka push -f #{pkg("foreman-#{version}.gem")}"
+end

dist/pkg.rake

@@ -0,0 +1,52 @@
+require "erb"
+
+file pkg("foreman-#{version}.pkg") => distribution_files do |t|
+  tempdir do |dir|
+    mkchdir("foreman") do
+      assemble_distribution
+      assemble_gems
+      assemble resource("pkg/foreman"), "bin/foreman", 0755
+    end
+
+    kbytes = %x{ du -ks foreman | cut -f 1 }
+    num_files = %x{ find foreman | wc -l }
+
+    mkdir_p "pkg"
+    mkdir_p "pkg/Resources"
+    mkdir_p "pkg/foreman-#{version}.pkg"
+
+    dist = File.read(resource("pkg/Distribution.erb"))
+    dist = ERB.new(dist).result(binding)
+    File.open("pkg/Distribution", "w") { |f| f.puts dist }
+
+    dist = File.read(resource("pkg/PackageInfo.erb"))
+    dist = ERB.new(dist).result(binding)
+    File.open("pkg/foreman-#{version}.pkg/PackageInfo", "w") { |f| f.puts dist }
+
+    mkdir_p "pkg/foreman-#{version}.pkg/Scripts"
+    cp resource("pkg/postinstall"), "pkg/foreman-#{version}.pkg/Scripts/postinstall"
+    chmod 0755, "pkg/foreman-#{version}.pkg/Scripts/postinstall"
+
+    sh %{ mkbom -s foreman pkg/foreman-#{version}.pkg/Bom }
+
+    Dir.chdir("foreman") do
+      sh %{ pax -wz -x cpio . > ../pkg/foreman-#{version}.pkg/Payload }
+    end
+
+    sh %{ pkgutil --flatten pkg foreman-#{version}.pkg }
+
+    cp_r "foreman-#{version}.pkg", t.name
+  end
+end
+
+task "pkg:build" => pkg("foreman-#{version}.pkg")
+
+task "pkg:clean" do
+  clean pkg("foreman-#{version}.pkg")
+end
+
+task "pkg:release" => "pkg:build" do |t|
+  store pkg("foreman-#{version}.pkg"), "foreman/foreman-#{version}.pkg"
+  store pkg("foreman-#{version}.pkg"), "foreman/foreman-beta.pkg" if beta?
+  store pkg("foreman-#{version}.pkg"), "foreman/foreman.pkg" unless beta?
+end

dist/resources/pkg/Distribution.erb

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<installer-script minSpecVersion="1.000000" authoringTool="org.ruby-lang.rake" authoringToolVersion="0.8.7">
+  <title>Foreman</title>
+  <options customize="never" allow-external-scripts="no"/>
+  <domains enable_localSystem="true"/>
+  <script><![CDATA[
+    function needs_git() {
+      return (system.compareVersion(system.version.ProductVersion, "10.7.0") < 0);
+    }
+  ]]></script>
+  <choices-outline>
+    <line choice="git"/>
+    <line choice="foreman-<%= version %>"/>
+  </choices-outline>
+  <choice id="git" title="git" start_selected="false" start_enabled="false" selected="needs_git()" enabled="needs_git()">
+    <pkg-ref id="git.pkg" />
+  </choice>
+  <choice id="foreman-<%= version %>" title="foreman">
+    <pkg-ref id="io.foreman.installer"/>
+  </choice>
+  <pkg-ref id="io.foreman.installer" installKBytes="<%= kbytes %>" version="<%= version %>" auth="Root">#foreman-<%= version %>.pkg</pkg-ref>
+</installer-script>
+

dist/resources/pkg/PackageInfo.erb

@@ -0,0 +1,7 @@
+<pkg-info format-version="2" identifier="io.foreman.installer" version="<%= version %>" install-location="/usr/local/foreman" auth="root">
+  <payload installKBytes="<%= kbytes %>" numberOfFiles="<%= num_files %>"/>
+  <scripts>
+    <postinstall file="./postinstall"/>
+  </scripts>
+</pkg-info>
+

dist/resources/pkg/foreman

@@ -0,0 +1,15 @@
+#!/usr/bin/ruby
+
+require "pathname"
+bin_file = Pathname.new(__FILE__).realpath
+
+gem_dir = File.expand_path("../../vendor/gems", bin_file)
+  Dir["#{gem_dir}/**/lib"].each do |libdir|
+  $:.unshift libdir
+end
+
+$:.unshift File.expand_path("../../lib", bin_file)
+
+require "foreman/cli"
+
+Foreman::CLI.start

dist/resources/pkg/postinstall

@@ -0,0 +1,2 @@
+#!/bin/sh
+ln -sf /usr/local/foreman/bin/foreman /usr/bin/foreman

dist/resources/tgz/foreman

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+require "pathname"
+bin_file = Pathname.new(__FILE__).realpath
+
+gem_dir = File.expand_path("../vendor/gems", bin_file)
+  Dir["#{gem_dir}/**/lib"].each do |libdir|
+  $:.unshift libdir
+end
+
+$:.unshift File.expand_path("../lib", bin_file)
+
+require "foreman/cli"
+
+Foreman::CLI.start

dist/tgz.rake

@@ -0,0 +1,24 @@
+file pkg("foreman-#{version}.tgz") => distribution_files do |t|
+  tempdir do |dir|
+    mkchdir("foreman") do
+      assemble_distribution
+      assemble_gems
+      rm_rf "bin"
+      assemble resource("tgz/foreman"), "foreman", 0755
+    end
+
+    sh "tar czvf #{t.name} foreman"
+  end
+end
+
+task "tgz:build" => pkg("foreman-#{version}.tgz")
+
+task "tgz:clean" do
+  clean pkg("foreman-#{version}.tgz")
+end
+
+task "tgz:release" => "tgz:build" do |t|
+  store pkg("foreman-#{version}.tgz"), "foreman/foreman-#{version}.tgz"
+  store pkg("foreman-#{version}.tgz"), "foreman/foreman-beta.tgz" if beta?
+  store pkg("foreman-#{version}.tgz"), "foreman/foreman.tgz" unless beta?
+end

foreman.gemspec

@@ -18,12 +18,4 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'term-ansicolor', '~> 1.0.5'
   gem.add_dependency 'thor',           '>= 0.13.6'
-
-  gem.add_development_dependency 'parka'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'ronn'
-  gem.add_development_dependency 'fakefs', '~> 0.2.1'
-  gem.add_development_dependency 'rcov',   '~> 0.9.8'
-  gem.add_development_dependency 'rr',     '~> 1.0.2'
-  gem.add_development_dependency 'rspec',  '~> 2.6.0'
 end

lib/foreman/cli.rb

@@ -53,9 +53,8 @@ class Foreman::CLI < Thor
   desc "check", "Validate your application's Procfile"
 
   def check
-    processes = engine.processes_in_order.map { |p| p.first }
+    error "no processes defined" unless engine.processes.length > 0
-    error "no processes defined" unless processes.length > 0
+    display "valid procfile detected (#{engine.processes.map(&:name).join(', ')})"
-    display "valid procfile detected (#{processes.join(', ')})"
   end
 
 private ######################################################################

lib/foreman/distribution.rb

@@ -0,0 +1,9 @@
+module Foreman
+  module Distribution
+    def self.files
+      Dir[File.expand_path("../../../{bin,data,lib}/**/*", __FILE__)].select do |file|
+        File.file?(file)
+      end
+    end
+  end
+end

lib/foreman/engine.rb

@@ -1,5 +1,6 @@
 require "foreman"
 require "foreman/process"
+require "foreman/procfile"
 require "foreman/utils"
 require "pty"
 require "tempfile"
@@ -19,45 +20,17 @@ class Foreman::Engine
   COLORS = [ cyan, yellow, green, magenta, red ]
 
   def initialize(procfile, options={})
-    @procfile  = read_procfile(procfile)
+    @procfile  = Foreman::Procfile.new(procfile)
     @directory = File.expand_path(File.dirname(procfile))
     @options = options
-    @environment = read_environment(options[:env])
+    @environment = read_environment_files(options[:env])
-  end
-
-  def processes
-    @processes ||= begin
-      @order = []
-      procfile.split("\n").inject({}) do |hash, line|
-        next hash if line.strip == ""
-        name, command = line.split(/ *: +/, 2)
-        unless command
-          warn_deprecated_procfile!
-          name, command = line.split(/ +/, 2)
-        end
-        process = Foreman::Process.new(name, command)
-        process.color = next_color
-        @order << process.name
-        hash.update(process.name => process)
-      end
-    end
-  end
-
-  def process_order
-    processes
-    @order.uniq
-  end
-
-  def processes_in_order
-    process_order.map do |name|
-      [name, processes[name]]
-    end
   end
 
   def start
     proctitle "ruby: foreman master"
 
-    processes_in_order.each do |name, process|
+    processes.each do |process|
+      process.color = next_color
       fork process
     end
 
@@ -68,8 +41,7 @@ class Foreman::Engine
   end
 
   def execute(name)
-
+    fork procfile[name]
-    fork processes[name]
 
     trap("TERM") { puts "SIGTERM received"; terminate_gracefully }
     trap("INT")  { puts "SIGINT received";  terminate_gracefully }
@@ -77,9 +49,13 @@ class Foreman::Engine
     watch_for_termination
   end
 
+  def processes
+    procfile.processes
+  end
+
   def port_for(process, num, base_port=nil)
     base_port ||= 5000
-    offset = processes_in_order.map { |p| p.first }.index(process.name) * 100
+    offset = procfile.process_names.index(process.name) * 100
     base_port.to_i + offset + num - 1
   end
 
@@ -113,7 +89,7 @@ private ######################################################################
 
     begin
       Dir.chdir directory do
-        PTY.spawn(runner, process.command) do |stdin, stdout, pid|
+        PTY.spawn(process.command) do |stdin, stdout, pid|
           trap("SIGTERM") { Process.kill("SIGTERM", pid) }
           until stdin.eof?
             info stdin.gets, process
@@ -134,6 +110,24 @@ private ######################################################################
     end
   end
 
+  def terminate_gracefully
+    info "sending SIGTERM to all processes"
+    kill_all "SIGTERM"
+    Timeout.timeout(3) { Process.waitall }
+  rescue Timeout::Error
+    info "sending SIGKILL to all processes"
+    kill_all "SIGKILL"
+  end
+
+  def watch_for_termination
+    pid, status = Process.wait2
+    process = running_processes.delete(pid)
+    info "process terminated", process
+    terminate_gracefully
+    kill_all
+  rescue Errno::ECHILD
+  end
+
   def info(message, process=nil)
     print process.color if process
     print "#{Time.now.strftime("%H:%M:%S")} #{pad_process_name(process)} | "
@@ -149,7 +143,7 @@ private ######################################################################
 
   def longest_process_name
     @longest_process_name ||= begin
-      longest = processes.keys.map { |name| name.length }.sort.last
+      longest = procfile.process_names.map { |name| name.length }.sort.last
       longest = 6 if longest < 6 # system
       longest
     end
@@ -160,30 +154,10 @@ private ######################################################################
     name.ljust(longest_process_name + 3) # add 3 for process number padding
   end
 
-  def print_info
-    info "currently running processes:"
-    running_processes.each do |pid, process|
-      info "pid #{pid}", process
-    end
-  end
-
   def proctitle(title)
     $0 = title
   end
 
-  def read_procfile(procfile)
-    File.read(procfile)
-  end
-
-  def watch_for_termination
-    pid, status = Process.wait2
-    process = running_processes.delete(pid)
-    info "process terminated", process
-    terminate_gracefully
-    kill_all
-  rescue Errno::ECHILD
-  end
-
   def running_processes
     @running_processes ||= {}
   end
@@ -194,41 +168,27 @@ private ######################################################################
     @current_color >= COLORS.length ? "" : COLORS[@current_color]
   end
 
-  def warn_deprecated_procfile!
+  def read_environment_files(filenames)
-    return if @already_warned_deprecated
-    @already_warned_deprecated = true
-    puts "!!! This format of Procfile is deprecated, and will not work starting in v0.12"
-    puts "!!! Use a colon to separate the process name from the command"
-    puts "!!! e.g.   web: thin start"
-  end
-
-  def read_environment(filename)
-    error "No such file: #{filename}" if filename && !File.exists?(filename)
-    filename ||= ".env"
     environment = {}
 
-    if File.exists?(filename)
+    (filenames || "").split(",").map(&:strip).each do |filename|
-      File.read(filename).split("\n").each do |line|
+      error "No such file: #{filename}" unless File.exists?(filename)
-        if line =~ /\A([A-Za-z_]+)=(.*)\z/
+      environment.merge!(read_environment(filename))
-          environment[$1] = $2
-        end
-      end
     end
 
+    environment.merge!(read_environment(".env")) unless filenames
     environment
   end
 
-  def runner
+  def read_environment(filename)
-    File.expand_path("../../../bin/foreman-runner", __FILE__)
+    return {} unless File.exists?(filename)
-  end
 
-  def terminate_gracefully
+    File.read(filename).split("\n").inject({}) do |hash, line|
-    info "sending SIGTERM to all processes"
+      if line =~ /\A([A-Za-z_]+)=(.*)\z/
-    kill_all "SIGTERM"
+        hash[$1] = $2
-    Timeout.timeout(3) { Process.waitall }
+      end
-  rescue Timeout::Error
+      hash
-    info "sending SIGKILL to all processes"
+    end
-    kill_all "SIGKILL"
   end
 
 end

lib/foreman/export/upstart.rb

@@ -26,7 +26,7 @@ class Foreman::Export::Upstart < Foreman::Export::Base
 
     process_template = export_template("upstart", "process.conf.erb", template_root)
 
-    engine.processes.values.each do |process|
+    engine.processes.each do |process|
       process_master_template = export_template("upstart", "process_master.conf.erb", template_root)
       process_master_config   = ERB.new(process_master_template).result(binding)
       write_file "#{location}/#{app}-#{process.name}.conf", process_master_config

lib/foreman/procfile.rb

@@ -0,0 +1,37 @@
+require "foreman"
+
+# A valid Procfile entry is captured by this regex.
+# All other lines are ignored.
+#
+# /^([A-Za-z0-9_]+):\s*(.+)$/
+#
+# $1 = name
+# $2 = command
+#
+class Foreman::Procfile
+
+  attr_reader :processes
+
+  def initialize(filename)
+    @processes = parse_procfile(filename)
+  end
+
+  def process_names
+    processes.map(&:name)
+  end
+
+  def [](name)
+    processes.detect { |process| process.name == name }
+  end
+
+private
+
+  def parse_procfile(filename)
+    File.read(filename).split("\n").map do |line|
+      if line =~ /^([A-Za-z0-9_]+):\s*(.+)$/
+        Foreman::Process.new($1, $2)
+      end
+    end.compact
+  end
+
+end

lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.21.0"
+  VERSION = "0.24.0"
 
 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

@@ -15,21 +15,8 @@ describe "Foreman::Engine" do
       before { write_procfile }
 
       it "reads the processes" do
-        subject.processes["alpha"].command.should == "./alpha"
+        subject.procfile["alpha"].command.should == "./alpha"
-        subject.processes["bravo"].command.should == "./bravo"
+        subject.procfile["bravo"].command.should == "./bravo"
-      end
-    end
-
-    describe "with a deprecated Procfile" do
-      before do
-        File.open("Procfile", "w") do |file|
-          file.puts "name command"
-        end
-      end
-
-      it "should print a deprecation warning" do
-        mock(subject).warn_deprecated_procfile!
-        subject.processes.length.should == 1
       end
     end
   end
@@ -37,8 +24,8 @@ describe "Foreman::Engine" do
   describe "start" do
     it "forks the processes" do
       write_procfile
-      mock(subject).fork(subject.processes["alpha"])
+      mock(subject).fork(subject.procfile["alpha"])
-      mock(subject).fork(subject.processes["bravo"])
+      mock(subject).fork(subject.procfile["bravo"])
       mock(subject).watch_for_termination
       subject.start
     end
@@ -46,9 +33,9 @@ describe "Foreman::Engine" do
     it "handles concurrency" do
       write_procfile
       engine = Foreman::Engine.new("Procfile",:concurrency => "alpha=2")
-      mock(engine).fork_individual(engine.processes["alpha"], 1, 5000)
+      mock(engine).fork_individual(engine.procfile["alpha"], 1, 5000)
-      mock(engine).fork_individual(engine.processes["alpha"], 2, 5001)
+      mock(engine).fork_individual(engine.procfile["alpha"], 2, 5001)
-      mock(engine).fork_individual(engine.processes["bravo"], 1, 5100)
+      mock(engine).fork_individual(engine.procfile["bravo"], 1, 5100)
       mock(engine).watch_for_termination
       engine.start
     end
@@ -57,14 +44,13 @@ describe "Foreman::Engine" do
   describe "execute" do
     it "runs the processes" do
       write_procfile
-      mock(subject).fork(subject.processes["alpha"])
+      mock(subject).fork(subject.procfile["alpha"])
       mock(subject).watch_for_termination
       subject.execute("alpha")
     end
   end
 
   describe "environment" do
-
     before(:each) do
       write_procfile
       stub(Process).fork
@@ -79,6 +65,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")

spec/spec_helper.rb

@@ -28,7 +28,7 @@ def write_procfile(procfile="Procfile")
   File.open(procfile, "w") do |file|
     file.puts "alpha: ./alpha"
     file.puts "\n"
-    file.puts "bravo: ./bravo"
+    file.puts "bravo:\t./bravo"
   end
   File.expand_path(procfile)
 end