rr 1.1.1 → 3.0.0

data/gemfiles/ruby_19_rspec_2.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+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
+gem "rspec", "~> 2.14"
+

data/gemfiles/ruby_19_rspec_2.gemfile.lock

@@ -0,0 +1,49 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (0.5.2)
+      bundler
+      rake
+    aws-sdk (1.9.5)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+      uuidtools (~> 2.1)
+    diff-lcs (1.2.4)
+    dotenv (0.7.0)
+    json (1.8.0)
+    json (1.8.0-java)
+    minitar (0.5.4)
+    multi_json (1.7.7)
+    nokogiri (1.5.9)
+    nokogiri (1.5.9-java)
+    open4 (1.3.0)
+    posix-spawn (0.3.6)
+    rake (10.0.4)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    uuidtools (2.1.4)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.5)
+  aws-sdk (~> 1.0)
+  dotenv (~> 0.7)
+  minitar (~> 0.5)
+  open4
+  posix-spawn
+  rake (~> 10.0)
+  rspec (~> 2.14)
+  simplecov (~> 0.7)

data/gemfiles/ruby_19_rspec_2_rails_4.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+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
+gem "rspec", "~> 2.14"
+gem "rails", "4.0.0"
+

data/gemfiles/ruby_19_rspec_2_rails_4.gemfile.lock

@@ -0,0 +1,119 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (4.0.0)
+    atomic (1.1.13)
+    aws-sdk (1.9.5)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+      uuidtools (~> 2.1)
+    builder (3.1.4)
+    diff-lcs (1.2.4)
+    dotenv (0.7.0)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.5)
+    json (1.8.0)
+    json (1.8.0-java)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.24)
+    minitar (0.5.4)
+    minitest (4.7.5)
+    multi_json (1.7.9)
+    nokogiri (1.5.9)
+    nokogiri (1.5.9-java)
+    open4 (1.3.0)
+    polyglot (0.3.3)
+    posix-spawn (0.3.6)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sprockets (2.10.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    thor (0.18.1)
+    thread_safe (0.1.2)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.14)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+    uuidtools (2.1.4)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.5)
+  aws-sdk (~> 1.0)
+  dotenv (~> 0.7)
+  minitar (~> 0.5)
+  open4
+  posix-spawn
+  rails (= 4.0.0)
+  rake (~> 10.0)
+  rspec (~> 2.14)
+  simplecov (~> 0.7)

data/lib/rr/class_instance_method_defined.rb

@@ -6,4 +6,4 @@ module RR
         klass.private_instance_methods(include_super).detect {|method_name| method_name.to_sym == instance_method.to_sym}
     end
   end
-end
+end

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.rb

@@ -4,14 +4,20 @@ module RR
   # and the implementation.
   class Double
     extend(Module.new do
-      def formatted_name(method_name, args)
-        formatted_errors = args.collect {|arg| arg.inspect}.join(', ')
+      def formatted_name(method_name, args, kwargs)
+        formatted_arguments =
+          args.collect {|arg| arg.inspect} +
+          kwargs.collect {|keyword, value| "#{keyword}: #{value.inspect}"}
+        formatted_errors = formatted_arguments.join(', ')
         "#{method_name}(#{formatted_errors})"
       end
 
       def list_message_part(doubles)
         doubles.collect do |double|
-          "- #{formatted_name(double.method_name, double.expected_arguments)}"
+          name = formatted_name(double.method_name,
+                                double.expected_arguments,
+                                double.expected_keyword_arguments)
+          "- #{name}"
         end.join("\n")
       end
     end)
@@ -32,14 +38,14 @@ module RR
 
     # Double#exact_match? returns true when the passed in arguments
     # exactly match the ArgumentEqualityExpectation arguments.
-    def exact_match?(*arguments)
-      definition.exact_match?(*arguments)
+    def exact_match?(arguments, keyword_arguments)
+      definition.exact_match?(arguments, keyword_arguments)
     end
 
     # Double#wildcard_match? returns true when the passed in arguments
     # wildcard match the ArgumentEqualityExpectation arguments.
-    def wildcard_match?(*arguments)
-      definition.wildcard_match?(*arguments)
+    def wildcard_match?(arguments, keyword_arguments)
+      definition.wildcard_match?(arguments, keyword_arguments)
     end
 
     # Double#attempt? returns true when the
