bourne 1.1.2 → 1.2.0

data/.gitignore

@@ -5,3 +5,5 @@ pkg
 tags
 rdoc
 *.gem
+Gemfile.lock
+.bundle

data/NEWS.md

@@ -0,0 +1,10 @@
+1.1.2 (2012-03-23)
+* Mention when a method is unstubbed
+* Compatible with Mocha 0.10.5
+
+1.1.1 (2012-03-04)
+* Exactly the same as 1.1.0, but built with 1.8.7 so people with 1.8.7 can
+  install the gem.
+
+1.1.0 (2012-02-24)
+* 1.9 compatible

data/bourne.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('mocha', '= 0.10.5')
+  s.add_dependency('mocha', '0.12.3') # follow instructions in mock.rb to update
 
   s.add_development_dependency('rake')
 end

data/lib/bourne/mock.rb

@@ -1,9 +1,13 @@
 require 'mocha/mock'
 require 'bourne/expectation'
+require 'mocha/expectation_error_factory'
 
 module Mocha # :nodoc:
-  # Overwrites #method_missing on Mocha::Mock so pass arguments to
-  # Mocha::Expectation#invoke so that an Invocation can be created.
+  # Overwrites #method_missing on Mocha::Mock
+  # - pass arguments to .invoke() calls to create Invocation
+  # - keep lowest else branch (bourne code)
+  # - update from https://github.com/freerange/mocha/blob/master/lib/mocha/mock.rb#L195
+  # - update test/unit/mock_test.rb
   class Mock # :nodoc:
     def method_missing(symbol, *arguments, &block)
       if @responder and not @responder.respond_to?(symbol)
@@ -16,7 +20,7 @@ module Mocha # :nodoc:
           matching_expectation.invoke(arguments, &block) if matching_expectation
           message = UnexpectedInvocation.new(self, symbol, *arguments).to_s
           message << @mockery.mocha_inspect
-          raise ExpectationError.new(message, caller)
+          raise ExpectationErrorFactory.build(message, caller)
         else
           target = if self.respond_to? :mocha
             self.mocha

data/lib/bourne/version.rb

@@ -1,3 +1,3 @@
 module Bourne
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/test/unit/mock_test.rb

@@ -1,3 +1,7 @@
+# to update:
+# - copy new code from https://raw.github.com/freerange/mocha/master/test/unit/mock_test.rb
+# - keep: require 'bourne/mock'
+# - keep: FakeExpectation test
 require File.expand_path('../../test_helper', __FILE__)
 require 'bourne/mock'
 require 'mocha/expectation_error'
@@ -9,18 +13,18 @@ class MockTest < Test::Unit::TestCase
   include Mocha
 
   def test_should_set_single_expectation
-   mock = build_mock
-   mock.expects(:method1).returns(1)
-   assert_nothing_raised(ExpectationError) do
-     assert_equal 1, mock.method1
-   end
+    mock = build_mock
+    mock.expects(:method1).returns(1)
+    assert_nothing_raised(ExpectationError) do
+      assert_equal 1, mock.method1
+    end
   end
 
   def test_should_build_and_store_expectations
-   mock = build_mock
-   expectation = mock.expects(:method1)
-   assert_not_nil expectation
-   assert_equal [expectation], mock.__expectations__.to_a
+    mock = build_mock
+    expectation = mock.expects(:method1)
+    assert_not_nil expectation
+    assert_equal [expectation], mock.__expectations__.to_a
   end
 
   def test_should_not_stub_everything_by_default

metadata

@@ -1,69 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bourne
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.2.0
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 2
-  version: 1.1.2
 platform: ruby
-authors: 
+authors:
 - Joe Ferris
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 10
-        - 5
-        version: 0.10.5
-  prerelease: false
-  requirement: *id001
+date: 2012-10-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mocha
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.3
+  type: :runtime
   prerelease: false
-  requirement: *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.3
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-description: |-
-  Extends mocha to allow detailed tracking and querying of
-      stub and mock invocations. Allows test spies using the have_received rspec
-      matcher and assert_received for Test::Unit. Extracted from the
-      jferris-mocha fork.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "Extends mocha to allow detailed tracking and querying of\n    stub
+  and mock invocations. Allows test spies using the have_received rspec\n    matcher
+  and assert_received for Test::Unit. Extracted from the\n    jferris-mocha fork."
 email: jferris@thoughtbot.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
 - LICENSE
+- NEWS.md
 - README.md
 - Rakefile
 - bourne.gemspec
@@ -93,38 +85,35 @@ files:
 - test/unit/mockery_test.rb
 homepage: http://github.com/thoughtbot/bourne
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1504688863187069383
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -1504688863187069383
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Adds test spies to mocha.
-test_files: 
+test_files:
 - test/acceptance/acceptance_test_helper.rb
 - test/acceptance/mocha_example_test.rb
 - test/acceptance/spy_test.rb