From 9ba2b32b36f5226ce22734408a95c5393e90ccc2 Mon Sep 17 00:00:00 2001
From: Raphael Randschau <nicolai86@me.com>
Date: Thu, 23 Feb 2012 17:02:59 +0100
Subject: [PATCH 1/8] add supervisord base template

---
 data/export/supervisord/master.conf.erb | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 data/export/supervisord/master.conf.erb

diff --git a/data/export/supervisord/master.conf.erb b/data/export/supervisord/master.conf.erb
new file mode 100644
index 0000000..4cf3586
--- /dev/null
+++ b/data/export/supervisord/master.conf.erb
@@ -0,0 +1,10 @@
+[program:<%= app %>-<%= process.name %>]
+command=<%= process.command %>
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=<%= log_root %>/<%=process.name%>-<%=num%>.log
+stderr_logfile=<%= log_root %>/<%=process.name%>-<%=num%>err.log
+user=<%= user %>
+directory=<%= engine.directory %>
+environment=<% engine.environment.each_pair { |var,env| "#{var.upcase}=#{env}" }.join(',') %>
\ No newline at end of file

From d03e931b6706dde6670be33fbf8b87e71b1ef997 Mon Sep 17 00:00:00 2001
From: Raphael Randschau <nicolai86@me.com>
Date: Thu, 23 Feb 2012 17:10:57 +0100
Subject: [PATCH 2/8] add supervisord export engine

---
 data/export/supervisord/master.conf.erb | 12 +++++++++++-
 lib/foreman/export/supervisord.rb       | 26 +++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 lib/foreman/export/supervisord.rb

diff --git a/data/export/supervisord/master.conf.erb b/data/export/supervisord/master.conf.erb
index 4cf3586..4597f73 100644
--- a/data/export/supervisord/master.conf.erb
+++ b/data/export/supervisord/master.conf.erb
@@ -1,3 +1,9 @@
+<% 
+engine.procfile.entries.each do |process|
+  next if (conc = self.concurrency[process.name]) < 1 
+  1.upto(self.concurrency[process.name]) do |num| 
+    port = engine.port_for(process, num, self.port)
+%>  
 [program:<%= app %>-<%= process.name %>]
 command=<%= process.command %>
 autostart=true
@@ -7,4 +13,8 @@ stdout_logfile=<%= log_root %>/<%=process.name%>-<%=num%>.log
 stderr_logfile=<%= log_root %>/<%=process.name%>-<%=num%>err.log
 user=<%= user %>
 directory=<%= engine.directory %>
-environment=<% engine.environment.each_pair { |var,env| "#{var.upcase}=#{env}" }.join(',') %>
\ No newline at end of file
+environment=<% engine.environment.each_pair { |var,env| "#{var.upcase}=#{env}" }.join(',') %>,<%= "PORT=#{port}" %>
+<% 
+  end
+end 
+%>
diff --git a/lib/foreman/export/supervisord.rb b/lib/foreman/export/supervisord.rb
new file mode 100644
index 0000000..4c4a13f
--- /dev/null
+++ b/lib/foreman/export/supervisord.rb
@@ -0,0 +1,26 @@
+require "erb"
+require "foreman/export"
+
+class Foreman::Export::Supervisord < Foreman::Export::Base
+
+  def export
+    error("Must specify a location") unless location
+
+    FileUtils.mkdir_p location
+
+    app = self.app || File.basename(engine.directory)
+    user = self.user || app
+    log_root = self.log || "/var/log/#{app}"
+    template_root = self.template
+
+    Dir["#{location}/#{app}*.conf"].each do |file|
+      say "cleaning up: #{file}"
+      FileUtils.rm(file)
+    end
+
+    master_template = export_template("supervisord", "master.conf.erb", template_root)
+    master_config   = ERB.new(master_template).result(binding)
+    write_file "#{location}/#{app}.conf", master_config
+  end
+
+end

From 8cb58b851752c5f680a858ab55fc4686190094c3 Mon Sep 17 00:00:00 2001
From: Raphael Randschau <nicolai86@me.com>
Date: Thu, 23 Feb 2012 17:11:19 +0100
Subject: [PATCH 3/8] require supervisord export

