shoulda-addons 0.2.2 → 0.2.3

data/lib/shoulda_benchmark.rb

@@ -1,3 +1,5 @@
+require 'benchmark'
+
 module ShouldaAddons
   module MiniTest
     module Benchmark
@@ -47,6 +49,11 @@ module Test
       def self.method_added(name)
         return if @ignoring_added_methods
         
+        test_name = if respond_to?(:name)
+                      name
+                    elsif respond_to?(:__name__)
+                      __name__
+                    end
         @__instrumented_methods ||= {}
         return unless name.to_s.match(/^test:/) || @__instrumented_methods[name]
         @ignoring_added_methods = true
@@ -56,7 +63,7 @@ module Test
           runtime = Benchmark.realtime do
             send(" #{name}")
           end
-          Shoulda.runtimes[self.name] = runtime
+          Shoulda.runtimes[test_name] = runtime
         end
         @ignoring_added_methods = false
       end

data/lib/shoulda_list_runner.rb

@@ -1,10 +1,12 @@
-module Color
-  COLORS = { :clear => 0, :red => 31, :green => 32, :yellow => 33 }
-  def self.method_missing(color_name, *args)
-    color(color_name) + args.first + color(:clear) 
-  end
-  def self.color(color)
-    "\e[#{COLORS[color.to_sym]}m"
+module ShouldaAddons
+  module Color
+    @@colors = { :clear => 0, :red => 31, :green => 32, :yellow => 33 }
+    def self.method_missing(color_name, *args)
+      color(color_name) + args.first + color(:clear) 
+    end
+    def self.color(color)
+      "\e[#{@@colors[color.to_sym]}m"
+    end
   end
 end
 
@@ -15,11 +17,16 @@ if defined?(MiniTest::Unit)
         alias_method :run_before_shoulda_runner, :run
         
         def run runner
+          test_name = if respond_to?(:name)
+                        name
+                      elsif respond_to?(:__name__)
+                        __name__
+                      end
           result = run_before_shoulda_runner(runner)
           if result == '.'
-            Color.green(name.gsub(/test: /, "")) + "\n"
+            ShouldaAddons::Color.green(test_name.gsub(/test: /, "")) + "\n"
           else
-            Color.red(name.gsub(/test: /, "")) + "\n"
+            ShouldaAddons::Color.red(test_name.gsub(/test: /, "")) + "\n"
           end
         end
       end
@@ -42,9 +49,9 @@ else
                 end
               else
                 if is_fault?(name)
-                  output(Color.red(name.gsub(/test: /, "")))
+                  output(ShouldaAddons::Color.red(name.gsub(/test: /, "")))
                 else
-                  output(Color.green(name.to_s.gsub(/test: /, "")))
+                  output(ShouldaAddons::Color.green(name.to_s.gsub(/test: /, "")))
                 end
               end
             end
@@ -66,4 +73,4 @@ else
       end
     end
   end
-end
+end

data/test/shoulda_benchmark_minitest_test.rb

@@ -0,0 +1,27 @@
+unless RUBY_VERSION >= '1.9'
+  puts 'Meant to run on Ruby 1.9'
+  exit
+end
+
+puts 'Running test for Minitest on Ruby 1.9'
+
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'
+require File.dirname(__FILE__) + '/../lib/shoulda_benchmark'
+
+class ShouldaBenchmarkMinitestTest < Test::Unit::TestCase
+  context 'Vrooom, vroom' do
+    should 'be slow' do
+      sleep 0.2
+    end
+    
+    should 'be faster' do
+      sleep 0.1
+    end
+    
+    should 'be wicked fast' do
+      # first!
+    end
+  end
+end

data/test/shoulda_benchmark_test_unit_1x_test.rb

@@ -0,0 +1,22 @@
+puts 'Running test for Test::Unit 1.x'
+
+require 'test/unit'
+require 'rubygems'
+require 'shoulda'
+require File.dirname(__FILE__) + '/../lib/shoulda_benchmark'
+
+class ShouldaBenchmarkTestUnit1xTest < Test::Unit::TestCase
+  context 'Vrooom, vroom' do
+    should 'be slow' do
+      sleep 0.2
+    end
+    
+    should 'be faster' do
+      sleep 0.1
+    end
+    
+    should 'be wicked fast' do
+      # first!
+    end
+  end
+end

