rr 1.0.4 → 1.0.5.rc1

data/Rakefile

@@ -1,88 +1,34 @@
-require "rake"
-require 'rake/contrib/rubyforgepublisher'
-require 'rake/clean'
-require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rubygems'
+require 'rake'
 
-desc "Runs the Rspec suite"
-task(:default) do
-  run_suite
-end
-
-desc "Runs the Rspec suite"
-task(:spec) do
-  run_suite
-end
+require File.expand_path('../spec/runner', __FILE__)
 
-def run_suite
-  dir = File.dirname(__FILE__)
-  system("ruby #{dir}/spec/spec_suite.rb") || raise("Spec Suite failed")
-end
+task :default => :spec
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "rr"
-    s.summary = "RR (Double Ruby) is a double framework that features a rich " <<
-                "selection of double techniques and a terse syntax. " <<
-                "http://xunitpatterns.com/Test%20Double.html"
-    s.email = "brian@pivotallabs.com"
-    s.homepage = "http://pivotallabs.com"
-    s.description = "RR (Double Ruby) is a double framework that features a rich " <<
-                    "selection of double techniques and a terse syntax. " <<
-                    "http://xunitpatterns.com/Test%20Double.html"
-    s.authors = ["Brian Takita"]
-    s.files = FileList[
-      '[A-Z]*',
-      '*.rb',
-      'lib/**/*.rb',
-      'spec/**/*.rb'
-    ].to_a
-    s.test_files = Dir.glob('spec/*_spec.rb')
-    s.has_rdoc = true
-    s.extra_rdoc_files = [ "README.rdoc", "CHANGES" ]
-    s.rdoc_options = ["--main", "README.rdoc", "--inline-source", "--line-numbers"]
-    s.rubyforge_project = "pivotalrb"
+desc "Runs all of the tests"
+task :spec do
+  ARGV.clear
+  unless SuitesRunner.new.run
+    raise "Spec Suite failed"
   end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
-RUBYFORGE_PACKAGE_NAME = "rr (Double Ruby)"
-# The package was renamed from "rr (Double R)" to "rr (Double Ruby)".
-# When this was last run, the script did not work for the new name but it did work for the old name.
-# Perhaps more time was needed for the name change to propagate?
-#RUBYFORGE_PACKAGE_NAME = "rr (Double R)"
-
-# This is hacked to get around the 3 character limitation for package names on Rubyforge.
-# http://rubyforge.org/tracker/index.php?func=detail&aid=27026&group_id=5&atid=102
-class Jeweler
-  module Commands
-    class ReleaseToRubyforge
-      def run
-        raise NoRubyForgeProjectInGemspecError unless @gemspec.rubyforge_project
 
-        @rubyforge.configure rescue nil
-
-        output.puts 'Logging in rubyforge'
-        @rubyforge.login
-
-        @rubyforge.userconfig['release_notes'] = @gemspec.description if @gemspec.description
-        @rubyforge.userconfig['preformatted'] = true
-
-        output.puts "Releasing #{@gemspec.name}-#{@version} to #{@gemspec.rubyforge_project}"
-        begin
-          @rubyforge.add_release(@gemspec.rubyforge_project, RUBYFORGE_PACKAGE_NAME, @version.to_s, @gemspec_helper.gem_path)
-        rescue StandardError => e
-          case e.message
-          when /no <group_id> configured for <#{Regexp.escape @gemspec.rubyforge_project}>/
-            raise RubyForgeProjectNotConfiguredError, @gemspec.rubyforge_project
-          when /no <package_id> configured for <#{Regexp.escape @gemspec.name}>/i
-            raise MissingRubyForgePackageError, @gemspec.name
-          else
-            raise
-          end
-        end
+namespace :spec do
+  SuitesRunner::TEST_SUITES.each do |path, class_fragment, desc|
+    desc "Runs all of the #{desc} tests"
+    task path do
+      ARGV.clear
+      require File.expand_path("../spec/suites/#{path}/runner.rb", __FILE__)
+      unless Object.const_get("#{class_fragment}SuiteRunner").new.run
+        raise "#{desc} Suite failed"
       end
     end
   end
 end
