muack 1.3.0 → 1.5.1

data/lib/muack/satisfying.rb

@@ -116,6 +116,7 @@ module Muack
   end
 
   class Where < Satisfying
+    None = Object.new
     def initialize spec
       super([spec])
     end
@@ -123,9 +124,9 @@ module Muack
     def match actual_arg, spec=api_args.first
       case spec
       when Hash
-        match_hash(actual_arg, spec)
+        actual_arg.kind_of?(Hash) && match_hash(actual_arg, spec)
       when Array
-        match_array(actual_arg, spec)
+        actual_arg.kind_of?(Array) && match_array(actual_arg, spec)
       else
         raise UnknownSpec.new(spec)
       end
@@ -134,7 +135,7 @@ module Muack
     private
     def match_hash actual_arg, spec
       (spec.keys | actual_arg.keys).all? do |key|
-        match_value(actual_arg[key], spec[key])
+        match_value(actual_arg, spec, key)
       end
     end
 
@@ -144,16 +145,24 @@ module Muack
       end
     end
 
-    def match_value av, ev
-      case ev
+    def match_value av, ev, key=None
+      if key == None
+        a, e = av, ev
+      elsif av.key?(key) && ev.key?(key)
+        a, e = av[key], ev[key]
+      else
+        return false
+      end
+
+      case e
       when Satisfying
-        ev.match(av)
+        e.match(a)
       when Hash
-        match_hash(av, ev)
+        a.kind_of?(Hash) && match_hash(a, e)
       when Array
-        match_array(av, ev)
+        a.kind_of?(Array) && match_array(a, e)
       else
-        ev == av
+        e == a
       end
     end
   end
@@ -166,7 +175,7 @@ module Muack
     private
     def match_hash actual_arg, subset
       subset.each_key.all? do |key|
-        match_value(actual_arg[key], subset[key])
+        match_value(actual_arg, subset, key)
       end
     end
   end
@@ -179,7 +188,7 @@ module Muack
     private
     def match_hash actual_arg, superset
       actual_arg.each_key.all? do |key|
-        match_value(actual_arg[key], superset[key])
+        match_value(actual_arg, superset, key)
       end
     end
   end

data/lib/muack/spy.rb

@@ -10,10 +10,8 @@ module Muack
 
     # used for Muack::Session#verify
     def __mock_verify
-      @stub.__mock_disps.values.flatten.each do |defi|
-        __mock_dispatch(defi.msg, defi.args) if __mock_defis.key?(defi.msg)
-      end
-      super # simulate dispatching before passing to mock to verify
+      __mock_dispatch_spy
+      super
     end
 
     # used for Muack::Session#reset, but spies never leave any track
@@ -21,5 +19,21 @@ module Muack
 
     private
     def __mock_inject_method defi; end # spies don't leave any track
+
+    # simulate dispatching before passing to mock to verify
+    def __mock_dispatch_spy
+      @stub.__mock_disps.values.flatten.each do |disp|
+        next unless __mock_defis.key?(disp.msg) # ignore undefined spies
+
+        defis = __mock_defis[disp.msg]
+        if idx = __mock_find_checked_difi(defis, disp, :index)
+          __mock_disps_push(defis.delete_at(idx)) # found, dispatch it
+        elsif defis.empty? # show called candidates
+          __mock_failed(disp)
+        else # show expected candidates
+          __mock_failed(disp, defis)
+        end
+      end
+    end
   end
 end

data/lib/muack/stub.rb

@@ -14,15 +14,16 @@ module Muack
     end
 
     # used for mocked object to dispatch mocked method
-    def __mock_dispatch msg, actual_args
-      if defi = __mock_defis[msg].find{ |d|
-                  __mock_check_args(d.args, actual_args) }
+    def __mock_dispatch actual_call
+      defis = __mock_defis[actual_call.msg]
+
+      if disp = __mock_find_checked_difi(defis, actual_call)
         # our spies are interested in this
-        __mock_disps_push(Definition.new(msg, actual_args))
-        defi
+        __mock_disps_push(actual_call)
+        disp
       else
         Mock.__send__(:raise, # Wrong argument
-          Unexpected.new(object, __mock_defis[msg], msg, actual_args))
+          Unexpected.new(object, defis, actual_call))
       end
     end
   end

