surrogate 0.7.0 → 0.8.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e5519647b998e324731c5f4077ab0902717266ff
+  data.tar.gz: 28ddc396ed4f356a85ebf882466eab96cbb4b34f
+SHA512:
+  metadata.gz: fcec1624106b21f4a9bfcc3966d311c8d53d7318f3eac6b1dfdc9268816a4a396d102f951f12c9f3086d2d684c941a69a4fc3dbcaf122b07c41887d3bcf3fb2f
+  data.tar.gz: e5e1e7233a828144ae186a0b057c4c4dd25296bad08bc6662be59c752ee653d653001a1beedc97681481a47a2e0a6daf59dc9bc3f81a7a8f4013782768288af7

data/.gitignore

@@ -1,5 +1,4 @@
 *.gem
 .bundle
 Gemfile.lock
-gemfiles/*.lock
 pkg/*

data/.travis.yml

@@ -1,8 +1,14 @@
 language: ruby
+script: "bundle exec rake"
 rvm:
   - 1.9.3
-script: "bundle exec rake"
-gemfile:
-  - gemfiles/rspec_mocks_2.2
-  - gemfiles/rspec_mocks_2.10
-  - gemfiles/rspec_mocks_2.11
+  - 2.0.0
+  - 2.1.2
+  - ruby-head
+  - rbx-2
+  - jruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: rbx-2

data/Gemfile

@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gemspec

data/Rakefile

@@ -10,8 +10,7 @@ RSpec::Core::RakeTask.new :rspec do |t|
   ]
 end
 
-require 'mountain_berry_fields/rake_task'
-MountainBerryFields::RakeTask.new :readme, 'Readme.md.mountain_berry_fields'
-
-
-task default: [:rspec, :readme]
+# require 'mountain_berry_fields/rake_task'
+# MountainBerryFields::RakeTask.new :readme, 'Readme.md.mountain_berry_fields'
+# task default: [:rspec, :readme]
+task default: :rspec

data/Readme.md

@@ -92,8 +92,7 @@ end
 MockClient.new.request 3 # => ["result1", "result2", "result3"]
 ```
 
-You don't need a **default if you set the ivar** of the same name (replace `?` with `_p` for predicates, and `!` with `_b` for bang methods, since you can't have question marks or bangs in ivar names)
-Note that methods without bodies will not have their arguments checked, and will not be asserted against when comparing signatures.
+You don't need a **default if you set the ivar** of the same name (replace `?` with `_p` for predicates, and `!` with `_b` for bang methods, since you can't have question marks or bangs in ivar names).
 
 ```ruby
 class MockClient
@@ -111,7 +110,7 @@ MockClient.new(12).id # => 12
 ```ruby
 class MockMP3
   Surrogate.endow self
-  define :play # defaults are optional, will raise error if invoked without being told what to do
+  define :play # default behavior is to do nothing, same as empty block yielding nothing
   define :info
 end
 

data/Readme.md.mountain_berry_fields

@@ -114,8 +114,7 @@ MockClient.new.request 3 # => ["result1", "result2", "result3"]
 <% end %>
 ```
 
-You don't need a **default if you set the ivar** of the same name (replace `?` with `_p` for predicates, and `!` with `_b` for bang methods, since you can't have question marks or bangs in ivar names)
-Note that methods without bodies will not have their arguments checked, and will not be asserted against when comparing signatures.
+You don't need a **default if you set the ivar** of the same name (replace `?` with `_p` for predicates, and `!` with `_b` for bang methods, since you can't have question marks or bangs in ivar names).
 
 ```ruby
 <% test 'overriding default by setting the ivar', with: :magic_comments do %>
@@ -136,7 +135,7 @@ MockClient.new(12).id # => 12
 <% test 'overriding default by invoking the method', with: :magic_comments do %>
 class MockMP3
   Surrogate.endow self
-  define :play # defaults are optional, will raise error if invoked without being told what to do
+  define :play # default behavior is to do nothing, same as empty block yielding nothing
   define :info
 end
 

data/lib/surrogate/rspec.rb

@@ -67,8 +67,10 @@ class Surrogate
 
   Endower.add_hook do |klass|
     klass.class_eval do
-      alias was should
-      alias was_not should_not
+      if respond_to?(:should)
+        alias was should
+        alias was_not should_not
+      end
     end
   end
 end

data/lib/surrogate/rspec/invocation_matcher.rb

@@ -38,7 +38,7 @@ class Surrogate
         self
       end
 
-      def failure_message_for_should
+      def failure_message
         message_for(
           if times_predicate.default? && with_filter.default?
             :FailureMessageShouldDefault
@@ -52,7 +52,7 @@ class Surrogate
         )
       end
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         message_for(
           if times_predicate.default? && with_filter.default?
             :FailureMessageShouldNotDefault

data/lib/surrogate/rspec/substitution_matcher.rb

@@ -15,7 +15,7 @@ class Surrogate
       end
 
 
-      def failure_message_for_should
+      def failure_message
         extra_instance_methods   = @comparison[:instance][:not_on_actual   ].to_a # these come in as sets
         extra_class_methods      = @comparison[:class   ][:not_on_actual   ].to_a
         missing_instance_methods = @comparison[:instance][:not_on_surrogate].to_a
@@ -44,7 +44,7 @@ class Surrogate
         "Was not substitutable because surrogate " << differences.join("\n")
       end
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         "Should not have been substitute, but was"
       end
 

data/lib/surrogate/rspec/with_filter.rb

@@ -17,13 +17,17 @@ class Surrogate
         end
 
         def matcher_class
-          return ::RSpec::Mocks::ArgumentListMatcher if approximate_2_11?
+          return ::RSpec::Mocks::ArgumentListMatcher if approximate_2_11? || approximate_3_0_0_rc?
           ::RSpec::Mocks::ArgumentExpectation
         end
 
         def approximate_2_11?
           Gem::Requirement.create('~> 2.11').satisfied_by? Gem::Version.new(::RSpec::Mocks::Version::STRING)
         end
+
+        def approximate_3_0_0_rc?
+          Gem::Requirement.create('~> 3.0.0.rc').satisfied_by? Gem::Version.new(::RSpec::Mocks::Version::STRING)
+        end
       end
 
 

data/lib/surrogate/version.rb

@@ -1,3 +1,3 @@
 class Surrogate
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/spec/defining_api_methods_spec.rb

@@ -172,8 +172,8 @@ describe 'define' do
     it 'has the same arity as the method' do
       mocked_class.define(:meth) { |a| a }
       mocked_class.new.meth(1).should == 1
-      expect { mocked_class.new.meth }.to raise_error ArgumentError, /0 for 1/
-      expect { mocked_class.new.meth 1, 2 }.to raise_error ArgumentError, /2 for 1/
+      expect { mocked_class.new.meth }.to raise_error ArgumentError, /0(, expected| for) 1/
+      expect { mocked_class.new.meth 1, 2 }.to raise_error ArgumentError, /2(, expected| for) 1/
     end
 
     it "can be defined with symbols or strings" do
@@ -219,7 +219,7 @@ describe 'define' do
     it 'raises arity errors, even if the value is overridden' do
       mocked_class.define(:meth) { }
       instance.instance_variable_set :@meth, "abc"
-      expect { instance.meth "extra", "args" }.to raise_error ArgumentError, /wrong number of arguments \(2 for 0\)/
+      expect { instance.meth "extra", "args" }.to raise_error ArgumentError, /2(, expected| for) 0/
     end
 
     it 'treats bastard methods as having no arity' do

data/spec/rspec/substitute_for_spec.rb

@@ -199,7 +199,7 @@ describe 'substutability matchers' do
     end
 
     it 'disregards when real object has natively implemented methods that cannot be reflected on' do
-      Array.method(:[]).parameters.should == [[:rest]] # make sure Array signatures aren't changing across versions or something
+      next unless Array.method(:[]).parameters == [[:rest]] # e.g. rbx names all their params, so we can reflect to some extent
       Array.instance_method(:insert).parameters.should == [[:rest]]
       surrogate = Surrogate.endow(Class.new) { define(:[]) { |a,b,c| } }.define(:insert) { |a,b,c| }
       Array.should substitute_for surrogate, subset: true, types: true
@@ -311,7 +311,7 @@ describe 'substutability matchers' do
     end
 
     it 'disregards when real object has natively implemented methods that cannot be reflected on' do
-      Array.method(:[]).parameters.should == [[:rest]] # make sure Array signatures aren't changing across versions or something
+      next unless Array.method(:[]).parameters == [[:rest]] # not all implementations do this
       Array.instance_method(:insert).parameters.should == [[:rest]]
       surrogate = Surrogate.endow(Class.new) { define(:[]) { |a,b,c| } }.define(:insert) { |a,b,c| }
       Array.should substitute_for surrogate, subset: true, names: true

data/spec/unit/argument_errorizer_spec.rb

@@ -40,13 +40,30 @@ describe Surrogate::ArgumentErrorizer do
   end
 
   it 'has useful error messages' do
-    assert_message ->(){},                           [1],   "wrong number of arguments (1 for 0) in #{meth_name}()"
-    assert_message ->(a){},                          [],    "wrong number of arguments (0 for 1) in #{meth_name}(a)"
-    assert_message ->(a){},                          [],    "wrong number of arguments (0 for 1) in #{meth_name}(a)"
-    assert_message ->(a=1){},                        [1,2], "wrong number of arguments (2 for 1) in #{meth_name}(a='?')"
-    assert_message ->(a, *b){},                      [],    "wrong number of arguments (0 for 1) in #{meth_name}(a, *b)"
-    assert_message ->(a, *b, &c){},                  [],    "wrong number of arguments (0 for 1) in #{meth_name}(a, *b, &c)"
-    assert_message ->(a, b, c=1, d=1, *e, f, &g){},  [],    "wrong number of arguments (0 for 3) in #{meth_name}(a, b, c='?', d='?', *e, f, &g)"
+    if defined?(RUBY_PLATFORM) && RUBY_ENGINE == 'rbx'
+      assert_message ->(){},                           [1],   /given 1, expected 0 in #{meth_name}\(\)/
+      assert_message ->(a){},                          [],    /given 0, expected 1 in #{meth_name}\(a\)/
+      assert_message ->(a){},                          [],    /given 0, expected 1 in #{meth_name}\(a\)/
+      assert_message ->(a=1){},                        [1,2], /given 2, expected 0 in #{meth_name}\(a='\?'\)/
+      assert_message ->(a, *b){},                      [],    /given 0, expected 1+ in #{meth_name}\(a, \*b\)/
+      assert_message ->(a, *b, &c){},                  [],    /given 0, expected 1+ in #{meth_name}\(a, \*b, &c\)/
+      assert_message ->(a, b, c=1, d=1, *e, f, &g){},  [],    /given 0, expected 3+ in #{meth_name}\(a, b, c='\?', d='\?', \*e, f, &g\)/
+    else
+      assert_message ->(){},                           [1],   "wrong number of arguments (1 for 0) in #{meth_name}()"
+      assert_message ->(a){},                          [],    "wrong number of arguments (0 for 1) in #{meth_name}(a)"
+      assert_message ->(a){},                          [],    "wrong number of arguments (0 for 1) in #{meth_name}(a)"
+      if RUBY_VERSION == '1.9.3'
+        assert_message ->(a=1){},                        [1,2], "wrong number of arguments (2 for 1) in #{meth_name}(a='?')"
+        assert_message ->(a, *b){},                      [],    "wrong number of arguments (0 for 1) in #{meth_name}(a, *b)"
+        assert_message ->(a, *b, &c){},                  [],    "wrong number of arguments (0 for 1) in #{meth_name}(a, *b, &c)"
+        assert_message ->(a, b, c=1, d=1, *e, f, &g){},  [],    "wrong number of arguments (0 for 3) in #{meth_name}(a, b, c='?', d='?', *e, f, &g)"
+      else
+        assert_message ->(a=1){},                        [1,2], "wrong number of arguments (2 for 0..1) in #{meth_name}(a='?')"
+        assert_message ->(a, *b){},                      [],    "wrong number of arguments (0 for 1+) in #{meth_name}(a, *b)"
+        assert_message ->(a, *b, &c){},                  [],    "wrong number of arguments (0 for 1+) in #{meth_name}(a, *b, &c)"
+        assert_message ->(a, b, c=1, d=1, *e, f, &g){},  [],    "wrong number of arguments (0 for 3+) in #{meth_name}(a, b, c='?', d='?', *e, f, &g)"
+      end
+    end
   end
 
   it 'raises an ArgumentError if initialized with a non lambda/method' do

data/surrogate.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec",                                "~> 2.4"
-  s.add_development_dependency "mountain_berry_fields",                "~> 1.0.3"
-  s.add_development_dependency "mountain_berry_fields-rspec",          "~> 1.0.3"
-  s.add_development_dependency "mountain_berry_fields-magic_comments", "~> 1.0.1"
+  s.add_development_dependency "rspec",                                "~> 3.0"
+  # s.add_development_dependency "mountain_berry_fields",                "~> 1.0.3"
+  # s.add_development_dependency "mountain_berry_fields-rspec",          "~> 1.0.3"
+  # s.add_development_dependency "mountain_berry_fields-magic_comments", "~> 1.0.1"
 end

metadata

@@ -1,71 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: surrogate
 version: !ruby/object:Gem::Version
-  version: 0.7.0
-  prerelease: 
+  version: 0.8.0
 platform: ruby
 authors:
 - Josh Cheek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70341864482800 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341864482800
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70341864481800 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: *70341864481800
-- !ruby/object:Gem::Dependency
-  name: mountain_berry_fields
-  requirement: &70341864496820 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :development
-  prerelease: false
-  version_requirements: *70341864496820
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mountain_berry_fields-rspec
-  requirement: &70341864496280 !ruby/object:Gem::Requirement
-    none: false
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70341864496280
-- !ruby/object:Gem::Dependency
-  name: mountain_berry_fields-magic_comments
-  requirement: &70341864495600 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :development
-  prerelease: false
-  version_requirements: *70341864495600
+        version: '3.0'
 description: Framework to aid in handrolling mock/spy objects.
 email:
 - josh.cheek@gmail.com
@@ -73,16 +45,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Changelog.md
+- Gemfile
 - Rakefile
 - Readme.md
 - Readme.md.mountain_berry_fields
-- gemfiles/rspec_mocks_2.10
-- gemfiles/rspec_mocks_2.11
-- gemfiles/rspec_mocks_2.2
 - lib/surrogate.rb
 - lib/surrogate/api_comparer.rb
 - lib/surrogate/argument_errorizer.rb
@@ -126,27 +95,26 @@ files:
 - todo
 homepage: https://github.com/JoshCheek/surrogate
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: surrogate
-rubygems_version: 1.8.11
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Framework to aid in handrolling mock/spy objects.
 test_files:
 - spec/acceptance_spec.rb
@@ -164,4 +132,3 @@ test_files:
 - spec/unit/api_comparer_spec.rb
 - spec/unit/argument_errorizer_spec.rb
 - spec/unit/map_method_name_to_ivar_spec.rb
-has_rdoc: 

data/.rvmrc

@@ -1,7 +0,0 @@
-rvm use ruby-1.9.3-p125
-
-root_dir="$(pwd)"
-
-alias ac="rspec '$root_dir/spec/acceptance_spec.rb'"
-alias sp="rspec $(find "$root_dir/spec" -name *_spec.rb | ruby -ne 'print unless /acceptance_spec/' | tr '\n' ' ')"
-

data/gemfiles/rspec_mocks_2.10

@@ -1,8 +0,0 @@
-# set this with
-# export BUNDLE_GEMFILE=gemfiles/rspec_mocks_2.10
-
-source "http://rubygems.org"
-
-gemspec path: File.expand_path('../..', __FILE__)
-
-gem "rspec", "= 2.10", group: :development

data/gemfiles/rspec_mocks_2.11

@@ -1,8 +0,0 @@
-# set this with
-# export BUNDLE_GEMFILE=gemfiles/rspec_mocks_2.11
-
-source "http://rubygems.org"
-
-gemspec path: File.expand_path('../..', __FILE__)
-
-gem "rspec", "~> 2.11", group: :development # squiggly is on purpose

data/gemfiles/rspec_mocks_2.2

@@ -1,8 +0,0 @@
-# set this with
-# export BUNDLE_GEMFILE=gemfiles/rspec_mocks_2.2
-
-source "http://rubygems.org"
-
-gemspec path: File.expand_path('../..', __FILE__)
-
-gem "rspec", "= 2.2", group: :development