rr 0.10.4 → 0.10.5

data/CHANGES

@@ -1,3 +1,9 @@
+0.10.5
+- Fixed issues with Ruby 1.9
+- Fixed stack overflow caused by double include in Test::Unit adapter [http://github.com/btakita/rr/issues#issue/16]. Identified by Dave Myron (http://github.com/contentfree)
+- Fixed warnings (Patch by Bryan Helmkamp)
+
+0.10.4
 - Handle lazily defined methods (where respond_to? returns true yet the method is not yet defined and the first call to method_missing defines the method). This pattern is used in ActiveRecord and ActionMailer.
 - Fixed warning about aliasing #instance_exec in jruby. http://github.com/btakita/rr/issues#issue/9 (Patch by Nathan Sobo)
 
@@ -218,4 +224,4 @@
 - Rspec and Test::Unit integration fixes
 
 * 0.1.0
-- Initial Release
+- Initial Release

data/README.rdoc

@@ -140,6 +140,15 @@ When the method is called "Information" is returned.
   view = controller.template
   mock(view).render(:partial => "user_info") {"Information"}
 
+You can also allow any number of arguments to be passed into the mock by using:
+  mock(view).render.with_any_args.twice do |*args|
+    if args.first == {:partial => "user_info}
+      "User Info"
+    else
+      "Stuff in the view #{args.inspect}"
+    end
+  end
+
 === stub
 stub replaces the method on the object with only an implementation. You
 can still use arguments to differentiate which stub gets invoked.
@@ -322,9 +331,11 @@ With any development effort, there are countless people who have contributed
 to making it possible. We all are standing on the shoulders of giants.
 * Andreas Haller for patches
 * Aslak Hellesoy for Developing Rspec
+* Bryan Helmkamp for patches
 * Christopher Redinger for patches
 * Dan North for syntax ideas
 * Dave Astels for some BDD inspiration
+* Dave Myron for a bug report
 * David Chelimsky for encouragement to make the RR framework, for developing the Rspec mock framework, syntax ideas, and patches
 * Daniel Sudol for identifing performance issues with RR
 * Felix Morio for pairing with me

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:minor: 10
-:patch: 4
+:patch: 5
+:build: 
 :major: 0
+:minor: 10

data/lib/rr/adapters/rspec.rb

@@ -24,9 +24,11 @@ module RR
       end
 
       class InvocationMatcher < SpyVerificationProxy
-        attr_reader :failure_message
+        attr_reader :failure_message, :spy_verification_proxy
  
         def initialize(method = nil)
+          @verification = nil
+          @subject = nil
           method_missing(method) if method
         end
 

data/lib/rr/adapters/test_unit.rb

@@ -5,19 +5,21 @@ module RR
       def self.included(mod)
         RR.trim_backtrace = true
         mod.class_eval do
-          alias_method :setup_without_rr, :setup
-          def setup_with_rr
-            setup_without_rr
-            RR.reset
-          end
-          alias_method :setup, :setup_with_rr
+          unless instance_methods.include?('setup_with_rr')
+            alias_method :setup_without_rr, :setup
+            def setup_with_rr
+              setup_without_rr
+              RR.reset
+            end
+            alias_method :setup, :setup_with_rr
 
-          alias_method :teardown_without_rr, :teardown
-          def teardown_with_rr
-            RR.verify
-            teardown_without_rr
+            alias_method :teardown_without_rr, :teardown
+            def teardown_with_rr
+              RR.verify
+              teardown_without_rr
+            end
+            alias_method :teardown, :teardown_with_rr
           end
-          alias_method :teardown, :teardown_with_rr
         end
       end
 

data/lib/rr/double_definitions/double_definition.rb

@@ -39,6 +39,9 @@ module RR
         @yields_value = nil
         @double_definition_creator = double_definition_creator
         @subject = subject
+        @ordered = false
+        @verbose = false
+        @verify_method_signature = false
       end
       
       attr_reader :argument_expectation

data/lib/rr/double_definitions/double_definition_creator.rb

@@ -52,7 +52,6 @@ module RR
       end
 
       attr_reader :subject, 
-                  :method_name, 
                   :args, :handler, 
                   :definition, 
                   :verification_strategy, 

data/lib/rr/errors/rr_error.rb

@@ -5,9 +5,9 @@ module RR
     class RRError < RuntimeError
       attr_writer :backtrace
       def backtrace
-        original_backtrace = (@backtrace) ? @backtrace : super
+        @backtrace ||= super
+        original_backtrace = @backtrace
         return original_backtrace unless RR.trim_backtrace
-
         return original_backtrace unless original_backtrace.respond_to?(:each)
         new_backtrace = []
         original_backtrace.each do |line|

data/lib/rr/injections/double_injection.rb

@@ -13,6 +13,7 @@ module RR
         @subject_class = subject_class
         @method_name = method_name.to_sym
         @doubles = []
+        @bypass_bound_method = nil
       end
 
       # RR::DoubleInjection#register_double adds the passed in Double
@@ -51,6 +52,7 @@ module RR
       # if one exists.
       def reset
         if subject_has_original_method?
+          subject_class.__send__(:remove_method, method_name)
           subject_class.__send__(:alias_method, method_name, original_method_alias_name)
           subject_class.__send__(:remove_method, original_method_alias_name)
         else

data/lib/rr/injections/method_missing_injection.rb

@@ -3,6 +3,7 @@ module RR
     class MethodMissingInjection < Injection
       def initialize(subject)
         @subject = subject
+        @placeholder_method_defined = false
       end
 
       def bind
@@ -26,9 +27,8 @@ module RR
           memoized_original_method_alias_name = original_method_alias_name
           placeholder_method_defined = @placeholder_method_defined
           subject_class.class_eval do
-            if placeholder_method_defined
-              remove_method :method_missing
-            else
+            remove_method :method_missing
+            unless placeholder_method_defined
               alias_method :method_missing, memoized_original_method_alias_name
             end
             remove_method memoized_original_method_alias_name

data/lib/rr/injections/singleton_method_added_injection.rb

@@ -3,6 +3,7 @@ module RR
     class SingletonMethodAddedInjection < Injection
       def initialize(subject)
         @subject = subject
+        @placeholder_method_defined = false
       end
 
       def bind
@@ -35,9 +36,8 @@ module RR
           memoized_original_method_alias_name = original_method_alias_name
           placeholder_method_defined = @placeholder_method_defined
           subject_class.class_eval do
-            if placeholder_method_defined
-              remove_method :singleton_method_added
-            else
+            remove_method :singleton_method_added
+            unless placeholder_method_defined
               alias_method :singleton_method_added, memoized_original_method_alias_name
             end
             remove_method memoized_original_method_alias_name

data/ruby_19_spec.rb

@@ -0,0 +1,12 @@
+require 'rubygems'
+require 'spec'
+require 'rr'
+include RR::Adapters::Rspec
+
+mock( socket = Object.new )
+stub(socket).bind("", 3333)
+
+stub(UDPSocket).new { socket }
+
+UDPSocket.new.bind( "", 3333 )
+UDPSocket.new.bind( "", 3333 )

data/spec/rr/double_definitions/double_definition_spec.rb

@@ -885,8 +885,11 @@ module RR
 
           context "when passed a Method" do
             it "sets the implementation to the passed in method" do
-              def subject.foobar(a, b)
-                [b, a]
+              class << subject
+                remove_method :foobar
+                def foobar(a, b)
+                  [b, a]
+                end
               end
               definition.implemented_by(subject.method(:foobar))
               subject.foobar(1, 2).should == [2, 1]

data/spec/rr/double_injection/double_injection_spec.rb

@@ -11,10 +11,13 @@ module RR
         end
       end
 
+      before do
+        @subject = Object.new
+      end
+
       describe "mock/stub" do
         context "when the subject responds to the injected method" do
           before do
-            @subject = Object.new
             class << subject
               attr_reader :original_foobar_called
 
@@ -24,10 +27,6 @@ module RR
               end
             end
 
-            def subject.foobar
-              :original_foobar
-            end
-
             subject.should respond_to(:foobar)
             subject.methods.should include('foobar')
             stub(subject).foobar {:new_foobar}
@@ -67,7 +66,6 @@ module RR
 
         context "when the subject does not respond to the injected method" do
           before do
-            @subject = Object.new
             subject.should_not respond_to(:foobar)
             subject.methods.should_not include('foobar')
             stub(subject).foobar {:new_foobar}
@@ -113,8 +111,6 @@ module RR
           context "when the subject has the method defined" do
             describe "being bound" do
               before do
-                @subject = Object.new
-
                 def subject.foobar
                   :original_foobar
                 end
@@ -161,7 +157,6 @@ module RR
             describe "being bound" do
               context "when the subject has not been previously bound to" do
                 before do
-                  @subject = Object.new
                   setup_subject
 
                   subject.should respond_to(:foobar)
@@ -313,7 +308,6 @@ module RR
 
               context "when the subject has been previously bound to" do
                 before do
-                  @subject = Object.new
                   setup_subject
 
                   subject.should respond_to(:foobar)
@@ -471,7 +465,6 @@ module RR
           context "when the subject responds to the method via method_missing" do
             describe "being bound" do
               before do
-                @subject = Object.new
                 subject.should_not respond_to(:foobar)
                 subject.methods.should_not include('foobar')
                 class << subject
@@ -516,7 +509,6 @@ module RR
           context "when the subject would raise a NoMethodError when the method is called" do
             describe "being bound" do
               before do
-                @subject = Object.new
                 subject.should_not respond_to(:foobar)
                 subject.methods.should_not include('foobar')
                 stub.proxy(subject).foobar {:new_foobar}

data/spec/rr/double_spec.rb

@@ -160,8 +160,11 @@ module RR
 
       describe "when implemented by a method" do
         it "sends block to the method" do
-          def subject.foobar(a, b)
-            yield(a, b)
+          class << subject
+            remove_method :foobar
+            def foobar(a, b)
+              yield(a, b)
+            end
           end
 
           double.definition.with(1, 2).implemented_by(subject.method(:foobar))

data/spec/rr/test_unit/test_unit_integration_test.rb

@@ -1,6 +1,8 @@
 require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 
 class TestUnitIntegrationTest < Test::Unit::TestCase
+  include RR::Adapters::TestUnit # Testing against double inclusion issues
+  
   def setup
     super
     @subject = Object.new

data/spec/spec_suite.rb

@@ -1,4 +1,12 @@
+require "rubygems"
+require "session"
+
 class ExampleSuite
+  attr_reader :bash
+  def initialize
+    @bash = Session::Bash.new
+  end
+
   def run
     run_core_examples
     run_rspec_examples
@@ -6,15 +14,24 @@ class ExampleSuite
   end
 
   def run_core_examples
-    system("ruby #{dir}/core_spec_suite.rb #{spec_opts}") || raise("Core suite Failed")
+    run_suite("#{dir}/core_spec_suite.rb #{spec_opts}") || raise("Core suite Failed")
   end
 
   def run_rspec_examples
-    system("ruby #{dir}/rspec_spec_suite.rb #{spec_opts}") || raise("Rspec suite Failed")
+    run_suite("#{dir}/rspec_spec_suite.rb #{spec_opts}") || raise("Rspec suite Failed")
   end
 
   def run_test_unit_examples
-    system("ruby #{dir}/test_unit_spec_suite.rb") || raise("Test::Unit suite Failed")
+    run_suite("#{dir}/test_unit_spec_suite.rb") || raise("Test::Unit suite Failed")
+  end
+
+  def run_suite(path)
+    # From http://www.eglug.org/node/946
+    bash.execute "exec 3>&1", :out => STDOUT, :err => STDERR
+    bash.execute "ruby -W #{path} 2>&1 >&3 3>&- | grep -v 'warning: useless use of' 3>&-; STATUS=${PIPESTATUS[0]}", :out => STDOUT, :err => STDERR
+    status = bash.execute("echo $STATUS")[0].to_s.strip.to_i
+    bash.execute "exec 3>&-", :out => STDOUT, :err => STDERR
+    return status == 0
   end
 
   def spec_opts

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors: 
 - Brian Takita
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-26 00:00:00 -07:00
+date: 2009-12-20 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -95,6 +95,7 @@ files:
 - lib/rr/wildcard_matchers/range.rb
 - lib/rr/wildcard_matchers/regexp.rb
 - lib/rr/wildcard_matchers/satisfy.rb
+- ruby_19_spec.rb
 - spec/core_spec_suite.rb
 - spec/environment_fixture_setup.rb
 - spec/high_level_spec.rb