flexmock 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d1c60d1a5f14850c56b0e8d61f4521fb1c9e060
-  data.tar.gz: 94039089f129be52329e975e587761ea2bf633f1
+  metadata.gz: 5a19c4b387841ace58998982852710a4f60f9eca
+  data.tar.gz: f978bfe038886bb05bde989258862e4a3278f5e3
 SHA512:
-  metadata.gz: af6c7bdccd67fa9583623d3f3fb6f052a682e1e408a8fc091b907c18814f891e5e1a80c9766d0136ca19eddfc5df891a3f51f16225872778e14a6b6438f2072e
-  data.tar.gz: 8fbbf4e0ecf57fde540642e6978d8bcb3d67ef0e532fb3437791cd760a83266df197df5e5fd38f80a3fc8bd91c9663c80c68aef656a2a9b061ba8d8376849dfb
+  metadata.gz: 58ce6ec7b11b4ab418fbea7d6cd5fa381fa23c6bdcb7000de8e29a17215c8ef18625e51784b478b2acfd13e563ca6e7ff01b36312da3bd779f03e9d40c485958
+  data.tar.gz: 0f18615a4cb83cfb14e4d5549ad5abd0b5863d04195005f93ecba5ad028ce193a7825e4464d808911638888fc9c215a5b0d6db14ff154581a047ec356aa4d3d7

data/lib/flexmock/core.rb

@@ -245,6 +245,8 @@ class FlexMock
     flexmock_define_expectation(caller, *args)
   end
 
+  ON_RUBY_20 = (RUBY_VERSION =~ /^2\.0\./)
+
   # Using +location+, define the expectations specified by +args+.
   def flexmock_define_expectation(location, *args)
     @last_expectation = EXP_BUILDER.parse_should_args(self, args) do |method_name|
@@ -253,8 +255,12 @@ class FlexMock
       result = Expectation.new(self, method_name, location)
       exp << result
       override_existing_method(method_name) if flexmock_respond_to?(method_name, true)
-      result = ExplicitNeeded.new(result, method_name, @base_class) if
-        @base_class && ! @base_class.flexmock_defined?(method_name)
+
+      if @base_class && !@base_class.flexmock_defined?(method_name)
+        if !ON_RUBY_20 || !@base_class.ancestors.include?(Class)
+          result = ExplicitNeeded.new(result, method_name, @base_class) 
+        end
+      end
       result
     end
   end

data/lib/flexmock/version.rb

@@ -1,3 +1,3 @@
 class FlexMock
-    VERSION = "2.3.3"
+    VERSION = "2.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Jim Weirich
@@ -15,56 +15,56 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: "\n    FlexMock is a extremely simple mock object class compatible\n
@@ -75,11 +75,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".autotest"
-- ".gitignore"
-- ".togglerc"
-- ".travis.yml"
-- ".yardopts"
+- .autotest
+- .gitignore
+- .togglerc
+- .travis.yml
+- .yardopts
 - CHANGES
 - Gemfile
 - README.md
@@ -175,17 +175,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Simple and Flexible Mock Objects for Testing