jferris-mocha 0.9.5.0.1241126838 → 0.9.7.0.1247796736

data/RELEASE

@@ -1,3 +1,21 @@
+= 0.9.7 (80d816f250dc13aaf856f3f9cbd97ebe9c371839)
+* Although I had provided a deprecation warning for people using Mocha::Standalone, I had assumed people wouldn't be explicitly loading the mocha/standalone.rb file. It turns out this assumption was incorrect at least in the case of Rspec. This is now fixed.
+
+= 0.9.6 (57f8f77d715b7f1d9efee2e1a9438f7905c0006b)
+* Version 2.0.1 of the test-unit gem introduced a private 'run_test' method on TestCase which clashed with the public TestRunner#run_test method. So this latter method has been renamed to 'run_as_test'.
+* Stop requiring rubygems - this should be an environmental choice for the user. http://gist.github.com/54177 - describes why requiring rubygems in your library code is a bad idea.
+* It seems like overkill to vendorize coderay and meta_project when they're only needed to generate the examples for documentation and for publishing files on RubyForge. So I'm removing them and installing them locally as gems when I need them.
+* Added support for 'test-unit' gem (version >= 2.0). Note that as with other versions of Test::Unit I'm completely replacing the TestCase#run method. Unfortunately in version 2.0.0 this method differs slightly from the same method in version 2.0.1 & 2.0.2, so we have to provide different implementations to ensure that the internal working of Test::Unit are not compromised by Mocha. Note also that unless the 'test-unit' gem is loaded, requiring 'test/unit' leads to a mixture of stdlib and gem classes being loaded causing errors. To avoid a dependency on rubygems, the gem is loaded only if MOCHA_OPTIONS is set to 'use_test_unit_gem' - this option is only intended for use in running Mocha's own tests. It might be worthwhile to create a shim gem like minitest_tu_shim to allow the test-unit gem to completely replace the stdlib, but that's a job for another day. The changes in the Rakefile are to make the default task run with the 'test-unit' gem (version >= 2.0).
+* Renamed Mocha::Standalone to Mocha::API to better reflect its purpose. Added a deprecation warning for those who are referencing Mocha::Standalone.
+* Fix exception raised by HasEntry#matches? if first param is not a Hash (thanks to Taylor Barstow).
+* Ken Collins reported [1] that Mocha is always loading MiniTest if it is available and loading it causes some Rails/ActionPack tests to break. I've removed the loading of MiniTest, but this now means the user has to ensure that if they want to use MiniTest in conjunction with Mocha, he must load MiniTest before loading Mocha. [1] http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/2060
+* Implemented Bacon integration (thanks to Ubiratan Pires Alberton), but this was then removed after deciding only to maintain integration with Test::Unit and MiniTest which are both Ruby standard libraries. See mailing list for details.
+* Don't monkey-patch MiniTest if it's already been monkey-patched by Mocha.
+* Fixed bug: MiniTest integration was counting ExpectationErrors as errors not failures. http://floehopper.lighthouseapp.com/projects/22289-mocha/tickets/41.
+* Fixed bug: Some Bacon tests were failing in Ruby 1.9.1. http://floehopper.lighthouseapp.com/projects/22289-mocha/tickets/43.
+* Chad Humphries pointed out that in Ruby 1.9.1, if you are not using Test::Unit or MiniTest, Mocha will attempt to load and monkey-patch Test::Unit. Mocha will now only monkey-patch Test::Unit and/or MiniTest if they have already been loaded. MiniTest tests will now run in both Ruby 1.8.6 (with MiniTest gem) and in Ruby 1.9.1 (with MiniTest std lib). See Ligthouse ticket - http://floehopper.lighthouseapp.com/projects/22289/tickets/49.
+* Made Mocha compatible with minitest 1.4.0 and above (thanks to Denis Defreyne).
+
 = 0.9.5 (93cad010345ce5d68f31422cfc32ed9dd6de13ec)
 * Fixed Lighthouse bug #32 - stub_everything should mean mock responds to anything.
 * Added Expectation#twice to improve readability. Thanks to pull request from Celestino Gomes.

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 require 'rake/testtask'
 
 module Mocha
-  VERSION = "0.9.5"
+  VERSION = "0.9.7"
 end
 
 desc "Run all tests"

