muack 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 012f658496e2711ec98bf468ffbb58ddfe339eafe03c4618e3cc9b91025b0b03
-  data.tar.gz: 505dbe6462efb20502468cf75f23459afa4589a8cd9d5f5ebc24eaf9a4d004ea
+  metadata.gz: 87b3de29deb805feea133c6e8fc7b3fc2720334df701a59452acc3141fd63509
+  data.tar.gz: aeb2e74419effc23ca0d1b51de935308242fd0fa12e9dae6be064dc11cc7e8ea
 SHA512:
-  metadata.gz: 9b538db391549b7da213ab0be7af6f58f71682277e897aae341285daecb47aad5bedfee581e0602908df4a5be55e5faa471d4bf8127a5cd68190058e22dc422c
-  data.tar.gz: 2d3ca26974fa4b73f2dd394ccf0323ebb720a40f3f6c30c72736680f4399f714a4a141998abf799dc846c4f1e0d2d4e3716fb719a256cfd2dd3618a57572be27
+  metadata.gz: 0d67d586cb7005f3ec8fae297cf6e9bc7f669cc1853dc5c293b28858fb3b7f6134c7e373399f5135fb88ab3879122e8f6c61a653925a456bab3a53715549a3de
+  data.tar.gz: a6387f685b6db8c25e447027698de5f47cc8aea2abef864552bc2d3010e5c5f92e637df9dd08ab6bdb3692e40c598ad6c01b1c7fae4d4e59672e9f66eae6fcf9

data/.gitlab-ci.yml

@@ -0,0 +1,40 @@
+
+stages:
+  - test
+
+.test:
+  stage: test
+  image: ruby:${RUBY_VERSION}-bullseye
+  variables:
+    GIT_DEPTH: "1"
+    GIT_SUBMODULE_STRATEGY: recursive
+    GIT_SUBMODULE_PATHS: task
+    RUBYOPT: --enable-frozen-string-literal
+  before_script:
+    - bundle install --retry=3
+    - unset CI # Coverage doesn't work well with frozen literal
+  script:
+    - ruby -vr bundler/setup -S rake test
+
+ruby:3.0:
+  extends:
+    - .test
+  variables:
+    RUBY_VERSION: '3.0'
+
+ruby:3.1:
+  extends:
+    - .test
+  variables:
+    RUBY_VERSION: '3.1'
+
+ruby:3.2:
+  extends:
+    - .test
+  variables:
+    RUBY_VERSION: '3.2'
+
+jruby:latest:
+  extends:
+    - .test
+  image: jruby:latest

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "task"]
 	path = task
-	url = git://github.com/godfat/gemgem.git
+	url = https://github.com/godfat/gemgem.git

data/CHANGES.md

@@ -1,5 +1,18 @@
 # CHANGES
 
+## Muack 1.7.0 -- 2022-12-29
+
+### Incompatible changes
+
+* Drop support for Ruby 2.6-
+
+### Bugs fixed
+
+* Fixed stubbed instance method not following the original visibility.
+  It's always public before this fix.
+* Worked around a few JRuby 9.4 compatibility issues. Note that there are
+  still some issues due to JRuby bugs. Those tests are currently skipped.
+
 ## Muack 1.6.0 -- 2020-12-06
 
 ### Enhancement

data/README.md