---
 lib/foreman/export.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/foreman/export.rb b/lib/foreman/export.rb
index df31d66..7cd80f3 100644
--- a/lib/foreman/export.rb
+++ b/lib/foreman/export.rb
@@ -30,3 +30,5 @@ require "foreman/export/inittab"
 require "foreman/export/upstart"
 require "foreman/export/bluepill"
 require "foreman/export/runit"
+require "foreman/export/supervisord"
+

From 1127551369b92a98d8cb2d317b1918ae06d13a66 Mon Sep 17 00:00:00 2001
From: Raphael Randschau <nicolai86@me.com>
Date: Thu, 23 Feb 2012 17:24:08 +0100
Subject: [PATCH 4/8] rename supervisord base template to app add supervisord
 stub

---
 Gemfile.lock                                  | 30 ++++----
 .../{master.conf.erb => app.conf.erb}         |  2 +-
 lib/foreman/export/supervisord.rb             |  6 +-
 spec/foreman/export/supervisord_spec.rb       | 75 +++++++++++++++++++
 spec/resources/export/supervisord/app.conf    | 10 +++
 5 files changed, 105 insertions(+), 18 deletions(-)
 rename data/export/supervisord/{master.conf.erb => app.conf.erb} (81%)
 create mode 100644 spec/foreman/export/supervisord_spec.rb
 create mode 100644 spec/resources/export/supervisord/app.conf

diff --git a/Gemfile.lock b/Gemfile.lock
index cec1000..da9b4de 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,28 +13,30 @@ GEM
       mime-types
       xml-simple
     builder (3.0.0)
-    crack (0.1.8)
+    crack (0.3.1)
     diff-lcs (1.1.3)
     fakefs (0.3.2)
     hpricot (0.8.6)
     hpricot (0.8.6-java)
-    mime-types (1.16)
-    multi_json (1.0.4)
-    mustache (0.11.2)
-    parka (0.6.2)
-      crack
-      rest-client
-      thor
+    mime-types (1.17.2)
+    multi_json (1.1.0)
+    mustache (0.99.4)
+    parka (0.8.0)
+      crack (~> 0.3.0)
+      psych (~> 1.2.1)
+      rest-client (~> 1.6.7)
+      thor (~> 0.14.6)
     posix-spawn (0.3.6)
+    psych (1.2.2)
     rake (0.9.2.2)
-    rdiscount (1.6.5)
-    rest-client (1.6.1)
+    rdiscount (1.6.8)
+    rest-client (1.6.7)
       mime-types (>= 1.16)
     ronn (0.7.3)
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
       rdiscount (>= 1.5.8)
-    rr (1.0.2)
+    rr (1.0.4)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -43,14 +45,14 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    simplecov (0.6.0)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     term-ansicolor (1.0.7)
     thor (0.14.6)
     win32console (1.3.0-x86-mingw32)
-    xml-simple (1.0.15)
+    xml-simple (1.1.1)
 
 PLATFORMS
   java
diff --git a/data/export/supervisord/master.conf.erb b/data/export/supervisord/app.conf.erb
similarity index 81%
rename from data/export/supervisord/master.conf.erb
rename to data/export/supervisord/app.conf.erb
index 4597f73..c56d327 100644
--- a/data/export/supervisord/master.conf.erb
+++ b/data/export/supervisord/app.conf.erb
@@ -13,7 +13,7 @@ stdout_logfile=<%= log_root %>/<%=process.name%>-<%=num%>.log
 stderr_logfile=<%= log_root %>/<%=process.name%>-<%=num%>err.log
 user=<%= user %>
 directory=<%= engine.directory %>
-environment=<% engine.environment.each_pair { |var,env| "#{var.upcase}=#{env}" }.join(',') %>,<%= "PORT=#{port}" %>
+environment=<% (engine.environment.each_pair { |var,env| "#{var.upcase}=#{env}" }.to_a + ["PORT=#{port}"]).join(',') %>
 <% 
   end
 end 