data/lib/mocha.rb

@@ -1,69 +1,3 @@
 require 'mocha_standalone'
 require 'mocha/configuration'
-
-if defined?(MiniTest::Unit::TestCase) && !MiniTest::Unit::TestCase.ancestors.include?(Mocha::API)
-  require 'mocha/integration/mini_test'
-
-  module MiniTest
-    class Unit
-      class TestCase
-        
-        include Mocha::API
-        
-        alias_method :run_before_mocha, :run
-        remove_method :run
-        
-        include Mocha::Integration::MiniTest::Version131AndAbove
-        
-      end
-    end
-  end
-end
-
-if defined?(Bacon) && Bacon::VERSION >= "1.1" && defined?(Bacon::Context) && !Bacon::Context.ancestors.include?(Mocha::API)
-
-  require 'mocha/integration/bacon'
-
-  module Bacon
-    class Context
-      include Mocha::API
-      include Mocha::Integration::Bacon::Version11AndAbove
-    end
-  end
-
-end
-
-require 'test/unit/testcase'
-require 'mocha/integration/test_unit'
-
-unless Test::Unit::TestCase.ancestors.include?(Mocha::API)
-  module Test
-    module Unit
-      class TestCase
-        
-        include Mocha::API
-        
-        alias_method :run_before_mocha, :run
-        remove_method :run
-        
-        test_unit_version = begin
-          require 'test/unit/version'
-          Test::Unit::VERSION
-        rescue LoadError
-          '1.x'
-        end
-
-        if test_unit_version == '2.0.0'
-          include Mocha::Integration::TestUnit::GemVersion200
-        elsif test_unit_version >= '2.0.1'
-          include Mocha::Integration::TestUnit::GemVersion201AndAbove
-        elsif RUBY_VERSION < '1.8.6'
-          include Mocha::Integration::TestUnit::RubyVersion185AndBelow
-        else
-          include Mocha::Integration::TestUnit::RubyVersion186AndAbove
-        end
-        
-      end
-    end
-  end
-end
+require 'mocha/integration'

data/lib/mocha/any_instance_method.rb

@@ -25,7 +25,11 @@ module Mocha
     end
 
     def define_new_method
