rr 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b16f1f300c83ac27387ef72db6fc1514b27a1e9
-  data.tar.gz: 7c082dad820121cb7c9c44cb0f0f1400085b4442
+  metadata.gz: 2135e46b66d09100c220437bb40f2989ccff6afc
+  data.tar.gz: 6307d6b090c14938825eaa4c5c474ba97788c770
 SHA512:
-  metadata.gz: ab2c7e8209606ee44e8cd7ae29eaee652090dc4cfd81d802475fd84c73058cc3e0de9ad36915a8c39111ecc5c0565c6145f886b248610ff078f70d896c88f012
-  data.tar.gz: 46d2b0399555904b5d6b2d81bc7875cc204fe1875f90e6b8069e75970eaac4a7129ebc45b79b7c45d3388664f94c81d635ea4b5abf1bf04fbe9963fbe92cec13
+  metadata.gz: ba91e27957d4ba1876e17f0a21480265b088234e3b5ad05638d33e2591bb8fe1df1373849c89c420d0a47f61a3f1091a117326ec91acd94c51de16b82e5b2fd3
+  data.tar.gz: d63946c4a0a43c25484d11b430831e306535e83600fc026834a02cc535417fa9b9ac2d5fb46ae61ed2b093e5930417c3f04d818b275bcc432f403d9d55271691

data/Appraisals

@@ -1,46 +1,6 @@
-ruby_18_stuff = proc do
-  ruby_18_rails_2 = proc do
-    gem 'rails', '~> 2.3'
-    gem 'mocha', '~> 0.12.0'
-    gem 'sqlite3', '~> 1.3', :platforms => :ruby
-    gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
-  end
-
-  #---
-
-  appraise 'ruby_18_rspec_1' do
-  end
-
-  appraise 'ruby_18_rspec_1_rails_2' do
-    instance_eval &ruby_18_rails_2
-  end
-end
-
-ruby_19_stuff = proc do
-  ruby_19_rails_3 = proc do
-    gem 'rails', '~> 3.0'
-  end
-
-  ruby_19_rails_4 = proc do
-    gem 'rails', '4.0.0'
-  end
-
-  #---
-
-  appraise 'ruby_19_rspec_2' do
-  end
-
-  appraise 'ruby_19_rspec_2_rails_3' do
-    instance_eval &ruby_19_rails_3
-  end
-
-  appraise 'ruby_19_rspec_2_rails_4' do
-    instance_eval &ruby_19_rails_4
-  end
+appraise 'ruby_19_rspec_2' do
 end
 
-if RUBY_VERSION =~ /^1\.8/
-  instance_eval &ruby_18_stuff
-else
-  instance_eval &ruby_19_stuff
+appraise 'ruby_19_rspec_2_rails_4' do
+  gem 'rails', '4.0.0'
 end

data/CHANGES.md

@@ -1,5 +1,51 @@
 # Changelog
 
