Skip to content

Commit

Permalink
update Aruba with fix for "too many open files" on 1.8.7
Browse files Browse the repository at this point in the history
  • Loading branch information
mislav committed Dec 14, 2013
1 parent 2beb240 commit f6d011e
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 40 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
source 'https://rubygems.org'

gem 'ronn', :platform => :mri
gem 'aruba'
gem 'cucumber'
gem 'aruba', '~> 0.5.3'
gem 'cucumber', '~> 1.2.1'
gem 'sinatra'
gem 'thin', :platform => :mri
gem 'json'
Expand Down
52 changes: 23 additions & 29 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,35 @@ GEM
remote: https://rubygems.org/
specs:
addressable (2.3.2)
aruba (0.4.11)
childprocess (>= 0.2.3)
aruba (0.5.3)
childprocess (>= 0.3.6)
cucumber (>= 1.1.1)
ffi (>= 1.0.11)
rspec (>= 2.7.0)
rspec-expectations (>= 2.7.0)
bouncy-castle-java (1.5.0146.1)
builder (3.0.0)
childprocess (0.3.3)
ffi (~> 1.0.6)
builder (3.2.2)
childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11)
crack (0.3.1)
cucumber (1.2.1)
cucumber (1.2.5)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.11.0)
json (>= 1.4.6)
gherkin (~> 2.11.7)
multi_json (~> 1.3)
daemons (1.1.8)
diff-lcs (1.1.3)
diff-lcs (1.2.4)
eventmachine (0.12.10)
ffi (1.0.11)
ffi (1.0.11-java)
gherkin (2.11.1)
json (>= 1.4.6)
gherkin (2.11.1-java)
json (>= 1.4.6)
ffi (1.9.0)
ffi (1.9.0-java)
gherkin (2.11.8)
multi_json (~> 1.3)
gherkin (2.11.8-java)
multi_json (~> 1.3)
hpricot (0.8.4)
jruby-openssl (0.7.7)
bouncy-castle-java (>= 1.5.0146.1)
json (1.7.3)
json (1.7.3-java)
json (1.8.0)
json (1.8.0-java)
multi_json (1.7.7)
mustache (0.99.4)
rack (1.4.1)
rack-protection (1.2.0)
Expand All @@ -46,14 +46,8 @@ GEM
hpricot (>= 0.8.2)
mustache (>= 0.7.0)
rdiscount (>= 1.5.8)
rspec (2.11.0)
rspec-core (~> 2.11.0)
rspec-expectations (~> 2.11.0)
rspec-mocks (~> 2.11.0)
rspec-core (2.11.0)
rspec-expectations (2.11.1)
diff-lcs (~> 1.1.3)
rspec-mocks (2.11.1)
rspec-expectations (2.14.0)
diff-lcs (>= 1.1.3, < 2.0)
sinatra (1.3.2)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
Expand All @@ -72,8 +66,8 @@ PLATFORMS
ruby

DEPENDENCIES
aruba
cucumber
aruba (~> 0.5.3)
cucumber (~> 1.2.1)
hub!
jruby-openssl
json
Expand Down
9 changes: 0 additions & 9 deletions features/support/env.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
require 'fileutils'
require 'forwardable'

# needed to avoid "Too many open files" on 1.8.7
Aruba::Process.class_eval do
def close_streams
@out.close
@err.close
end
end

system_git = `which git 2>/dev/null`.chomp
lib_dir = File.expand_path('../../../lib', __FILE__)
bin_dir = File.expand_path('../fakebin', __FILE__)
Expand Down Expand Up @@ -57,7 +49,6 @@ def close_streams

After do
@server.stop if defined? @server and @server
processes.each {|_, p| p.close_streams }
FileUtils.rm_f("#{bin_dir}/vim")
end

Expand Down

0 comments on commit f6d011e

Please sign in to comment.