foreman 0.29.0 → 0.30.0

data/lib/foreman/engine.rb

@@ -115,7 +115,7 @@ private ######################################################################
     print "#{Time.now.strftime("%H:%M:%S")} #{pad_process_name(name)} | "
     print Term::ANSIColor.reset
     print message.chomp
-    puts
+    puts ""
   end
 
   def print(message=nil)

data/lib/foreman/process.rb

@@ -27,9 +27,21 @@ class Foreman::Process
 
 private
 
+  def fork_with_io(command)
+    io = case RUBY_VERSION
+    when /^1\.9\./
+      IO.popen([Foreman.runner, replace_command_env(command)], "w+")
+    when /^1\.8\./
+      full_command = replace_command_env(command).gsub("'", "\\'")
+      IO.popen("#{Foreman.runner} '#{full_command}'", "w+")
+    else
+      raise "Unknown Ruby version: #{RUBY_VERSION}"
+    end
+    [ io, io.pid ]
+  end
+
   def run_process(command, pipe)
-    io = IO.popen([Foreman.runner, replace_command_env(command)], "w+")
-    @pid = io.pid
+    io, @pid = fork_with_io(command)
     trap("SIGTERM") { "got sigterm for %d" % @pid }
     output pipe, "started with pid %d" % @pid
     Thread.new do

data/lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.29.0"
+  VERSION = "0.30.0"
 
 end

metadata

@@ -1,45 +1,59 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: foreman
-version: !ruby/object:Gem::Version
-  version: 0.29.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 30
+  - 0
+  version: 0.30.0
 platform: ruby
-authors:
+authors: 
 - David Dollar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: term-ansicolor
-  requirement: &70244540418780 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+
+date: 2011-12-22 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 5
         version: 1.0.5
-  type: :runtime
+  requirement: *id001
+  name: term-ansicolor
   prerelease: false
-  version_requirements: *70244540418780
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: &70244540415120 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.13.6
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 13
+        - 6
+        version: 0.13.6
+  requirement: *id002
+  name: thor
   prerelease: false
-  version_requirements: *70244540415120
+  type: :runtime
 description: Process manager for applications with multiple components
 email: ddollar@gmail.com
-executables:
+executables: 
 - foreman
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - bin/foreman
 - bin/runner
 - data/example/error
@@ -91,35 +105,35 @@ files:
 - spec/resources/export/upstart/app-bravo.conf
 - spec/resources/export/upstart/app.conf
 - spec/spec_helper.rb
-- man/foreman.1
+has_rdoc: true
 homepage: http://github.com/ddollar/foreman
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
       - 0
-      hash: -705079765555919501
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
       - 0
-      hash: -705079765555919501
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Process manager for applications with multiple components
 test_files: []
+

data/man/foreman.1