@@ -74,18 +80,26 @@ module RR
       argument_expectation.expected_arguments
     end
 
+    # The keyword arguments that this Double expects
+    def expected_keyword_arguments
+      verify_argument_expectation_is_set
+      argument_expectation.expected_keyword_arguments
+    end
+
     # The TimesCalledMatcher for the TimesCalledExpectation
     def times_matcher
       definition.times_matcher
     end
 
     def formatted_name
-      self.class.formatted_name(method_name, expected_arguments)
+      self.class.formatted_name(method_name,
+                                expected_arguments,
+                                expected_keyword_arguments)
     end
 
-    def method_call(args)
+    def method_call(args, kwargs)
       if verbose?
-        puts Double.formatted_name(method_name, args)
+        puts Double.formatted_name(method_name, args, kwargs)
       end
       times_called_expectation.attempt if definition.times_matcher
       space.verify_ordered_double(self) if ordered?
@@ -148,6 +162,10 @@ module RR
       definition.argument_expectation.expected_arguments
     end
 
+    def kwargs
+      definition.argument_expectation.expected_keyword_arguments
+    end
+
     def argument_expectation
       definition.argument_expectation
     end

data/lib/rr/double_definitions/double_definition.rb

@@ -36,16 +36,26 @@ module RR
       end
 
       module ArgumentDefinitionConstructionMethods
-        # Double#with sets the expectation that the Double will receive
-        # the passed in arguments.
-        #
-        # Passing in a block sets the return value.
-        #
-        #   mock(subject).method_name.with(1, 2) {:return_value}
-        def with(*args, &return_value_block)
-          @argument_expectation = Expectations::ArgumentEqualityExpectation.new(*args)
-          install_method_callback return_value_block
-          self
+        if KeywordArguments.fully_supported?
+          # Double#with sets the expectation that the Double will receive
+          # the passed in arguments.
+          #
+          # Passing in a block sets the return value.
+          #
+          #   mock(subject).method_name.with(1, 2) {:return_value}
+          def with(*args, **kwargs, &return_value_block)
+            @argument_expectation =
+              Expectations::ArgumentEqualityExpectation.new(args, kwargs)
+            install_method_callback return_value_block
+            self
+          end
+        else
+          def with(*args, &return_value_block)
+            @argument_expectation =
+              Expectations::ArgumentEqualityExpectation.new(args, {})
+            install_method_callback return_value_block
+            self
+          end
         end
 
         # Double#with_any_args sets the expectation that the Double can receive
@@ -67,7 +77,8 @@ module RR
         #
         #   mock(subject).method_name.with_no_args {:return_value}
         def with_no_args(&return_value_block)
-          @argument_expectation = Expectations::ArgumentEqualityExpectation.new()
+          @argument_expectation =
+            Expectations::ArgumentEqualityExpectation.new([], {})
           install_method_callback return_value_block
           self
         end
@@ -298,18 +309,18 @@ module RR
           @verbose ? true : false
         end
 
-        def exact_match?(*arguments)
+        def exact_match?(arguments, keyword_arguments)
           unless @argument_expectation
             raise RR::Errors.build_error(:DoubleDefinitionError, "#argument_expectation must be defined on #{inspect}")
           end
-          @argument_expectation.exact_match?(*arguments)
+          @argument_expectation.exact_match?(arguments, keyword_arguments)
         end
 
-        def wildcard_match?(*arguments)
+        def wildcard_match?(arguments, keyword_arguments)
           unless @argument_expectation
             raise RR::Errors.build_error(:DoubleDefinitionError, "#argument_expectation must be defined on #{inspect}")
           end
-          @argument_expectation.wildcard_match?(*arguments)
+          @argument_expectation.wildcard_match?(arguments, keyword_arguments)
         end
 
         def terminal?
@@ -320,7 +331,19 @@ module RR
         end
 
         def expected_arguments
-          argument_expectation ? argument_expectation.expected_arguments : []
+          if argument_expectation
+            argument_expectation.expected_arguments
+          else
+            []
+          end
+        end
+
+        def expected_keyword_arguments
+          if argument_expectation
+            argument_expectation.expected_keyword_arguments
+          else
+            {}
+          end
         end
 
         def implementation_is_original_method?