diff --git a/lib/foreman/export/supervisord.rb b/lib/foreman/export/supervisord.rb
index 4c4a13f..4afc4b4 100644
--- a/lib/foreman/export/supervisord.rb
+++ b/lib/foreman/export/supervisord.rb
@@ -18,9 +18,9 @@ class Foreman::Export::Supervisord < Foreman::Export::Base
       FileUtils.rm(file)
     end
 
-    master_template = export_template("supervisord", "master.conf.erb", template_root)
-    master_config   = ERB.new(master_template).result(binding)
-    write_file "#{location}/#{app}.conf", master_config
+    app_template = export_template("supervisord", "app.conf.erb", template_root)
+    app_config   = ERB.new(app_template).result(binding)
+    write_file "#{location}/#{app}.conf", app_config
   end
 
 end
diff --git a/spec/foreman/export/supervisord_spec.rb b/spec/foreman/export/supervisord_spec.rb
new file mode 100644
index 0000000..d921a23
--- /dev/null
+++ b/spec/foreman/export/supervisord_spec.rb
@@ -0,0 +1,75 @@
+require "spec_helper"
+require "foreman/engine"
+require "foreman/export/supervisord"
+require "tmpdir"
+
+describe Foreman::Export::Supervisord, :fakefs do
+  let(:procfile) { FileUtils.mkdir_p("/tmp/app"); write_procfile("/tmp/app/Procfile") }
+  let(:engine)   { Foreman::Engine.new(procfile) }
+  let(:options)  { Hash.new }
+  let(:supervisord)  { Foreman::Export::Supervisord.new("/tmp/init", engine, options) }
+
+  before(:each) { load_export_templates_into_fakefs("supervisord") }
+  before(:each) { stub(supervisord).say }
+
+  it "exports to the filesystem" do
+    supervisord.export
+
+    File.read("/tmp/init/app.conf").should         == example_export_file("supervisord/app.conf")
+  end
+
+  it "cleans up if exporting into an existing dir" do
+    mock(FileUtils).rm("/tmp/init/app.conf")
+
+    supervisord.export
+    supervisord.export
+  end
+
+  context "with concurrency" do
+    let(:options) { Hash[:concurrency => "alpha=2"] }
+
+    it "exports to the filesystem with concurrency" do
+      pending
+    end
+  end
+
+  context "with alternate templates" do
+    let(:template_root) { "/tmp/alternate" }
+    let(:upstart) { Foreman::Export::Upstart.new("/tmp/init", engine, :template => template_root) }
+
+    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
+
+      File.read("/tmp/init/app.conf").should == "alternate_template\n"
+      pendign
+    end
+  end
+
+  context "with alternate templates from home dir" do
+    let(:default_template_root) {File.expand_path("#{ENV['HOME']}/.foreman/templates")}
+
+    before do
+      ENV['_FOREMAN_SPEC_HOME'] = ENV['HOME']
+      ENV['HOME'] = "/home/appuser"
+      FileUtils.mkdir_p default_template_root
+      File.open("#{default_template_root}/master.conf.erb", "w") { |f| f.puts "default_alternate_template" }
+    end
+
+    after do
+      ENV['HOME'] = ENV.delete('_FOREMAN_SPEC_HOME')
+    end
+
+    it "can export with alternate template files" do
+      upstart.export
+
+      File.read("/tmp/init/app.conf").should == "default_alternate_template\n"
+      pending
+    end
+  end
+
+end
diff --git a/spec/resources/export/supervisord/app.conf b/spec/resources/export/supervisord/app.conf
new file mode 100644
index 0000000..d757914
--- /dev/null
+++ b/spec/resources/export/supervisord/app.conf
@@ -0,0 +1,10 @@
+[program:app-alpha]
+command=./alpha
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/app/alpha-1.log
+stderr_logfile=/var/log/app/alpha-1err.log
+user=app
+directory=/tmp/app
+environment=PORT=5000
\ No newline at end of file

From 0b3da59947915a17897a3295980faefd168a59cb Mon Sep 17 00:00:00 2001
From: Raphael Randschau <nicolai86@me.com>
Date: Fri, 24 Feb 2012 19:52:18 +0100
Subject: [PATCH 5/8] passing first export

