Merge pull request #360 from kjwierenga/feature/require-posix-spawn

Feature/require posix spawn
This commit is contained in:
David Dollar
2013-05-03 12:55:16 -07:00
3 changed files with 29 additions and 4 deletions

View File

@@ -34,6 +34,7 @@ class Foreman::CLI < Thor
end
def start(process=nil)
require_posix_spawn_for_ruby_18!
check_procfile!
load_environment!
engine.load_procfile(procfile)
@@ -137,6 +138,14 @@ private ######################################################################
end
end
def require_posix_spawn_for_ruby_18!
begin
Kernel.require 'posix/spawn' # Use Kernel explicitly so we can mock the require call in the spec
rescue LoadError
error "foreman requires gem `posix-spawn` on Ruby #{RUBY_VERSION}. Please `gem install posix-spawn`."
end if Foreman.ruby_18?
end
def procfile
case
when options[:procfile] then options[:procfile]

View File

@@ -100,4 +100,12 @@ describe "Foreman::CLI", :fakefs do
end
end
describe "when posix-spawn is not present on ruby 1.8" do
it "should fail with an error" do
mock(Kernel).require('posix/spawn') { raise LoadError }
output = foreman("start -f #{resource_path("Procfile")}")
output.should == "ERROR: foreman requires gem `posix-spawn` on Ruby #{RUBY_VERSION}. Please `gem install posix-spawn`.\n"
end
end if running_ruby_18?
end

View File

@@ -10,6 +10,15 @@ require "fakefs/spec_helpers"
$:.unshift File.expand_path("../../lib", __FILE__)
begin
def running_ruby_18?
defined?(RUBY_VERSION) and RUBY_VERSION =~ /^1\.8\.\d+/
end
require 'posix/spawn' if running_ruby_18?
rescue LoadError
STDERR.puts "WARNING: foreman requires gem `posix-spawn` on Ruby #{RUBY_VERSION}. Please `gem install posix-spawn`."
end
def mock_export_error(message)
lambda { yield }.should raise_error(Foreman::Export::Exception, message)
end
@@ -36,8 +45,7 @@ end
def forked_foreman(args)
rd, wr = make_pipe
if Foreman.jruby_18? || Foreman.ruby_18?
require 'posix/spawn'
if running_ruby_18?
POSIX::Spawn.spawn({}, "bundle exec bin/foreman #{args}", :out => wr, :err => wr)
else
Process.spawn("bundle exec bin/foreman #{args}", :out => wr, :err => wr)
@@ -66,8 +74,7 @@ def fork_and_capture(&blk)
end
def fork_and_get_exitstatus(args)
pid = if Foreman.jruby_18? || Foreman.ruby_18?
require 'posix/spawn'
pid = if running_ruby_18?
POSIX::Spawn.spawn({}, "bundle exec bin/foreman #{args}", :out => "/dev/null", :err => "/dev/null")
else
Process.spawn("bundle exec bin/foreman #{args}", :out => "/dev/null", :err => "/dev/null")
@@ -170,4 +177,5 @@ RSpec.configure do |config|
config.order = 'rand'
config.include FakeFS::SpecHelpers, :fakefs
config.mock_with :rr
config.backtrace_clean_patterns = []
end