foreman 0.51.0-java → 0.52.0-java

data/bin/foreman-runner

@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 #
-#/ Usage: foreman-runner [-d <dir>] <command> [<args>...]
+#/ Usage: foreman-runner [-d <dir>] [-p] <command> [<args>...]
 #/
 #/ Run a command with exec, optionally changing directory first
 
@@ -16,9 +16,12 @@ usage() {
   exit
 }
 
-while getopts ":hd:" OPT; do
+read_profiled=""
+
+while getopts ":hd:p" OPT; do
   case $OPT in
      d) cd "$OPTARG" ;;
+     p) read_profiled="1" ;;
      h) usage ;;
     \?) error "invalid option: -$OPTARG" ;;
      :) error "option -$OPTARG requires an argument" ;;
@@ -29,4 +32,13 @@ shift $((OPTIND-1))
 
 [ -z "$1" ] && usage
 
+if [ "$read_profiled" == "1" ]; then
+  shopt -s nullglob
+  for script in .profile.d/*; do
+    echo "sourcing $script"
+    source $script
+  done
+  shopt -u nullglob
+fi
+
 exec "$@"

data/data/export/upstart/master.conf.erb

@@ -6,3 +6,6 @@ bash << "EOF"
 EOF
 
 end script
+
+start on started network
+stop on stopping network

data/lib/foreman/process.rb

@@ -43,23 +43,20 @@ class Foreman::Process
         Process.spawn env, expanded_command, :out => output, :err => output
       end
     elsif Foreman.jruby?
-      Dir.chdir(cwd) do
-        require "posix/spawn"
-        POSIX::Spawn.spawn env, command, :out => output, :err => output
-      end
+      require "posix/spawn"
+      wrapped_command = "#{Foreman.runner} -d '#{cwd}' -p -- #{command}"
+      POSIX::Spawn.spawn env, wrapped_command, :out => output, :err => output
     elsif Foreman.ruby_18?
-      Dir.chdir(cwd) do
-        fork do
-          $stdout.reopen output
-          $stderr.reopen output
-          env.each { |k,v| ENV[k] = v }
-          exec command
-        end
+      fork do
+        $stdout.reopen output
+        $stderr.reopen output
+        env.each { |k,v| ENV[k] = v }
+        wrapped_command = "#{Foreman.runner} -d '#{cwd}' -p -- #{command}"
+        exec wrapped_command
       end
     else
-      Dir.chdir(cwd) do
-        Process.spawn env, command, :out => output, :err => output
-      end
+      wrapped_command = "#{Foreman.runner} -d '#{cwd}' -p -- #{command}"
+      Process.spawn env, wrapped_command, :out => output, :err => output
     end
   end
 
@@ -96,7 +93,7 @@ class Foreman::Process
 private
 
   def cwd
-    @options[:cwd] || "."
+    File.expand_path(@options[:cwd] || ".")
   end
 
 end

data/lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.51.0"
+  VERSION = "0.52.0"
 
 end

data/spec/resources/export/upstart/app.conf

@@ -6,3 +6,6 @@ bash << "EOF"
 EOF
 
 end script
+
+start on started network
+stop on stopping network

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman
 version: !ruby/object:Gem::Version
-  version: 0.51.0
+  version: 0.52.0
   prerelease: 
 platform: java
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70203687847680 !ruby/object:Gem::Requirement
+  requirement: &70211491658580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.13.6
   type: :runtime
   prerelease: false
-  version_requirements: *70203687847680
+  version_requirements: *70211491658580
 - !ruby/object:Gem::Dependency
   name: posix-spawn
-  requirement: &70203687840660 !ruby/object:Gem::Requirement
+  requirement: &70211491674340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70203687840660
+  version_requirements: *70211491674340
 description: Process manager for applications with multiple components
 email: ddollar@gmail.com
 executables: