RUBY_ENGINE is not defined in ruby 1.8.7

rubygems · May 4, 2012 · 9a769ac · 9a769ac
1 parent 9474e88
commit 9a769ac
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/lib/bundler/ruby_version.rb b/lib/bundler/ruby_version.rb
@@ -69,11 +69,16 @@ def version
     end
 
     def engine
-      RUBY_ENGINE
+      if defined?(RUBY_ENGINE)
+        RUBY_ENGINE
+      else
+        # not defined in ruby 1.8.7
+        "ruby"
+      end
     end
 
     def engine_version
-      case RUBY_ENGINE
+      case engine
       when "ruby"
         RUBY_VERSION
       when "rbx"

diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
@@ -293,7 +293,7 @@ def simulate_platform(platform)
     end
 
     def simulate_ruby_engine(engine, version = "1.6.0")
-      return if engine == RUBY_ENGINE
+      return if engine == local_ruby_engine
 
       old, ENV['BUNDLER_SPEC_RUBY_ENGINE'] = ENV['BUNDLER_SPEC_RUBY_ENGINE'], engine
       old_version, ENV['BUNDLER_SPEC_RUBY_ENGINE_VERSION'] = ENV['BUNDLER_SPEC_RUBY_ENGINE_VERSION'], version

diff --git a/spec/support/platforms.rb b/spec/support/platforms.rb
@@ -51,7 +51,7 @@ def not_local_tag
     end
 
     def local_ruby_engine
-      ENV["BUNDLER_SPEC_RUBY_ENGINE"] || RUBY_ENGINE
+      ENV["BUNDLER_SPEC_RUBY_ENGINE"] || (defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby")
     end
 
     def local_engine_version

diff --git a/spec/support/rubygems_hax/platform.rb b/spec/support/rubygems_hax/platform.rb
@@ -12,7 +12,7 @@ module Bundler
 
 class Object
   if ENV['BUNDLER_SPEC_RUBY_ENGINE']
-    remove_const :RUBY_ENGINE
+    remove_const :RUBY_ENGINE if defined?(RUBY_ENGINE)
     RUBY_ENGINE = ENV['BUNDLER_SPEC_RUBY_ENGINE']
 
     if RUBY_ENGINE == "jruby"