---
 data/export/supervisord/app.conf.erb       | 14 +++++---------
 lib/foreman/export/supervisord.rb          |  2 +-
 spec/foreman/export/supervisord_spec.rb    | 10 ++--------
 spec/resources/export/supervisord/app.conf | 13 ++++++++++++-
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/data/export/supervisord/app.conf.erb b/data/export/supervisord/app.conf.erb
index c56d327..50ae6b0 100644
--- a/data/export/supervisord/app.conf.erb
+++ b/data/export/supervisord/app.conf.erb
@@ -1,9 +1,8 @@
-<% 
-engine.procfile.entries.each do |process|
+<% engine.procfile.entries.each do |process|
+  p self.concurrency[process.name]
   next if (conc = self.concurrency[process.name]) < 1 
   1.upto(self.concurrency[process.name]) do |num| 
-    port = engine.port_for(process, num, self.port)
-%>  
+    port = engine.port_for(process, num, self.port) %>  
 [program:<%= app %>-<%= process.name %>]
 command=<%= process.command %>
 autostart=true
@@ -13,8 +12,5 @@ stdout_logfile=<%= log_root %>/<%=process.name%>-<%=num%>.log
 stderr_logfile=<%= log_root %>/<%=process.name%>-<%=num%>err.log
 user=<%= user %>
 directory=<%= engine.directory %>
-environment=<% (engine.environment.each_pair { |var,env| "#{var.upcase}=#{env}" }.to_a + ["PORT=#{port}"]).join(',') %>
-<% 
-  end
-end 
-%>
+environment=<% (engine.environment.each_pair { |var,env| "#{var.upcase}=#{env}" }.to_a + ["PORT=#{port}"]).join(',') 
+end end %>
diff --git a/lib/foreman/export/supervisord.rb b/lib/foreman/export/supervisord.rb
index 4afc4b4..11eedd6 100644
--- a/lib/foreman/export/supervisord.rb
+++ b/lib/foreman/export/supervisord.rb
@@ -19,7 +19,7 @@ class Foreman::Export::Supervisord < Foreman::Export::Base
     end
 
     app_template = export_template("supervisord", "app.conf.erb", template_root)
-    app_config   = ERB.new(app_template).result(binding)
+    app_config   = ERB.new(app_template, 0, '<').result(binding)
     write_file "#{location}/#{app}.conf", app_config
   end
 
diff --git a/spec/foreman/export/supervisord_spec.rb b/spec/foreman/export/supervisord_spec.rb
index d921a23..c6661a1 100644
--- a/spec/foreman/export/supervisord_spec.rb
+++ b/spec/foreman/export/supervisord_spec.rb
@@ -35,7 +35,7 @@ describe Foreman::Export::Supervisord, :fakefs do
 
   context "with alternate templates" do
     let(:template_root) { "/tmp/alternate" }
-    let(:upstart) { Foreman::Export::Upstart.new("/tmp/init", engine, :template => template_root) }
+    let(:supervisord) { Foreman::Export::Upstart.new("/tmp/init", engine, :template => template_root) }
 
     before do
       FileUtils.mkdir_p template_root
@@ -43,10 +43,7 @@ describe Foreman::Export::Supervisord, :fakefs do
     end
 
     it "can export with alternate template files" do
-      upstart.export
-
-      File.read("/tmp/init/app.conf").should == "alternate_template\n"
-      pendign
+      pending
     end
   end
 
@@ -65,9 +62,6 @@ describe Foreman::Export::Supervisord, :fakefs do
     end
 
     it "can export with alternate template files" do
-      upstart.export
-
-      File.read("/tmp/init/app.conf").should == "default_alternate_template\n"
       pending
     end
   end
diff --git a/spec/resources/export/supervisord/app.conf b/spec/resources/export/supervisord/app.conf
index d757914..e8e720e 100644
--- a/spec/resources/export/supervisord/app.conf
+++ b/spec/resources/export/supervisord/app.conf
@@ -1,3 +1,4 @@
+  
 [program:app-alpha]
 command=./alpha
 autostart=true
