get cukes passing on JRuby

mislav · Nov 22, 2012 · be7e9b5 · be7e9b5
1 parent c7f66d7
commit be7e9b5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,10 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'ronn'
+gem 'ronn', :platform => :mri
 gem 'aruba'
 gem 'cucumber'
 gem 'sinatra'
-gem 'thin'
+gem 'thin', :platform => :mri
 gem 'json'
+gem 'jruby-openssl', :platform => :jruby
 
 gemspec
diff --git a/features/support/env.rb b/features/support/env.rb
@@ -40,7 +40,12 @@ def close_streams
 
   FileUtils.mkdir_p ENV['HOME']
 
-  @aruba_io_wait_seconds = 0.02
+  if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
+    @aruba_timeout_seconds = 5
+    @aruba_io_wait_seconds = 0.1
+  else
+    @aruba_io_wait_seconds = 0.02
+  end
 end
 
 After do

diff --git a/lib/hub.rb b/lib/hub.rb
@@ -1,4 +1,4 @@
-require 'hub/version'
+require 'hub/version' unless defined?(Hub::VERSION)
 require 'hub/args'
 require 'hub/ssh_config'
 require 'hub/github_api'