muack 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23619481e2ad1d312e8b023d3643e777b11a0532
-  data.tar.gz: 182baa8926b5b645f4522f8d4bb03ab32e83c52d
+  metadata.gz: af70a254e2da3b9b4e1c876f9487a597ddf3f897
+  data.tar.gz: b5ae8e833a730c0547f9d4d3b3b10b2b8beb9732
 SHA512:
-  metadata.gz: d07419f23b7fd2535e7392bea7df9e744b1e4a1cbf6511bf6ec881e76d4d0d87a5a71e3a4012cc8c54f5dcb30f063196c8bd1cad51ccb5cb97fa3c5a00b9b2a6
-  data.tar.gz: 3e25a12d67d1533e56836690440badcf0734f78a11d7ab310db4830df3a501d0040ba50e9538620337db3b51e183a5b29ac6a6ae574e3615c173a8aafa13b805
+  metadata.gz: 94b296d5a7026b2702cf247ba45fbcacb9e5bf8ee107247100d39b5c1c8ae1458bf8c8d7695ffd123006a4200425ef45d33bcd9ae03ce0846a8573b422f22ee7
+  data.tar.gz: 79191de263d9aab1a4f23927c0d7e13dd3a1b58e1cfa6668b22c07f2d22874e29adf048c340e7ca73377e3975f3a70118625d1208fc6e1f43375adc9887ac46a

data/CHANGES.md

@@ -1,5 +1,11 @@
 # CHANGES
 
+## Muack 0.7.2 -- 2013-08-23
+
+* Show correct Expected error for special satisfiers. Previously, it would
+  incorrectly showing Unexpected error. However it's considered expected,
+  it's simply the number of times is wrong.
+
 ## Muack 0.7.1 -- 2013-07-13
 
 * Added `respond_to` argument matcher corresponding to RR's duck_type.

data/README.md

@@ -469,15 +469,6 @@ mock(object).foobar(is_a(TrueClass) | is_a(FalseClass))
 object.foobar(false)
 ```
 
-Or simply pass a custom satisfy block for it.
-Though there's not much point here. Just want to demonstrate.
-
-``` ruby
-mock(object).foobar(
-  satisfy{ |a| a.kind_of?(TrueClass) || a.kind_of?(FalseClass) })
-object.foobar(false)
-```
-
 Since duck_type is a weird name to me. Here we use `respond_to(:walk, :talk)`.
 
 ``` ruby

data/Rakefile

@@ -1,7 +1,12 @@
 
-require "#{dir = File.dirname(__FILE__)}/task/gemgem"
-Gemgem.dir = dir
+begin
+  require "#{dir = File.dirname(__FILE__)}/task/gemgem"
+rescue LoadError
+  sh 'git submodule update --init'
+  exec Gem.ruby, '-S', 'rake', *ARGV
+end
 
+Gemgem.dir = dir
 ($LOAD_PATH << File.expand_path("#{Gemgem.dir}/lib")).uniq!
 
 desc 'Generate gemspec'

data/lib/muack/mock.rb

@@ -59,9 +59,9 @@ module Muack
         end
       else
         defis = __mock_disps[msg]
-        if expected_defi = defis.find{ |d| d.args == actual_args }
+        if expected = defis.find{ |d| __mock_check_args(d.args, actual_args) }
           Mock.__send__(:raise, # Too many times
-            Expected.new(object, expected_defi, defis.size, defis.size+1))
+            Expected.new(object, expected, defis.size, defis.size+1))
         else
           Mock.__send__(:raise, # Wrong argument
             Unexpected.new(object, defis, msg, actual_args))

data/lib/muack/version.rb

@@ -1,4 +1,4 @@
 
 module Muack
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/muack.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "muack"
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2013-07-13"
+  s.date = "2013-08-23"
   s.description = "Muack -- Yet another mocking library.\n\nBasically it's an [RR][] clone, but much faster under heavy use.\nIt's 32x times faster (750s vs 23s) for running [Rib][] tests.\n\n[RR]: https://github.com/rr/rr\n[Rib]: https://github.com/godfat/rib"
   s.email = ["godfat (XD) godfat.org"]
   s.files = [
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/godfat/muack"
   s.licenses = ["Apache License 2.0"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.5"
+  s.rubygems_version = "2.0.6"
   s.summary = "Muack -- Yet another mocking library."
   s.test_files = [
   "test/test_any_instance_of.rb",

data/test/test_mock.rb

@@ -120,6 +120,22 @@ describe Muack::Mock do
       end
     end
 
+    should 'have correct message for mocks with special satisfier' do
+      mock(Obj).say(anything)
+      begin
+        Obj.say(1)
+        Obj.say(2)
+        'never'.should.eq 'reach'
+      rescue Muack::Expected => e
+        expected = 'obj.say(Muack::API.anything())'
+        e.expected.should.eq expected
+        e.expected_times.should.eq 1
+        e.actual_times  .should.eq 2
+        e.message       .should.eq "\nExpected: #{expected}\n  " \
+                                   "called 1 times\n but was 2 times."
+      end
+    end
+
     should 'raise if a mock with times(0) gets called' do
       mock(Obj).say.times(0)
       begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muack
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Muack -- Yet another mocking library.
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Muack -- Yet another mocking library.