@@ -7,4 +8,14 @@ stdout_logfile=/var/log/app/alpha-1.log
 stderr_logfile=/var/log/app/alpha-1err.log
 user=app
 directory=/tmp/app
-environment=PORT=5000
\ No newline at end of file
+environment=  
+[program:app-bravo]
+command=./bravo
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/app/bravo-1.log
+stderr_logfile=/var/log/app/bravo-1err.log
+user=app
+directory=/tmp/app
+environment=

From a49ef286e80f1659f151f90b6226d11526a101fe Mon Sep 17 00:00:00 2001
From: Raphael Randschau <nicolai86@me.com>
Date: Fri, 24 Feb 2012 20:18:38 +0100
Subject: [PATCH 6/8] all specs are passing

---
 data/export/supervisord/app.conf.erb          | 21 ++++++++++++-------
 spec/foreman/export/supervisord_spec.rb       | 18 ++++++++++------
 .../export/supervisord/app-alpha-2.conf       | 21 +++++++++++++++++++
 spec/resources/export/supervisord/app.conf    | 12 +++++------
 4 files changed, 52 insertions(+), 20 deletions(-)
 create mode 100644 spec/resources/export/supervisord/app-alpha-2.conf

diff --git a/data/export/supervisord/app.conf.erb b/data/export/supervisord/app.conf.erb
index 50ae6b0..6ee197c 100644
--- a/data/export/supervisord/app.conf.erb
+++ b/data/export/supervisord/app.conf.erb
@@ -1,16 +1,21 @@
-<% engine.procfile.entries.each do |process|
-  p self.concurrency[process.name]
+<% 
+engine.procfile.entries.each do |process|
   next if (conc = self.concurrency[process.name]) < 1 
   1.upto(self.concurrency[process.name]) do |num| 
-    port = engine.port_for(process, num, self.port) %>  
-[program:<%= app %>-<%= process.name %>]
+    port = engine.port_for(process, num, self.port) 
+    name = if (conc > 1); "#{process.name}-#{num}" else process.name; end
+    environment = (engine.environment.each_pair { |var,env| "#{var.upcase}=#{env}" }.to_a << "PORT=#{port}")
+%>  
+[program:<%= app %>-<%= name %>]
 command=<%= process.command %>
 autostart=true
 autorestart=true
 stopsignal=QUIT
-stdout_logfile=<%= log_root %>/<%=process.name%>-<%=num%>.log
-stderr_logfile=<%= log_root %>/<%=process.name%>-<%=num%>err.log
+stdout_logfile=<%= log_root %>/<%=process.name%>-<%=num%>-out.log
+stderr_logfile=<%= log_root %>/<%=process.name%>-<%=num%>-err.log
 user=<%= user %>
 directory=<%= engine.directory %>
-environment=<% (engine.environment.each_pair { |var,env| "#{var.upcase}=#{env}" }.to_a + ["PORT=#{port}"]).join(',') 
-end end %>
+environment=<%= environment.join(',') %><%
+  end 
+end 
+%>
\ No newline at end of file
diff --git a/spec/foreman/export/supervisord_spec.rb b/spec/foreman/export/supervisord_spec.rb
index c6661a1..c87d056 100644
--- a/spec/foreman/export/supervisord_spec.rb
+++ b/spec/foreman/export/supervisord_spec.rb
@@ -29,21 +29,25 @@ describe Foreman::Export::Supervisord, :fakefs do
     let(:options) { Hash[:concurrency => "alpha=2"] }
 
     it "exports to the filesystem with concurrency" do
-      pending
+      supervisord.export
+      
+      File.read("/tmp/init/app.conf").should            == example_export_file("supervisord/app-alpha-2.conf")
     end
   end
 
   context "with alternate templates" do
     let(:template_root) { "/tmp/alternate" }
-    let(:supervisord) { Foreman::Export::Upstart.new("/tmp/init", engine, :template => template_root) }
+    let(:supervisord) { Foreman::Export::Supervisord.new("/tmp/init", engine, :template => template_root) }
 
     before do
       FileUtils.mkdir_p template_root