data/lib/muack/test.rb

@@ -2,20 +2,51 @@
 require 'pork/auto'
 require 'muack'
 
-Pork::Executor.__send__(:include, Muack::API)
+Pork::Suite.include(Muack::API)
 
-Obj = Object.new
-Str = 'Moo'
-def Obj.inspect
-  'obj'
-end
-def Obj.private
-  'pri'
+Str = String.new('Moo')
+class Cls
+  def inspect
+    'obj'
+  end
+  def aloha a=0, b=1
+    [a, b]
+  end
+  def bonjour a: 0, b: 1
+    [a, b]
+  end
+  def ciao h={a: 0, b: 1}
+    h.values_at(:a, :b)
+  end
+  module Prepend
+    def prepend_aloha a=0, b=1
+      [a, b]
+    end
+    def prepend_bonjour a: 0, b: 1
+      [a, b]
+    end
+    def prepend_ciao h={a: 0, b: 1}
+      h.values_at(:a, :b)
+    end
+  end
+  prepend Prepend
 end
-def Obj.aloha a=0, b=1
-  [a, b]
+Obj = Cls.new
+class << Obj
+  private def private
+    'pri'
+  end
+
+  def single_aloha a=0, b=1
+    [a, b]
+  end
+  def single_bonjour a: 0, b: 1
+    [a, b]
+  end
+  def single_ciao h={a: 0, b: 1}
+    h.values_at(:a, :b)
+  end
 end
