0.52.0

Make upstart export start/stop with network

Changelog.md

@@ -1,3 +1,7 @@
+## 0.51.0 (2012-07-11)
+
+* dont try to colorize windows  [David Dollar]
+
 ## 0.50.0 (2012-07-11)
 
 * handle windows  [David Dollar]

Gemfile.lock

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

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/example/.profile.d/foo.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+export FOO=bar

data/export/upstart/master.conf.erb

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

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

lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.51.0"
+  VERSION = "0.52.0"
 
 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.50.0" "Foreman Manual"
+.TH "FOREMAN" "1" "July 2012" "Foreman 0.51.0" "Foreman Manual"
 .
 .SH "NAME"
 \fBforeman\fR \- manage Procfile\-based applications

spec/resources/export/upstart/app.conf

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