-      File.open("#{template_root}/master.conf.erb", "w") { |f| f.puts "alternate_template" }
+      File.open("#{template_root}/app.conf.erb", "w") { |f| f.puts "alternate_template" }
     end
 
     it "can export with alternate template files" do
-      pending
+      supervisord.export
+      
+      File.read("/tmp/init/app.conf").should == "alternate_template\n"
     end
   end
 
@@ -54,7 +58,7 @@ describe Foreman::Export::Supervisord, :fakefs do
       ENV['_FOREMAN_SPEC_HOME'] = ENV['HOME']
       ENV['HOME'] = "/home/appuser"
       FileUtils.mkdir_p default_template_root
-      File.open("#{default_template_root}/master.conf.erb", "w") { |f| f.puts "default_alternate_template" }
+      File.open("#{default_template_root}/app.conf.erb", "w") { |f| f.puts "default_alternate_template" }
     end
 
     after do
@@ -62,7 +66,9 @@ describe Foreman::Export::Supervisord, :fakefs do
     end
 
     it "can export with alternate template files" do
-      pending
+      supervisord.export
+
+      File.read("/tmp/init/app.conf").should == "default_alternate_template\n"
     end
   end
 
diff --git a/spec/resources/export/supervisord/app-alpha-2.conf b/spec/resources/export/supervisord/app-alpha-2.conf
new file mode 100644
index 0000000..210ec71
--- /dev/null
+++ b/spec/resources/export/supervisord/app-alpha-2.conf
@@ -0,0 +1,21 @@
+  
+[program:app-alpha-1]
+command=./alpha
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/app/alpha-1-out.log
+stderr_logfile=/var/log/app/alpha-1-err.log
+user=app
+directory=/tmp/app
+environment=PORT=5000  
+[program:app-alpha-2]
+command=./alpha
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/app/alpha-2-out.log
+stderr_logfile=/var/log/app/alpha-2-err.log
+user=app
+directory=/tmp/app
+environment=PORT=5001
diff --git a/spec/resources/export/supervisord/app.conf b/spec/resources/export/supervisord/app.conf
index e8e720e..15ed279 100644
--- a/spec/resources/export/supervisord/app.conf
+++ b/spec/resources/export/supervisord/app.conf
@@ -4,18 +4,18 @@ command=./alpha
 autostart=true
 autorestart=true
 stopsignal=QUIT
-stdout_logfile=/var/log/app/alpha-1.log
-stderr_logfile=/var/log/app/alpha-1err.log
+stdout_logfile=/var/log/app/alpha-1-out.log
+stderr_logfile=/var/log/app/alpha-1-err.log
 user=app
 directory=/tmp/app
-environment=  
+environment=PORT=5000  
 [program:app-bravo]
 command=./bravo
 autostart=true
 autorestart=true
 stopsignal=QUIT
-stdout_logfile=/var/log/app/bravo-1.log
-stderr_logfile=/var/log/app/bravo-1err.log
+stdout_logfile=/var/log/app/bravo-1-out.log
+stderr_logfile=/var/log/app/bravo-1-err.log
 user=app
 directory=/tmp/app
-environment=
+environment=PORT=5100

From 279a251c789e154d7513c1d96c9ebd337f76549a Mon Sep 17 00:00:00 2001
From: Raphael Randschau <nicolai86@me.com>
Date: Fri, 24 Feb 2012 20:29:16 +0100
Subject: [PATCH 7/8] fix whitespaces

---
 data/export/supervisord/app.conf.erb               | 14 +++++++-------
 spec/resources/export/supervisord/app-alpha-2.conf |  4 ++--
 spec/resources/export/supervisord/app.conf         |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/data/export/supervisord/app.conf.erb b/data/export/supervisord/app.conf.erb
index 6ee197c..9e2b156 100644
--- a/data/export/supervisord/app.conf.erb
+++ b/data/export/supervisord/app.conf.erb
@@ -1,11 +1,11 @@
-<% 
+<%
 engine.procfile.entries.each do |process|
