0.7.4

.env

@@ -1 +0,0 @@
-FOO=bar

.gitignore

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

Gemfile

@@ -1,15 +1,16 @@
 source "http://rubygems.org"
 
-gemspec
-
 group :development do
   gem 'parka'
   gem 'rake'
-  gem 'ronn'
-  gem 'fakefs', '~> 0.3.2'
-  gem 'rcov',   '~> 0.9.8'
-  gem 'rr',     '~> 1.0.2'
-  gem 'rspec',  '~> 2.6.0'
-  gem 'aws-s3'
-  gem "rubyzip"
 end
+
+group :test do
+  gem 'fakefs', '~> 0.2.1'
+  gem 'rcov',   '~> 0.9.8'
+  gem 'rr',     '~> 0.10.11'
+  gem 'rspec',  '~> 2.0.0.beta.19'
+end
+
+gem 'term-ansicolor', '~> 1.0.5'
+gem 'thor',           '~> 0.13.6'

Gemfile.lock

@@ -1,62 +1,37 @@
-PATH
-  remote: .
-  specs:
-    foreman (0.26.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.3.2)
+    fakefs (0.2.1)
-    hpricot (0.8.2)
     mime-types (1.16)
-    mustache (0.11.2)
+    parka (0.3.1)
-    parka (0.6.2)
-      crack
       rest-client
       thor
-    rake (0.9.2)
+    rake (0.8.7)
     rcov (0.9.8)
-    rdiscount (1.6.5)
+    rest-client (1.6.0)
-    rest-client (1.6.1)
       mime-types (>= 1.16)
-    ronn (0.7.3)
+    rr (0.10.11)
-      hpricot (>= 0.8.2)
+    rspec (2.0.0.beta.19)
-      mustache (>= 0.7.0)
+      rspec-core (= 2.0.0.beta.19)
-      rdiscount (>= 1.5.8)
+      rspec-expectations (= 2.0.0.beta.19)
-    rr (1.0.2)
+      rspec-mocks (= 2.0.0.beta.19)
-    rspec (2.6.0)
+    rspec-core (2.0.0.beta.19)
-      rspec-core (~> 2.6.0)
+    rspec-expectations (2.0.0.beta.19)
-      rspec-expectations (~> 2.6.0)
+      diff-lcs (>= 1.1.2)
-      rspec-mocks (~> 2.6.0)
+    rspec-mocks (2.0.0.beta.19)
-    rspec-core (2.6.4)
+    term-ansicolor (1.0.5)
-    rspec-expectations (2.6.0)
+    thor (0.13.8)
-      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)
-  fakefs (~> 0.3.2)
-  foreman!
   parka
   rake
   rcov (~> 0.9.8)
-  ronn
+  rr (~> 0.10.11)
-  rr (~> 1.0.2)
+  rspec (~> 2.0.0.beta.19)
-  rspec (~> 2.6.0)
+  term-ansicolor (~> 1.0.5)
-  rubyzip
+  thor (~> 0.13.6)

README.markdown