-      stubbee.class_eval("def #{method}(*args, &block); self.class.any_instance.mocha.method_missing(:#{method}, *args, &block); end", __FILE__, __LINE__)
+      stubbee.class_eval(%{
+        def #{method}(*args, &block)
+          self.class.any_instance.mocha.method_missing(:#{method}, *args, &block)
+        end
+      }, __FILE__, __LINE__)
     end
 
     def remove_new_method

data/lib/mocha/class_method.rb

@@ -37,7 +37,11 @@ module Mocha
     end
   
     def define_new_method
-      stubbee.__metaclass__.class_eval("def #{method}(*args, &block); mocha.method_missing(:#{method}, *args, &block); end", __FILE__, __LINE__)
+      stubbee.__metaclass__.class_eval(%{
+        def #{method}(*args, &block)
+          mocha.method_missing(:#{method}, *args, &block)
+        end
+      }, __FILE__, __LINE__)
     end
   
     def remove_new_method

data/lib/mocha/integration.rb

@@ -0,0 +1,38 @@
+module Mocha
+  
+  module Integration
+    
+    class << self
+    
+      def monkey_patches
+        patches = []
+        if test_unit_testcase_defined? && !test_unit_testcase_inherits_from_miniunit_testcase?
+          patches << 'mocha/integration/test_unit'
+        end
+        if mini_unit_testcase_defined?
+          patches << 'mocha/integration/mini_test'
+        end
+        patches
+      end
+      
+      def test_unit_testcase_defined?
+        defined?(Test) && defined?(Test::Unit) && defined?(Test::Unit::TestCase)
+      end
+      
+      def mini_unit_testcase_defined?
+        defined?(MiniTest) && defined?(MiniTest::Unit) && defined?(MiniTest::Unit::TestCase)
+      end
+      
+      def test_unit_testcase_inherits_from_miniunit_testcase?
+        test_unit_testcase_defined? && mini_unit_testcase_defined? && Test::Unit::TestCase.ancestors.include?(MiniTest::Unit::TestCase)
+      end
+      
+    end
+    
+  end
+  
+end
+
+Mocha::Integration.monkey_patches.each do |patch|
+  require patch
+end

data/lib/mocha/integration/mini_test.rb

@@ -1 +1,21 @@
-require 'mocha/integration/mini_test/version_131_and_above'
+require 'mocha/api'
+
+if !MiniTest::Unit::TestCase.ancestors.include?(Mocha::API)
+  
+  require 'mocha/integration/mini_test/version_131_and_above'
+  
+  module MiniTest
+    class Unit
+      class TestCase
+        
+        include Mocha::API
+        
+        alias_method :run_before_mocha, :run
+        remove_method :run
+        
+        include Mocha::Integration::MiniTest::Version131AndAbove
+        
+      end
+    end
+  end
+end

data/lib/mocha/integration/mini_test/version_131_and_above.rb

@@ -18,21 +18,22 @@ module Mocha
         def run runner
           assertion_counter = AssertionCounter.new(self)
           result = '.'
+          name = (self.respond_to?(:name) ? self.name : self.__name__)
           begin
             begin
               @passed = nil
               self.setup
-              self.__send__ self.name
+              self.__send__ name
               mocha_verify(assertion_counter)
               @passed = true
             rescue Exception => e
               @passed = false
-              result = runner.puke(self.class, self.name, Mocha::Integration::MiniTest.translate(e))
+              result = runner.puke(self.class, name, Mocha::Integration::MiniTest.translate(e))
             ensure
               begin
                 self.teardown
               rescue Exception => e
-                result = runner.puke(self.class, self.name, Mocha::Integration::MiniTest.translate(e))
+                result = runner.puke(self.class, name, Mocha::Integration::MiniTest.translate(e))
               end
             end
           ensure

data/lib/mocha/integration/test_unit.rb

@@ -1,4 +1,40 @@
-require 'mocha/integration/test_unit/gem_version_200'
-require 'mocha/integration/test_unit/gem_version_201_and_above'
-require 'mocha/integration/test_unit/ruby_version_185_and_below'
-require 'mocha/integration/test_unit/ruby_version_186_and_above'
+require 'mocha/api'
+
+if !Test::Unit::TestCase.ancestors.include?(Mocha::API)
+ 
+  require 'mocha/integration/test_unit/gem_version_200'
+  require 'mocha/integration/test_unit/gem_version_201_and_above'
+  require 'mocha/integration/test_unit/ruby_version_185_and_below'
+  require 'mocha/integration/test_unit/ruby_version_186_and_above'
+  
+  module Test
+    module Unit
+      class TestCase
+        
+        include Mocha::API
+        
+        alias_method :run_before_mocha, :run
+        remove_method :run
+        
+        test_unit_version = begin
+          require 'test/unit/version'
+          Test::Unit::VERSION
+        rescue LoadError
+          '1.x'
+        end
+
+        if test_unit_version == '2.0.0'
+          include Mocha::Integration::TestUnit::GemVersion200
+        elsif test_unit_version >= '2.0.1'
+          include Mocha::Integration::TestUnit::GemVersion201AndAbove
+        elsif RUBY_VERSION < '1.8.6'
+          include Mocha::Integration::TestUnit::RubyVersion185AndBelow
+        else
+          include Mocha::Integration::TestUnit::RubyVersion186AndAbove
+        end
+        
+      end
+    end
+  end
+  
+end

data/lib/mocha/standalone.rb

@@ -0,0 +1 @@
+require 'mocha/api'

data/test/acceptance/minitest_test.rb

@@ -1,15 +1,22 @@
 require File.join(File.dirname(__FILE__), "acceptance_test_helper")
 
+begin
+  require 'rubygems'
+  gem 'minitest'
+rescue Gem::LoadError
+  # MiniTest gem not available
+end
+
 begin
   require 'minitest/unit'
 rescue LoadError
   # MiniTest not available
 end
 
-# force load so that MiniTest is suitably monkey-patched
-load 'mocha.rb'
-
 if defined?(MiniTest)
+  
+  # monkey-patch MiniTest now that it has hopefully been loaded
+  require 'mocha/integration/mini_test'
 
   class MiniTestSampleTest < MiniTest::Unit::TestCase
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jferris-mocha
 version: !ruby/object:Gem::Version 
-  version: 0.9.5.0.1241126838
+  version: 0.9.7.0.1247796736
 platform: ruby
 authors: 
 - James Mead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-29 21:00:00 -07:00
+date: 2009-07-15 21:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,9 +49,6 @@ files:
 - lib/mocha/in_state_ordering_constraint.rb
 - lib/mocha/inspect.rb
 - lib/mocha/instance_method.rb
-- lib/mocha/integration/bacon/assertion_counter.rb
-- lib/mocha/integration/bacon/version_11_and_above.rb
-- lib/mocha/integration/bacon.rb
 - lib/mocha/integration/mini_test/assertion_counter.rb
 - lib/mocha/integration/mini_test/version_131_and_above.rb
 - lib/mocha/integration/mini_test.rb
@@ -61,6 +58,7 @@ files:
 - lib/mocha/integration/test_unit/ruby_version_185_and_below.rb
 - lib/mocha/integration/test_unit/ruby_version_186_and_above.rb
 - lib/mocha/integration/test_unit.rb
+- lib/mocha/integration.rb
 - lib/mocha/invocation.rb
 - lib/mocha/is_a.rb
 - lib/mocha/logger.rb
@@ -100,6 +98,7 @@ files:
 - lib/mocha/sequence.rb
 - lib/mocha/single_return_value.rb
 - lib/mocha/single_yield.rb
+- lib/mocha/standalone.rb
 - lib/mocha/state_machine.rb
 - lib/mocha/stubbing_error.rb
 - lib/mocha/unexpected_invocation.rb
@@ -109,8 +108,6 @@ files:
 - lib/stubba.rb
 - test/acceptance/acceptance_test_helper.rb
 - test/acceptance/api_test.rb
-- test/acceptance/bacon_spec.rb
-- test/acceptance/bacon_test.rb
 - test/acceptance/bug_18914_test.rb
 - test/acceptance/bug_21465_test.rb
 - test/acceptance/bug_21563_test.rb

data/lib/mocha/integration/bacon.rb

@@ -1 +0,0 @@
-require 'mocha/integration/bacon/version_11_and_above.rb'

data/lib/mocha/integration/bacon/assertion_counter.rb

@@ -1,23 +0,0 @@
-module Mocha
-
-  module Integration
-
-    module Bacon
-
-      class AssertionCounter
-
-        def initialize(counter)
-          @counter = counter
-        end
-
-        def increment
-          @counter[:requirements] += 1
-        end
-
-      end
-
-    end
-
-  end
-
-end

data/lib/mocha/integration/bacon/version_11_and_above.rb

@@ -1,34 +0,0 @@
-require 'mocha/integration/bacon/assertion_counter'
-
-module Mocha
-
-  module Integration
-
-    module Bacon
-
-      module Version11AndAbove
-
-        def self.included(base)
-
-          base.class_eval do
-            alias :it_before_bacon :it
-            def it(description)
-              it_before_bacon(description) do
-                assertion_counter = ::Mocha::Integration::Bacon::AssertionCounter.new(::Bacon::Counter)
-                mocha_setup
-                yield
-                mocha_verify(assertion_counter)
-                mocha_teardown
-              end
-            end
-          end
-
-        end
-
-      end
-
-    end
-
-  end
-
-end

data/test/acceptance/bacon_spec.rb

@@ -1,67 +0,0 @@
-# This is not meant to be run by itself. It will be run by bacon_test.rb
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib"))
-require 'bacon'
-require 'mocha'
-
-module MetaTestOutput
-  def handle_specification(name)
-    yield
-  end
-
-  def handle_requirement(description)
-    yield
-  end
-
-  def handle_summary
-    puts
-    puts Bacon::ErrorLog  if Bacon::Backtraces
-    puts "%d tests, %d assertions, %d failures, %d errors" %
-      Bacon::Counter.values_at(:specifications, :requirements, :failed, :errors)
-  end
-
-end
-
-Bacon.extend MetaTestOutput
-Bacon.summary_on_exit
-
-describe "Bacon specs using Mocha" do
-  should "pass when all expectations were fulfilled" do
-    mockee = mock()
-    mockee.expects(:blah)
-    mockee.blah
-  end
-
-  should "fail when not all expectations were fulfilled" do
-    mockee = mock()
-    mockee.expects(:blah)
-  end
-
-  should "fail when there is an unexpected invocation" do
-    mockee = mock()
-    mockee.blah
-  end
-
-  should "pass when they receive all expected parameters" do
-    mockee = mock()
-    mockee.expects(:blah).with(has_key(:wibble))
-    mockee.blah(:wibble => 1)
-  end
-
-  should "fail when they receive unexpected parameters" do
-    mockee = mock()
-    mockee.expects(:blah).with(has_key(:wibble))
-    mockee.blah(:wobble => 2)
-  end
-
-  should "pass when all Stubba expectations are fulfilled" do
-    stubbee = Class.new { define_method(:blah) {} }.new
-    stubbee.expects(:blah)
-    stubbee.blah
-  end
-
-  should "fail when not all Stubba expectations were fulfilled" do
-    stubbee = Class.new { define_method(:blah) {} }.new
-    stubbee.expects(:blah)
-  end
-
-end

data/test/acceptance/bacon_test.rb

@@ -1,110 +0,0 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
-
-begin
-  require 'bacon'
-rescue LoadError
-  # Bacon not available
-end
-
-if defined?(Bacon) && Bacon::VERSION >= "1.1"
-
-  class BaconRunner
-
-    attr_reader :output, :tests, :assertions, :failures, :errors
-
-    def initialize(*paths)
-      @paths = paths
-    end
-
-    def run(name)
-      @output = `bacon -n '#{name}' #{@paths.join(' ')}`
-      numbers = @output.scan(/(\d+) tests, (\d+) assertions, (\d+) failures, (\d+) errors/)
-      numbers.flatten!.map!{|e| e.to_i}
-
-      @tests = numbers[0]
-      @assertions = numbers[1]
-      @failures = numbers[2]
-      @errors = numbers[3]
-    end
-
-  end
-
-  class BaconTest < Test::Unit::TestCase
-
-    def setup
-      @runner = BaconRunner.new("#{File.dirname(__FILE__)}/bacon_spec.rb")
-    end
-
-    def test_should_pass_mocha_test
-
-      @runner.run('should pass when all expectations were fulfilled')
-
-      assert_equal 0, @runner.errors
-      assert_equal 1, @runner.tests
-    end
-
-    def test_should_fail_mocha_test_due_to_unfulfilled_expectation
-
-      @runner.run('should fail when not all expectations were fulfilled')
-
-      assert_equal 1, @runner.errors
-      assert_equal 1, @runner.tests
-      assert_not_all_expectation_were_satisfied(@runner.output)
-
-    end
-
-    def test_should_fail_mocha_test_due_to_unexpected_invocation
-      @runner.run('should fail when there is an unexpected invocation')
-      
-      assert_equal 1, @runner.errors
-      assert_equal 1, @runner.tests
-      assert_unexpected_invocation(@runner.output)
-    end
-
-  
-    def test_should_pass_stubba_test
-      @runner.run('should pass when all Stubba expectations are fulfilled')
-    
-      assert_equal 0, @runner.errors
-      assert_equal 1, @runner.tests
-    end
-  
-    def test_should_fail_stubba_test_due_to_unfulfilled_expectation
-      @runner.run('should fail when not all Stubba expectations were fulfilled')
-
-      assert_equal 1, @runner.errors
-      assert_equal 1, @runner.tests
-      assert_not_all_expectation_were_satisfied(@runner.output)
-    end
-  
-    def test_should_pass_mocha_test_with_matching_parameter
-      @runner.run('should pass when they receive all expected parameters')
-
-      assert_equal 0, @runner.errors
-      assert_equal 1, @runner.tests
-    end
-  
-    def test_should_fail_mocha_test_with_non_matching_parameter
-      @runner.run('should fail when they receive unexpected parameters')
-
-      assert_equal 1, @runner.errors
-      assert_equal 1, @runner.tests
-      assert_unexpected_invocation(@runner.output)
-    end
-
-    private
-
-    def assert_unexpected_invocation(string)
-      assert_match Regexp.new('unexpected invocation'), string, "Bacon output:\n#{string}"
-    end
-
-    def assert_not_all_expectation_were_satisfied(string)
-      assert_match Regexp.new('not all expectations were satisfied'), string, "Bacon output:\n#{string}"
-    end
-
-  end
-
-else
-  warn "Bacon is not available, so BaconTest has not been run."
-end
-