-  next if (conc = self.concurrency[process.name]) < 1 
-  1.upto(self.concurrency[process.name]) do |num| 
-    port = engine.port_for(process, num, self.port) 
+  next if (conc = self.concurrency[process.name]) < 1
+  1.upto(self.concurrency[process.name]) do |num|
+    port = engine.port_for(process, num, self.port)
     name = if (conc > 1); "#{process.name}-#{num}" else process.name; end
     environment = (engine.environment.each_pair { |var,env| "#{var.upcase}=#{env}" }.to_a << "PORT=#{port}")
-%>  
+%>
 [program:<%= app %>-<%= name %>]
 command=<%= process.command %>
 autostart=true
@@ -16,6 +16,6 @@ stderr_logfile=<%= log_root %>/<%=process.name%>-<%=num%>-err.log
 user=<%= user %>
 directory=<%= engine.directory %>
 environment=<%= environment.join(',') %><%
-  end 
-end 
+  end
+end
 %>
\ No newline at end of file
diff --git a/spec/resources/export/supervisord/app-alpha-2.conf b/spec/resources/export/supervisord/app-alpha-2.conf
index 210ec71..c16b72f 100644
--- a/spec/resources/export/supervisord/app-alpha-2.conf
+++ b/spec/resources/export/supervisord/app-alpha-2.conf
@@ -1,4 +1,4 @@
-  
+
 [program:app-alpha-1]
 command=./alpha
 autostart=true
@@ -8,7 +8,7 @@ stdout_logfile=/var/log/app/alpha-1-out.log
 stderr_logfile=/var/log/app/alpha-1-err.log
 user=app
 directory=/tmp/app
-environment=PORT=5000  
+environment=PORT=5000
 [program:app-alpha-2]
 command=./alpha
 autostart=true
diff --git a/spec/resources/export/supervisord/app.conf b/spec/resources/export/supervisord/app.conf
index 15ed279..efcb28e 100644
--- a/spec/resources/export/supervisord/app.conf
+++ b/spec/resources/export/supervisord/app.conf
@@ -1,4 +1,4 @@
-  
+
 [program:app-alpha]
 command=./alpha
 autostart=true
@@ -8,7 +8,7 @@ stdout_logfile=/var/log/app/alpha-1-out.log
 stderr_logfile=/var/log/app/alpha-1-err.log
 user=app
 directory=/tmp/app
-environment=PORT=5000  
+environment=PORT=5000
 [program:app-bravo]
 command=./bravo
 autostart=true

From 084b9493d1d4c217c351ea59ba08dd22b34fe096 Mon Sep 17 00:00:00 2001
From: Raphael Randschau <nicolai86@me.com>
Date: Fri, 24 Feb 2012 20:31:07 +0100
Subject: [PATCH 8/8] revert bundle update

---
 Gemfile.lock | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index da9b4de..cec1000 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,30 +13,28 @@ GEM
       mime-types
       xml-simple
     builder (3.0.0)
-    crack (0.3.1)
+    crack (0.1.8)
     diff-lcs (1.1.3)
     fakefs (0.3.2)
     hpricot (0.8.6)
     hpricot (0.8.6-java)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
-    mustache (0.99.4)
-    parka (0.8.0)
-      crack (~> 0.3.0)
-      psych (~> 1.2.1)
-      rest-client (~> 1.6.7)
-      thor (~> 0.14.6)
+    mime-types (1.16)
+    multi_json (1.0.4)
+    mustache (0.11.2)
+    parka (0.6.2)
+      crack
+      rest-client
+      thor
     posix-spawn (0.3.6)
-    psych (1.2.2)
     rake (0.9.2.2)
-    rdiscount (1.6.8)
-    rest-client (1.6.7)
+    rdiscount (1.6.5)
+    rest-client (1.6.1)
       mime-types (>= 1.16)
     ronn (0.7.3)
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
       rdiscount (>= 1.5.8)
-    rr (1.0.4)
+    rr (1.0.2)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -45,14 +43,14 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    simplecov (0.6.0)
-      multi_json (~> 1.0)
+    simplecov (0.5.4)
+      multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     term-ansicolor (1.0.7)
     thor (0.14.6)
     win32console (1.3.0-x86-mingw32)
-    xml-simple (1.1.1)
+    xml-simple (1.0.15)
 
 PLATFORMS
   java