rr 1.0.4 → 1.0.5.rc1

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

@@ -6,9 +6,10 @@ module RR
           include RR::Adapters::RRMethods
 
           def call(subject_class, stubbed_methods=nil, &block)
-            ::RR::DoubleDefinitions::DoubleDefinitionCreate.set_default_double_injection_strategy(lambda do |double_definition_create|
+            strategy_lambda = lambda do |double_definition_create|
               ::RR::DoubleDefinitions::Strategies::DoubleInjection::AnyInstanceOf.new(double_definition_create)
-            end) do
+            end
+            ::RR::DoubleDefinitions::DoubleDefinitionCreate.set_default_double_injection_strategy(strategy_lambda) do
               if stubbed_methods
                 subject_class.class_eval do
                   stubbed_methods.each do |name, value|

data/lib/rr/double_definitions/strategies/strategy.rb

@@ -3,21 +3,22 @@ module RR
     module Strategies
       class Strategy
         attr_reader :double_definition_create, :definition, :method_name, :args, :handler
+
         include Space::Reader
 
         def initialize(double_definition_create)
           @double_definition_create = double_definition_create
         end
-        
+
         def call(definition, method_name, args, handler)
           @definition, @method_name, @args, @handler = definition, method_name, args, handler
           do_call
         end
 
         def verify_subject(subject)
-        end  
+        end
 
-        protected
+      protected
         def do_call
           raise NotImplementedError
         end
@@ -40,4 +41,4 @@ module RR
       end
     end
   end
-end
+end

data/lib/rr/double_definitions/strategies/strategy_methods.rb

@@ -4,10 +4,10 @@ module RR
       module StrategyMethods
         extend(Module.new do
           def lately_bound_alias_method(target_method_name, source_method_name)
-            module_eval((<<-METHOD), __FILE__, __LINE__+1)
-            def #{target_method_name}(*args, &block)
-              #{source_method_name}(*args, &block)
-            end
+            module_eval(<<-METHOD, __FILE__, __LINE__+1)
+              def #{target_method_name}(*args, &block)
+                #{source_method_name}(*args, &block)
+              end
             METHOD
           end
         end)
@@ -39,14 +39,12 @@ module RR
         def any_instance_of!(method_name=nil, &definition_eval_block)
           any_instance_of(Object.new, method_name, &definition_eval_block)
         end
-        lately_bound_alias_method :all_instances_of, :any_instance_of
-        lately_bound_alias_method :all_instances_of!, :any_instance_of!
 
         def instance_of!(method_name=nil, &definition_eval_block)
           instance_of(Object.new, method_name, &definition_eval_block)
         end
-        lately_bound_alias_method :new_instance_of, :instance_of
-        lately_bound_alias_method :new_instance_of!, :instance_of!
+        lately_bound_alias_method :all_instances_of, :instance_of
+        lately_bound_alias_method :all_instances_of!, :instance_of!
       end
     end
   end

data/lib/rr/double_definitions/strategies/verification/mock.rb

@@ -14,7 +14,7 @@ module RR
         #
         # When passed the subject, a DoubleDefinitionCreateBlankSlate is returned. Passing
         # a method with arguments to the proxy will set up expectations that
-        # the a call to the subject's method with the arguments will happen,
+        # a call to the subject's method with the arguments will happen,
         # and return the prescribed value.
         #   mock(subject).method_name_1 {return_value_1}
         #   mock(subject).method_name_2(arg1, arg2) {return_value_2}
@@ -29,7 +29,7 @@ module RR
         #   mock(subject) do
         #     method_name_1 {return_value_1}
         #     method_name_2(arg_1, arg_2) {return_value_2}
-        #   end        
+        #   end
         class Mock < VerificationStrategy
           protected
           def do_call
@@ -39,4 +39,4 @@ module RR
       end
     end
   end
-end
+end

data/lib/rr/double_matches.rb

@@ -5,6 +5,7 @@ module RR
                 :exact_non_terminal_doubles_to_attempt,
                 :wildcard_terminal_doubles_to_attempt,
                 :wildcard_non_terminal_doubles_to_attempt
+
     def initialize(doubles) #:nodoc:
       @doubles = doubles
       @matching_doubles = []
@@ -39,4 +40,4 @@ module RR
       self
     end
   end
-end
+end

data/lib/rr/expectations/argument_equality_expectation.rb

@@ -32,10 +32,10 @@ module RR
         expected_arguments == other.expected_arguments
       end
 
-      protected
+    protected
       def equality_match(arg1, arg2)
         arg1.respond_to?(:'__rr__original_==') ? arg1.__send__(:'__rr__original_==', arg2) : arg1 == arg2
       end
     end
   end
-end
+end

data/lib/rr/expectations/times_called_expectation.rb

@@ -40,7 +40,7 @@ module RR
         times_matcher.terminal?
       end
 