@@ -1,218 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "FOREMAN" "1" "November 2011" "Foreman 0.26.0" "Foreman Manual"
-.
-.SH "NAME"
-\fBforeman\fR \- manage Procfile\-based applications
-.
-.SH "SYNOPSIS"
-\fBforeman start [process]\fR
-.
-.br
-\fBforeman export <format> [location]\fR
-.
-.SH "DESCRIPTION"
-\fBForeman\fR is a manager for Procfile\-based applications\. Its aim is to 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\.
-.
-.SH "RUNNING"
-\fBforeman start\fR is used to run your application directly from the command line\.
-.
-.P
-If no additional parameters are passed, foreman will run one instance of each type of process defined in your Procfile\.
-.
-.P
-If a parameter is passed, foreman will run one instance of the specified application type\.
-.
-.P
-The following options control how the application is run:
-.
-.TP
-\fB\-c\fR, \fB\-\-concurrency\fR
-Specify the number of each process type to run\. The value passed in should be in the format \fBprocess=num,process=num\fR
-.
-.TP
-\fB\-p\fR, \fB\-\-port\fR
-Specify which port to use as the base for this application\. Should be a multiple of 1000\.
-.
-.SH "EXPORTING"
-\fBforeman export\fR is used to export your application to another process management format\.
-.
-.P
-An location to export can be passed as an argument\. This argument may be either required or optional depending on the export format\.
-.
-.P
-The following options control how the application is run:
-.
-.TP
-\fB\-a\fR, \fB\-\-app\fR
-Use this name rather than the application\'s root directory name as the name of the application when exporting\.
-.
-.TP
-\fB\-c\fR, \fB\-\-concurrency\fR
-Specify the number of each process type to run\. The value passed in should be in the format \fBprocess=num,process=num\fR
-.
-.TP
-\fB\-l\fR, \fB\-\-log\fR
-Specify the directory to place process logs in\.
-.
-.TP
-\fB\-p\fR, \fB\-\-port\fR
-Specify which port to use as the base for this application\. Should be a multiple of 1000\.
-.
-.TP
-\fB\-u\fR, \fB\-\-user\fR
-Specify the user the application should be run as\. Defaults to the app name
-.
-.SH "OPTIONS"
-These options control all modes of foreman\'s operation\.
-.
-.TP
-\fB\-e\fR, \fB\-\-env\fR
-Specify an alternate environment file\. You can specify more than one file by using: \fB\-\-env file1,file2\fR\.
-.
-.TP
-\fB\-f\fR, \fB\-\-procfile\fR
-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\.
-.
-.SH "EXPORT FORMATS"
-foreman currently supports the following output formats:
-.
-.IP "\(bu" 4
-bluepill
-.
-.IP "\(bu" 4
-inittab
-.
-.IP "\(bu" 4
-runit
-.
-.IP "\(bu" 4
-upstart
-.
-.IP "" 0
-.
-.SH "INITTAB EXPORT"
-Will export a chunk of inittab\-compatible configuration:
-.
-.IP "" 4
-.
-.nf
-
-# \-\-\-\-\- foreman example processes \-\-\-\-\-
-EX01:4:respawn:/bin/su \- example \-c \'PORT=5000 bundle exec thin start >> /var/log/web\-1\.log 2>&1\'
-EX02:4:respawn:/bin/su \- example \-c \'PORT=5100 bundle exec rake jobs:work >> /var/log/job\-1\.log 2>&1\'
-# \-\-\-\-\- end foreman example processes \-\-\-\-\-
-.
-.fi
-.
-.IP "" 0
-.
-.SH "UPSTART EXPORT"
-Will create a series of upstart scripts in the location you specify\. Scripts will be structured to make the following commands valid:
-.
-.P
-\fBstart appname\fR
-.
-.P
-\fBstop appname\-processname\fR
-.
-.P
-\fBrestart appname\-processname\-3\fR
-.
-.SH "PROCFILE"
-A Procfile should contain both a name for the process and the command used to run it\.
-.
-.IP "" 4
-.
-.nf
-
-web: bundle exec thin start
-job: bundle exec rake jobs:work
-.
-.fi
-.
-.IP "" 0
-.
-.P
-A process name may contain letters, numbers amd the underscore character\. You can validate your Procfile format using the \fBcheck\fR command:
-.
-.IP "" 4
-.
-.nf
-
-$ foreman check
-.
-.fi
-.
-.IP "" 0
-.
-.SH "ENVIRONMENT"
-If a \fB\.env\fR file exists in the current directory, the default environment will be read from it\. This file should contain key/value pairs, separated by \fB=\fR, with one key/value pair per line\.
-.
-.IP "" 4
-.
-.nf
-
-FOO=bar
-BAZ=qux
-.
-.fi
-.
-.IP "" 0
-.
-.SH "DEFAULT OPTIONS"
-If a \fB\.foreman\fR file exists in the current directory, default options will be read from it\. This file should be in YAML format with the long option name as keys\. Example:
-.
-.IP "" 4
-.
-.nf
-
-concurrency: alpha=0,bravo=1
-port: 15000
-.
-.fi
-.
-.IP "" 0
-.
-.SH "EXAMPLES"
-Start one instance of each process type, interleave the output on stdout:
-.
-.IP "" 4
-.
-.nf
-
-$ foreman start
-.
-.fi
-.
-.IP "" 0
-.
-.P
-Export the application in upstart format:
-.
-.IP "" 4
-.
-.nf
-
-$ foreman export upstart /etc/init
-.
-.fi
-.
-.IP "" 0
-.
-.P
-Run one process type from the application defined in a specific Procfile:
-.
-.IP "" 4
-.
-.nf
-
-$ foreman start alpha \-p ~/myapp/Procfile
-.
-.fi
-.
-.IP "" 0
-.
-.SH "COPYRIGHT"
-Foreman is Copyright (C) 2010 David Dollar \fIhttp://daviddollar\.org\fR