foreman 0.36.1 → 0.37.0.pre1

data/bin/runner

@@ -1,2 +1,36 @@
 #!/bin/sh
+#
+#/ Usage: runner [-d <dir>] <command>
+#/
+#/ Run a command with exec, optionally changing directory first
+
+set -e
+
+error() {
+  echo $@ >&2
+  exit 1
+}
+
+usage() {
+  cat $0 | grep '^#/' | cut -c4-
+  exit
+}
+
+while getopts ":hd:" OPT; do
+  case $OPT in
+     d) cd $OPTARG ;;
+     h) usage ;;
+    \?) error "invalid option: -$OPTARG" ;;
+     :) error "option -$OPTARG requires an argument" ;;
+  esac
+done
+
+shift $((OPTIND-1))
+
+command=$1
+
+if [ "$1" == "" ]; then
+  usage
+fi
+
 exec $1 2>&1

data/lib/foreman/process.rb

@@ -1,4 +1,5 @@
 require "foreman"
+require "rubygems"
 
 class Foreman::Process
 
@@ -14,10 +15,8 @@ class Foreman::Process
   end
 
   def run(pipe, basedir, environment)
-    Dir.chdir(basedir) do
-      with_environment(environment.merge("PORT" => port.to_s)) do
-        run_process entry.command, pipe
-      end
+    with_environment(environment.merge("PORT" => port.to_s)) do
+      run_process basedir, entry.command, pipe
     end
   end
 
@@ -27,21 +26,33 @@ class Foreman::Process
 
 private
 
-  def fork_with_io(command)
+  def jruby?
+    defined?(RUBY_PLATFORM) and RUBY_PLATFORM == "java"
+  end
+
+  def fork_with_io(command, basedir)
     reader, writer = IO.pipe
-    pid = fork do
-      trap("INT", "IGNORE")
-      writer.sync = true
-      $stdout.reopen writer
-      $stderr.reopen writer
-      reader.close
-      exec Foreman.runner, replace_command_env(command)
+    command = replace_command_env(command)
+    pid = if jruby?
+      require "posix/spawn"
+      POSIX::Spawn.spawn(Foreman.runner, "-d", basedir, command, {
+        :out => writer, :err => writer
+      })
+    else
+      fork do
+        trap("INT", "IGNORE")
+        writer.sync = true
+        $stdout.reopen writer
+        $stderr.reopen writer
+        reader.close
+        exec Foreman.runner, "-d", basedir, command
+      end
     end
     [ reader, pid ]
   end
 
-  def run_process(command, pipe)
-    io, @pid = fork_with_io(command)
+  def run_process(basedir, command, pipe)
+    io, @pid = fork_with_io(command, basedir)
     output pipe, "started with pid %d" % @pid
     Thread.new do
       until io.eof?

data/lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.36.1"
+  VERSION = "0.37.0.pre1"
 
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: foreman
 version: !ruby/object:Gem::Version
-  version: 0.36.1
-  prerelease: 
+  version: 0.37.0.pre1
+  prerelease: 7
 platform: ruby
 authors:
 - David Dollar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000Z
+date: 2012-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70333089676880 !ruby/object:Gem::Requirement
+  requirement: &70172598141120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70333089676880
+  version_requirements: *70172598141120
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70333089664420 !ruby/object:Gem::Requirement
+  requirement: &70172598140300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 0.13.6
   type: :runtime
   prerelease: false
-  version_requirements: *70333089664420
+  version_requirements: *70172598140300
 description: Process manager for applications with multiple components
 email: ddollar@gmail.com
 executables:
@@ -106,21 +106,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3775390511397259528
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 3775390511397259528
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Process manager for applications with multiple components