flexmock 2.3.6 → 2.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 10c81d85395c9cb8d2f2ec418fa925152082a699
-  data.tar.gz: 2602ebd6fb2d2b77b6627ba42b1fbbadb31b6854
+SHA256:
+  metadata.gz: 55dadc89381c542f0d6f81c9484b4febc6adf1ef2b8292a504d60406e4c6f915
+  data.tar.gz: 80eb120f913a93d90f855442ab0bf8fc13bbec222279dec77340979a8cc8f024
 SHA512:
-  metadata.gz: d68327dfd946bf6119291610513fd3a98718b031fc98742e5641177f78f51b10398fcb676832e61737cbf68b447de6cb0b726fa8fdc1b6e27591ab672826febc
-  data.tar.gz: 93bd5f2683c1bf3250986d82fbcce88afdd4f7f6866eb76a926ade7c07f27b9ea71759ddc864c58371cff9e984813fb1cef990c4dac663bd3d027e6f971531b7
+  metadata.gz: 8afcf774571ed28b0e90b631ebfb88e91812c9494f2bef4c3b1d36dc4726514c7fb21ff22f6c9accd5331f214a5f5f12826b5d1d07a6868fb39a6154d016a0f7
+  data.tar.gz: 7b3bf8f227f97efb5e4a6cb8d80d9e5ef4a2c1f29e8978fadb95597b419010f1abeaf8650bdbc533389fd09746aeae597fc97447ec2b7e46507f36cff180dc58

data/.github/workflows/test.yml