-Obj.singleton_class.__send__(:private, :private)
 
 Muack::EnsureReset = lambda{
   [Obj, Str].each do |o|

data/lib/muack/version.rb

@@ -1,4 +1,4 @@
 
 module Muack
-  VERSION = '1.3.0'
+  VERSION = '1.5.1'
 end

data/muack.gemspec

@@ -1,62 +1,72 @@
 # -*- encoding: utf-8 -*-
-# stub: muack 1.3.0 ruby lib
+# stub: muack 1.5.1 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "muack"
-  s.version = "1.3.0"
+  s.name = "muack".freeze
+  s.version = "1.5.1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2015-05-24"
-  s.description = "Muack -- A fast, small, yet powerful mocking library.\n\nInspired by [RR][], and it's 32x times faster (750s vs 23s) than RR\nfor 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.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Lin Jen-Shin (godfat)".freeze]
+  s.date = "2020-12-06"
+  s.description = "Muack -- A fast, small, yet powerful mocking library.\n\nInspired by [RR][], and it's 32x times faster (750s vs 23s) than RR\nfor running [Rib][] tests.\n\n[RR]: https://github.com/rr/rr\n[Rib]: https://github.com/godfat/rib".freeze
+  s.email = ["godfat (XD) godfat.org".freeze]
   s.files = [
-  ".gitignore",
-  ".gitmodules",
-  ".travis.yml",
-  "CHANGES.md",
-  "Gemfile",
-  "LICENSE",
-  "README.md",
-  "Rakefile",
-  "lib/muack.rb",
-  "lib/muack/any_instance_of.rb",
-  "lib/muack/block.rb",
-  "lib/muack/coat.rb",
-  "lib/muack/definition.rb",
-  "lib/muack/error.rb",
-  "lib/muack/failure.rb",
-  "lib/muack/mock.rb",
-  "lib/muack/modifier.rb",
-  "lib/muack/satisfying.rb",
-  "lib/muack/session.rb",
-  "lib/muack/spy.rb",
-  "lib/muack/stub.rb",
-  "lib/muack/test.rb",
-  "lib/muack/version.rb",
-  "muack.gemspec",
-  "task/README.md",
-  "task/gemgem.rb",
-  "test/test_any_instance_of.rb",
-  "test/test_coat.rb",
-  "test/test_from_readme.rb",
-  "test/test_mock.rb",
-  "test/test_modifier.rb",
-  "test/test_proxy.rb",
-  "test/test_satisfying.rb",
-  "test/test_stub.rb"]
-  s.homepage = "https://github.com/godfat/muack"
-  s.licenses = ["Apache License 2.0"]
-  s.rubygems_version = "2.4.7"
-  s.summary = "Muack -- A fast, small, yet powerful mocking library."
+  ".gitignore".freeze,
+  ".gitmodules".freeze,
+  ".travis.yml".freeze,
+  "CHANGES.md".freeze,
+  "Gemfile".freeze,
+  "LICENSE".freeze,
+  "README.md".freeze,
+  "Rakefile".freeze,
+  "lib/muack.rb".freeze,
+  "lib/muack/any_instance_of.rb".freeze,
+  "lib/muack/block.rb".freeze,
+  "lib/muack/block_26.rb".freeze,
+  "lib/muack/block_27.rb".freeze,
+  "lib/muack/coat.rb".freeze,
+  "lib/muack/definition.rb".freeze,
+  "lib/muack/error.rb".freeze,
+  "lib/muack/failure.rb".freeze,
+  "lib/muack/mock.rb".freeze,
+  "lib/muack/modifier.rb".freeze,
+  "lib/muack/satisfying.rb".freeze,
+  "lib/muack/session.rb".freeze,
+  "lib/muack/spy.rb".freeze,
+  "lib/muack/stub.rb".freeze,
+  "lib/muack/test.rb".freeze,
+  "lib/muack/version.rb".freeze,
+  "muack.gemspec".freeze,
+  "task/README.md".freeze,
+  "task/gemgem.rb".freeze,
+  "test/test_any_instance_of.rb".freeze,
+  "test/test_coat.rb".freeze,
+  "test/test_from_readme.rb".freeze,
+  "test/test_keyargs.rb".freeze,
+  "test/test_mock.rb".freeze,
+  "test/test_modifier.rb".freeze,
+  "test/test_prepend.rb".freeze,
+  "test/test_proxy.rb".freeze,
+  "test/test_satisfying.rb".freeze,
+  "test/test_spy.rb".freeze,
+  "test/test_stub.rb".freeze,
+  "test/test_visibility.rb".freeze]
+  s.homepage = "https://github.com/godfat/muack".freeze
+  s.licenses = ["Apache-2.0".freeze]
+  s.rubygems_version = "3.1.4".freeze
+  s.summary = "Muack -- A fast, small, yet powerful mocking library.".freeze
   s.test_files = [
-  "test/test_any_instance_of.rb",
-  "test/test_coat.rb",
-  "test/test_from_readme.rb",
-  "test/test_mock.rb",
-  "test/test_modifier.rb",
-  "test/test_proxy.rb",
-  "test/test_satisfying.rb",
-  "test/test_stub.rb"]
+  "test/test_any_instance_of.rb".freeze,
+  "test/test_coat.rb".freeze,
+  "test/test_from_readme.rb".freeze,
+  "test/test_keyargs.rb".freeze,
+  "test/test_mock.rb".freeze,
+  "test/test_modifier.rb".freeze,
+  "test/test_prepend.rb".freeze,
+  "test/test_proxy.rb".freeze,
+  "test/test_satisfying.rb".freeze,
+  "test/test_spy.rb".freeze,
+  "test/test_stub.rb".freeze,
+  "test/test_visibility.rb".freeze]
 end

data/task/README.md

@@ -4,16 +4,16 @@
 
 Provided tasks:
 
-    rake clean        # Remove ignored files
+    rake clean        # Trash ignored files
     rake gem:build    # Build gem
     rake gem:install  # Install gem
     rake gem:release  # Release gem
     rake gem:spec     # Generate gemspec
-    rake test         # Run tests in memory
+    rake test         # Run tests
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby) 1.9.3, 2.0.0, Rubinius and JRuby.
+* Tested with MRI (official CRuby) and JRuby.
 
 ## INSTALLATION:
 
