switch to posix-spawn for jruby

This commit is contained in:
David Dollar committed 2012-01-22 18:39:20 -05:00
1 parent 7a25d3ac5a
commit 9cc0afca49
4 files changed
+12 -4

No files matched your search

+4
View File
@@ -2,6 +2,10 @@ source "http://rubygems.org"
gemspec gemspec
platform :jruby do
gem "posix-spawn", "~> 0.3.6"
end
group :development do group :development do
gem 'parka' gem 'parka'
gem 'rake' gem 'rake'
+2
View File
@@ -24,6 +24,7 @@ GEM
crack crack
rest-client rest-client
thor thor
posix-spawn (0.3.6)
rake (0.9.2.2) rake (0.9.2.2)
rcov (0.9.8) rcov (0.9.8)
rcov (0.9.8-java) rcov (0.9.8-java)
@@ -57,6 +58,7 @@ DEPENDENCIES
fakefs (~> 0.3.2) fakefs (~> 0.3.2)
foreman! foreman!
parka parka
posix-spawn (~> 0.3.6)
rake rake
rcov (~> 0.9.8) rcov (~> 0.9.8)
ronn ronn
+2 -2
View File
@@ -19,8 +19,8 @@ Gem::Specification.new do |gem|
gem.add_dependency 'term-ansicolor', '~> 1.0.7' gem.add_dependency 'term-ansicolor', '~> 1.0.7'
gem.add_dependency 'thor', '>= 0.13.6' gem.add_dependency 'thor', '>= 0.13.6'
if RUBY_PLATFORM == "java" || ENV["JRUBY"] if ENV["JRUBY"]
gem.add_dependency "spoon", "~> 0.0.1" gem.add_dependency "posix-spawn", "~> 0.3.6"
gem.platform = Gem::Platform.new("java") gem.platform = Gem::Platform.new("java")
end end
end end
+4 -2
View File
@@ -34,8 +34,10 @@ private
reader, writer = IO.pipe reader, writer = IO.pipe
command = replace_command_env(command) command = replace_command_env(command)
pid = if jruby? pid = if jruby?
require "spoon" require "posix/spawn"
Spoon.spawnp Foreman.runner, "-d", basedir, command POSIX::Spawn.spawn(Foreman.runner, "-d", basedir, command, {
:out => writer, :err => writer
})
else else
fork do fork do
trap("INT", "IGNORE") trap("INT", "IGNORE")