data/test/shoulda_benchmark_test_unit_2x_test.rb

@@ -0,0 +1,22 @@
+puts 'Running test for Test::Unit 2.x'
+
+require 'rubygems'
+gem 'test-unit'
+require 'shoulda'
+require File.dirname(__FILE__) + '/../lib/shoulda_benchmark'
+
+class ShouldaBenchmarkTestUnit2xTest < Test::Unit::TestCase
+  context 'Vrooom, vroom' do
+    should 'be slow' do
+      sleep 0.2
+    end
+    
+    should 'be faster' do
+      sleep 0.1
+    end
+    
+    should 'be wicked fast' do
+      # first!
+    end
+  end
+end

data/test/shoulda_list_runner_minitest_test.rb

@@ -0,0 +1,23 @@
+unless RUBY_VERSION >= '1.9'
+  puts 'Meant to run on Ruby 1.9'
+  exit
+end
+
+puts 'Running test for Minitest'
+
+require 'test/unit'
+require 'rubygems'
+require File.dirname(__FILE__) + '/../lib/shoulda_list_runner'
+require 'shoulda'
+
+class ShouldaBenchmarkTestUnit1xTest < Test::Unit::TestCase
+  context 'I' do
+    should 'be green' do
+      assert true
+    end
+    
+    should 'be red' do
+      assert false
+    end
+  end
+end

data/test/shoulda_list_runner_test_unit_1x_test.rb

@@ -0,0 +1,18 @@
+puts 'Running test for Test::Unit 1.x'
+
+require 'test/unit'
+require 'rubygems'
+require 'shoulda'
+require File.dirname(__FILE__) + '/../lib/shoulda_list_runner'
+
+class ShouldaBenchmarkTestUnit1xTest < Test::Unit::TestCase
+  context 'Vrooom, vroom' do
+    should 'be green' do
+      assert true
+    end
+    
+    should 'be red' do
+      assert false
+    end
+  end
+end

data/test/shoulda_list_runner_test_unit_2x_test.rb

@@ -0,0 +1,18 @@
+puts 'Running test for Test::Unit 2.x'
+
+require 'rubygems'
+gem 'test-unit'
+require File.dirname(__FILE__) + '/../lib/shoulda_list_runner'
+require 'shoulda'
+
+class ShouldaBenchmarkTestUnit1xTest < Test::Unit::TestCase
+  context 'I' do
+    should 'be green' do
+      assert true
+    end
+    
+    should 'be red' do
+      assert false
+    end
+  end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: shoulda-addons
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Mathias Meyer
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 +01:00
+date: 2010-11-28 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -26,33 +31,48 @@ files:
 - lib/shoulda_addons.rb
 - lib/shoulda_benchmark.rb
 - lib/shoulda_list_runner.rb
+- test/shoulda_benchmark_minitest_test.rb
+- test/shoulda_benchmark_test_unit_1x_test.rb
+- test/shoulda_benchmark_test_unit_2x_test.rb
+- test/shoulda_list_runner_minitest_test.rb
+- test/shoulda_list_runner_test_unit_1x_test.rb
+- test/shoulda_list_runner_test_unit_2x_test.rb
 has_rdoc: true
 homepage: http://github.com/mattmatt/shoulda-addons
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Neat addons for Shoulda, because Shoulda is neat.
-test_files: []
-
+test_files: 
+- test/shoulda_benchmark_minitest_test.rb
+- test/shoulda_benchmark_test_unit_1x_test.rb
+- test/shoulda_benchmark_test_unit_2x_test.rb
+- test/shoulda_list_runner_minitest_test.rb
+- test/shoulda_list_runner_test_unit_1x_test.rb
+- test/shoulda_list_runner_test_unit_2x_test.rb