0.10.1

README.markdown

@@ -1,4 +1,9 @@
-Foreman
+# Foreman
-=======
+
+## Manual
 
 See the [man page](http://ddollar.github.com/foreman) for usage.
+
+## License
+
+MIT

Rakefile

@@ -37,6 +37,7 @@ task :man do
   sh "git commit -m 'update readme' || echo 'nothing to commit'"
 end
 
+desc "Generate the Github docs"
 task :pages => :man do
   sh %{
     cp man/foreman.1.html /tmp/foreman.1.html

lib/foreman.rb

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

lib/foreman/engine.rb

@@ -25,7 +25,7 @@ class Foreman::Engine
       @order = []
       procfile.split("\n").inject({}) do |hash, line|
         next if line.strip == ""
-        name, command = line.split(" ", 2)
+        name, command = line.split(/:? +/, 2)
         process = Foreman::Process.new(name, command)
         process.color = next_color
         @order << process.name
@@ -95,12 +95,11 @@ private ######################################################################
     running_processes[pid] = process
   end
 
-  def run(process, log_to_file=true)
+  def run(process)
     proctitle "ruby: foreman #{process.name}"
 
     begin
       Dir.chdir directory do
-        FileUtils.mkdir_p "log"
         command = process.command
 
         PTY.spawn("#{process.command} 2>&1") do |stdin, stdout, pid|

man/foreman.1.ronn

@@ -1,4 +1,4 @@
-foreman(1) -- manage Psfile-based applications
+foreman(1) -- manage Procfile-based applications
 ================================================
 
 ## SYNOPSIS
@@ -8,8 +8,8 @@ foreman(1) -- manage Psfile-based applications
 
 ## DESCRIPTION
 
-**Foreman** is a manager for Psfile-based applications. Its aim is to
+**Foreman** is a manager for Procfile-based applications. Its aim is to
-abstract away the details of the Psfile format, and allow you to either run
+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.
 
@@ -18,7 +18,7 @@ format.
 `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 Psfile.
+type of process defined in your Procfile.
 
 If a parameter is passed, foreman will run one instance of the specified
 application type.
@@ -66,8 +66,8 @@ The following options control how the application is run:
 
 These options control all modes of foreman's operation.
 
-  * `-f`, `--psfile`:
+  * `-f`, `--procfile`:
-    Specify an alternate location for the application's Psfile. This file's
+    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.
 
@@ -99,13 +99,13 @@ will be structured to make the following commands valid:
 
   `restart appname-processname-3`
 
-## PSFILE
+## PROCFILE
 
-A Psfile should contain both a name for the process and the command used
+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
 
 ## EXAMPLES
 
@@ -117,9 +117,9 @@ Export the application in upstart format:
 
     $ foreman export upstart /etc/init
 
-Run one process type from the application defined in a specific Psfile:
+Run one process type from the application defined in a specific Procfile:
 
-    $ foreman start alpha -p ~/myapp/Psfile
+    $ foreman start alpha -p ~/myapp/Procfile
 
 ## COPYRIGHT
 

spec/spec_helper.rb

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