@@ -1,4 +1,4 @@
-# Muack [![Build Status](https://secure.travis-ci.org/godfat/muack.png?branch=master)](http://travis-ci.org/godfat/muack) [![Coverage Status](https://coveralls.io/repos/github/godfat/muack/badge.png)](https://coveralls.io/github/godfat/muack) [![Join the chat at https://gitter.im/godfat/muack](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/godfat/muack)
+# Muack [![Pipeline status](https://gitlab.com/godfat/muack/badges/master/pipeline.svg)](https://gitlab.com/godfat/muack/-/pipelines)
 
 by Lin Jen-Shin ([godfat](http://godfat.org))
 
@@ -1221,7 +1221,7 @@ Or, I am happy to break legacy.
 
 Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2013-2020, Lin Jen-Shin (godfat)
+Copyright (c) 2013-2022, 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/lib/muack/block.rb

@@ -1,6 +1,16 @@
 
-if RUBY_VERSION < '2.7'
-  require 'muack/block_26'
-else
-  require 'muack/block_27'
+module Muack
+  class Block < Struct.new(:block, :context)
+    def initialize block, context=nil
+      super
+    end
+
+    def call(...)
+      if context
+        context.instance_exec(...)
+      else
+        block.call(...)
+      end
+    end
+  end
 end

data/lib/muack/mock.rb

@@ -131,36 +131,18 @@ module Muack
       end
     end
 
-    if ::Class.instance_method(:method_defined?).arity == 1 # Ruby 2.5-
-      def self.direct_method_defined? mod, msg
-        mod.public_instance_methods(false).include?(msg) ||
-          mod.protected_instance_methods(false).include?(msg) ||
-          mod.private_instance_methods(false).include?(msg)
-      end
-
-      def self.method_visibility mod, msg
-        if mod.public_instance_methods(false).include?(msg)
-          :public
-        elsif mod.protected_instance_methods(false).include?(msg)
-          :protected
-        elsif mod.private_instance_methods(false).include?(msg)
-          :private
-        end
-      end
-    else # Ruby 2.6+
-      def self.direct_method_defined? mod, msg
-        mod.method_defined?(msg, false) || # this doesn't cover private method
-          mod.private_method_defined?(msg, false)
-      end
+    def self.direct_method_defined? mod, msg
+      mod.method_defined?(msg, false) || # this doesn't cover private method
+        mod.private_method_defined?(msg, false)
+    end
 
-      def self.method_visibility mod, msg
-        if mod.public_method_defined?(msg, false)
-          :public
-        elsif mod.protected_method_defined?(msg, false)
-          :protected
-        elsif mod.private_method_defined?(msg, false)
-          :private
-        end
+    def self.method_visibility mod, msg, inherit=false
+      if mod.public_method_defined?(msg, inherit)
+        :public
+      elsif mod.protected_method_defined?(msg, inherit)
+        :protected
+      elsif mod.private_method_defined?(msg, inherit)
+        :private
       end
     end
 
@@ -191,11 +173,15 @@ module Muack
 
     def self.store_original_method mod, defi
       if visibility = method_visibility(mod, defi.msg)
+        # Defined in itself, we need to make alias
         original_method = find_new_name(mod, defi.msg)
         mod.__send__(:alias_method, original_method, defi.msg)
         defi.original_method = original_method
         defi.visibility = visibility
-      else
+      elsif visibility = method_visibility(mod, defi.msg, true)
+        # Defined in parent, we can just override
+        defi.visibility = visibility
+      else # Not defined, pick a reasonable default
         defi.visibility = :public
       end
     end
@@ -292,12 +278,12 @@ module Muack
         ::Kernel.instance_method(:method).bind(object).call(method_name).
         super_method
 
-      if super_method.owner == ::Class && super_method.name == :new
+      if super_method.owner.kind_of?(::Class) && super_method.name == :new
         initialize_method = ::Class.instance_method(:instance_method).
           bind(object).call(:initialize)
         __mock_block_with_kargs?(initialize_method)
       else
-        super_method && __mock_block_with_kargs?(super_method)
+        __mock_block_with_kargs?(super_method)
       end
     end
 

data/lib/muack/session.rb

@@ -22,6 +22,10 @@ module Muack
     def verify obj=nil
       if obj
         with(obj, :[]).all?(&:__mock_verify)
+      elsif RUBY_ENGINE == 'jruby'
+        # Workaround weird error:
+        # TypeError: Muack::Stub#to_ary should return Array
+        data.each_value.all?{ |v| v.__mock_verify }
       else
         data.each_value.all?(&:__mock_verify)
       end

data/lib/muack/version.rb

@@ -1,4 +1,4 @@
 
 module Muack
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 end

data/muack.gemspec

@@ -1,20 +1,20 @@
 # -*- encoding: utf-8 -*-
-# stub: muack 1.6.0 ruby lib
+# stub: muack 1.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "muack".freeze
-  s.version = "1.6.0"
+  s.version = "1.7.0"
 
   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.date = "2022-12-29"
   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".freeze,
+  ".gitlab-ci.yml".freeze,
   ".gitmodules".freeze,
-  ".travis.yml".freeze,
   "CHANGES.md".freeze,
   "Gemfile".freeze,
   "LICENSE".freeze,
@@ -23,8 +23,6 @@ Gem::Specification.new do |s|
   "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,
@@ -54,7 +52,7 @@ Gem::Specification.new do |s|
   "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.rubygems_version = "3.4.1".freeze
   s.summary = "Muack -- A fast, small, yet powerful mocking library.".freeze
   s.test_files = [
   "test/test_any_instance_of.rb".freeze,

data/task/README.md

@@ -39,7 +39,7 @@ end
 
 Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2011-2019, Lin Jen-Shin (godfat)
+Copyright (c) 2011-2021, 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

@@ -42,6 +42,7 @@ module Gemgem
 
   def gem_install
     require 'rubygems/commands/install_command'
+    require 'rubygems/package'
     # read ~/.gemrc
     Gem.use_paths(Gem.configuration[:gemhome], Gem.configuration[:gempath])
     Gem::Command.extra_args = Gem.configuration[:gem]
@@ -51,7 +52,8 @@ module Gemgem
     cmd.handle_options([])
 
     # install
-    install = Gem::Installer.new(gem_path, cmd.options)
+    gem_package = Gem::Package.new(gem_path)
+    install = Gem::Installer.new(gem_package, cmd.options)
     install.install
     puts "\e[35mGem installed: \e[33m#{strip_path(install.gem_dir)}\e[0m"
   end

data/test/test_any_instance_of.rb

@@ -113,6 +113,17 @@ describe Muack::AnyInstanceOf do
     obj.f.should.eq 0
   end
 
+  describe 'mock any_instance_of on a method defined higher up' do
+    methods_count = klass.instance_methods.size
+
+    would 'not store a backup method' do
+      any_instance_of(klass){ |inst| mock(inst).to_s{ 'to_s' } }
+
+      expect(klass.new.to_s).eq 'to_s'
+      expect(klass.instance_methods.size).eq methods_count
+    end
+  end
+
   # Brought from rspec-mocks and it's currently failing on rspec-mocks
   would 'stub any_instance_of on module extending it self' do
     mod = Module.new {

data/test/test_keyargs.rb

@@ -50,6 +50,9 @@ describe Muack::Mock do
       end
 
       would 'instance method' do
+        # https://github.com/jruby/jruby/issues/7545
+        skip if RUBY_ENGINE == 'jruby' && obj.kind_of?(Muack::AnyInstanceOf)
+
         mock(obj).bonjour(a: 0, b: 1)
 
         expect(instance.bonjour(a: 0, b: 1)).eq([0, 1])

data/test/test_mock.rb

@@ -244,12 +244,12 @@ describe Muack::Mock do
         end
 
         would 'any_instance_of m1' do
-          skip
+          skip if RUBY_ENGINE == 'jruby'
 
           mock(any_instance_of(@m1)).f{:g}
 
           expect(@c0.f).eq :m0
-          expect(@c1.f).eq :g # m1 does not know c1 thus no way to pass this
+          expect(@c1.f).eq :g
         end
 
         would 'any_instance_of c0.class' do

data/test/test_prepend.rb

@@ -94,6 +94,35 @@ describe 'mock with prepend' do
     paste :test
   end
 
+  describe 'class with a chain of prepended modules' do
+    would 'not affect other modules' do
+      mod0 = Module.new{ def f; :m0; end }
+      mod1 = Module.new{ def f; :m1; end }
+      klass0 = Class.new{ prepend mod0 }
+      klass1 = Class.new{ prepend mod1 }
+      klass = Class.new{ prepend mod1; prepend mod0 }
+
+      mock(any_instance_of(klass)).f{:f}
+
+      expect(klass.new.f).eq :f
+      expect(klass0.new.f).eq :m0
+      expect(klass1.new.f).eq :m1
+    end
+  end
+
+  describe 'class and subclass' do
+    would 'work for prepended superclass' do
+      mod = Module.new{ def f; :f; end }
+      base = Class.new{ prepend mod }
+      sub = Class.new(base)
+
+      mock(any_instance_of(base)).f{:g}.times(2)
+
+      expect(base.new.f).eq :g
+      expect(sub.new.f).eq :g
+    end
+  end
+
   # Brought from rspec-mocks and it's currently failing on rspec-mocks
   # See https://github.com/rspec/rspec-mocks/pull/1218
   would "handle stubbing prepending methods that were only defined on the prepended module" do

data/test/test_visibility.rb

@@ -18,17 +18,9 @@ describe 'retain visibility' do
   end
 
   def generate visibility
-    klass = Class.new do
-      def greet
-        'hi'
-      end
-    end
+    klass = Class.new
 
     mod = Module.new do
-      def greet
-        hello
-      end
-
       def hello
         'hello'
       end
@@ -97,8 +89,54 @@ describe 'retain visibility' do
     paste :test
   end
 
+  describe 'set the same visibility from the original method' do
+    copy :test do
+      def find_visibilities
+        %i[public protected private].map do |v|
+          object.send("#{v}_methods").include?(:hello)
+        end
+      end
+
+      would do
+        current_visibilities = find_visibilities
+
+        stub(object).hello{ :stub }
+
+        expect(find_visibilities).eq current_visibilities
+      end
+    end
+
+    describe 'for instance method' do
+      def object
+        @object ||= Class.new do
+          private
+          def hello; :hello; end
+        end.new
+      end
+
+      paste :test
+    end
+
+    describe 'for singleton method' do
+      def object
+        @object ||= begin
+          ret = Object.new
+          def ret.hello; :hello; end
+          ret
+        end
+      end
+
+      paste :test
+    end
+  end
+
   # Brought from rspec-mocks
   would "correctly restore the visibility of methods whose visibility has been tweaked on the singleton class" do
+    # JRuby didn't store the visibility change on the singleton class,
+    # therefore it cannot be properly detected and visibility change
+    # will be lost upon reset.
+    skip if RUBY_ENGINE == 'jruby'
+
     # hello is a private method when mixed in, but public on the module
     # itself
     mod = Module.new do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muack
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-06 00:00:00.000000000 Z
+date: 2022-12-29 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Muack -- A fast, small, yet powerful mocking library.
@@ -25,8 +25,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".gitmodules"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -35,8 +35,6 @@ files:
 - lib/muack.rb
 - lib/muack/any_instance_of.rb
 - lib/muack/block.rb
-- lib/muack/block_26.rb
-- lib/muack/block_27.rb
 - lib/muack/coat.rb
 - lib/muack/definition.rb
 - lib/muack/error.rb
@@ -83,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Muack -- A fast, small, yet powerful mocking library.

data/.travis.yml

@@ -1,22 +0,0 @@
-sudo: false
-language: ruby
-
-install: 'gem update --system; gem install bundler; bundle install --retry=3'
-before_script: unset CI
-script: 'ruby -vwr bundler/setup -S rake test'
-
-matrix:
-  include:
-    - rvm: 2.3
-    - rvm: 2.4
-      env: RUBYOPT=--enable-frozen-string-literal
-    - rvm: 2.5
-      env: RUBYOPT=--enable-frozen-string-literal
-    - rvm: 2.6
-      env: RUBYOPT=--enable-frozen-string-literal
-    - rvm: 2.7
-      env: RUBYOPT=--enable-frozen-string-literal
-    - rvm: ruby-head
-      env: RUBYOPT=--enable-frozen-string-literal
-    - rvm: jruby-9.2
-      env: RUBYOPT=--enable-frozen-string-literal

data/lib/muack/block_26.rb

@@ -1,16 +0,0 @@
-
-module Muack
-  class Block < Struct.new(:block, :context)
-    def initialize block, context=nil
-      super
-    end
-
-    def call(*args, &block)
-      if context
-        context.instance_exec(*args, &block)
-      else
-        block.call(*args, &block)
-      end
-    end
-  end
-end

data/lib/muack/block_27.rb

@@ -1,16 +0,0 @@
-
-module Muack
-  class Block < Struct.new(:block, :context)
-    def initialize block, context=nil
-      super
-    end
-
-    def call(...)
-      if context
-        context.instance_exec(...)
-      else
-        block.call(...)
-      end
-    end
-  end
-end