rr 1.1.0 → 1.1.1.rc1

data/README.md

@@ -164,21 +164,13 @@ Want to contribute a bugfix or new feature to RR? Great! Follow these steps:
 ### Running test suites
 
 In order to test support for multiple Ruby versions and environments, there are
-multiple test suites, and Rake tasks to run these suites. Here is the list of
-available Rake tasks under Ruby >= 1.9:
+multiple test suites, and Rake tasks to run these suites. The list of available
+Rake tasks depends on which version of Ruby you are under, but you can get the
+full list with:
 
-    rake spec:rspec_2
-    rake spec:minitest
-    rake spec:test_unit_2
+    rake -D spec:
 
-Here is the list under Ruby 1.8:
-
-    rake spec:rspec_1
-    rake spec:test_unit_2
-    rake spec:test_unit_1
-
-As a shortcut, to run all the available suites under the Ruby version you are
-on, you can simply say:
+To run all the suites, simply say:
 
     rake
 
@@ -196,19 +188,31 @@ course, the necessary Rubies as well too.
 
 ## Compatibility
 
-RR is designed and tested to work against the following test frameworks and Ruby
-versions:
+RR is designed and tested to work against the following test frameworks and
+Ruby/Rails versions:
 
 |                       | Ruby 1.8.7-p371 | Ruby 1.9.3-p392 | Ruby 2.0.0-p0 | JRuby 1.7.3 (1.9 mode) |
 |-----------------------|:---------------:|:---------------:|:-------------:|:----------------------:|
-| MiniTest 4.x                      |   | ✓ | ✓ | ✓ |
-| Test::Unit (Ruby 1.8)             | ✓ |   |   |   |
-| Test::Unit (Ruby 1.8) + Rails 2.x | ✓ |   |   |   |
-| Test::Unit 2.x                    | ✓ | ✓ | ✓ | ✓ |
-| Test::Unit 2.x + Rails 2.x        | ✓ |   |   |   |
-| Test::Unit 2.x + Rails 3.x        |   | ✓ | ✓ | ✓ |
-| RSpec 1.x                         | ✓ |   |   |   |
-| RSpec 2.x                         |   | ✓ | ✓ | ✓ |
+| MiniTest 4.x                        |   | ✓ | ✓ | ✓ |
+| MiniTest 4.x + Rails 3              |   | ✓ | ✓ | ✓ |
+| MiniTest 4.x + Rails 4.0.0.rc1      |   | ✓ | ✓ | ✓ |
+| Minitest 5.x                        |   | ✓ | ✓ | ✓ |
+| Minitest 5.x + Rails 3              |   | ✓ | ✓ | ✓ |
+| Test::Unit 1                        | ✓ |   |   |   |
+| Test::Unit 1 + Rails 2.x            | ✓ |   |   |   |
+| Test::Unit 2.0.0                    |   | ✓ | ✓ | ✓ |
+| Test::Unit 2.0.0 + Rails 3.x        |   | ✓ | ✓ | ✓ |
+| Test::Unit 2.0.0 + Rails 4.0.0.rc1  |   | ✓ | ✓ | ✓ |
+| Test::Unit 2.4.x                    | ✓ |   |   |   |
+| Test::Unit 2.4.x + Rails 2.x        | ✓ |   |   |   |
+| Test::Unit ~> 2.5                   |   | ✓ | ✓ | ✓ |
+| Test::Unit ~> 2.5 + Rails 3.x       |   | ✓ | ✓ | ✓ |
+| Test::Unit ~> 2.5 + Rails 4.0.0.rc1 |   | ✓ | ✓ | ✓ |
+| RSpec 1.x                           | ✓ |   |   |   |
+| RSpec 1.x + Rails 2.x               | ✓ |   |   |   |
+| RSpec 2.x                           |   | ✓ | ✓ | ✓ |
+| RSpec 2.x + Rails 3.x               |   | ✓ | ✓ | ✓ |
+| RSpec 2.x + Rails 4.0.0.rc1         |   | ✓ | ✓ | ✓ |
 
 
 ## Author/Contact

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1.rc1

data/lib/rr/adapters.rb

@@ -17,9 +17,9 @@ module RR
         adapter = shim_adapters[adapter_const_name] ||=
           case adapter_const_name
             when :TestUnit
-              find_applicable_adapter(:TestUnit1, :TestUnit2ActiveSupport, :TestUnit2)
+              RR.find_applicable_adapter_matching(/^TestUnit/)
             when :MiniTest
-              find_applicable_adapter(:MinitestActiveSupport, :Minitest, :MiniTest4ActiveSupport, :MiniTest4)
+              RR.find_applicable_adapter_matching(/^minitest/i)
           end
 
         adapter
@@ -31,23 +31,6 @@ module RR
         @shim_adapters ||= {}
       end
 
