0.60.2

Fix for fix on issue #260

.travis.yml

@@ -19,4 +19,3 @@ rvm:
   - 1.9.2
   - 1.9.3
   - jruby
-  - ree

Changelog.md

@@ -1,3 +1,29 @@
+## 0.60.1 (2012-10-08)
+
+* sleep on select() to avoid spinning the cpu  [Silvio Relli]
+
+## 0.60.0 (2012-09-25)
+
+* foreman run can run things from the Procfile like heroku run.  [Dan Peterson]
+
+## 0.59.0 (2012-09-15)
+
+* Use /bin/sh instead of bash for foreman-runner  [Jeremy Evans]
+
+## 0.58.0 (2012-09-14)
+
+* dont set HOME  [David Dollar]
+* Add StandardOutPath to launchd export  [Aaron Kalin]
+* Add command argument string splitting  [Aaron Kalin]
+* Cleanup launchd exporter  [Aaron Kalin]
+* Enable trim_mode via '-' in ERB templates  [Aaron Kalin]
+* Add support for setting environment variables  [Aaron Kalin]
+* foreman run should exit with the same code as its command  [Omar Khan]
+* Handle multiline strings in .env file  [Szymon Nowak]
+* Use path and env variables in the inittab export  [Indrek Juhkam]
+* fixed the directory option  [Arnaud Lachaume]
+* Add capistrano export support  [Daniel Farrell]
+
 ## 0.57.0 (2012-08-21)
 
 * fix startup checks for upstart exporter  [Aditya Sanghi]

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    foreman (0.60.0)
+    foreman (0.60.2)
       thor (>= 0.13.6)
 
 GEM

lib/foreman/engine.rb

@@ -273,7 +273,8 @@ private
     Thread.new do
       begin
         loop do
-          (IO.select(@readers.values).first || []).each do |reader|
+          io = IO.select(@readers.values, nil, nil, 30)
+          (io.nil? ? [] : io.first).each do |reader|
             data = reader.gets
             output_with_mutex name_for(@readers.invert[reader]), data
           end

lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.60.0"
+  VERSION = "0.60.2"
 
 end

man/foreman.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FOREMAN" "1" "July 2012" "Foreman 0.57.0" "Foreman Manual"
+.TH "FOREMAN" "1" "August 2012" "Foreman 0.60.1" "Foreman Manual"
 .
 .SH "NAME"
 \fBforeman\fR \- manage Procfile\-based applications