@@ -0,0 +1,32 @@
+name: Unit Tests
+
+on: [pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: ["2.7", "2.6", "2.5"]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+    - name: Configure bundler without 'vscode'
+      run: bundle config set --local without vscode
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake test
+      env:
+        GIT_AUTHOR_NAME: flexmock CI Git Identity
+        GIT_AUTHOR_EMAIL: flexmock@github.actions
+        GIT_COMMITTER_NAME: flexmock CI Git Identity
+        GIT_COMMITTER_EMAIL: flexmock@github.actions

data/.travis.yml

@@ -1,19 +1,32 @@
-sudo: false
 language: ruby
 rvm:
-  - '2.0'
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
-  - 2.4.0
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
   - ruby-head
-  - jruby-9.1.5.0
 
 matrix:
+  include:
+    - rvm: jruby-9.1.17.0
+      jdk: openjdk8
+      name: "JRuby 9.1"
+    - rvm: jruby-9.2.11.1
+      jdk: openjdk11
+      name: "JRuby 9.2"
+
   allow_failures:
     - rvm: ruby-head
+    # Revisit when fixing https://github.com/jruby/jruby/issues/4678
+    - name: "JRuby 9.2"
   fast_finish: true
 
+env:
+  global:
+    - JRUBY_OPTS="--debug"
+
 script:
     - rake test
     - rake test_rspec

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 

data/README.md

@@ -1,9 +1,9 @@
 # Flex Mock -- Making Mocking Easy
 
 [![Build Status](https://travis-ci.org/doudou/flexmock.svg?branch=master)](https://travis-ci.org/doudou/flexmock)
-[![Gem Version](https://badge.fury.io/rb/flexmock.svg)](http://badge.fury.io/rb/flexmock)
+[![Gem Version](https://badge.fury.io/rb/flexmock.svg)](https://badge.fury.io/rb/flexmock)
 [![Coverage Status](https://coveralls.io/repos/doudou/flexmock/badge.svg?branch=master&service=github)](https://coveralls.io/github/doudou/flexmock?branch=master)
-[![Documentation](http://b.repl.ca/v1/yard-docs-blue.png)](http://rubydoc.info/gems/flexmock/frames)
+[![API Documentation](http://img.shields.io/badge/yard-docs-blue.svg)](https://rubydoc.info/gems/flexmock/frames)
 
 FlexMock is a simple, but flexible, mock object library for Ruby unit
 testing.

data/doc/index.rdoc

@@ -4,20 +4,20 @@ FlexMock is a simple, but flexible, mock object library for Ruby unit
 testing.
 
 This is the API documentation site for flexmock. You can find the user
-documentation at http://github.com/jimweirich/flexmock
+documentation at http://github.com/doudou/flexmock
 
 == Links
 
-* <b>User Guide</b> -- http://github.com/jimweirich/flexmock
-* <b>API Documents</b> -- http://flexmock.rubyforge.org
+* <b>User Guide</b> -- http://github.com/doudou/flexmock
 * <b>RubyGems</b>   -- Install with: `gem install flexmock`
-* <b>Source</b> -- https://github.com/jimweirich/flexmock
-* <b>Bug Reports / Issue Tracking</b> -- https://github.com/jimweirich/flexmock/issues
-* <b>Continuous Integration</b> -- http://travis-ci.org/#!/jimweirich/flexmock
+* <b>Source</b> -- https://github.com/doudou/flexmock
+* <b>Bug Reports / Issue Tracking</b> -- https://github.com/doudou/flexmock/issues
+* <b>Continuous Integration</b> -- http://travis-ci.org/#!/doudou/flexmock
 
 == License
 
 Copyright 2003-2013 by Jim Weirich (jim.weirich@gmail.com).
+Copyright 2013-2020 by Sylvain Joyeux (sylvain.joyeux@m4x.org)
 All rights reserved.
 
 Permission is granted for use, copying, modification, distribution,

data/flexmock.gemspec

@@ -10,13 +10,13 @@ spec = Gem::Specification.new do |s|
     interface is simple, it is very flexible.
   }
 
-  s.required_ruby_version = ">= 2.0"
+  s.required_ruby_version = ">= 2.2"
 
   s.license = 'MIT'
 
   #### Dependencies and requirements.
 
-  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'minitest', ">= 5.0"
   s.add_development_dependency 'rake'
   s.add_development_dependency 'simplecov', '>= 0.11.0'
   s.add_development_dependency 'coveralls'

data/lib/flexmock/minitest_integration.rb

@@ -98,7 +98,11 @@ class FlexMock
     end
 
     def assertion_failed_error
-      MiniTest::Assertion
+      if defined?(::Minitest)
+        ::Minitest::Assertion
+      else
+        MiniTest::Assertion
+      end
     end
 
     def check_failed_error

data/lib/flexmock/partial_mock.rb

@@ -99,21 +99,14 @@ class FlexMock
       :invoke_original
     ]
 
-    attr_reader :method_definitions
-
     # Initialize a PartialMockProxy object.
     def initialize(obj, mock, safe_mode, parent: nil)
       @obj = obj
       @mock = mock
       @proxy_definition_module = nil
+      @parent = parent
       @initialize_override = nil
 
-      if parent
-        @method_definitions = parent.method_definitions.dup
-      else
-        @method_definitions = {}
-      end
-
       unless safe_mode
         add_mock_method(:should_receive)
         MOCK_METHODS.each do |sym|
@@ -175,9 +168,33 @@ class FlexMock
       flexmock_invoke_original(m, args)
     end
 
+    # Whether the given method's original definition has been stored
+    def find_original_method(m)
+      it = @obj.method(m)
+      while it && (it.owner != @proxy_definition_module)
+        it = it.super_method
+      end
+
+      return unless it
+      while it && it.owner.kind_of?(ProxyDefinitionModule)
+        it = it.super_method
+      end
+      it
+    rescue NameError => e
+      raise unless e.name == m
+    end
+
+    # Whether the given method's original definition has been stored
+    def original_method(m)
+      unless (m = find_original_method(m))
+        raise ArgumentError, "no original method for #{m}"
+      end
+      m
+    end
+
     # Whether the given method's original definition has been stored
     def has_original_method?(m)
-      @method_definitions.has_key?(m)
+      find_original_method(m)
     end
 
     # Whether the given method is already being proxied
@@ -188,12 +205,12 @@ class FlexMock
 
     def flexmock_define_expectation(location, *args)
       EXP_BUILDER.parse_should_args(self, args) do |method_name|
-        if !has_proxied_method?(method_name) && !has_original_method?(method_name)
-          hide_existing_method(method_name)
+        if !has_proxied_method?(method_name)
+          define_proxy_method(method_name)
         end
         ex = @mock.flexmock_define_expectation(location, method_name)
         if FlexMock.partials_verify_signatures
-          if existing_method = @method_definitions[method_name]
+          if (existing_method = find_original_method(method_name))
             ex.with_signature_matching(existing_method)
           end
         end
@@ -207,7 +224,6 @@ class FlexMock
     end
 
     def add_mock_method(method_name)
-      stow_existing_definition(method_name)
       proxy_module_eval do
         define_method(method_name) { |*args, &block|
           proxy = __flexmock_proxy or
@@ -316,12 +332,12 @@ class FlexMock
     # Invoke the original definition of method on the object supported by
     # the stub.
     def flexmock_invoke_original(method, args)
-      if original_method = @method_definitions[method]
+      if (original_method = find_original_method(method))
         if Proc === args.last
           block = args.last
           args = args[0..-2]
         end
-        original_method.bind(@obj).call(*args, &block)
+        original_method.call(*args, &block)
       else
         @obj.__send__(:method_missing, method, *args, &block)
       end
@@ -394,11 +410,14 @@ class FlexMock
       target_singleton_class.class_eval(*args, &block)
     end
 
+    class ProxyDefinitionModule < Module
+    end
+
     # Evaluate a block into the module we use to define the proxy methods
     def proxy_module_eval(*args, &block)
       if !@proxy_definition_module
         obj = @obj
-        @proxy_definition_module = m = Module.new do
+        @proxy_definition_module = m = ProxyDefinitionModule.new do
           define_method("__flexmock_proxy") do
             if box = obj.instance_variable_get(:@flexmock_proxy)
               box.proxy
@@ -417,19 +436,7 @@ class FlexMock
     # not a singleton, all we need to do is override it with our own
     # singleton.
     def hide_existing_method(method_name)
-      existing_method = stow_existing_definition(method_name)
       define_proxy_method(method_name)
-      existing_method
-    end
-
-    # Stow the existing method definition so that it can be recovered
-    # later.
-    def stow_existing_definition(method_name)
-      if !@method_definitions.has_key?(method_name)
-        @method_definitions[method_name] = target_class_eval { instance_method(method_name) }
-      end
-      @method_definitions[method_name]
-    rescue NameError
     end
 
     # Define a proxy method that forwards to our mock object.  The

data/lib/flexmock/test_unit_integration.rb

@@ -68,7 +68,7 @@ class FlexMock
     def assertion_failed_error
       defined?(Test::Unit::AssertionFailedError) ?
         Test::Unit::AssertionFailedError :
-        MiniTest::Assertion
+        Minitest::Assertion
     end
 
     def check_failed_error

data/lib/flexmock/test_unit_testcase_extensions.rb

@@ -30,8 +30,8 @@ class FlexMock
   end
 end
 
-if defined?(MiniTest)
-  module MiniTest
+if defined?(Minitest)
+  module Minitest
     class Unit
       class TestCase
         FlexMock::GenericTestCase.define_extensions_on(self)

data/lib/flexmock/version.rb

@@ -1,3 +1,3 @@
 class FlexMock
-    VERSION = "2.3.6"
+    VERSION = "2.3.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.3.8
 platform: ruby
 authors:
 - Jim Weirich
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2023-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +76,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".autotest"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".togglerc"
 - ".travis.yml"
@@ -178,15 +179,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Simple and Flexible Mock Objects for Testing