shoulda-addons 0.1.1 → 0.2.0

data/lib/shoulda_benchmark.rb

@@ -1,3 +1,44 @@
+module ShouldaAddons
+  module MiniTest
+    module Benchmark
+      def self.included(base)
+        base.class_eval do
+          alias :run_before_benchmark :run
+          
+          def run args = []
+            result = run_before_benchmark
+            puts Shoulda.runtimes.collect{|name, total| [name, total]}.
+              sort{|runtime1, runtime2| runtime2[1] <=> runtime1[1]}[0...10].
+              collect{|name, total| "#{"%0.2f" % total} s: #{name.to_s.gsub(/test: /, "")}"}.<<("").join("\n")
+            result
+          end
+        end
+      end
+    end
+  end
+end
+
+if defined?(MiniTest::Unit)
+  module ::MiniTest
+    class Unit
+      include ShouldaAddons::MiniTest::Benchmark
+    end
+  end
+else
+  module Test
+    module Unit
+      class TestResult
+        alias :to_old_s :to_s
+        def to_s
+          Shoulda.runtimes.collect{|name, total| [name, total]}.
+            sort{|runtime1, runtime2| runtime2[1] <=> runtime1[1]}[0...10].
+            collect{|name, total| "#{"%0.2f" % total} s: #{name.to_s.gsub(/test: /, "")}"}.<<("").<<(to_old_s).join("\n")
+        end
+      end
+    end
+  end
+end
+
 module Test
   module Unit
     class TestCase
@@ -17,17 +58,6 @@ module Test
         end
         @ignoring_added_methods = false
       end
-      
-    end
-    
-    class TestResult
-      alias :to_old_s :to_s
-      def to_s
-        puts Shoulda.runtimes.collect {|name, total| total}.inject(0) {|num, sum| num + sum}
-        Shoulda.runtimes.collect{|name, total| [name, total]}.
-          sort{|runtime1, runtime2| runtime2[1] <=> runtime1[1]}[0...10].
-          collect{|name, total| "#{"%0.2f" % total} s: #{name.to_s.gsub(/test: /, "")}"}.<<("").<<(to_old_s).join("\n")
-      end
     end
   end
 end

data/lib/shoulda_list_runner.rb

@@ -1,6 +1,3 @@
-require 'test/unit'
-require 'test/unit/ui/console/testrunner'
-
 module Color
   COLORS = { :clear => 0, :red => 31, :green => 32, :yellow => 33 }
   def self.method_missing(color_name, *args)
@@ -11,30 +8,51 @@ module Color
   end
 end
 
-module Test
-  module Unit
-    module UI
-      module Console
-        class TestRunner
-          def test_finished(name)
-            if is_fault?(name)
-              puts Color.red(name.gsub(/test: /, ""))
-            else
-              puts Color.green(name.to_s.gsub(/test: /, ""))
-            end
+if defined?(MiniTest::Unit)
+  module MiniTest
+    class Unit
+      class TestCase
+        alias_method :run_before_shoulda_runner, :run
+        
+        def run runner
+          result = run_before_shoulda_runner(runner)
+          if result == '.'
+            Color.green(name.gsub(/test: /, "")) + "\n"
+          else
+            Color.red(name.gsub(/test: /, "")) + "\n"
           end
+        end
+      end
+    end
+  end
+else
+  require 'test/unit/ui/console/testrunner'
+
+  module Test
+    module Unit
+      module UI
+        module Console
+          class TestRunner
+            def test_finished(name)
+              if is_fault?(name)
+                puts Color.red(name.gsub(/test: /, ""))
+              else
+                puts Color.green(name.to_s.gsub(/test: /, ""))
+              end
+            end
           
-          def is_fault?(name)
-            !_faults_by_name[name].nil?
-          end
+            def is_fault?(name)
+              !_faults_by_name[name].nil?
+            end
           
-          def _faults_by_name
-            @_faults_by_name ||= {}
-          end
+            def _faults_by_name
+              @_faults_by_name ||= {}
+            end
           
-          def add_fault(fault)
-            @faults << fault
-            _faults_by_name[fault.test_name] = fault
+            def add_fault(fault)
+              @faults << fault
+              _faults_by_name[fault.test_name] = fault
+            end
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shoulda-addons
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Mathias Meyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-17 00:00:00 +02:00
+date: 2009-10-18 00:00:00 +02:00
 default_executable: 
 dependencies: []