+## 1.2.0 - 2016-05-30
+
+### Improvements
+
+  * Renamed RR::Adapters::RRMethods to RR::DSL.
+
+  * Deprecated RRMethods.
+
+  * Updated document. [GitHub#57][Patch by Nikolay Shebanov]
+
+  * Dropped Ruby 1.8 support.
+
+  * Dropped Ruby 1.9 support.
+
+  * Dropped Rails 3 support.
+
+  * Dropped test-unit integration support. Use
+    [test-unit-rr](https://test-unit.github.io/#test-unit-rr).
+
+  * Supported OpenStruct in Ruby 2.3
+    [GitHub#64][Reported by soylent][Reported by Arthur Le Maitre]
+
+### Fixes
+
+  * Fixed using RSpec's RR adapter to not override our RSpec adapter.
+    If RR is required and then you use `mock_with :rr` you would not be able to
+    use `have_received`.
+
+  * Fixed a bug that `Hash` argument is too wild.
+    [GitHub#54][Reported by Yutaka HARA]
+
+  * Fixed a bug that `Array` argument is too wild.
+    [GitHub#54][Reported by Skye Shaw]
+
+### Thanks
+
+  * Nikolay Shebanov
+
+  * Yutaka HARA
+
+  * Skye Shaw
+
+  * soylent
+
+  * Arthur Le Maitre
+
 ## 1.1.2 (August 17, 2013)
 
 * Add tests, appraisals, etc. back to the published gem ([#32][i32]).

data/CREDITS.md

@@ -1,5 +1,10 @@
 # Credits
 
+## Maintainer
+
+* Kouhei Sutou ([@kou](https://github.com/kou))
+
+
 ## Authors
 
 * Brian Takita ([@btakita](http://github.com/btakita))

data/Gemfile

@@ -1,19 +1,10 @@
 source 'https://rubygems.org'
 
 gem 'rake', '~> 10.0'
-gem 'aws-sdk', '~> 1.0'
-gem 'minitar', '~> 0.5'
-gem 'dotenv', '~> 0.7'
 gem 'simplecov', '~> 0.7'
 gem 'appraisal', '~> 0.5'
 gem 'posix-spawn', :platforms => :mri
 gem 'open4', :platforms => :mri
-
-# Put this here instead of in Appraisals so that when running a single test file
-# in development we can say `rspec ...` or `spec ...` instead of having to
-# prepend it with BUNDLE_GEMFILE=...
-if RUBY_VERSION =~ /^1\.8/
-  gem 'rspec', '~> 1.3'
-else
-  gem 'rspec', '~> 2.14'
-end
+gem 'test-unit'
+gem 'test-unit-rr'
+gem 'rspec', '~> 2.14'

data/README.md

@@ -3,6 +3,15 @@
 RR is a test double framework for Ruby that features a rich selection of double
 techniques and a terse syntax.
 
+---
+
+## Learning more
+
+1. [A whirlwind tour of RR](#a-whirlwind-tour-of-rr)
+2. [What is a test double?](doc/01_test_double.md)
+3. [Syntax between RR and other double/mock frameworks](doc/02_syntax_comparison.md)
+4. [API overview - Full listing of DSL methods](doc/03_api_overview.md)
+
 
 ## A whirlwind tour of RR
 
@@ -87,6 +96,11 @@ end
 
 ## Installing RR into your project
 
+NOTE: If you want to use RR with
+[test-unit](https://test-unit.github.io/), use
+[test-unit-rr](https://test-unit.github.io/#test-unit-rr). You don't
+need to read the following subsections.
+
 For minimal setup, RR looks for an existing test framework and then hooks itself
 into it. Hence, RR works best when loaded *after* the test framework that you
 are using is loaded.
@@ -129,39 +143,25 @@ require 'your/test/framework'  # if you are using something other than MiniTest
 require 'rr'
 ~~~
 
-
-## Learning more
-
-1. [What is a test double?](doc/01_test_double.md)
-2. [Syntax between RR and other double/mock frameworks](doc/02_syntax_comparison.md)
-3. [API overview](doc/03_api_overview.md)
-
-
 ## Compatibility
 
 RR is designed and tested to work against the following Ruby versions:
 
-* 1.8.7-p374
-* 1.9.3-p392
-* 2.0.0-p195
+* 2.1
+* 2.2
+* 2.3
 * JRuby 1.7.4
 
 as well as the following test frameworks:
 
-* RSpec 1 (Ruby 1.8.7)
-* RSpec 2 (Ruby 1.9+)
-* Test::Unit 1 (Ruby 1.8.7)
-* Test::Unit 2.4.x (Ruby 1.8.7)
-* Test::Unit 2.0.0 (Ruby 1.9+)
-* Test::Unit 2.5.x (Ruby 1.9+)
-* MiniTest 4 (Ruby 1.9+)
-* Minitest 5 (Ruby 1.9+)
+* RSpec 2
+* Test::Unit via [test-unit-rr](https://test-unit.github.io/#test-unit-rr)
+* MiniTest 4
+* Minitest 5
 
 and the following Rails versions:
 
-* Rails 2.3.x (Ruby 1.8.7)
-* Rails 3.2.x (Ruby 1.9+)
-* Rails 4.0.x (Ruby 1.9+)
+* Rails 4
 
 
 ## Help!
@@ -205,8 +205,9 @@ To run all the suites, simply say:
 
 ## Author/Contact
 
-RR was originally written by Brian Takita. It is currently maintained by Elliot
-Winkler (<elliot.winkler@gmail.com>).
+RR was originally written by Brian Takita. And it was maintained by
+Elliot Winkler (<elliot.winkler@gmail.com>). It is currently
+maintained by Kouhei Sutou (<kou@cozmixng.org>).
 
 
 ## Credits

data/Rakefile

@@ -4,52 +4,30 @@ require 'rake'
 
 require 'pp'
 
-# appraisal
-require 'appraisal'
-
 # build, install, release
 require 'bundler/gem_tasks'
 
-# appraisals
-Appraisal::File.each do |appraisal|
-  desc "Resolve and install dependencies for the #{appraisal.name} appraisal"
-  task "appraisal:#{appraisal.name}:install" do
-    appraisal.install
+begin
+  # appraisal
+  require 'appraisal'
+
+  # appraisals
+  Appraisal::File.each do |appraisal|
+    desc "Resolve and install dependencies for the #{appraisal.name} appraisal"
+    task "appraisal:#{appraisal.name}:install" do
+      appraisal.install
+    end
   end
+rescue LoadError
 end
 
 # spec
 require File.expand_path('../spec/defines_spec_suite_tasks', __FILE__)
 DefinesSpecSuiteTasks.call
-task :default => ['appraisal:install', :spec]
-
-task :package_tests do
-  require File.expand_path('../lib/rr/version', __FILE__)
-  require 'aws/s3'
-  require 'archive/tar/minitar'
-  require 'dotenv'
-
-  Dotenv.load
-  AWS.config(
-    :access_key_id => ENV['AWS_ACCESS_KEY_ID'],
-    :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY']
-  )
 
-  file_path = File.join(Dir.tmpdir, "rr-#{RR.version}-tests.tar")
-  File.open(file_path, 'wb') do |fh|
-    Zlib::GzipWriter.open(fh) do |zfh|
-      Archive::Tar::Minitar.pack('spec', zfh)
-    end
-  end
-  puts "Wrote to #{file_path}."
-
-  remote_file_path = "v#{RR.version}.tar.gz"
-  bucket_name = 'rubygem-rr/tests'
-  puts "Uploading #{file_path} to s3.amazonaws.com/#{bucket_name}/#{remote_file_path} ..."
-  s3 = AWS::S3.new
-  bucket = s3.buckets[bucket_name]
-  object = bucket.objects[remote_file_path]
-  File.open(file_path, 'rb') {|f| object.write(f) }
-  object.acl = :public_read
+desc "Run tests"
+task :test do
+  ruby("test/run-test.rb")
 end
-task :release => :package_tests
+
+task :default => ['appraisal:install', :spec, :test]

data/doc/02_syntax_comparison.md

@@ -94,3 +94,4 @@ my_object.should_receive(:hello).with('bob', 'jane').and_return('Hello Bob and J
 # RR
 mock(my_object).hello('bob', 'jane') { 'Hello Bob and Jane' }
 mock(my_object).hello('bob', 'jane').returns('Hello Bob and Jane')  # same thing, just more verbose
+~~~

data/lib/rr/core_ext/array.rb

@@ -1,6 +1,8 @@
 class Array
   def wildcard_match?(other)
     return false unless other.is_a?(Array)
+    return false unless size == other.size
+
     each_with_index do |value, i|
       if value.respond_to?(:wildcard_match?)
         return false unless value.wildcard_match?(other[i])

data/lib/rr/core_ext/hash.rb

@@ -3,6 +3,8 @@ class Hash
     return false unless other.is_a?(Hash)
 
     other_keys = other.keys
+    return false if keys.size != other_keys.size
+
     other_values = other.values
     each_with_index do |(key, value), i|
       if key.respond_to?(:wildcard_match?)

data/lib/rr/deprecations.rb

@@ -0,0 +1,97 @@
+module RR
+  module Adapters
+    # People who manually include RR into their test framework will use
+    # these constants
+
+    module MiniTest
+      def self.included(base)
+        RR::Deprecations.show_warning_for_deprecated_adapter
+        RR.autohook
+      end
+    end
+
+    module TestUnit
+      def self.included(base)
+        RR::Deprecations.show_warning_for_deprecated_adapter
+        RR.autohook
+      end
+    end
+
+    module RSpec2
+      def self.included(base)
+        RR::Deprecations.show_warning_for_deprecated_adapter
+        RR.autohook
+      end
+    end
+
+    module Rspec
+      def self.const_missing(name)
+        if name == :InvocationMatcher
+          # Old versions of the RSpec-2 adapter for RR floating out in the wild
+          # still refer to this constant
+          RR::Deprecations.constant_deprecated_in_favor_of(
+            'RR::Adapters::Rspec::InvocationMatcher',
+            'RR::Integrations::RSpec::InvocationMatcher'
+          )
+          RR::Integrations::RSpec::InvocationMatcher
+        else
+          super
+        end
+      end
+    end
+
+    module RRMethods
+      include RR::DSL
+
+      def self.included(base)
+        # This was once here but is now deprecated
+        RR::Deprecations.constant_deprecated_in_favor_of(
+          'RR::Adapters::RRMethods',
+          'RR::DSL'
+        )
+      end
+    end
+  end
+
+  # This is here because RSpec-2's RR adapters uses it
+  module Extensions
+    def self.const_missing(name)
+      if name == :InstanceMethods
+        RR.autohook
+        RR::Integrations::RSpec2::Mixin
+      else
+        super
+      end
+    end
+  end
+
+  module Deprecations
+    def self.show_warning(msg, options = {})
+      start_backtrace_at_frame = options.fetch(:start_backtrace_at_frame, 2)
+      backtrace = caller(start_backtrace_at_frame)
+
+      lines = []
+      lines << ('-' * 80)
+      lines << 'Warning from RR:'
+      lines.concat msg.split(/\n/).map {|l| "  #{l}" }
+      lines << ""
+      lines << "Called from:"
+      lines.concat backtrace[0..2].map {|l| " - #{l}" }
+      lines << ('-' * 80)
+
+      Kernel.warn lines.join("\n")
+    end
+
+    def self.constant_deprecated_in_favor_of(old_name, new_name)
+      show_warning "#{old_name} is deprecated;\nplease use #{new_name} instead.",
+        :start_backtrace_at_frame => 3
+    end
+
+    def self.show_warning_for_deprecated_adapter
+      RR::Deprecations.show_warning(<<EOT.strip)
+RR now has an autohook system. You don't need to `include RR::Adapters::*` in
+your test framework's base class anymore.
+EOT
+    end
+  end
+end

data/lib/rr/double_definitions/double_injections/any_instance_of.rb

@@ -3,7 +3,7 @@ module RR
     module DoubleInjections
       class AnyInstanceOf
         extend(Module.new do
-          include RR::Adapters::RRMethods
+          include RR::DSL
 
           def call(subject_class, stubbed_methods=nil, &block)
             strategy_lambda = lambda do |double_definition_create|

data/lib/rr/double_definitions/double_injections/instance.rb

@@ -3,7 +3,7 @@ module RR
     module DoubleInjections
       class Instance
         extend(Module.new do
-          include ::RR::Adapters::RRMethods
+          include ::RR::DSL
 
           def call(double_method_name, *args, &definition_eval_block)
             double_definition_create = DoubleDefinitions::DoubleDefinitionCreate.new
@@ -13,4 +13,4 @@ module RR
       end
     end
   end
-end
+end