flexmock 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9387eb1544230a8a90aa555763f306093cd6e71c
-  data.tar.gz: 7f0a5a0b13e16ab4bf8fe73332df1b6e4096a3a3
+  metadata.gz: 158433b510fe021438b3e2c88a82b1ffd0efcb36
+  data.tar.gz: 65961b49054d7ff956bf6807d007aadb0b1105a9
 SHA512:
-  metadata.gz: 0701e4a445c1e9a10134727d655faf532d2f0a925b06ea04afa565f81af51bba095c3b61fca54b09917f7e3cf2aa7d7de327031a98fc1b9afc094c9e57976978
-  data.tar.gz: 1c646119d8530ee4b3c12514f61b6f92530c4c0ad8f5374abdf43414f89f936116a832a4df598f0d281e31a519549edd9ea5aa779a9247aa2704a0dc76e0e208
+  metadata.gz: ed5f37949186a46a14c4391ee4987f9b314acf1d876979a538704957526d24f7e1f6a67f00fd27a31d668b1b5086537a8a805269baae81d799059a3e041f94b3
+  data.tar.gz: 0c92dadcc4e1bea6951214e0e43704d6e677201ed53ea370eea3ad4ddfd9b60b6ec28a56264f98b59b73b216a7afdb830ce24376a1aa6836be78e12e38c5d296

data/.travis.yml

@@ -1,5 +1,10 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.6
-  - 2.2.2
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+
+script:
+    - rake test
+    - rake test_rspec

data/Gemfile

@@ -2,3 +2,7 @@ source 'http://rubygems.org'
 
 gemspec
 
+group :test do
+    gem 'rspec', '>= 2.11'
+end
+

data/README.md

@@ -116,7 +116,7 @@ to 0.6.0 required the explicit include.
 ## RSpec Integration
 
 FlexMock also supports integration with the RSpec behavior
-specification framework.  Starting with version 0.9.0 of RSpec, you
+specification framework.  Starting with version 2.11.0 of RSpec, you
 will be able to say:
 
 ```ruby

data/Rakefile

@@ -4,7 +4,15 @@ require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
+  t.ruby_opts << '-w'
   t.test_files = FileList['test/*_test.rb']
 end
 
+task :test_rspec do
+    if !system('rspec', 'test/rspec_integration')
+        puts "RSpec tests failed"
+        exit 1
+    end
+end
+
 task :default => :test

data/flexmock.gemspec

@@ -18,6 +18,7 @@ spec = Gem::Specification.new do |s|
 
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'simplecov', '>= 0.11.0'
   s.add_development_dependency 'coveralls'
 
   #### Which files are to be included in this gem?  Everything!  (Except CVS directories.)

data/lib/flexmock/core.rb

@@ -57,6 +57,7 @@ class FlexMock
   # container for this mock.
   def initialize(name="unknown", container=nil)
     @flexmock_name = name
+    @flexmock_closed = false
     @expectations = Hash.new
     @ignore_missing = false
     @verified = false

data/lib/flexmock/rspec.rb

@@ -21,7 +21,7 @@ class FlexMock
   end
 
   class RSpecFrameworkAdapter
-    def make_assertion(msg, &block)
+    def make_assertion(msg, backtrace = caller, &block)
       msg = msg.call if msg.is_a?(Proc)
       SpecModule::Expectations.fail_with(msg) unless yield
     end

data/lib/flexmock/rspec_spy_matcher.rb

@@ -22,10 +22,18 @@ class FlexMock
       end
 
       def failure_message_for_should
+        failure_message
+      end
+
+      def failure_message
         describe_spy_expectation(@spy, @method_name, @args, @options)
       end
 
       def failure_message_for_should_not
+        failure_message_when_negated
+      end
+
+      def failure_message_when_negated
         describe_spy_negative_expectation(@spy, @method_name, @args, @options)
       end
 

data/lib/flexmock/version.rb

@@ -1,3 +1,3 @@
 class FlexMock
-    VERSION = "2.0.4"
+    VERSION = "2.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Jim Weirich
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -39,6 +39,20 @@ dependencies:
     - - ">="
       - !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