0.56.0

changed to check env for bash

Changelog.md

@@ -1,3 +1,22 @@
+## 0.55.0 (2012-08-14)
+
+* use a forked process to exec a run with environment  [David Dollar]
+
+## 0.54.0 (2012-08-14)
+
+* use Foreman::Process to extract command running  [David Dollar]
+* changed to check env for bash  [brntbeer]
+
+## 0.53.0 (2012-07-24)
+
+* put app root in $HOME  [David Dollar]
+
+## 0.52.0 (2012-07-24)
+
+* wrap command in a runner that sources .profile.d scripts  [David Dollar]
+* fix upstart export specs  [David Dollar]
+* Make upstart export start/stop with network  [Daniel Farrell]
+
 ## 0.51.0 (2012-07-11)
 
 * dont try to colorize windows  [David Dollar]

Gemfile.lock

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

bin/foreman-runner

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

lib/foreman/cli.rb

@@ -75,13 +75,17 @@ class Foreman::CLI < Thor
 
   def run(*args)
     load_environment!
-    begin
+    pid = fork do
-      exec engine.env, args.shelljoin
+      begin
-    rescue Errno::EACCES
+        engine.env.each { |k,v| ENV[k] = v }
-      error "not executable: #{args.first}"
+        exec args.shelljoin
-    rescue Errno::ENOENT
+      rescue Errno::EACCES
-      error "command not found: #{args.first}"
+        error "not executable: #{args.first}"
+      rescue Errno::ENOENT
+        error "command not found: #{args.first}"
+      end
     end
+    Process.wait(pid)
   end
 
   desc "version", "Display Foreman gem version"

lib/foreman/engine.rb

@@ -256,7 +256,10 @@ private
       1.upto(formation[@names[process]]) do |n|
         reader, writer = create_pipe
         begin
-          pid = process.run(:output => writer, :env => { "PORT" => port_for(process, n).to_s })
+          pid = process.run(:output => writer, :env => {
+            "HOME" => process.cwd,
+            "PORT" => port_for(process, n).to_s
+          })
           writer.puts "started with pid #{pid}"
         rescue Errno::ENOENT
           writer.puts "unknown command: #{process.command}"

lib/foreman/process.rb

@@ -90,8 +90,10 @@ class Foreman::Process
     !alive?
   end
 
-private
+  # Returns the working directory for this +Process+
-
+  #
+  # @returns [String]
+  #
   def cwd
     File.expand_path(@options[:cwd] || ".")
   end

lib/foreman/version.rb

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