foreman 0.4.3 → 0.4.4

data/README.markdown

@@ -15,7 +15,7 @@ format.
 
 ## RUNNING
 
-`foreman start` is used to run your application directly from the command line. 
+`foreman start` is used to run your application directly from the command line.
 
 If no additional parameters are passed, foreman will run one instance of each
 type of process defined in your Procfile.
@@ -42,10 +42,10 @@ The following options control how the application is run:
   * `-a`, `--app`:
     Use this name rather than the application's root directory name as the
     name of the application when exporting.
-    
+
   * `-c`, `--concurrency`:
     Specify the number of each process type to run. The value passed in
-    should be in the format `process=num,process=num`.
+    should be in the format `process=num,process=num`
 
 ## OPTIONS
 
@@ -56,6 +56,14 @@ These options control all modes of foreman's operation.
     containing directory will be assumed to be the root directory of the
     application.
 
+## PROCFILE
+
+A Procfile should contain both a name for the process and the command used
+to run it.
+
+    web  bundle exec thin start
+    job  bundle exec rake jobs:work
+
 ## EXAMPLES
 
 Start one instance of each process type, interleave the output on stdout:
@@ -65,7 +73,7 @@ Start one instance of each process type, interleave the output on stdout:
 Export the application in upstart format:
 
     $ foreman export upstart /etc/init
-    
+
 Run one process type from the application defined in a specific Procfile:
 
     $ foreman start alpha -p ~/app/Procfile
@@ -80,6 +88,7 @@ Foreman is Copyright (C) 2010 David Dollar <http://daviddollar.org>
 [RUNNING]: #RUNNING "RUNNING"
 [EXPORTING]: #EXPORTING "EXPORTING"
 [OPTIONS]: #OPTIONS "OPTIONS"
+[PROCFILE]: #PROCFILE "PROCFILE"
 [EXAMPLES]: #EXAMPLES "EXAMPLES"
 [COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
 

data/Rakefile

@@ -64,7 +64,7 @@ begin
     s.platform = Gem::Platform::RUBY
     s.has_rdoc = false
 
-    s.files = %w(Rakefile README.md) + Dir["{bin,lib,spec}/**/*"]
+    s.files = %w(Rakefile README.md) + Dir["{bin,export,lib,spec}/**/*"]
     s.require_path = "lib"
 
     # #s.bindir             = "bin"

data/export/upstart/master.conf.erb

@@ -0,0 +1,13 @@
+pre-start script
+
+bash << "EOF"
+  mkdir -p /var/log/<%= app %>
+
+  <% engine.processes.keys.sort.each do |process| %>
+    <% 1.upto(concurrency[process]).each do |num| %>
+      start <%=app%>-<%=process%>-<%=num%>
+    <% end %>
+  <% end %>
+EOF
+
+end script

data/export/upstart/process.conf.erb

@@ -0,0 +1,5 @@
+stop on stopping <%= app %>
+respawn
+
+chdir <%= engine.directory %>
+exec <%= process.command %> >> /var/log/<%=app%>/<%=process.name%>-<%=num%>.log 2>&1

data/lib/foreman.rb

@@ -1,6 +1,6 @@
 module Foreman
 
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 
   class AppDoesNotExist < Exception; end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: foreman
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - David Dollar
@@ -141,6 +141,8 @@ extra_rdoc_files:
 files: 
 - Rakefile
 - bin/foreman
+- export/upstart/master.conf.erb
+- export/upstart/process.conf.erb
 - lib/foreman.rb
 - lib/foreman/cli.rb
 - lib/foreman/configuration.rb