-      def find_applicable_adapter(*adapter_const_names)
-        adapter = adapter_const_names.
-          map { |adapter_const_name| RR::Integrations.build(adapter_const_name) }.
-          find { |adapter| adapter.applies? }
-        if adapter
-          mod = Module.new
-          (class << mod; self; end).class_eval do
-            define_method(:included) do |base|
-              # Note: This assumes that the thing that is including this module
-              # is the same that the adapter detected and will hook into.
-              adapter.hook
-            end
-          end
-          mod
-        end
-      end
-
       def show_warning_for(adapter_const_name)
         warn <<EOT
 --------------------------------------------------------------------------------

data/lib/rr/autohook.rb

@@ -1,37 +1,11 @@
 module RR
   class << self
-    ADAPTER_NAMES = [
-      :RSpec1,
-      :RSpec2,
-      :TestUnit1,
-      :TestUnit2ActiveSupport,
-      :TestUnit2,
-      :MiniTest4ActiveSupport,
-      :MiniTest4,
-      :MinitestActiveSupport,
-      :Minitest
-    ]
-
     def autohook
-      applicable_adapters.each do |adapter|
-        puts "Using adapter: #{adapter.name}" if RR.debug?
-        adapter.hook
+      applicable_adapters.each { |adapter| adapter.load }
+      if applicable_adapters.empty?
+        puts "No adapters matched!" if RR.debug?
       end
     end
-
-    private
-
-    def adapters
-      @adapters ||= ADAPTER_NAMES.map { |adapter_name|
-        [adapter_name, RR::Integrations.build(adapter_name)]
-      }
-    end
-
-    def applicable_adapters
-      @applicable_adapters ||= adapters.
-        map { |_, adapter| adapter }.
-        select { |adapter| adapter.applies? }
-    end
   end
 end
 

data/lib/rr/integrations.rb

@@ -1,7 +1,49 @@
+require 'set'
+
 module RR
   module Integrations
-    def self.build(name)
-      const_get(name).new
+  end
+
+  def self.register_adapter(klass)
+    adapter = Integrations::Decorator.new(klass.new)
+    unless adapters_by_name.key?(adapter.name)
+      adapters << adapter
+      adapters_by_name[adapter.name] = adapter
+    end
+  end
+
+  def self.adapters
+    @adapters ||= []
+  end
+
+  def self.adapters_by_name
+    @adapters_by_name ||= {}
+  end
+
+  def self.loaded_adapter_names
+    adapters.
+      select { |adapter| adapter.loaded? }.
+      map { |adapter| adapter.name }
+  end
+
+  def self.applicable_adapters
+    adapters.select { |adapter| adapter.applies? }
+  end
+
+  def self.find_applicable_adapter_matching(pattern)
+    adapter = adapters.
+      select { |adapter| adapter.name.to_s =~ pattern }.
+      find   { |adapter| adapter.applies? }
+    if adapter
+      mod = Module.new
+      (class << mod; self; end).class_eval do
+        define_method(:included) do |base|
+          # Note: This assumes that the thing that is including this module
+          # is the same that the adapter detected and will hook into.
+          adapter.hook
+        end
+      end
+      mod
     end
   end
 end

data/lib/rr/integrations/decorator.rb

@@ -0,0 +1,40 @@
+require 'delegate'
+
+module RR
+  module Integrations
+    class Decorator < SimpleDelegator
+      def initialize(adapter)
+        super(adapter)
+        @loaded = false
+      end
+
+      def name
+        __getobj__.class.to_s.split('::').last.to_sym
+      end
+
+      def applies?
+        __getobj__.applies?
+      rescue => e
+        if RR.debug?
+          puts "#{__getobj__.class}#applies? failed: #{e.class} (#{e.message})"
+          puts e.backtrace.map {|x| "  " + x }.join("\n")
+        end
+      end
+
+      def load
+        hook
+        @loaded = true
+        puts "Loaded adapter: #{name}" if RR.debug?
+      rescue => e
+        if RR.debug?
+          puts "Couldn't load adapter #{name}: #{e.class} (#{e.message})"
+          puts e.backtrace.map {|x| "  " + x }.join("\n")
+        end
+      end
+
+      def loaded?
+        @loaded
+      end
+    end
+  end
+end

data/lib/rr/integrations/minitest.rb

@@ -23,5 +23,7 @@ module RR
         ::Minitest::VERSION
       end
     end
+
+    RR.register_adapter Minitest
   end
 end

data/lib/rr/integrations/minitest_4.rb

@@ -62,5 +62,8 @@ module RR
         end
       end
     end
+
+    RR.register_adapter MiniTest4
   end
 end
+

data/lib/rr/integrations/minitest_4_active_support.rb

@@ -35,5 +35,7 @@ module RR
         end
       end
     end
+
+    RR.register_adapter MiniTest4ActiveSupport
   end
 end

data/lib/rr/integrations/minitest_active_support.rb

@@ -9,5 +9,7 @@ module RR
         'Minitest + ActiveSupport'
       end
     end