+
+begin
+  require 'bundler'
+  require 'bundler/gem_tasks'
+rescue LoadError
+  puts "Bundler isn't installed. Run `gem install bundler` to get it."
+end

data/VERSION

@@ -0,0 +1 @@
+1.0.5.rc1

data/lib/rr.rb

@@ -83,9 +83,12 @@ require "#{dir}/rr/spy_verification_proxy"
 require "#{dir}/rr/spy_verification"
 
 require "#{dir}/rr/adapters/rspec"
+require "#{dir}/rr/adapters/rspec2"
 require "#{dir}/rr/adapters/test_unit"
 require "#{dir}/rr/adapters/minitest"
 
+require "#{dir}/rr/version"
+
 module RR
   class << self
     include Adapters::RRMethods

data/lib/rr/adapters/minitest.rb

@@ -2,6 +2,7 @@ module RR
   module Adapters
     module MiniTest
       include RRMethods
+
       def self.included(mod)
         RR.trim_backtrace = true
         mod.class_eval do
@@ -16,6 +17,11 @@ module RR
             alias_method :teardown_without_rr, :teardown
             def teardown_with_rr
               RR.verify
+            rescue RR::Errors::RRError => rr_error
+              assertion = ::MiniTest::Assertion.new(rr_error.message)
+              assertion.set_backtrace(rr_error.backtrace)
+              raise assertion
+            ensure
               teardown_without_rr
             end
             alias_method :teardown, :teardown_with_rr

data/lib/rr/adapters/rr_methods.rb

@@ -2,6 +2,7 @@ module RR
   module Adapters
     module RRMethods
       include ::RR::DoubleDefinitions::Strategies::StrategyMethods
+
       def mock(subject=DoubleDefinitions::DoubleDefinitionCreate::NO_SUBJECT, method_name=nil, &definition_eval_block)
         double_definition_create = DoubleDefinitions::DoubleDefinitionCreate.new
         double_definition_create.mock(subject, method_name, &definition_eval_block)
@@ -31,8 +32,10 @@ module RR
         double_definition_create = DoubleDefinitions::DoubleDefinitionCreate.new
         double_definition_create.instance_of(subject, method_name, &definition_eval_block)
       end
-      alias_method :any_instance_of, :instance_of
-      alias_method :all_instances_of, :instance_of
+
+      def any_instance_of(*args, &block)
+        RR::DoubleDefinitions::DoubleInjections::AnyInstanceOf.call(*args, &block)
+      end
 
       # Verifies all the DoubleInjection objects have met their
       # TimesCalledExpectations.
@@ -127,19 +130,12 @@ module RR
         RR::SpyVerificationProxy.new(subject)
       end
 
-      def new_instance_of(*args, &block)
-        RR::DoubleDefinitions::DoubleInjections::NewInstanceOf.call(*args, &block)
-      end
-
-      def any_instance_of(*args, &block)
-        RR::DoubleDefinitions::DoubleInjections::AnyInstanceOf.call(*args, &block)
-      end
-
       instance_methods.each do |name|
         alias_method "rr_#{name}", name
       end
     end
   end
+
   module Extensions
     InstanceMethods = Adapters::RRMethods
   end

data/lib/rr/adapters/rspec.rb

@@ -9,12 +9,15 @@ module RR
       end
 
       include RRMethods
+
       def setup_mocks_for_rspec
         RR.reset
       end
+
       def verify_mocks_for_rspec
         RR.verify
       end
+
       def teardown_mocks_for_rspec
         RR.reset
       end

data/lib/rr/adapters/rspec2.rb