-      protected
+    protected
       def times_matcher
         double.definition.times_matcher
       end
@@ -54,4 +54,4 @@ module RR
       end
     end
   end
-end
+end

data/lib/rr/injections/double_injection.rb

@@ -86,6 +86,7 @@ module RR
           end
         end
       end)
+
       include ClassInstanceMethodDefined
 
       attr_reader :subject_class, :method_name, :doubles
@@ -126,12 +127,12 @@ module RR
         BoundObjects[id] = subject_class
 
         subject_class.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-        def #{method_name}(*args, &block)
-          ::RR::Injections::DoubleInjection::BoundObjects[#{id}].class_eval do
-            remove_method(:#{method_name})
+          def #{method_name}(*args, &block)
+            ::RR::Injections::DoubleInjection::BoundObjects[#{id}].class_eval do
+              remove_method(:#{method_name})
+            end
+            method_missing(:#{method_name}, *args, &block)
           end
-          method_missing(:#{method_name}, *args, &block)
-        end
         RUBY
         self
       end
@@ -141,11 +142,11 @@ module RR
         BoundObjects[id] = subject_class
 
         subject_class.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-        def #{method_name}(*args, &block)
-          arguments = MethodArguments.new(args, block)
-          obj = ::RR::Injections::DoubleInjection::BoundObjects[#{id}]
-          RR::Injections::DoubleInjection.dispatch_method(self, obj, :#{method_name}, arguments.arguments, arguments.block)
-        end
+          def #{method_name}(*args, &block)
+            arguments = MethodArguments.new(args, block)
+            obj = ::RR::Injections::DoubleInjection::BoundObjects[#{id}]
+            RR::Injections::DoubleInjection.dispatch_method(self, obj, :#{method_name}, arguments.arguments, arguments.block)
+          end
         RUBY
         self
       end
@@ -203,7 +204,7 @@ module RR
         @dispatch_method_delegates_to_dispatch_original_method = nil
       end
 
-      protected
+    protected
       def deferred_bind_method
         unless subject_has_method_defined?(original_method_alias_name)
           bind_method_with_alias

data/lib/rr/injections/injection.rb

@@ -22,7 +22,7 @@ module RR
         subject_class.instance_method(original_method_alias_name)
       end
 
-      protected
+    protected
       def subject_respond_to_method?(subject, method_name)
         subject_has_method_defined?(method_name) ||
           class_instance_method_defined(subject_class, :respond_to?) &&
@@ -30,4 +30,4 @@ module RR
       end
     end
   end
-end
+end

data/lib/rr/injections/method_missing_injection.rb

@@ -12,9 +12,13 @@ module RR
           instances.include?(subject)
         end
       end)
+
+      BoundObjects = {}
+
       include ClassInstanceMethodDefined
 
       attr_reader :subject_class
+
       def initialize(subject_class)
         @subject_class = subject_class
         @placeholder_method_defined = false
@@ -30,6 +34,18 @@ module RR
               end
             end
           end
+          # Ruby 1.9 will raise a NoMethodError when #method_missing is defined
+          # on the subject, but #to_ary isn't. #method_missing will always be
+          # defined thanks to BasicObject, but #to_ary may not, so in this case
+          # we need to supply our own. Furthermore, Ruby has special logic to
+          # handle the return value of #to_ary; if it is nil, then it tells Ruby
+          # to ignore #to_ary altogether and use a default rule to arrayify the
+          # object in question.
+          unless class_instance_method_defined(subject_class, :to_ary)
+            subject_class.class_eval do
+              def to_ary; nil; end
+            end
+          end
           subject_class.__send__(:alias_method, original_method_alias_name, :method_missing)
           bind_method
         end
@@ -50,18 +66,16 @@ module RR
         end
       end
 
-      protected
-      BoundObjects = {}
-
+    protected
       def bind_method
         id = BoundObjects.size
         BoundObjects[id] = subject_class
 
         subject_class.class_eval((<<-METHOD), __FILE__, __LINE__ + 1)
-        def method_missing(method_name, *args, &block)
-          obj = ::RR::Injections::MethodMissingInjection::BoundObjects[#{id}]
-          MethodDispatches::MethodMissingDispatch.new(self, obj, method_name, args, block).call
-        end
+          def method_missing(method_name, *args, &block)
+            obj = ::RR::Injections::MethodMissingInjection::BoundObjects[#{id}]
+            MethodDispatches::MethodMissingDispatch.new(self, obj, method_name, args, block).call
+          end
         METHOD
       end
 

data/lib/rr/injections/singleton_method_added_injection.rb

@@ -16,9 +16,11 @@ module RR
           instances.include?(subject)
         end
       end)
+
       include ClassInstanceMethodDefined
 
       attr_reader :subject_class
+
       def initialize(subject_class)
         @subject_class = subject_class
         @placeholder_method_defined = false
@@ -63,7 +65,7 @@ module RR
         end
       end
 
-      protected
+    protected
       def original_method_alias_name
         "__rr__original_singleton_method_added"
       end

data/lib/rr/method_dispatches/base_method_dispatch.rb

@@ -10,7 +10,7 @@ module RR
         raise NotImplementedError
       end
 
-      protected
+    protected
       def find_double_to_attempt
         matches = DoubleMatches.new(doubles).find_all_matches(args)
 

data/lib/rr/method_dispatches/method_dispatch.rb

@@ -2,6 +2,7 @@ module RR
   module MethodDispatches
     class MethodDispatch < BaseMethodDispatch
       attr_reader :double_injection, :subject
+
       def initialize(double_injection, subject, args, block)
         @double_injection, @subject, @args, @block = double_injection, subject, args, block
         @double = find_double_to_attempt
@@ -34,7 +35,7 @@ module RR
         end
       end
 
-      protected
+    protected
       def call_implementation
         if implementation_is_original_method?
           call_original_method

data/lib/rr/method_dispatches/method_missing_dispatch.rb

@@ -8,6 +8,7 @@ module RR
       end)
 
       attr_reader :subject, :subject_class, :method_name
+
       def initialize(subject, subject_class, method_name, args, block)
         @subject, @subject_class, @method_name, @args, @block = subject, subject_class, method_name, args, block
       end
@@ -36,7 +37,7 @@ module RR
         end
       end
 
-      protected
+    protected
       def call_implementation
         if implementation_is_original_method?
           space.record_call(subject, method_name, args, block)

data/lib/rr/proc_from_block.rb

@@ -1,7 +1,11 @@
 module RR
-  class ProcFromBlock < Proc
-    def ==(other)
-      Proc.new(&self) == other
+  if RUBY_VERSION =~ /^1.8/
+    class ProcFromBlock < Proc
+      def ==(other)
+        Proc.new(&self) == other
+      end
     end
+  else
+    ProcFromBlock = Proc
   end
-end
+end

data/lib/rr/space.rb

@@ -13,7 +13,7 @@ module RR
       end
       attr_writer :instance
 
-      protected
+    protected
       def method_missing(method_name, *args, &block)
         instance.__send__(method_name, *args, &block)
       end
@@ -21,6 +21,7 @@ module RR
 
     attr_reader :ordered_doubles, :recorded_calls
     attr_accessor :trim_backtrace
+
     def initialize
       @ordered_doubles = []
       @trim_backtrace = false
@@ -86,7 +87,7 @@ module RR
       ]
     end
 
-    protected
+  protected
     # Removes the ordered Doubles from the list
     def reset_ordered_doubles
       @ordered_doubles.clear

data/lib/rr/times_called_matchers/times_called_matcher.rb

@@ -35,10 +35,10 @@ module RR
         "#{@times.inspect} times"
       end
 
-      protected
+    protected
       def pluralized_time(times_called)
         (times_called == 1) ? "time" : "times"
       end
     end
   end
-end
+end

data/lib/rr/version.rb

@@ -0,0 +1,5 @@
+
+module RR
+  VERSION = File.read(File.expand_path('../../../VERSION', __FILE__))
+  def self.version; VERSION; end
+end

data/lib/rr/wildcard_matchers/boolean.rb

@@ -14,10 +14,10 @@ module RR
         'boolean'
       end
 
-      protected
+    protected
       def is_a_boolean?(subject)
         subject.is_a?(TrueClass) || subject.is_a?(FalseClass)
       end
     end
   end
-end
+end

data/spec/runner.rb

@@ -0,0 +1,41 @@
+require 'session'
+
+class SuitesRunner
+  TEST_SUITES = [
+    [:rspec, 'RSpec', 'RSpec'],
+    [:test_unit, 'TestUnit', 'Test::Unit'],
+    [:minitest, 'Minitest', 'MiniTest']
+  ]
+
+  attr_reader :bash
+
+  def initialize
+    @bash = Session::Bash.new
+  end
+
+  def run
+    TEST_SUITES.each_with_index do |(path, class_fragment, desc), i|
+      puts "----------------" unless i == 0
+      run_examples(path, class_fragment, desc)
+      puts
+    end
+  end
+
+  def run_examples(path, class_fragment, desc)
+    path = File.expand_path("../suites/#{path}/runner.rb", __FILE__)
+    # From http://www.eglug.org/node/946
+    bash.execute "exec 3>&1", :out => STDOUT, :err => STDERR
+    # XXX: why are we checking for this warning here...
+    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
+    unless status == 0
+      raise "#{desc} Suite Failed"
+    end
+  end
+end
+
+if $0 == __FILE__
+  SuitesRunner.new.run
+end
+