Better detection of rbx and Typhoe...yeah i can't spell it

mwunsch · Sep 16, 2012 · 3a491b7 · 3a491b7
1 parent f020cb1
commit 3a491b7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,9 +4,6 @@ gemspec
 
 gem "rake", "~> 0.9.2"
 gem "excon"
-if !(RUBY_ENGINE =~ /rbx/)
-  gem "typhoeus"
-end
 
 group :test do
   gem "rspec", "~> 2.11.0"
@@ -21,3 +18,7 @@ end
 platforms :jruby do
   gem "jruby-openssl"
 end
+
+platforms :ruby do
+  gem "typhoeus"
+end
diff --git a/lib/weary/adapters/typhoeus.rb b/lib/weary/adapters/typhoeus.rb
@@ -1,7 +1,7 @@
 begin
   require 'typhoeus'
 rescue LoadError => e
-  if RUBY_ENGINE =~ /rbx/
+  if defined? RUBY_ENGINE and 'rbx' == RUBY_ENGINE
     warn "Typhoeus is not yet available on Rubinius: #{e.message}"
   else
     raise $!

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -6,6 +6,11 @@
 
 WebMock.disable_net_connect!
 
+def rbx?
+  defined? RUBY_ENGINE and 'rbx' == RUBY_ENGINE
+end
+
 RSpec.configure do |c|
-  c.filter_run_excluding :exclude_from_rbx => !!(RUBY_ENGINE =~ /rbx/)
-end
+  c.filter_run_excluding :exclude_from_rbx => rbx?
+end
+