+
+    RR.register_adapter MinitestActiveSupport
   end
 end

data/lib/rr/integrations/rspec_1.rb

@@ -24,7 +24,9 @@ module RR
       end
 
       def applies?
-        defined?(::Spec)
+        defined?(::Spec) &&
+        defined?(::Spec::VERSION::STRING) &&
+        ::Spec::VERSION::STRING =~ /^1/
       end
 
       def hook
@@ -38,5 +40,7 @@ module RR
         end
       end
     end
+
+    RR.register_adapter RSpec1
   end
 end

data/lib/rr/integrations/rspec_2.rb

@@ -6,7 +6,9 @@ module RR
       end
 
       def applies?
-        defined?(::RSpec)
+        defined?(::RSpec) &&
+        defined?(::RSpec::Core::Version::STRING) &&
+        ::RSpec::Core::Version::STRING =~ /^2/
       end
 
       def hook
@@ -20,5 +22,7 @@ module RR
         end
       end
     end
+
+    RR.register_adapter RSpec2
   end
 end

data/lib/rr/integrations/test_unit_1.rb

@@ -12,7 +12,10 @@ module RR
       end
 
       def applies?
-        defined?(::Test::Unit) && !has_test_unit_version?
+        defined?(::Test::Unit) &&
+        defined?(::Test::Unit::TestCase) &&
+        !has_test_unit_version? &&
+        !test_unit_just_wraps_minitest?
       end
 
       def hook(test_case_class = ::Test::Unit::TestCase)
@@ -41,7 +44,11 @@ module RR
         end
       end
 
-      private
+      def test_unit_just_wraps_minitest?
+        defined?(::Test::Unit::TestCase) &&
+        defined?(::MiniTest::Unit::TestCase) &&
+        ::Test::Unit::TestCase < ::MiniTest::Unit::TestCase
+      end
 
       def has_test_unit_version?
         require 'test/unit/version'
@@ -50,5 +57,7 @@ module RR
         false
       end
     end
+
+    RR.register_adapter TestUnit1
   end
 end

data/lib/rr/integrations/test_unit_2.rb

@@ -2,12 +2,14 @@ module RR
   module Integrations
     class TestUnit2 < TestUnit1
       def name
-        'Test::Unit 2'
+        RR.ruby_18? ? 'Test::Unit 2.4.x' : 'Test::Unit >= 2.5'
       end
 
       def applies?
         defined?(::Test::Unit) && has_test_unit_version?
       end
     end
+
+    RR.register_adapter TestUnit2
   end
 end

data/lib/rr/integrations/test_unit_200.rb

@@ -0,0 +1,27 @@
+module RR
+  module Integrations
+    class TestUnit200
+      def initialize
+        @mt4_adapter = RR.adapters_by_name[:MiniTest4]
+        @tu_adapter = RR.adapters_by_name[:TestUnit1]
+      end
+
+      def name
+        'Test::Unit 2.0.0'
+      end
+
+      def applies?
+        @mt4_adapter.applies? &&
+        defined?(::Test::Unit) &&
+        !@tu_adapter.has_test_unit_version? &&
+        @tu_adapter.test_unit_just_wraps_minitest?
+      end
+
+      def hook
+        @mt4_adapter.hook
+      end
+    end
+
+    RR.register_adapter TestUnit200
+  end
+end

data/lib/rr/integrations/test_unit_200_active_support.rb

@@ -0,0 +1,25 @@
+module RR
+  module Integrations
+    class TestUnit200ActiveSupport
+      def initialize
+        @mt4as_adapter = RR.adapters_by_name[:MiniTest4ActiveSupport]
+        @tu200_adapter = RR.adapters_by_name[:TestUnit200]
+      end
+
+      def name
+        "#{@tu200_adapter.name} + ActiveSupport"
+      end
+
+      def applies?
+        @tu200_adapter.applies? && defined?(::ActiveSupport::TestCase)
+      end
+
+      def hook
+        @mt4as_adapter.hook
+      end
+    end
+
+    RR.register_adapter TestUnit200ActiveSupport
+  end
+end
+

data/lib/rr/integrations/test_unit_2_active_support.rb

@@ -2,15 +2,16 @@ module RR
   module Integrations
     class TestUnit2ActiveSupport
       def initialize
-        @tu2_adapter = TestUnit2.new
+        @tu2_adapter = RR.adapters_by_name[:TestUnit2]
       end
 
       def name
-        'Test::Unit 2 w/ ActiveSupport'
+        "#{@tu2_adapter.name} + ActiveSupport"
       end
 
       def applies?
-        @tu2_adapter.applies? && defined?(::ActiveSupport::TestCase)
+        @tu2_adapter.applies? &&
+          defined?(::ActiveSupport::TestCase)
       end
 
       def hook
@@ -31,5 +32,7 @@ module RR
         end
       end
     end
+
+    RR.register_adapter TestUnit2ActiveSupport
   end
 end