mocha 0.10.0 → 0.10.1

data/README.rdoc

@@ -12,12 +12,26 @@ Mocha was harvested from projects at {Reevoo}[http://www.reevoo.com/] by me ({Ja
 
 https://secure.travis-ci.org/floehopper/mocha.png
 
-== Download and Installation
+== Installation
 
-Install the gem with the following command...
+Install the latest version of the gem with the following command...
 
   $ gem install mocha
 
+Note that if you are intending to use Mocha with Test::Unit or MiniTest, you should only load Mocha *after* loading the relevant test library...
+
+  require "test/unit"
+  require "mocha"
+
+If you're using Bundler, ensure the correct load order by not auto-requiring Mocha in the Gemfile and then later load it once you know the test library has been loaded...
+
+  # Gemfile
+  gem "mocha", :require => false
+
+  # Elsewhere after Bundler has loaded gems
+  require "test/unit"
+  require "mocha"
+
 Or install the {Rails}[http://www.rubyonrails.org/] plugin...
 
   $ script/plugin install git://github.com/floehopper/mocha.git
@@ -40,4 +54,4 @@ Or download Mocha...
 
 Copyright Revieworld Ltd. 2006
 
-You may use, copy and redistribute this library under the same terms as {Ruby itself}[http://www.ruby-lang.org/en/LICENSE.txt] or under the {MIT license}[http://mocha.rubyforge.org/files/MIT-LICENSE.html].
+You may use, copy and redistribute this library under the same terms as {Ruby itself}[http://www.ruby-lang.org/en/LICENSE.txt] or under the {MIT license}[http://mocha.rubyforge.org/files/MIT-LICENSE.html].

data/RELEASE.rdoc

@@ -1,4 +1,14 @@
-= 0.10.0 ()
+= 0.10.1 ()
+* Merge pull request #51 from meineerde/issues/50-minitest-2.10.0. Use Gem::Requirement & Gem::Version for version comparison. Fixes issue #50. Thanks to meineerde.
+* Fixed typo in rdoc for Mocha::ObjectMethods.
+* Improve README as suggested in issue #46. Explain that Mocha must be loaded after test libraries and how to achieve this using Bundler.
+* Merge pull request #43 - nobody expects the spanish inquisition! Thanks to cairo140.
+* Fix for issue #39 - improve documentation for Expectation#multiple_yields.
+* Fix for issue #38 where a subtle change in test-unit v2.3.0 had been missed - only visible in verbose mode.
+* Support for MiniTest up to v2.6.2 has been verified.
+* Add explicit development dependency on coderay for generating syntax-highlighted code examples.
+
+= 0.10.0 (68a4a59e1af74baf3929af418f73f5627bba548d)
 * Add Expectation#throws to allow a stubbed method to use Kernel#throw.
 * Updates for versions of Test::Unit up to and including v2.3.3 (including patch by Jens Fahnenbruck).
 * Updates for versions of MiniTest up to and including v2.5.1.

data/lib/mocha/expectation.rb

@@ -230,6 +230,9 @@ module Mocha # :nodoc:
     # :call-seq: multiple_yields(*parameter_groups) -> expectation
     #
     # Modifies expectation so that when the expected method is called, it yields multiple times per invocation with the specified +parameter_groups+.
+    #
+    # Note that each +parameter_group+ should be an Array representing the parameters to be passed to the block for a single yield. In the following example when the expected_method is called, the stub will invoke the block twice, the first time it passes 'result_1', 'result_2' as the parameters, and the second time it passes 'result_3' as the parameters.
+    #
     #   object = mock()
     #   object.expects(:expected_method).multiple_yields(['result_1', 'result_2'], ['result_3'])
     #   yielded_values = []

data/lib/mocha/integration/mini_test.rb

@@ -10,7 +10,7 @@ if !MiniTest::Unit::TestCase.ancestors.include?(Mocha::API)
   require 'mocha/integration/mini_test/version_142_to_172'
   require 'mocha/integration/mini_test/version_200'
   require 'mocha/integration/mini_test/version_201_to_222'
-  require 'mocha/integration/mini_test/version_230_to_251'
+  require 'mocha/integration/mini_test/version_230_to_262'
 
   module MiniTest
     class Unit
@@ -22,30 +22,28 @@ if !MiniTest::Unit::TestCase.ancestors.include?(Mocha::API)
         remove_method :run
 
         mini_test_version = begin
-          MiniTest::Unit::VERSION
+          Gem::Version.new(MiniTest::Unit::VERSION)
         rescue LoadError
-          'unknown'
+          Gem::Version.new('0.0.0')
         end
 
         $stderr.puts "Detected MiniTest version: #{mini_test_version}" if $options['debug']
 
-        if (mini_test_version >= '1.3.0') && (mini_test_version <= '1.3.1')
+        if Gem::Requirement.new('>= 1.3.0', '<= 1.3.1') =~ mini_test_version
           include Mocha::Integration::MiniTest::Version13
-        elsif (mini_test_version == '1.4.0')
+        elsif Gem::Requirement.new('1.4.0') =~ mini_test_version
           include Mocha::Integration::MiniTest::Version140
-        elsif (mini_test_version == '1.4.1')
+        elsif Gem::Requirement.new('1.4.1') =~ mini_test_version
           include Mocha::Integration::MiniTest::Version141
-        elsif (mini_test_version >= '1.4.2') && (mini_test_version <= '1.7.2')
+        elsif Gem::Requirement.new('>= 1.4.2', '<= 1.7.2') =~ mini_test_version
           include Mocha::Integration::MiniTest::Version142To172
-        elsif (mini_test_version == '2.0.0')
+        elsif Gem::Requirement.new('2.0.0') =~ mini_test_version
           include Mocha::Integration::MiniTest::Version200
-        elsif (mini_test_version >= '2.0.1') && (mini_test_version <= '2.2.2')
+        elsif Gem::Requirement.new('>= 2.0.1', '<= 2.2.2') =~ mini_test_version
           include Mocha::Integration::MiniTest::Version201To222
-        elsif (mini_test_version >= '2.3.0') && (mini_test_version <= '2.5.1')
-          include Mocha::Integration::MiniTest::Version230To251
-        elsif (mini_test_version > '2.5.1')
-          $stderr.puts "*** MiniTest integration has not been verified but patching anyway ***" if $options['debug']
-          include Mocha::Integration::MiniTest::Version230To251
+        elsif Gem::Requirement.new('>= 2.3.0') =~ mini_test_version
+          $stderr.puts "*** MiniTest integration has not been verified but patching anyway ***" if (Gem::Requirement.new('> 2.6.2') =~ mini_test_version) && $options['debug']
+          include Mocha::Integration::MiniTest::Version230To262
         else
           $stderr.puts "*** No Mocha integration for MiniTest version ***" if $options['debug']
         end

data/lib/mocha/integration/mini_test/{version_230_to_251.rb → version_230_to_262.rb}

@@ -7,9 +7,9 @@ module Mocha
 
     module MiniTest
 
-      module Version230To251
+      module Version230To262
         def self.included(mod)
-          $stderr.puts "Monkey patching MiniTest >= v2.3.0 <= v2.5.1" if $options['debug']
+          $stderr.puts "Monkey patching MiniTest >= v2.3.0 <= v2.6.2" if $options['debug']
         end
         def run runner
           trap 'INFO' do

data/lib/mocha/integration/test_unit.rb

@@ -6,7 +6,7 @@ if !Test::Unit::TestCase.ancestors.include?(Mocha::API)
   require 'mocha/integration/test_unit/gem_version_200'
   require 'mocha/integration/test_unit/gem_version_201_to_202'
   require 'mocha/integration/test_unit/gem_version_203_to_220'
-  require 'mocha/integration/test_unit/gem_version_230_to_233'
+  require 'mocha/integration/test_unit/gem_version_230_to_240'
   require 'mocha/integration/test_unit/ruby_version_185_and_below'
   require 'mocha/integration/test_unit/ruby_version_186_and_above'
 
@@ -21,9 +21,9 @@ if !Test::Unit::TestCase.ancestors.include?(Mocha::API)
 
         test_unit_version = begin
           load 'test/unit/version.rb'
-          Test::Unit::VERSION
+          Gem::Version.new(Test::Unit::VERSION)
         rescue LoadError
-          '1.x'
+          Gem::Version.new('1.x')
         end
 
         if $options['debug']
@@ -31,23 +31,21 @@ if !Test::Unit::TestCase.ancestors.include?(Mocha::API)
           $stderr.puts "Detected Test::Unit version: #{test_unit_version}"
         end
 
-        if (test_unit_version == '1.x') || (test_unit_version == '1.2.3')
+        if (test_unit_version == Gem::Version.new('1.x')) || (test_unit_version == Gem::Version.new('1.2.3'))
           if RUBY_VERSION < '1.8.6'
             include Mocha::Integration::TestUnit::RubyVersion185AndBelow
           else
             include Mocha::Integration::TestUnit::RubyVersion186AndAbove
           end
-        elsif (test_unit_version == '2.0.0')
+        elsif Gem::Requirement.new('2.0.0') =~ test_unit_version
           include Mocha::Integration::TestUnit::GemVersion200
-        elsif (test_unit_version >= '2.0.1') && (test_unit_version <= '2.0.2')
+        elsif Gem::Requirement.new('>= 2.0.1', '<= 2.0.2') =~ test_unit_version
           include Mocha::Integration::TestUnit::GemVersion201To202
-        elsif (test_unit_version >= '2.0.3') && (test_unit_version <= '2.2.0')
+        elsif Gem::Requirement.new('>= 2.0.3', '<= 2.2.0') =~ test_unit_version
           include Mocha::Integration::TestUnit::GemVersion203To220
-        elsif (test_unit_version >= '2.3.0') && (test_unit_version <= '2.3.3')
-          include Mocha::Integration::TestUnit::GemVersion230To233
-        elsif (test_unit_version > '2.3.3')
-          $stderr.puts "*** Test::Unit integration has not been verified but patching anyway ***" if $options['debug']
-          include Mocha::Integration::TestUnit::GemVersion230To233
+        elsif Gem::Requirement.new('>= 2.3.0') =~ test_unit_version
+          $stderr.puts "*** Test::Unit integration has not been verified but patching anyway ***" if (Gem::Requirement.new('> 2.4.0') =~ test_unit_version) && $options['debug']
+          include Mocha::Integration::TestUnit::GemVersion230To240
         else
           $stderr.puts "*** No Mocha integration for Test::Unit version ***" if $options['debug']
         end

data/lib/mocha/integration/test_unit/{gem_version_230_to_233.rb → gem_version_230_to_240.rb}

@@ -8,9 +8,9 @@ module Mocha
 
     module TestUnit
 
-      module GemVersion230To233
+      module GemVersion230To240
         def self.included(mod)
-          $stderr.puts "Monkey patching Test::Unit gem >= v2.3.0 and <= v2.3.3" if $options['debug']
+          $stderr.puts "Monkey patching Test::Unit gem >= v2.3.0 and <= v2.4.0" if $options['debug']
         end
         def run(result)
           assertion_counter = AssertionCounter.new(result)
@@ -18,7 +18,7 @@ module Mocha
             @internal_data.test_started
             @_result = result
             yield(Test::Unit::TestCase::STARTED, name)
-            yield(Test::Unit::TestCase::STARTED_OBJECT, name)
+            yield(Test::Unit::TestCase::STARTED_OBJECT, self)
             begin
               begin
                 run_setup
@@ -44,7 +44,7 @@ module Mocha
             @internal_data.test_finished
             result.add_run
             yield(Test::Unit::TestCase::FINISHED, name)
-            yield(Test::Unit::TestCase::FINISHED_OBJECT, name)
+            yield(Test::Unit::TestCase::FINISHED_OBJECT, self)
           ensure
             # @_result = nil # For test-spec's after_all :<
           end

data/lib/mocha/object.rb

@@ -7,7 +7,7 @@ require 'mocha/argument_iterator'
 
 module Mocha
   
-  # Methods added all objects to allow mocking and stubbing on real objects.
+  # Methods added to all objects to allow mocking and stubbing on real objects.
   #
   # Methods return a Mocha::Expectation which can be further modified by methods on Mocha::Expectation.
   module ObjectMethods
@@ -51,6 +51,9 @@ module Mocha
     #   product.expects(:valid?).returns(true)
     #   product.expects(:save).returns(true)
     def expects(method_name_or_hash)
+      if method_name_or_hash.to_s =~ /the[^a-z]*spanish[^a-z]*inquisition/i
+        raise Mocha::ExpectationError.new('NOBODY EXPECTS THE SPANISH INQUISITION!')
+      end
       expectation = nil
       mockery = Mocha::Mockery.instance
       iterator = ArgumentIterator.new(method_name_or_hash)

data/lib/mocha/version.rb

@@ -1,3 +1,3 @@
 module Mocha
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/mocha.gemspec

@@ -29,15 +29,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency("rake", ">= 0")
       s.add_development_dependency("introspection", "~> 0.0.1")
-      s.add_development_dependency("rdoc", "~> 2.4.2")
+      s.add_development_dependency("rdoc", "~> 3.1")
+      s.add_development_dependency("coderay", "~> 0.1")
     else
       s.add_dependency("rake", ">= 0")
       s.add_dependency("introspection", "~> 0.0.1")
-      s.add_dependency("rdoc", "~> 2.4.2")
+      s.add_dependency("rdoc", "~> 3.1")
+      s.add_dependency("coderay", "~> 0.1")
     end
   else
     s.add_dependency("rake", ">= 0")
     s.add_dependency("introspection", "~> 0.0.1")
-    s.add_dependency("rdoc", "~> 2.4.2")
+    s.add_dependency("rdoc", "~> 3.1")
+    s.add_dependency("coderay", "~> 0.1")
   end
 end

data/test/unit/object_test.rb

@@ -78,5 +78,10 @@ class ObjectTest < Test::Unit::TestCase
     any_instance = Class::AnyInstance.new(klass)
     assert_equal klass, any_instance.stubba_object
   end
+
+  def test_nobody_expects_the_spanish_inquisition
+    object = Object.new
+    assert_raise(Mocha::ExpectationError) { object.expects(:the_spanish_inquisition) }
+  end
   
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mocha
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 10
-  - 0
-  version: 0.10.0
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - James Mead
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-05 00:00:00 Z
+date: 2012-01-16 00:00:00 +00:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -29,12 +31,12 @@ dependencies:
         - 0
         - 1
         version: 0.0.1
-  requirement: *id001
   type: :runtime
   name: metaclass
-  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,12 +45,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
   type: :development
   name: rake
-  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -59,26 +61,39 @@ dependencies:
         - 0
         - 1
         version: 0.0.1
-  requirement: *id003
   type: :development
   name: introspection
-  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 5
         segments: 
-        - 2
-        - 4
-        - 2
-        version: 2.4.2
-  requirement: *id004
+        - 3
+        - 1
+        version: "3.1"
   type: :development
   name: rdoc
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
+  type: :development
+  name: coderay
+  version_requirements: *id005
 description: Mocking and stubbing library with JMock/SchMock syntax, which allows mocking and stubbing of methods on real (non-mock) classes.
 email: mocha-developer@googlegroups.com
 executables: []
@@ -140,13 +155,13 @@ files:
 - lib/mocha/integration/mini_test/version_142_to_172.rb
 - lib/mocha/integration/mini_test/version_200.rb
 - lib/mocha/integration/mini_test/version_201_to_222.rb
-- lib/mocha/integration/mini_test/version_230_to_251.rb
+- lib/mocha/integration/mini_test/version_230_to_262.rb
 - lib/mocha/integration/test_unit.rb
 - lib/mocha/integration/test_unit/assertion_counter.rb
 - lib/mocha/integration/test_unit/gem_version_200.rb
 - lib/mocha/integration/test_unit/gem_version_201_to_202.rb
 - lib/mocha/integration/test_unit/gem_version_203_to_220.rb
-- lib/mocha/integration/test_unit/gem_version_230_to_233.rb
+- lib/mocha/integration/test_unit/gem_version_230_to_240.rb
 - lib/mocha/integration/test_unit/ruby_version_185_and_below.rb
 - lib/mocha/integration/test_unit/ruby_version_186_and_above.rb
 - lib/mocha/is_a.rb
@@ -305,6 +320,7 @@ files:
 - test/unit/string_inspect_test.rb
 - test/unit/thrower_test.rb
 - test/unit/yield_parameters_test.rb
+has_rdoc: true
 homepage: http://mocha.rubyforge.org
 licenses: []
 
@@ -338,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mocha
-rubygems_version: 1.8.8
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Mocking and stubbing library