@@ -0,0 +1,30 @@
+module RR
+  module Adapters
+    module RSpec2
+      def self.included(mod)
+        patterns = RSpec.configuration.backtrace_clean_patterns
+        unless patterns.include?(RR::Errors::BACKTRACE_IDENTIFIER)
+          patterns.push(RR::Errors::BACKTRACE_IDENTIFIER)
+        end
+      end
+
+      include RRMethods
+
+      def setup_mocks_for_rspec
+        RR.reset
+      end
+
+      def verify_mocks_for_rspec
+        RR.verify
+      end
+
+      def teardown_mocks_for_rspec
+        RR.reset
+      end
+
+      def have_received(method = nil)
+        RR::Adapters::Rspec::InvocationMatcher.new(method)
+      end
+    end
+  end
+end

data/lib/rr/adapters/test_unit.rb

@@ -2,8 +2,10 @@ module RR
   module Adapters
     module TestUnit
       include RRMethods
+
       def self.included(mod)
         RR.trim_backtrace = true
+
         mod.class_eval do
           unless instance_methods.detect {|method_name| method_name.to_sym == :setup_with_rr}
             alias_method :setup_without_rr, :setup

data/lib/rr/double.rb

@@ -17,6 +17,7 @@ module RR
     end)
 
     attr_reader :times_called, :double_injection, :definition, :times_called_expectation
+
     include Space::Reader
 
     def initialize(double_injection, definition)
@@ -94,7 +95,7 @@ module RR
       definition.implementation_is_original_method?
     end
 
-    protected
+  protected
     def ordered?
       definition.ordered?
     end
@@ -151,4 +152,4 @@ module RR
       definition.argument_expectation
     end
   end
-end
+end

data/lib/rr/double_definitions/child_double_definition_create.rb

@@ -2,6 +2,7 @@ module RR
   module DoubleDefinitions
     class ChildDoubleDefinitionCreate < DoubleDefinitionCreate # :nodoc
       attr_reader :parent_double_definition
+
       def initialize(parent_double_definition)
         @parent_double_definition = parent_double_definition
         super()
@@ -15,11 +16,11 @@ module RR
         raise NoMethodError
       end
 
-      protected
+    protected
       def add_strategy(subject, method_name, definition_eval_block, &block)
         super do
           block.call
-          parent_double_definition.implemented_by(lambda {|*args|subject})
+          parent_double_definition.implemented_by(lambda {|*args| subject })
         end
       end
     end

data/lib/rr/double_definitions/double_definition.rb

@@ -2,6 +2,7 @@ module RR
   module DoubleDefinitions
     class DoubleDefinition #:nodoc:
       ORIGINAL_METHOD = Object.new
+
       attr_accessor(
         :argument_expectation,
         :times_matcher,
@@ -25,7 +26,7 @@ module RR
         @verbose = false
         @verify_method_signature = false
       end
-      
+
       def subject
         double_definition_create.subject
       end
@@ -33,14 +34,14 @@ module RR
       def root_subject
         double_definition_create.root_subject
       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}        
+        #   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
@@ -69,7 +70,7 @@ module RR
           @argument_expectation = Expectations::ArgumentEqualityExpectation.new()
           install_method_callback return_value_block
           self
-        end        
+        end
       end
       include ArgumentDefinitionConstructionMethods
 
@@ -102,7 +103,7 @@ module RR
         #
         # Passing in a block sets the return value.
         #
-        #   mock(subject).method_name.twice {:return_value}        
+        #   mock(subject).method_name.twice {:return_value}
         def twice(&return_value_block)
           @times_matcher = TimesCalledMatchers::IntegerMatcher.new(2)
           install_method_callback return_value_block
@@ -128,7 +129,7 @@ module RR
         #
         # Passing in a block sets the return value.
         #
-        #   mock(subject).method_name.at_most(4) {:return_value}        
+        #   mock(subject).method_name.at_most(4) {:return_value}
         def at_most(number, &return_value_block)
           @times_matcher = TimesCalledMatchers::AtMostMatcher.new(number)
           install_method_callback return_value_block