@@ -23,13 +23,13 @@ And in Rakefile:
 
 ``` ruby
 begin
-  require "#{dir = File.dirname(__FILE__)}/task/gemgem"
+  require "#{__dir__}/task/gemgem"
 rescue LoadError
-  sh 'git submodule update --init'
+  sh 'git submodule update --init --recursive'
   exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
 end
 
-Gemgem.init(dir) do |s|
+Gemgem.init(__dir__, :submodules => %w[your-dep]) do |s|
   s.name    = 'your-gem'
   s.version = '0.1.0'
 end
@@ -37,9 +37,9 @@ end
 
 ## LICENSE:
 
-Apache License 2.0
+Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2011-2013, Lin Jen-Shin (godfat)
+Copyright (c) 2011-2019, Lin Jen-Shin (godfat)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/task/gemgem.rb

@@ -1,7 +1,7 @@
 
 module Gemgem
   class << self
-    attr_accessor :dir, :spec, :spec_create
+    attr_accessor :dir, :spec, :submodules, :spec_create
   end
 
   module_function
@@ -11,12 +11,14 @@ module Gemgem
   def pkg_dir    ; "#{dir}/pkg"                       ; end
   def escaped_dir; @escaped_dir ||= Regexp.escape(dir); end
 
-  def init dir, &block
+  def init dir, options={}, &block
     self.dir = dir
-    $LOAD_PATH.unshift("#{dir}/lib")
     ENV['RUBYLIB'] = "#{dir}/lib:#{ENV['RUBYLIB']}"
     ENV['PATH']    = "#{dir}/bin:#{ENV['PATH']}"
+    self.submodules  = options[:submodules] || []
     self.spec_create = block
+
+    $LOAD_PATH.unshift("#{dir}/lib", *submodules_libs)
   end
 
   def create
@@ -26,7 +28,7 @@ module Gemgem
 
       s.description = description.join
       s.summary     = description.first
-      s.license     = readme['LICENSE'].sub(/.+\n\n/, '').lines.first.strip
+      s.license     = license
 
       s.date        = Time.now.strftime('%Y-%m-%d')
       s.files       = gem_files
@@ -79,6 +81,11 @@ module Gemgem
   end
 
   def gem_check
+    unless git('status', '--porcelain').empty?
+      puts("\e[35mWorking copy is not clean.\e[0m")
+      exit(3)
+    end
+
     ver = spec.version.to_s
 
     if ENV['VERSION'].nil?
@@ -110,6 +117,7 @@ module Gemgem
       SimpleCov.start do
         add_filter('test/')
         add_filter('test.rb')
+        submodules_libs.each(&method(:add_filter))
       end
     end
 
@@ -154,11 +162,15 @@ module Gemgem
   end
 
   def strip_home_path path
-    path.sub(ENV['HOME'], '~')
+    path.sub(/\A#{Regexp.escape(ENV['HOME'])}\//, '~/')
   end
 
   def strip_cwd_path path
-    path.sub(Dir.pwd, '.')
+    path.sub(/\A#{Regexp.escape(Dir.pwd)}\//, '')
+  end
+
+  def submodules_libs
+    submodules.map{ |path| "#{dir}/#{path}/lib" }
   end
 
   def git *args
@@ -196,6 +208,11 @@ module Gemgem
     @description ||= (readme['DESCRIPTION']||'').sub(/.+\n\n/, '').lines.to_a
   end
 
+  def license
+    readme['LICENSE'].sub(/.+\n\n/, '').lines.first.
+      split(/[()]/).map(&:strip).reject(&:empty?).last
+  end
+
   def all_files
     @all_files ||= fold_files(glob).sort
   end
@@ -216,7 +233,8 @@ module Gemgem
 
   def gem_files
     @gem_files ||= all_files.reject{ |f|
-      f =~ ignored_pattern && !git_files.include?(f)
+      f =~ submodules_pattern ||
+        (f =~ ignored_pattern && !git_files.include?(f))
     }
   end
 
@@ -248,6 +266,15 @@ module Gemgem
                          end
   end
 
+  def submodules_pattern
+    @submodules_pattern ||= if submodules.empty?
+                              /^$/
+                            else
+                              Regexp.new(submodules.map{ |path|
+                                "^#{Regexp.escape(path)}/" }.join('|'))
+                            end
+  end
+
   def expand_patterns pathes
     # http://git-scm.com/docs/gitignore
     pathes.flat_map{ |path|