@@ -1,49 +1,4 @@
-# Foreman
+Foreman
-
+=======
-## 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
-
-## Manual
 
 See the [man page](http://ddollar.github.com/foreman) for usage.
-
-## Authorship
-
-Created by David Dollar
-
-Patches contributed by:
-
-* Adam Wiggins
-* 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
-
-MIT

Rakefile

@@ -13,7 +13,7 @@ task :default => :spec
 task :release => :man
 
 desc "Run all specs"
-RSpec::Core::RakeTask.new(:spec) do |t|
+Rspec::Core::RakeTask.new(:spec) do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end
 
@@ -22,10 +22,10 @@ task :rcov => "rcov:build" do
   %x{ open coverage/index.html }
 end
 
-RSpec::Core::RakeTask.new("rcov:build") do |t|
+Rspec::Core::RakeTask.new("rcov:build") do |t|
   t.pattern = 'spec/**/*_spec.rb'
   t.rcov = true
-  t.rcov_opts = [ "--exclude", ".bundle", "--exclude", "spec" ]
+  t.rcov_opts = [ "--exclude", Gem.default_dir , "--exclude", "spec" ]
 end
 
 desc 'Build the manual'
@@ -33,136 +33,19 @@ task :man do
   ENV['RONN_MANUAL']  = "Foreman Manual"
   ENV['RONN_ORGANIZATION'] = "Foreman #{Foreman::VERSION}"
   sh "ronn -w -s toc -r5 --markdown man/*.ronn"
-end
-
-desc "Commit the manual to git"
-task "man:commit" => :man do
   sh "git add README.markdown"
   sh "git commit -m 'update readme' || echo 'nothing to commit'"
 end
 
-desc "Generate the Github docs"
+task :pages => :man do
-task :pages => "man:commit" do
   sh %{
     cp man/foreman.1.html /tmp/foreman.1.html
     git checkout gh-pages
     rm ./index.html
     cp /tmp/foreman.1.html ./index.html
     git add -u index.html
-    git commit -m "saving man page to github docs"
+    git commit -m "rebuilding man page"
     git push origin -f gh-pages
     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

data/example/Procfile

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

data/example/log/neverdie.log

@@ -1,4 +0,0 @@
-tick
-tick
-./never_die:6:in `sleep': Interrupt
-	from ./never_die:6

data/example/ticker

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-$stdout.sync = true
-
-%w( SIGINT SIGTERM ).each do |signal|
-  trap(signal) do
-    puts "received #{signal} but i'm ignoring it!"
-  end
-end
-
-while true
-  puts "tick: #{ARGV.inspect} -- FOO:#{ENV["FOO"]}"
-  sleep 1
-end

data/export/bluepill/master.pill.erb

@@ -1,27 +0,0 @@
-Bluepill.application("<%= app %>", :foreground => false, :log_file => "/var/log/bluepill.log") do |app|
-
-  app.uid = "<%= user %>"
-  app.gid = "<%= user %>"
-
-<% 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|
-    process.start_command = "<%= process.command.gsub("$PORT", port.to_s) %>"
-
-    process.working_dir = "<%= engine.directory %>"
-    process.daemonize = true
-    process.environment = {"PORT" => "<%= port %>"}
-    process.stop_signals = [:quit, 30.seconds, :term, 5.seconds, :kill]
-
-    process.stdout = process.stderr = "<%= log_root %>/<%= app %>-<%= process.name %>-<%=num%>.log"
-
-    process.monitor_children do |children|
-      children.stop_command "kill -QUIT {{PID}}"
-    end
-    
-    process.group = "<%= app %>-<%= process.name %>"
-  end
-<% end %>
-<% end %>
-end

data/export/runit/log_run.erb

@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-
-LOG=<%= log_root %>/<%= process.name %>-<%= num %>
-
-test -d "$LOG" || mkdir -p m2750 "$LOG" && chown <%= user %> "$LOG"
-exec chpst -u <%= user %> svlogd "$LOG"

data/export/runit/run.erb

@@ -1,3 +0,0 @@
-#!/bin/sh
-cd <%= engine.directory %>
-exec chpst -u <%= user %> -e <%= process_env_directory %> <%= process.command %>

data/export/upstart/process.conf.erb

@@ -1,5 +0,0 @@
-start on starting <%= app %>-<%= process.name %>
-stop on stopping <%= app %>-<%= process.name %>
-respawn
-
-exec su - <%= user %> -c 'cd <%= engine.directory %>; export PORT=<%= port %>;<% engine.environment.each_pair do |var,env| %> export <%= var.upcase %>=<%= env %>; <% end %> <%= process.command %> >> <%= log_root %>/<%=process.name%>-<%=num%>.log 2>&1'

dist/gem.rake

@@ -1,14 +0,0 @@
-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

@@ -1,52 +0,0 @@
-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

@@ -1,23 +0,0 @@
-<?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

@@ -1,7 +0,0 @@
-<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

@@ -1,15 +0,0 @@
-#!/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

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

dist/resources/tgz/foreman

@@ -1,15 +0,0 @@
-#!/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

@@ -1,24 +0,0 @@
-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

example/error

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

example/ticker

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+while true
+  puts "tick: #{ARGV.inspect}"
+  sleep 1
+end

export/upstart/process.conf.erb

@@ -0,0 +1,6 @@
+start on starting <%= app %>-<%= process.name %>
+stop on stopping <%= app %>-<%= process.name %>
+respawn
+
+chdir <%= engine.directory %>
+exec su <%= user %> -c "PORT=<%= port %> <%= process.command %> >> <%= log_root %>/<%=process.name%>-<%=num%>.log 2>&1"

foreman.gemspec

@@ -1,21 +1,13 @@
-$:.unshift File.expand_path("../lib", __FILE__)
+require "rubygems"
-require "foreman/version"
+require "parka/specification"
 
-Gem::Specification.new do |gem|
+Parka::Specification.new do |gem|
   gem.name     = "foreman"
   gem.version  = Foreman::VERSION
-
-  gem.author   = "David Dollar"
-  gem.email    = "ddollar@gmail.com"
-  gem.homepage = "http://github.com/ddollar/foreman"
   gem.summary  = "Process manager for applications with multiple components"
+  gem.homepage = "http://github.com/ddollar/foreman"
 
-  gem.description = gem.summary
+  gem.executables  = "foreman"
-
+  gem.files       << "man/foreman.1"
-  gem.executables = "foreman"
+  gem.files       << Dir["export/**/*"]
-  gem.files = Dir["**/*"].select { |d| d =~ %r{^(README|bin/|data/|ext/|lib/|spec/|test/)} }
-  gem.files << "man/foreman.1"
-
-  gem.add_dependency 'term-ansicolor', '~> 1.0.5'
-  gem.add_dependency 'thor',           '>= 0.13.6'
 end

lib/foreman.rb

@@ -1,7 +1,7 @@
-require "foreman/version"
-
 module Foreman
 
+  VERSION = "0.7.4"
+
   class AppDoesNotExist < Exception; end
 
 end

lib/foreman/cli.rb

@@ -2,25 +2,24 @@ require "foreman"
 require "foreman/engine"
 require "foreman/export"
 require "thor"
-require "yaml"
 
 class Foreman::CLI < Thor
 
-  class_option :procfile, :type => :string, :aliases => "-f", :desc => "Default: Procfile"
+  class_option :procfile, :type => :string, :aliases => "-f", :desc => "Default: ./Procfile"
 
   desc "start [PROCESS]", "Start the application, or a specific process"
 
-  method_option :env,         :type => :string,  :aliases => "-e", :desc => "Specify an environment file to load, defaults to .env"
   method_option :port,        :type => :numeric, :aliases => "-p"
-  method_option :concurrency, :type => :string,  :aliases => "-c", :banner => '"alpha=5,bar=3"'
+  method_option :concurrency, :type => :string,  :aliases => "-c",
+    :banner => '"alpha=5,bar=3"'
 
   def start(process=nil)
     check_procfile!
 
     if process
-      engine.execute(process)
+      engine.execute(process, options)
     else
-      engine.start
+      engine.start(options)
     end
   end
 
@@ -28,10 +27,8 @@ class Foreman::CLI < Thor
 
   method_option :app,         :type => :string,  :aliases => "-a"
   method_option :log,         :type => :string,  :aliases => "-l"
-  method_option :env,         :type => :string,  :aliases => "-e", :desc => "Specify an environment file to load, defaults to .env"
   method_option :port,        :type => :numeric, :aliases => "-p"
   method_option :user,        :type => :string,  :aliases => "-u"
-  method_option :template,    :type => :string,  :aliases => "-t"
   method_option :concurrency, :type => :string,  :aliases => "-c",
     :banner => '"alpha=5,bar=3"'
 
@@ -39,10 +36,8 @@ class Foreman::CLI < Thor
     check_procfile!
 
     formatter = case format
-      when "inittab" then Foreman::Export::Inittab
       when "upstart" then Foreman::Export::Upstart
-      when "bluepill" then Foreman::Export::Bluepill
+      when "inittab" then Foreman::Export::Inittab
-      when "runit"    then Foreman::Export::Runit
       else error "Unknown export format: #{format}."
     end
 
@@ -52,30 +47,21 @@ class Foreman::CLI < Thor
     error ex.message
   end
 
-  desc "check", "Validate your application's Procfile"
-
-  def check
-    error "no processes defined" unless engine.processes.length > 0
-    display "valid procfile detected (#{engine.processes.map(&:name).join(', ')})"
-  end
-
 private ######################################################################
 
   def check_procfile!
-    error("#{procfile} does not exist.") unless File.exist?(procfile)
+    error("Procfile does not exist.") unless File.exist?(procfile)
   end
 
   def engine
-    @engine ||= Foreman::Engine.new(procfile, options)
+    @engine ||= Foreman::Engine.new(procfile)
   end
 
   def procfile
-    options[:procfile] || "Procfile"
+    options[:procfile] || "./Procfile"
   end
 
-  def display(message)
+private ######################################################################
-    puts message
-  end
 
   def error(message)
     puts "ERROR: #{message}"
@@ -86,11 +72,4 @@ private ######################################################################
     File.exist?(procfile)
   end
 
-  def options
-    original_options = super
-    return original_options unless File.exists?(".foreman")
-    defaults = YAML::load_file(".foreman") || {}
-    Thor::CoreExt::HashWithIndifferentAccess.new(defaults.merge(original_options))
-  end
-
 end

lib/foreman/distribution.rb

@@ -1,9 +0,0 @@
-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,10 +1,8 @@
 require "foreman"
 require "foreman/process"
-require "foreman/procfile"
 require "foreman/utils"
 require "pty"
 require "tempfile"
-require "timeout"
 require "term/ansicolor"
 require "fileutils"
 
@@ -12,70 +10,68 @@ class Foreman::Engine
 
   attr_reader :procfile
   attr_reader :directory
-  attr_reader :environment
-  attr_reader :options
 
   extend Term::ANSIColor
 
   COLORS = [ cyan, yellow, green, magenta, red ]
 
-  def initialize(procfile, options={})
+  def initialize(procfile)
-    @procfile  = Foreman::Procfile.new(procfile)
+    @procfile  = read_procfile(procfile)
     @directory = File.expand_path(File.dirname(procfile))
-    @options = options
-    @environment = read_environment_files(options[:env])
-  end
-
-  def start
-    proctitle "ruby: foreman master"
-    termtitle "#{File.basename(@directory)} - foreman (#{processes.size} processes)"
-
-    processes.each do |process|
-      process.color = next_color
-      fork process
-    end
-
-    trap("TERM") { puts "SIGTERM received"; terminate_gracefully }
-    trap("INT")  { puts "SIGINT received";  terminate_gracefully }
-
-    watch_for_termination
-  end
-
-  def execute(name)
-    error "no such process: #{name}" unless procfile[name]
-    fork procfile[name]
-
-    trap("TERM") { puts "SIGTERM received"; terminate_gracefully }
-    trap("INT")  { puts "SIGINT received";  terminate_gracefully }
-
-    watch_for_termination
   end
 
   def processes
-    procfile.processes
+    @processes ||= begin
+      procfile.split("\n").inject({}) do |hash, line|
+        next if line.strip == ""
+        name, command = line.split(" ", 2)
+        process = Foreman::Process.new(name, command)
+        process.color = next_color
+        hash.update(process.name => process)
+      end
+    end
+  end
+
+  def start(options={})
+    proctitle "ruby: foreman master"
+
+    processes.each do |name, process|
+      fork process, options
+    end
+
+    trap("TERM") { kill_and_exit("TERM") }
+    trap("INT")  { kill_and_exit("INT")  }
+
+    watch_for_termination
+  end
+
+  def execute(name, options={})
+    fork processes[name], options
+
+    trap("TERM") { kill_and_exit("TERM") }
+    trap("INT")  { kill_and_exit("INT")  }
+
+    watch_for_termination
   end
 
   def port_for(process, num, base_port=nil)
     base_port ||= 5000
-    offset = procfile.process_names.index(process.name) * 100
+    offset = processes.keys.sort.index(process.name) * 100
     base_port.to_i + offset + num - 1
   end
 
 private ######################################################################
 
-  def fork(process)
+  def fork(process, options={})
-    concurrency = Foreman::Utils.parse_concurrency(@options[:concurrency])
+    concurrency = Foreman::Utils.parse_concurrency(options[:concurrency])
 
     1.upto(concurrency[process.name]) do |num|
-      fork_individual(process, num, port_for(process, num, @options[:port]))
+      fork_individual(process, port_for(process, num, options[:port]))
     end
   end
 
-  def fork_individual(process, num, port)
+  def fork_individual(process, port)
-    @environment.each { |k,v| ENV[k] = v }
-
     ENV["PORT"] = port.to_s
-    ENV["PS"]   = "#{process.name}.#{num}"
 
     pid = Process.fork do
       run(process)
@@ -85,49 +81,32 @@ private ######################################################################
     running_processes[pid] = process
   end
 
-  def run(process)
+  def run(process, log_to_file=true)
     proctitle "ruby: foreman #{process.name}"
-    trap("SIGINT", "IGNORE")
 
-    begin
+    Dir.chdir directory do
-      Dir.chdir directory do
+      FileUtils.mkdir_p "log"
-        PTY.spawn(process.command) do |stdin, stdout, pid|
+      command = process.command
-          trap("SIGTERM") { Process.kill("SIGTERM", pid) }
+
+      begin
+        PTY.spawn("#{process.command} 2>&1") do |stdin, stdout, pid|
           until stdin.eof?
             info stdin.gets, process
           end
         end
-      end
+      rescue PTY::ChildExited, Interrupt
-    rescue PTY::ChildExited, Interrupt, Errno::EIO, Errno::ENOENT
-      begin
         info "process exiting", process
-      rescue Interrupt
       end
     end
   end
 
-  def kill_all(signal="SIGTERM")
+  def kill_and_exit(signal="TERM")
+    info "terminating"
     running_processes.each do |pid, process|
-      Process.kill(signal, pid) rescue Errno::ESRCH
+      info "killing #{process.name} in pid #{pid}"
+      Process.kill(signal, pid)
     end
-  end
+    exit 0
-
-  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)
@@ -138,30 +117,39 @@ private ######################################################################
     puts
   end
 
-  def error(message)
-    puts "ERROR: #{message}"
-    exit 1
-  end
-
   def longest_process_name
     @longest_process_name ||= begin
-      longest = procfile.process_names.map { |name| name.length }.sort.last
+      longest = processes.keys.map { |name| name.length }.sort.last
       longest = 6 if longest < 6 # system
       longest
     end
   end
 
   def pad_process_name(process)
-    name = process ? "#{ENV["PS"]}" : "system"
+    name = process ? "#{process.name}:#{ENV["PORT"]}" : "system"
-    name.ljust(longest_process_name + 3) # add 3 for process number padding
+    name.ljust(longest_process_name + 6) # add 6 for port 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 termtitle(title)
+  def read_procfile(procfile)
-    printf("\033]0;#{title}\007")
+    File.read(procfile)
+  end
+
+  def watch_for_termination
+    pid, status = Process.wait2
+    process = running_processes.delete(pid)
+    info "process terminated", process
+    kill_and_exit
   end
 
   def running_processes
@@ -174,27 +162,4 @@ private ######################################################################
     @current_color >= COLORS.length ? "" : COLORS[@current_color]
   end
 
-  def read_environment_files(filenames)
-    environment = {}
-
-    (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 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
-      end
-      hash
-    end
-  end
-
 end

lib/foreman/export.rb

@@ -4,8 +4,5 @@ module Foreman::Export
   class Exception < ::Exception; end
 end
 
-require "foreman/export/base"
-require "foreman/export/inittab"
 require "foreman/export/upstart"
-require "foreman/export/bluepill"
+require "foreman/export/inittab"
-require "foreman/export/runit"

lib/foreman/export/base.rb

@@ -23,14 +23,8 @@ private ######################################################################
     puts "[foreman export] %s" % message
   end
 
-  def export_template(exporter, file, template_root)
+  def export_template(name)
-    if template_root && File.exist?(file_path = File.join(template_root, file))
+    File.read(File.expand_path("../../../../export/#{name}", __FILE__))
-      File.read(file_path)
-    elsif File.exist?(file_path = File.join("~/.foreman/templates", file))
-      File.read(file_path)
-    else
-      File.read(File.expand_path("../../../../data/export/#{exporter}/#{file}", __FILE__))
-    end
   end
 
   def write_file(filename, contents)

lib/foreman/export/bluepill.rb

@@ -1,28 +0,0 @@
-require "erb"
-require "foreman/export"
-
-class Foreman::Export::Bluepill < Foreman::Export::Base
-
-  def export(location, options={})
-    error("Must specify a location") unless location
-
-    FileUtils.mkdir_p location
-
-    app = options[:app] || File.basename(engine.directory)
-    user = options[:user] || app
-    log_root = options[:log] || "/var/log/#{app}"
-    template_root = options[:template]
-
-    Dir["#{location}/#{app}.pill"].each do |file|
-      say "cleaning up: #{file}"
-      FileUtils.rm(file)
-    end
-
-    concurrency = Foreman::Utils.parse_concurrency(options[:concurrency])
-
-    master_template = export_template("bluepill", "master.pill.erb", template_root)
-    master_config   = ERB.new(master_template).result(binding)
-    write_file "#{location}/#{app}.pill", master_config
-  end
-
-end

lib/foreman/export/inittab.rb

@@ -1,4 +1,4 @@
-require "foreman/export"
+require "foreman/export/base"
 
 class Foreman::Export::Inittab < Foreman::Export::Base
 
@@ -12,7 +12,7 @@ class Foreman::Export::Inittab < Foreman::Export::Base
     inittab = []
     inittab << "# ----- foreman #{app} processes -----"
 
-    engine.processes.inject(1) do |index, process|
+    engine.processes.values.inject(1) do |index, process|
       1.upto(concurrency[process.name]) do |num|
         id = app.slice(0, 2).upcase + sprintf("%02d", index)
         port = engine.port_for(process, num, options[:port])
@@ -27,8 +27,8 @@ class Foreman::Export::Inittab < Foreman::Export::Base
     inittab = inittab.join("\n") + "\n"
 
     if fname
-      FileUtils.mkdir_p(log_root) rescue error "could not create #{log_root}"
+      FileUtils.mkdir_p(log_root)
-      FileUtils.chown(user, nil, log_root) rescue error "could not chown #{log_root} to #{user}"
+      FileUtils.chown(user, nil, log_root)
       write_file(fname, inittab)
     else
       puts inittab

lib/foreman/export/runit.rb

@@ -1,60 +0,0 @@
-require "erb"
-require "foreman/export"
-
-class Foreman::Export::Runit < Foreman::Export::Base
-  ENV_VARIABLE_REGEX = /([a-zA-Z_]+[a-zA-Z0-9_]*)=(\S+)/
-  
-  def export(location, options={})
-    error("Must specify a location") unless location
-    
-    app = options[:app] || File.basename(engine.directory)
-    user = options[:user] || app
-    log_root = options[:log] || "/var/log/#{app}"
-    template_root = options[:template]
-    
-    concurrency = Foreman::Utils.parse_concurrency(options[:concurrency])
-    
-    run_template = export_template('runit', 'run.erb', template_root)
-    log_run_template = export_template('runit', 'log_run.erb', template_root)
-
-    engine.processes.each do |process|
-      1.upto(concurrency[process.name]) do |num|
-        process_directory     = "#{location}/#{app}-#{process.name}-#{num}"
-        process_env_directory = "#{process_directory}/env"
-        process_log_directory = "#{process_directory}/log"
-        
-        create_directory process_directory
-        create_directory process_env_directory
-        create_directory process_log_directory
-        
-        run = ERB.new(run_template).result(binding)
-        write_file "#{process_directory}/run", run
-        
-        port = engine.port_for(process, num, options[:port])
-        environment_variables = {'PORT' => port}.
-            merge(engine.environment).
-            merge(inline_variables(process.command))
-            
-        environment_variables.each_pair do |var, env|
-          write_file "#{process_env_directory}/#{var.upcase}", env
-        end
-        
-        log_run = ERB.new(log_run_template).result(binding)
-        write_file "#{process_log_directory}/run", log_run
-        
-      end
-    end
-    
-  end
-  
-  private
-  def create_directory(location)
-    say "creating: #{location}"
-    FileUtils.mkdir(location)
-  end
-  
-  def inline_variables(command)
-    variable_name_regex = 
-    Hash[*command.scan(ENV_VARIABLE_REGEX).flatten]
-  end
-end

lib/foreman/export/upstart.rb

@@ -1,5 +1,5 @@
 require "erb"
-require "foreman/export"
+require "foreman/export/base"
 
 class Foreman::Export::Upstart < Foreman::Export::Base
 
@@ -11,7 +11,6 @@ class Foreman::Export::Upstart < Foreman::Export::Base
     app = options[:app] || File.basename(engine.directory)
     user = options[:user] || app
     log_root = options[:log] || "/var/log/#{app}"
-    template_root = options[:template]
 
     Dir["#{location}/#{app}*.conf"].each do |file|
       say "cleaning up: #{file}"
@@ -20,15 +19,14 @@ class Foreman::Export::Upstart < Foreman::Export::Base
 
     concurrency = Foreman::Utils.parse_concurrency(options[:concurrency])
 
-    master_template = export_template("upstart", "master.conf.erb", template_root)
+    master_template = export_template("upstart/master.conf.erb")
     master_config   = ERB.new(master_template).result(binding)
     write_file "#{location}/#{app}.conf", master_config
 
-    process_template = export_template("upstart", "process.conf.erb", template_root)
+    process_template = export_template("upstart/process.conf.erb")
 
-    engine.processes.each do |process|
+    engine.processes.values.each do |process|
-      next if (conc = concurrency[process.name]) < 1
+      process_master_template = export_template("upstart/process_master.conf.erb")
-      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

@@ -1,37 +0,0 @@
-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/utils.rb

@@ -3,7 +3,7 @@ require "foreman"
 class Foreman::Utils
 
   def self.parse_concurrency(concurrency)
-    begin
+    @concurrency ||= begin
       pairs = concurrency.to_s.gsub(/\s/, "").split(",")
       pairs.inject(Hash.new(1)) do |hash, pair|
         process, amount = pair.split("=")

lib/foreman/version.rb

@@ -1,5 +0,0 @@
-module Foreman
-
-  VERSION = "0.26.0"
-
-end

man/foreman.1

@@ -1,215 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "FOREMAN" "1" "November 2011" "Foreman 0.25.0" "Foreman Manual"
-.
-.SH "NAME"
-\fBforeman\fR \- manage Procfile\-based applications
-.
-.SH "SYNOPSIS"
-\fBforeman start [process]\fR
-.
-.br
-\fBforeman export <format> [location]\fR
-.
-.SH "DESCRIPTION"
-\fBForeman\fR is a manager for Procfile\-based applications\. Its aim is to abstract away the details of the Procfile format, and allow you to either run your application directly or export it to some other process management format\.
-.
-.SH "RUNNING"
-\fBforeman start\fR is used to run your application directly from the command line\.
-.
-.P
-If no additional parameters are passed, foreman will run one instance of each type of process defined in your Procfile\.
-.
-.P
-If a parameter is passed, foreman will run one instance of the specified application type\.
-.
-.P
-The following options control how the application is run:
-.
-.TP
-\fB\-c\fR, \fB\-\-concurrency\fR
-Specify the number of each process type to run\. The value passed in should be in the format \fBprocess=num,process=num\fR
-.
-.TP
-\fB\-p\fR, \fB\-\-port\fR
-Specify which port to use as the base for this application\. Should be a multiple of 1000\.
-.
-.SH "EXPORTING"
-\fBforeman export\fR is used to export your application to another process management format\.
-.
-.P
-An location to export can be passed as an argument\. This argument may be either required or optional depending on the export format\.
-.
-.P
-The following options control how the application is run:
-.
-.TP
-\fB\-a\fR, \fB\-\-app\fR
-Use this name rather than the application\'s root directory name as the name of the application when exporting\.
-.
-.TP
-\fB\-c\fR, \fB\-\-concurrency\fR
-Specify the number of each process type to run\. The value passed in should be in the format \fBprocess=num,process=num\fR
-.
-.TP
-\fB\-l\fR, \fB\-\-log\fR
-Specify the directory to place process logs in\.
-.
-.TP
-\fB\-p\fR, \fB\-\-port\fR
-Specify which port to use as the base for this application\. Should be a multiple of 1000\.
-.
-.TP
-\fB\-u\fR, \fB\-\-user\fR
-Specify the user the application should be run as\. Defaults to the app name
-.
-.SH "OPTIONS"
-These options control all modes of foreman\'s operation\.
-.
-.TP
-\fB\-e\fR, \fB\-\-env\fR
-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
-Specify an alternate location for the application\'s Procfile\. This file\'s containing directory will be assumed to be the root directory of the application\.
-.
-.SH "EXPORT FORMATS"
-foreman currently supports the following output formats:
-.
-.IP "\(bu" 4
-bluepill
-.
-.IP "\(bu" 4
-inittab
-.
-.IP "\(bu" 4
-upstart
-.
-.IP "" 0
-.
-.SH "INITTAB EXPORT"
-Will export a chunk of inittab\-compatible configuration:
-.
-.IP "" 4
-.
-.nf
-
-# \-\-\-\-\- foreman example processes \-\-\-\-\-
-EX01:4:respawn:/bin/su \- example \-c \'PORT=5000 bundle exec thin start >> /var/log/web\-1\.log 2>&1\'
-EX02:4:respawn:/bin/su \- example \-c \'PORT=5100 bundle exec rake jobs:work >> /var/log/job\-1\.log 2>&1\'
-# \-\-\-\-\- end foreman example processes \-\-\-\-\-
-.
-.fi
-.
-.IP "" 0
-.
-.SH "UPSTART EXPORT"
-Will create a series of upstart scripts in the location you specify\. Scripts will be structured to make the following commands valid:
-.
-.P
-\fBstart appname\fR
-.
-.P
-\fBstop appname\-processname\fR
-.
-.P
-\fBrestart appname\-processname\-3\fR
-.
-.SH "PROCFILE"
-A Procfile should contain both a name for the process and the command used to run it\.
-.
-.IP "" 4
-.
-.nf
-
-web: bundle exec thin start
-job: bundle exec rake jobs:work
-.
-.fi
-.
-.IP "" 0
-.
-.P
-A process name may contain letters, numbers amd the underscore character\. You can validate your Procfile format using the \fBcheck\fR command:
-.
-.IP "" 4
-.
-.nf
-
-$ foreman check
-.
-.fi
-.
-.IP "" 0
-.
-.SH "ENVIRONMENT"
-If a \fB\.env\fR file exists in the current directory, the default environment will be read from it\. This file should contain key/value pairs, separated by \fB=\fR, with one key/value pair per line\.
-.
-.IP "" 4
-.
-.nf
-
-FOO=bar
-BAZ=qux
-.
-.fi
-.
-.IP "" 0
-.
-.SH "DEFAULT OPTIONS"
-If a \fB\.foreman\fR 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:
-.
-.IP "" 4
-.
-.nf
-
-concurrency: alpha=0,bravo=1
-port: 15000
-.
-.fi
-.
-.IP "" 0
-.
-.SH "EXAMPLES"
-Start one instance of each process type, interleave the output on stdout:
-.
-.IP "" 4
-.
-.nf
-
-$ foreman start
-.
-.fi
-.
-.IP "" 0
-.
-.P
-Export the application in upstart format:
-.
-.IP "" 4
-.
-.nf
-
-$ foreman export upstart /etc/init
-.
-.fi
-.
-.IP "" 0
-.
-.P
-Run one process type from the application defined in a specific Procfile:
-.
-.IP "" 4
-.
-.nf
-
-$ foreman start alpha \-p ~/myapp/Procfile
-.
-.fi
-.
-.IP "" 0
-.
-.SH "COPYRIGHT"
-Foreman is Copyright (C) 2010 David Dollar \fIhttp://daviddollar\.org\fR

man/foreman.1.ronn

@@ -66,10 +66,6 @@ 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. 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
     containing directory will be assumed to be the root directory of the
@@ -79,8 +75,6 @@ These options control all modes of foreman's operation.
 
 foreman currently supports the following output formats:
 
-  * bluepill
-
   * inittab
 
   * upstart
@@ -110,31 +104,8 @@ will be structured to make the following commands valid:
 A Procfile should contain both a name for the process and the command used
 to run it.
 
-    web: bundle exec thin start
+    web  bundle exec thin start
-    job: bundle exec rake jobs:work
+    job  bundle exec rake jobs:work
-
-A process name may contain letters, numbers amd the underscore character.
-You can validate your Procfile format using the `check` command:
-
-    $ foreman check
-
-## ENVIRONMENT
-
-If a `.env` file exists in the current directory, the default environment will
-be read from it. This file should contain key/value pairs, separated by `=`, with
-one key/value pair per line.
-
-    FOO=bar
-    BAZ=qux
-
-## DEFAULT OPTIONS
-
-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,bravo=1
-    port: 15000
 
 ## EXAMPLES
 
@@ -148,7 +119,7 @@ Export the application in upstart format:
 
 Run one process type from the application defined in a specific Procfile:
 
-    $ foreman start alpha -p ~/myapp/Procfile
+    $ foreman start alpha -p ~/app/Procfile
 
 ## COPYRIGHT
 

spec/foreman/cli_spec.rb

@@ -19,22 +19,13 @@ describe "Foreman::CLI" do
 
       it "runs successfully" do
         dont_allow(subject).error
-        mock.instance_of(Foreman::Engine).start
+        mock.instance_of(Foreman::Engine).start({})
         subject.start
       end
     end
   end
 
   describe "export" do
-    describe "options" do
-      it "respects --env" do
-        write_procfile
-        write_env("envfile")
-        mock.instance_of(Foreman::Export::Upstart).export("/upstart", { "env" => "envfile" })
-        foreman %{ export upstart /upstart --env envfile }
-      end
-    end
-
     describe "with a non-existent Procfile" do
       it "prints an error" do
         mock_error(subject, "Procfile does not exist.") do
@@ -67,27 +58,4 @@ describe "Foreman::CLI" do
     end
   end
 
-  describe "check" do
-    describe "with a valid Procfile" do
-      before { write_procfile }
-
-      it "displays the jobs" do
-        mock(subject).display("valid procfile detected (alpha, bravo)")
-        subject.check
-      end
-    end
-
-    describe "with a blank Procfile" do
-      before do
-        FileUtils.touch("Procfile")
-      end
-
-      it "displays an error" do
-        mock_error(subject, "no processes defined") do
-          subject.check
-        end
-      end
-    end
-  end
-
 end

spec/foreman/engine_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 require "foreman/engine"
 
 describe "Foreman::Engine" do
-  subject { Foreman::Engine.new("Procfile", {}) }
+  subject { Foreman::Engine.new("Procfile") }
 
   describe "initialize" do
     describe "without an existing Procfile" do
@@ -12,11 +12,10 @@ describe "Foreman::Engine" do
     end
 
     describe "with a Procfile" do
-      before { write_procfile }
-
       it "reads the processes" do
-        subject.procfile["alpha"].command.should == "./alpha"
+        write_procfile
-        subject.procfile["bravo"].command.should == "./bravo"
+        subject.processes["alpha"].command.should == "./alpha"
+        subject.processes["bravo"].command.should == "./bravo"
       end
     end
   end
@@ -24,76 +23,28 @@ describe "Foreman::Engine" do
   describe "start" do
     it "forks the processes" do
       write_procfile
-      mock(subject).fork(subject.procfile["alpha"])
+      mock(subject).fork(subject.processes["alpha"], {})
-      mock(subject).fork(subject.procfile["bravo"])
+      mock(subject).fork(subject.processes["bravo"], {})
       mock(subject).watch_for_termination
       subject.start
     end
 
     it "handles concurrency" do
       write_procfile
-      engine = Foreman::Engine.new("Procfile",:concurrency => "alpha=2")
+      mock(subject).fork_individual(subject.processes["alpha"], 5000)
-      mock(engine).fork_individual(engine.procfile["alpha"], 1, 5000)
+      mock(subject).fork_individual(subject.processes["alpha"], 5001)
-      mock(engine).fork_individual(engine.procfile["alpha"], 2, 5001)
+      mock(subject).fork_individual(subject.processes["bravo"], 5100)
-      mock(engine).fork_individual(engine.procfile["bravo"], 1, 5100)
+      mock(subject).watch_for_termination
-      mock(engine).watch_for_termination
+      subject.start(:concurrency => "alpha=2")
-      engine.start
     end
   end
 
   describe "execute" do
     it "runs the processes" do
       write_procfile
-      mock(subject).fork(subject.procfile["alpha"])
+      mock(subject).fork(subject.processes["alpha"], {})
       mock(subject).watch_for_termination
       subject.execute("alpha")
     end
-
-    it "shows an error running a process that doesnt exist" do
-      write_procfile
-      mock(subject).puts("ERROR: no such process: foo")
-      lambda { subject.execute("foo") }.should raise_error(SystemExit)
-    end
-  end
-
-  describe "environment" do
-    before(:each) do
-      write_procfile
-      stub(Process).fork
-    end
-
-    it "should read if specified" do
-      File.open("/tmp/env", "w") { |f| f.puts("FOO=baz") }
-      engine = Foreman::Engine.new("Procfile", :env => "/tmp/env")
-      stub(engine).info
-      mock(engine).watch_for_termination
-      engine.environment.should == {"FOO"=>"baz"}
-      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")
-    end
-
-    it "should read .env if none specified" do
-      File.open(".env", "w") { |f| f.puts("FOO=qoo") }
-      engine = Foreman::Engine.new("Procfile")
-      stub(engine).info
-      mock(engine).watch_for_termination
-      mock(engine).fork_individual(anything, anything, anything)
-      engine.environment.should == {"FOO"=>"qoo"}
-      engine.execute("bravo")
-    end
   end
 end

spec/foreman/export/bluepill_spec.rb

@@ -1,20 +0,0 @@
-require "spec_helper"
-require "foreman/engine"
-require "foreman/export/bluepill"
-require "tmpdir"
-
-describe Foreman::Export::Bluepill do
-  let(:procfile) { FileUtils.mkdir_p("/tmp/app"); write_procfile("/tmp/app/Procfile") }
-  let(:engine) { Foreman::Engine.new(procfile) }
-  let(:bluepill) { Foreman::Export::Bluepill.new(engine) }
-
-  before(:each) { load_export_templates_into_fakefs("bluepill") }
-  before(:each) { stub(bluepill).say }
-
-  it "exports to the filesystem" do
-    bluepill.export("/tmp/init", :concurrency => "alpha=2")
-    
-    File.read("/tmp/init/app.pill").should == example_export_file("bluepill/app.pill")
-  end
-
-end

spec/foreman/export/runit_spec.rb

@@ -1,35 +0,0 @@
-require "spec_helper"
-require "foreman/engine"
-require "foreman/export/runit"
-require "tmpdir"
-
-describe Foreman::Export::Runit do
-  let(:procfile) { FileUtils.mkdir_p("/tmp/app"); write_procfile("/tmp/app/Procfile", 'bar=baz') }
-  let(:engine) { Foreman::Engine.new(procfile) }
-  let(:runit) { Foreman::Export::Runit.new(engine) }
-  
-  before(:each) { load_export_templates_into_fakefs("runit") }
-  before(:each) { stub(runit).say }
-  
-  it "exports to the filesystem" do
-    FileUtils.mkdir_p('/tmp/init')
-    runit.export('/tmp/init', :concurrency => 'alpha=2')
-    
-    File.read("/tmp/init/app-alpha-1/run").should == example_export_file('runit/app-alpha-1-run')
-    File.read("/tmp/init/app-alpha-1/log/run").should == 
-        example_export_file('runit/app-alpha-1-log-run')
-    File.read("/tmp/init/app-alpha-1/env/PORT").should == "5000\n"
-    File.read("/tmp/init/app-alpha-1/env/BAR").should == "baz\n"
-    
-    File.read("/tmp/init/app-alpha-2/run").should == example_export_file('runit/app-alpha-2-run')
-    File.read("/tmp/init/app-alpha-2/log/run").should == 
-        example_export_file('runit/app-alpha-2-log-run')
-    File.read("/tmp/init/app-alpha-2/env/PORT").should == "5001\n"
-    File.read("/tmp/init/app-alpha-2/env/BAR").should == "baz\n"
-    
-    File.read("/tmp/init/app-bravo-1/run").should == example_export_file('runit/app-bravo-1-run')
-    File.read("/tmp/init/app-bravo-1/log/run").should == 
-        example_export_file('runit/app-bravo-1-log-run')
-    File.read("/tmp/init/app-bravo-1/env/PORT").should == "5100\n"
-  end
-end

spec/foreman/export/upstart_spec.rb

@@ -1,55 +1,2 @@
 require "spec_helper"
-require "foreman/engine"
 require "foreman/export/upstart"
-require "tmpdir"
-
-describe Foreman::Export::Upstart do
-  let(:procfile) { FileUtils.mkdir_p("/tmp/app"); write_procfile("/tmp/app/Procfile") }
-  let(:engine) { Foreman::Engine.new(procfile) }
-  let(:upstart) { Foreman::Export::Upstart.new(engine) }
-
-  before(:each) { load_export_templates_into_fakefs("upstart") }
-  before(:each) { stub(upstart).say }
-
-  it "exports to the filesystem" do
-    upstart.export("/tmp/init", :concurrency => "alpha=2")
-
-    File.read("/tmp/init/app.conf").should         == example_export_file("upstart/app.conf")
-    File.read("/tmp/init/app-alpha.conf").should   == example_export_file("upstart/app-alpha.conf")
-    File.read("/tmp/init/app-alpha-1.conf").should == example_export_file("upstart/app-alpha-1.conf")
-    File.read("/tmp/init/app-alpha-2.conf").should == example_export_file("upstart/app-alpha-2.conf")
-    File.read("/tmp/init/app-bravo.conf").should   == example_export_file("upstart/app-bravo.conf")
-    File.read("/tmp/init/app-bravo-1.conf").should == example_export_file("upstart/app-bravo-1.conf")
-  end
-
-  context "with alternate templates" do
-    let(:template_root) { "/tmp/alternate" }
-
-    before do
-      FileUtils.mkdir_p template_root
-      File.open("#{template_root}/master.conf.erb", "w") { |f| f.puts "alternate_template" }
-    end
-
-    it "can export with alternate template files" do
-      upstart.export("/tmp/init", :template => template_root)
-
-      File.read("/tmp/init/app.conf").should == "alternate_template\n"
-    end
-  end
-
-  context "with alternate templates from home dir" do
-    let(:default_template_root) {File.expand_path("~/.foreman/templates")}
-
-    before do
-      FileUtils.mkdir_p default_template_root
-      File.open("#{default_template_root}/master.conf.erb", "w") { |f| f.puts "default_alternate_template" }
-    end
-
-    it "can export with alternate template files" do
-      upstart.export("/tmp/init")
-
-      File.read("/tmp/init/app.conf").should == "default_alternate_template\n"
-    end
-  end
-
-end

spec/resources/export/bluepill/app.pill

@@ -1,65 +0,0 @@
-Bluepill.application("app", :foreground => false, :log_file => "/var/log/bluepill.log") do |app|
-
-  app.uid = "app"
-  app.gid = "app"
-
-
-
-
-  app.process("alpha-1") do |process|
-    process.start_command = "./alpha"
-
-    process.working_dir = "/tmp/app"
-    process.daemonize = true
-    process.environment = {"PORT" => "5000"}
-    process.stop_signals = [:quit, 30.seconds, :term, 5.seconds, :kill]
-
-    process.stdout = process.stderr = "/var/log/app/app-alpha-1.log"
-
-    process.monitor_children do |children|
-      children.stop_command "kill -QUIT {{PID}}"
-    end
-    
-    process.group = "app-alpha"
-  end
-
-
-  app.process("alpha-2") do |process|
-    process.start_command = "./alpha"
-
-    process.working_dir = "/tmp/app"
-    process.daemonize = true
-    process.environment = {"PORT" => "5001"}
-    process.stop_signals = [:quit, 30.seconds, :term, 5.seconds, :kill]
-
-    process.stdout = process.stderr = "/var/log/app/app-alpha-2.log"
-
-    process.monitor_children do |children|
-      children.stop_command "kill -QUIT {{PID}}"
-    end
-    
-    process.group = "app-alpha"
-  end
-
-
-
-
-  app.process("bravo-1") do |process|
-    process.start_command = "./bravo"
-
-    process.working_dir = "/tmp/app"
-    process.daemonize = true
-    process.environment = {"PORT" => "5100"}
-    process.stop_signals = [:quit, 30.seconds, :term, 5.seconds, :kill]
-
-    process.stdout = process.stderr = "/var/log/app/app-bravo-1.log"
-
-    process.monitor_children do |children|
-      children.stop_command "kill -QUIT {{PID}}"
-    end
-    
-    process.group = "app-bravo"
-  end
-
-
-end

spec/resources/export/runit/app-alpha-1-log-run

@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-
-LOG=/var/log/app/alpha-1
-
-test -d "$LOG" || mkdir -p m2750 "$LOG" && chown app "$LOG"
-exec chpst -u app svlogd "$LOG"

spec/resources/export/runit/app-alpha-1-run

@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /tmp/app
-exec chpst -u app -e /tmp/init/app-alpha-1/env ./alpha bar=baz

spec/resources/export/runit/app-alpha-2-log-run

@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-
-LOG=/var/log/app/alpha-2
-
-test -d "$LOG" || mkdir -p m2750 "$LOG" && chown app "$LOG"
-exec chpst -u app svlogd "$LOG"

spec/resources/export/runit/app-alpha-2-run

@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /tmp/app
-exec chpst -u app -e /tmp/init/app-alpha-2/env ./alpha bar=baz

spec/resources/export/runit/app-bravo-1-log-run

@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-
-LOG=/var/log/app/bravo-1
-
-test -d "$LOG" || mkdir -p m2750 "$LOG" && chown app "$LOG"
-exec chpst -u app svlogd "$LOG"

spec/resources/export/runit/app-bravo-1-run

@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /tmp/app
-exec chpst -u app -e /tmp/init/app-bravo-1/env ./bravo

spec/resources/export/upstart/app-alpha-1.conf

@@ -1,5 +0,0 @@
-start on starting app-alpha
-stop on stopping app-alpha
-respawn
-
-exec su - app -c 'cd /tmp/app; export PORT=5000; ./alpha >> /var/log/app/alpha-1.log 2>&1'

spec/resources/export/upstart/app-alpha-2.conf

@@ -1,5 +0,0 @@
-start on starting app-alpha
-stop on stopping app-alpha
-respawn
-
-exec su - app -c 'cd /tmp/app; export PORT=5001; ./alpha >> /var/log/app/alpha-2.log 2>&1'

spec/resources/export/upstart/app-alpha.conf

@@ -1,2 +0,0 @@
-start on starting app
-stop on stopping app

spec/resources/export/upstart/app-bravo-1.conf

@@ -1,5 +0,0 @@
-start on starting app-bravo
-stop on stopping app-bravo
-respawn
-
-exec su - app -c 'cd /tmp/app; export PORT=5100; ./bravo >> /var/log/app/bravo-1.log 2>&1'

spec/resources/export/upstart/app-bravo.conf

@@ -1,2 +0,0 @@
-start on starting app
-stop on stopping app

spec/resources/export/upstart/app.conf

@@ -1,8 +0,0 @@
-pre-start script
-
-bash << "EOF"
-  mkdir -p /var/log/app
-  chown -R app /var/log/app
-EOF
-
-end script

spec/spec_helper.rb

@@ -3,7 +3,7 @@ require "rspec"
 require "fakefs/safe"
 require "fakefs/spec_helpers"
 
-$:.unshift File.expand_path("../../lib", __FILE__)
+$:.unshift "lib"
 
 def mock_error(subject, message)
   mock_exit do
@@ -12,10 +12,6 @@ def mock_error(subject, message)
   end
 end
 
-def foreman(args)
-  Foreman::CLI.start(args.split(" "))
-end
-
 def mock_exit(&block)
   block.should raise_error(SystemExit)
 end
@@ -28,42 +24,14 @@ def write_foreman_config(app)
   end
 end
 
-def write_procfile(procfile="Procfile", alpha_env="")
+def write_procfile(procfile="Procfile")
   File.open(procfile, "w") do |file|
-    file.puts "alpha: ./alpha" + " #{alpha_env}".rstrip
+    file.puts "alpha ./alpha"
-    file.puts "\n"
+    file.puts "bravo ./bravo"
-    file.puts "bravo:\t./bravo"
-  end
-  File.expand_path(procfile)
-end
-
-def write_env(env=".env")
-  File.open(env, "w") do |file|
-    file.puts "FOO=bar"
   end
 end
 
-def load_export_templates_into_fakefs(type)
+Rspec.configure do |config|
-  FakeFS.deactivate!
-  files = Dir[File.expand_path("../../data/export/#{type}/**", __FILE__)].inject({}) do |hash, file|
-    hash.update(file => File.read(file))
-  end
-  FakeFS.activate!
-  files.each do |filename, contents|
-    File.open(filename, "w") do |f|
-      f.puts contents
-    end
-  end
-end
-
-def example_export_file(filename)
-  FakeFS.deactivate!
-  data = File.read(File.expand_path("../resources/export/#{filename}", __FILE__))
-  FakeFS.activate!
-  data
-end
-
-RSpec.configure do |config|
   config.color_enabled = true
   config.include FakeFS::SpecHelpers
   config.mock_with :rr