@@ -141,7 +142,7 @@ module RR
         #
         # Passing in a block sets the return value.
         #
-        #   mock(subject).method_name.any_number_of_times        
+        #   mock(subject).method_name.any_number_of_times
         def any_number_of_times(&return_value_block)
           @times_matcher = TimesCalledMatchers::AnyTimesMatcher.new
           install_method_callback return_value_block
@@ -154,7 +155,7 @@ module RR
         #
         # Passing in a block sets the return value.
         #
-        #   mock(subject).method_name.times(4) {:return_value}        
+        #   mock(subject).method_name.times(4) {:return_value}
         def times(matcher_value, &return_value_block)
           @times_matcher = TimesCalledMatchers::TimesCalledMatcher.create(matcher_value)
           install_method_callback return_value_block
@@ -269,8 +270,8 @@ module RR
           self
         end
         alias_method :strong, :verify_method_signature
-        
-        protected
+
+      protected
         def install_method_callback(block)
           if block
             if implementation_is_original_method?
@@ -323,14 +324,15 @@ module RR
         def verify_method_signature?
           !!@verify_method_signature
         end
-        alias_method :strong?, :verify_method_signature?        
+        alias_method :strong?, :verify_method_signature?
 
-        protected
+      protected
         def implementation_strategy
           double_definition_create.implementation_strategy
         end
       end
       include StateQueryMethods
+
       include ::RR::DoubleDefinitions::Strategies::StrategyMethods
 
       def mock(subject=DoubleDefinitionCreate::NO_SUBJECT, method_name=nil, &definition_eval_block)
@@ -362,4 +364,4 @@ module RR
       end
     end
   end
-end
+end

data/lib/rr/double_definitions/double_definition_create.rb

@@ -51,7 +51,7 @@ module RR
           subject.__id__ === NO_SUBJECT.__id__
         end
 
-        protected
+      protected
         def add_verification_strategy(verification_strategy_class, subject=NO_SUBJECT, method_name=nil, &definition_eval_block)
           add_strategy(subject, method_name, definition_eval_block) do
             self.verification_strategy = verification_strategy_class.new(self)
@@ -105,8 +105,10 @@ module RR
       class DoubleDefinitionCreateError < Errors::RRError
       end
 
-      # Verification Strategies
+      ## Verification Strategies
+
       include ::RR::DoubleDefinitions::Strategies::StrategyMethods
+
       def mock(subject=NO_SUBJECT, method_name=nil, &definition_eval_block)
         self.add_verification_strategy(::RR::DoubleDefinitions::Strategies::Verification::Mock, subject, method_name, &definition_eval_block)
       end
@@ -119,7 +121,8 @@ module RR
         self.add_verification_strategy(::RR::DoubleDefinitions::Strategies::Verification::DontAllow, subject, method_name, &definition_eval_block)
       end
 
-      # Implementation Strategies
+      ## Implementation Strategies
+
       def proxy(subject=NO_SUBJECT, method_name=nil, &definition_eval_block)
         self.add_implementation_strategy(::RR::DoubleDefinitions::Strategies::Implementation::Proxy, subject, method_name, &definition_eval_block)
       end
@@ -128,7 +131,8 @@ module RR
         self.add_implementation_strategy(::RR::DoubleDefinitions::Strategies::Implementation::StronglyTypedReimplementation, subject, method_name, &definition_eval_block)
       end
 
-      # DoubleInjection Strategies
+      ## DoubleInjection Strategies
+
       def instance_of(subject=NO_SUBJECT, method_name=nil, &definition_eval_block)
         self.add_double_injection_strategy(::RR::DoubleDefinitions::Strategies::DoubleInjection::AnyInstanceOf, subject, method_name, &definition_eval_block)
       end
@@ -136,4 +140,4 @@ module RR
       alias_method :all_instances_of, :instance_of
     end
   end
-end
+end