From: Marc Peabody <marc@edgecase.com>
Date: Wed, 12 Jan 2011 20:37:38 +0000 (-0500)
Subject: Revert "Updated with Rubinius Support"
X-Git-Url: https://git.eng.unimelb.edu.au/public?a=commitdiff_plain;h=670101783b72d00c39bec258cdefe378aec6fa35;p=ruby_koans.git

Revert "Updated with Rubinius Support"

This reverts commit 3ce23a8ee09f276e778aeab0c7b477b2e7b5a8ab.
---

diff --git a/Rakefile b/Rakefile
index d60dfd2..19b3bc1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -75,7 +75,7 @@ module RubyImpls
 
   # List of expected ruby implementations.
   def self.expected
-    %w(ruby-1.8.6 ruby-1.8.7 ruby-1.9.2 jruby ree rbx)
+    %w(ruby-1.8.6 ruby-1.8.7 ruby-1.9.2 jruby ree)
   end
 end
 
diff --git a/src/about_methods.rb b/src/about_methods.rb
index 0bdb399..1497f9b 100644
--- a/src/about_methods.rb
+++ b/src/about_methods.rb
@@ -44,7 +44,7 @@ class AboutMethods < EdgeCase::Koan
       my_global_method
     end
     #--
-    pattern = "wrong (number|#) of arguments|given \\d+, expected \\d+"
+    pattern = "wrong (number|#) of arguments"
     #++
     assert_match(/#{__(pattern)}/, exception.message)
 
diff --git a/src/about_objects.rb b/src/about_objects.rb
index 64f39ee..1faf0a0 100644
--- a/src/about_objects.rb
+++ b/src/about_objects.rb
@@ -30,22 +30,20 @@ class AboutObjects < EdgeCase::Koan
     assert_equal __(true), obj.object_id != another_obj.object_id
   end
 
-  not_in_ruby_version('rbx') do
-    def test_some_system_objects_always_have_the_same_id
-      assert_equal __(0), false.object_id
-      assert_equal __(2), true.object_id
-      assert_equal __(4), nil.object_id
-    end
-
-    def test_small_integers_have_fixed_ids
-      assert_equal __(1), 0.object_id
-      assert_equal __(3), 1.object_id
-      assert_equal __(5), 2.object_id
-      assert_equal __(201), 100.object_id
-
-      # THINK ABOUT IT:
-      # What pattern do the object IDs for small integers follow?
-    end
+  def test_some_system_objects_always_have_the_same_id
+    assert_equal __(0), false.object_id
+    assert_equal __(2), true.object_id
+    assert_equal __(4), nil.object_id
+  end
+
+  def test_small_integers_have_fixed_ids
+    assert_equal __(1), 0.object_id
+    assert_equal __(3), 1.object_id
+    assert_equal __(5), 2.object_id
+    assert_equal __(201), 100.object_id
+
+    # THINK ABOUT IT:
+    # What pattern do the object IDs for small integers follow?
   end
 
   def test_clone_creates_a_different_object
diff --git a/src/edgecase.rb b/src/edgecase.rb
index 37dc4a9..c024438 100644
--- a/src/edgecase.rb
+++ b/src/edgecase.rb
@@ -13,18 +13,13 @@ end
 def ruby_version?(version)
   RUBY_VERSION =~ /^#{version}/ ||
     (version == 'jruby' && defined?(JRUBY_VERSION)) ||
-    (version == 'mri' && (! defined?(JRUBY_VERSION) && ! defined?(Rubinius))) ||
-    (version == 'rbx' && defined?(Rubinius))
+    (version == 'mri' && ! defined?(JRUBY_VERSION))
 end
 
 def in_ruby_version(*versions)
   yield if versions.any? { |v| ruby_version?(v) }
 end
 
-def not_in_ruby_version(*versions)
-  yield unless versions.any? { |v| ruby_version?(v) }
-end
-
 # Standard, generic replacement value.
 # If value19 is given, it is used inplace of value for Ruby 1.9.
 def __(value="FILL ME IN", value19=:mu)
@@ -57,7 +52,7 @@ class Object
     end
   end
 
-  in_ruby_version("1.9", "rbx") do
+  in_ruby_version("1.9") do
     public :method_missing
   end
 end