foreman 0.41.0 → 0.42.0

data/data/export/supervisord/app.conf.erb

@@ -1,12 +1,15 @@
 <%
+app_names = []
 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)
     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}")
+    environment = (engine.environment.map{ |var,env| "#{var.upcase}=#{env}" } + ["PORT=#{port}"])
+    app_name = "#{app}-#{name}"
+    app_names << app_name
 %>
-[program:<%= app %>-<%= name %>]
+[program:<%= app_name %>]
 command=<%= process.command %>
 autostart=true
 autorestart=true
@@ -18,4 +21,7 @@ directory=<%= engine.directory %>
 environment=<%= environment.join(',') %><%
   end
 end
-%>
+%>
+
+[group:<%= app %>]
+programs=<%= app_names.join(',') %>

data/lib/foreman/engine.rb

@@ -51,6 +51,22 @@ class Foreman::Engine
     environment.each { |k,v| ENV[k] = v }
   end
 
+  def self.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/
+        key, val = [$1, $2]
+        case val
+          when /\A'(.*)'\z/ then hash[key] = $1
+          when /\A"(.*)"\z/ then hash[key] = $1.gsub(/\\(.)/, '\1')
+          else hash[key] = val
+        end
+      end
+      hash
+    end
+  end
+
 private ######################################################################
 
   def spawn_processes
@@ -195,26 +211,10 @@ private ######################################################################
 
     (filenames || "").split(",").map(&:strip).each do |filename|
       error "No such file: #{filename}" unless File.exists?(filename)
-      environment.merge!(read_environment(filename))
+      environment.merge!(Foreman::Engine.read_environment(filename))
     end
 
-    environment.merge!(read_environment(".env")) unless filenames
+    environment.merge!(Foreman::Engine.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/
-        key, val = [$1, $2]
-        case val
-          when /\A'(.*)'\z/ then hash[key] = $1
-          when /\A"(.*)"\z/ then hash[key] = $1.gsub(/\\(.)/, '\1')
-          else hash[key] = val
-        end
-      end
-      hash
-    end
-  end
 end

data/lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.41.0"
+  VERSION = "0.42.0"
 
 end

data/spec/foreman/export/supervisord_spec.rb

@@ -30,7 +30,7 @@ describe Foreman::Export::Supervisord, :fakefs do
 
     it "exports to the filesystem with concurrency" do
       supervisord.export
-      
+
       File.read("/tmp/init/app.conf").should            == example_export_file("supervisord/app-alpha-2.conf")
     end
   end
@@ -46,7 +46,7 @@ describe Foreman::Export::Supervisord, :fakefs do
 
     it "can export with alternate template files" do
       supervisord.export
-      
+
       File.read("/tmp/init/app.conf").should == "alternate_template\n"
     end
   end

data/spec/resources/export/supervisord/app-alpha-2.conf

@@ -19,3 +19,6 @@ stderr_logfile=/var/log/app/alpha-2-err.log
 user=app
 directory=/tmp/app
 environment=PORT=5001
+
+[group:app]
+programs=app-alpha-1,app-alpha-2

data/spec/resources/export/supervisord/app.conf

@@ -19,3 +19,6 @@ stderr_logfile=/var/log/app/bravo-1-err.log
 user=app
 directory=/tmp/app
 environment=PORT=5100
+
+[group:app]
+programs=app-alpha,app-bravo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman
 version: !ruby/object:Gem::Version
-  version: 0.41.0
+  version: 0.42.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70166560574240 !ruby/object:Gem::Requirement
+  requirement: &70264218748020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.13.6
   type: :runtime
   prerelease: false
-  version_requirements: *70166560574240
+  version_requirements: *70264218748020
 description: Process manager for applications with multiple components
 email: ddollar@gmail.com
 executables:
@@ -110,18 +110,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4054055636504419796
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4054055636504419796
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11