rspec 0.7.2 → 0.7.5.1

data/lib/spec/expectations/sugar.rb

@@ -1,7 +1,7 @@
 module Spec
   module Expectations
     # This module adds syntactic sugar that allows usage of should_* instead of should.*
-    module UnderscoreSugar
+    module UnderscoreSugar # :nodoc:
       def handle_underscores_for_rspec!
         original_method_missing = instance_method(:method_missing)
         class_eval do
@@ -14,7 +14,7 @@ module Spec
             return Spec::Expectations::Should::Should.new(self).__send__(__strip_should(sym), *args, &block)
           end
           
-          def __strip_should sym
+          def __strip_should(sym) # :nodoc 
             sym.to_s[7..-1]
           end
         end

data/lib/spec/expectations.rb

@@ -2,3 +2,31 @@ require 'spec/expectations/sugar'
 require 'spec/expectations/errors'
 require 'spec/expectations/extensions'
 require 'spec/expectations/should'
+require 'spec/expectations/message_builder'
+
+module Spec
+  # See Spec::Expectations::ObjectExpectations for expectations that
+  # are available on all objects.
+  #
+  # See Spec::Expectations::ProcExpectations for expectations that
+  # are available on Proc objects.
+  #
+  # See Spec::Expectations::NumericExpectations for expectations that
+  # are available on Numeric objects.
+  module Expectations
+    class << self
+      # raises a Spec::Expectations::ExpecationNotMetError with message
+      def fail_with(message)
+        Kernel::raise(Spec::Expectations::ExpectationNotMetError.new(message))
+      end
+      
+      def build_message(actual, expectation, expected)
+        message_builder.build_message(actual, expectation, expected)
+      end
+      
+      def message_builder #:nodoc:
+        @message_builder ||= MessageBuilder.new
+      end
+    end
+  end
+end

data/lib/spec/mocks/error_generator.rb

@@ -3,7 +3,7 @@ module Spec
     class ErrorGenerator
       attr_writer :opts
       
-      def initialize target, name
+      def initialize(target, name)
         @target = target
         @name = name
       end
@@ -12,27 +12,34 @@ module Spec
         @opts ||= {}
       end
 
-      def raise_unexpected_message_error sym, *args
+      def raise_unexpected_message_error(sym, *args)
         __raise "#{intro} received unexpected message :#{sym}#{arg_message(*args)}"
       end
       
-      def raise_expectation_error sym, expected_received_count, actual_received_count, *args
+      def raise_unexpected_message_args_error(expectation, *args)
+        #this is either :no_args or an Array
+        expected_args = (expectation.expected_args == :no_args ? "(no args)" : format_args(*expectation.expected_args))
+        actual_args = args.empty? ? "(no args)" : format_args(*args)
+        __raise "#{intro} expected #{expectation.sym.inspect} with #{expected_args} but received it with #{actual_args}"
+      end
+      
+      def raise_expectation_error(sym, expected_received_count, actual_received_count, *args)
         __raise "#{intro} expected :#{sym}#{arg_message(*args)} #{count_message(expected_received_count)}, but received it #{count_message(actual_received_count)}"
       end
       
-      def raise_out_of_order_error sym
+      def raise_out_of_order_error(sym)
         __raise "#{intro} received :#{sym} out of order"
       end
       
-      def raise_block_failed_error sym, detail
+      def raise_block_failed_error(sym, detail)
         __raise "#{intro} received :#{sym} but passed block failed with: #{detail}"
       end
       
-      def raise_missing_block_error args_to_yield
+      def raise_missing_block_error(args_to_yield)
         __raise "#{intro} asked to yield |#{arg_list(*args_to_yield)}| but no block was passed"
       end
       
-      def raise_wrong_arity_error args_to_yield, arity
+      def raise_wrong_arity_error(args_to_yield, arity)
         __raise "#{intro} yielded |#{arg_list(*args_to_yield)}| to block with arity of #{arity}"
       end
       
@@ -41,15 +48,19 @@ module Spec
         @name ? "Mock '#{@name}'" : @target.to_s
       end
       
-      def __raise message
+      def __raise(message)
         message = opts[:message] unless opts[:message].nil?
         Kernel::raise(Spec::Mocks::MockExpectationError, message)
       end
       
-      def arg_message *args
-        return "" if [:any_args] == args
-        return if args.empty?
-        " with [" + arg_list(*args) + "]"
+      def arg_message(*args)
+        " with " + format_args(*args)
+      end
+      
+      def format_args(*args)
+        return "(no args)" if args.empty? || args == :no_args || args == [:no_args]
+        return "(any args)" if [:any_args] == args
+        "(" + arg_list(*args) + ")"
       end
 
       def arg_list(*args)

data/lib/spec/mocks/message_expectation.rb

@@ -22,6 +22,10 @@ module Spec
         @at_most = nil
         @args_to_yield = nil
       end
+      
+      def expected_args
+        @args_expectation.args
+      end
 
       def and_return(*values, &return_block)
         Kernel::raise AmbiguousReturnError unless @method_block.nil?
@@ -41,6 +45,14 @@ module Spec
         @exception_to_raise = exception
       end
       
+      def and_throw(symbol)
+        @symbol_to_throw = symbol
+      end
+      
+      def and_yield(*args)
+        @args_to_yield = args
+      end
+  
       def matches(sym, args)
         @sym == sym and @args_expectation.check_args(args)
       end
@@ -83,7 +95,7 @@ module Spec
         if block.nil?
           @error_generator.raise_missing_block_error @args_to_yield
         end
-        if @args_to_yield.length != block.arity
+        if block.arity > -1 && @args_to_yield.length != block.arity
           @error_generator.raise_wrong_arity_error @args_to_yield, block.arity
         end
         block.call(*@args_to_yield)
@@ -125,7 +137,6 @@ module Spec
         end
       end
 
-
       def with(*args)
         @args_expectation = ArgumentExpectation.new(args)
         self
@@ -146,7 +157,7 @@ module Spec
         self
       end
       
-      def set_expected_received_count relativity, n
+      def set_expected_received_count(relativity, n)
         @at_least = (relativity == :at_least)
         @at_most = (relativity == :at_most)
         @expected_received_count = 1 if n == :once
@@ -179,38 +190,30 @@ module Spec
         self
       end
   
-      def and_throw(symbol)
-        @symbol_to_throw = symbol
-      end
-      
-      def and_yield(*args)
-        @args_to_yield = args
-      end
-  
       def ordered
         @order_group.register(self)
         @ordered = true
         self
       end
       
-      def negative_expectation_for? sym
+      def negative_expectation_for?(sym)
         return false
       end
     end
     
     class NegativeMessageExpectation < MessageExpectation
       def initialize(message, expectation_ordering, expected_from, sym, method_block)
-        super message, expectation_ordering, expected_from, sym, method_block, 0
+        super(message, expectation_ordering, expected_from, sym, method_block, 0)
       end
       
-      def negative_expectation_for? sym
+      def negative_expectation_for?(sym)
         return @sym == sym
       end
     end
     
     class MethodStub < BaseExpectation
       def initialize(message, expectation_ordering, expected_from, sym, method_block)
-        super message, expectation_ordering, expected_from, sym, method_block, 0
+        super(message, expectation_ordering, expected_from, sym, method_block, 0)
         @expected_received_count = :any
       end
     end

data/lib/spec/mocks/mock_handler.rb

@@ -41,14 +41,11 @@ module Spec
       end
 
       def __add expected_from, sym, block
-        Runner::Specification.add_listener(self) if @options[:auto_verify]
+        current_spec = Runner::Specification.current
+        current_spec.after_teardown {verify} if current_spec && @options[:auto_verify]
         define_expected_method(sym)
       end
 
-      def spec_finished spec
-        verify
-      end
-
       def define_expected_method(sym)
         if @target.respond_to?(sym) && !@proxied_methods[sym]
           @proxied_methods[sym] = @target.method(sym)
@@ -106,7 +103,7 @@ module Spec
         @proxied_methods.clear
       end
 
-      def metaclass_eval str
+      def metaclass_eval(str)
         (class << @target; self; end).class_eval str
       end
 
@@ -135,15 +132,19 @@ module Spec
         if expectation = find_matching_expectation(sym, *args)
           expectation.invoke(args, block)
         elsif stub = find_matching_method_stub(sym)
-          stub.invoke([], nil)
+          stub.invoke([], block)
         elsif expectation = find_almost_matching_expectation(sym, *args)
-          raise_unexpected_message_error(sym, *args) unless has_negative_expectation?(sym) unless null_object?
+          raise_unexpected_message_args_error(expectation, *args) unless has_negative_expectation?(sym) unless null_object?
         else
           @target.send :method_missing, sym, *args, &block
         end
       end
 
-      def raise_unexpected_message_error sym, *args
+      def raise_unexpected_message_args_error(expectation, *args)
+        @error_generator.raise_unexpected_message_args_error expectation, *args
+      end
+
+      def raise_unexpected_message_error(sym, *args)
         @error_generator.raise_unexpected_message_error sym, *args
       end
 

data/lib/spec/mocks/mock_methods.rb

@@ -10,7 +10,7 @@ module Spec
       end
       
       def stub!(sym)
-        __mock_handler.add_stub caller(1)[0], sym
+        __mock_handler.add_stub(caller(1)[0], sym)
       end
       
       def received_message?(sym, *args, &block)

data/lib/spec/rake/spectask.rb

@@ -12,8 +12,9 @@ module Spec
     #
     # Example:
     #  
-    #   Rake::SpecTask.new do |t|
+    #   Spec::Rake::SpecTask.new do |t|
     #     t.warning = true
+    #     t.rcov = true
     #   end
     #
     # This will create a task that can be run with:
@@ -63,6 +64,11 @@ module Spec
 
       # A message to print to stdout when there are failures.
       attr_accessor :failure_message
+      
+      # Whether or not to run specs via DRb. Setting this to true may
+      # run specs faster, especially in a Rails environment.
+      # Defaults to false
+      attr_accessor :drb
 
       # Explicitly define the list of spec files to be included in a
       # spec.  +list+ is expected to be an array of file names (a
@@ -93,7 +99,7 @@ module Spec
       end
 
       def define
-        spec_script = File.expand_path(File.dirname(__FILE__) + '/../../../bin/spec')
+        spec_script = File.expand_path(File.dirname(__FILE__) + '/../../../bin/' + (drb ? 'drbspec' : 'spec'))
 
         lib_path = @libs.join(File::PATH_SEPARATOR)
         actual_name = Hash === name ? name.keys.first : name

data/lib/spec/runner/backtrace_tweaker.rb

@@ -1,42 +1,51 @@
 module Spec
   module Runner
-    class NoisyBacktraceTweaker
-      def tweak_instance_exec_line line, spec_name
-        line = line.split(':in')[0] + ":in `#{spec_name}'" if line.include?('__instance_exec')
-        line
+    class BacktraceTweaker
+      def clean_up_double_slashes(line)
+        line.gsub!('//','/')
       end
+    end
+
+    class NoisyBacktraceTweaker < BacktraceTweaker
       def tweak_backtrace(error, spec_name)
         return if error.backtrace.nil?
-        error.backtrace.collect! do |line|
-          tweak_instance_exec_line line, spec_name
+        error.backtrace.each do |line|
+          clean_up_double_slashes(line)
         end
-        error.backtrace.compact!
       end
     end
 
     # Tweaks raised Exceptions to mask noisy (unneeded) parts of the backtrace
-    class QuietBacktraceTweaker
-      def tweak_instance_exec_line line, spec_name
-        line = line.split(':in')[0] if line.include?('__instance_exec')
-        line
+    class QuietBacktraceTweaker < BacktraceTweaker
+      unless defined?(IGNORE_PATTERNS)
+        root_dir = File.expand_path(File.join(__FILE__, '..', '..', '..', '..'))
+        spec_files = Dir["#{root_dir}/lib/spec/*"].map do |path| 
+          subpath = path[root_dir.length..-1]
+          /#{subpath}/
+        end
+        IGNORE_PATTERNS = spec_files + [
+          /\/lib\/ruby\//,
+          /bin\/spec:/,
+          /bin\/rcov:/,
+          /lib\/rspec_on_rails/,
+          /vendor\/rails/,
+          # TextMate's Ruby and RSpec plugins
+          /Ruby\.tmbundle\/Support\/tmruby.rb:/,
+          /RSpec\.tmbundle\/Support\/lib/,
+          /temp_textmate\./
+        ]
       end
+      
       def tweak_backtrace(error, spec_name)
         return if error.backtrace.nil?
         error.backtrace.collect! do |line|
-          line = tweak_instance_exec_line line, spec_name
-          line = nil if line =~ /\/lib\/ruby\//
-          line = nil if line =~ /\/lib\/spec\/expectations\//
-          line = nil if line =~ /\/lib\/spec\/mocks\//
-          line = nil if line =~ /\/lib\/spec\/rake\//
-          line = nil if line =~ /\/lib\/spec\/runner\//
-          line = nil if line =~ /bin\/spec:/
-          line = nil if line =~ /bin\/rcov:/
-          line = nil if line =~ /lib\/rspec_on_rails/
-          line = nil if line =~ /script\/rails_spec/
-          # TextMate's Ruby and RSpec plugins
-          line = nil if line =~ /Ruby\.tmbundle\/Support\/tmruby.rb:/
-          line = nil if line =~ /RSpec\.tmbundle\/Support\/lib/
-          line = nil if line =~ /temp_textmate\./
+          clean_up_double_slashes(line)
+          IGNORE_PATTERNS.each do |ignore|
+            if line =~ ignore
+              line = nil
+              break
+            end
+          end
           line
         end
         error.backtrace.compact!

data/lib/spec/runner/context.rb

@@ -20,11 +20,20 @@ module Spec
         def inherit(klass)
           @context_eval_module.inherit klass
         end
+        alias :inherit_context_eval_module_from :inherit
 
         def include(mod)
           @context_eval_module.include mod
         end
 
+        def context_setup(&block)
+          @context_eval_module.context_setup(&block)
+        end
+
+        def context_teardown(&block)
+          @context_eval_module.context_teardown(&block)
+        end
+
         def setup(&block)
           @context_eval_module.setup(&block)
         end
@@ -39,15 +48,16 @@ module Spec
 
         def run(reporter, dry_run=false)
           reporter.add_context(@name)
-
           prepare_execution_context_class
+          errors = run_context_setup(reporter, dry_run)
+
           specifications.each do |specification|
-            specification.run(reporter, setup_block, teardown_block, dry_run, execution_context(specification))
-          end
-        end
-        
-        def execution_context specification
-          execution_context_class.new(specification)
+            specification_execution_context = execution_context(specification)
+            specification_execution_context.copy_instance_variables_from(@once_only_execution_context_instance, [:@spec]) unless context_setup_block.nil?
+            specification.run(reporter, setup_block, teardown_block, dry_run, specification_execution_context)
+          end unless errors.length > 0
+          
+          run_context_teardown(reporter, dry_run)
         end
 
         def number_of_specs
@@ -82,6 +92,14 @@ module Spec
           @context_eval_module.method_missing(*args)
         end
 
+        def context_setup_block
+          @context_eval_module.send :context_setup_block
+        end
+
+        def context_teardown_block
+          @context_eval_module.send :context_teardown_block
+        end
+
         def specifications
           @context_eval_module.send :specifications
         end
@@ -118,6 +136,37 @@ module Spec
           @context_eval_module.send :execution_context_class
         end
 
+        def execution_context specification
+          execution_context_class.new(specification)
+        end
+
+        def run_context_setup(reporter, dry_run)
+          errors = []
+          unless dry_run
+            begin
+              @once_only_execution_context_instance = execution_context(nil)
+              @once_only_execution_context_instance.instance_eval(&context_setup_block)
+            rescue => e
+              errors << e
+              location = "context_setup"
+              reporter.spec_finished(location, e, location) if reporter
+            end
+          end
+          errors
+        end
+        
+        def run_context_teardown(reporter, dry_run)
+          unless dry_run
+            begin 
+              @once_only_execution_context_instance ||= execution_context(nil) 
+              @once_only_execution_context_instance.instance_eval(&context_teardown_block) 
+            rescue => e
+              location = "context_teardown"
+              reporter.spec_finished(location, e, location) if reporter
+            end
+          end
+        end
+
       end
       include InstanceMethods
     end

data/lib/spec/runner/context_eval.rb

@@ -11,6 +11,14 @@ module Spec
           context_modules << mod
         end
 
+        def context_setup(&block)
+          context_setup_parts << block
+        end
+
+        def context_teardown(&block)
+          context_teardown_parts << block
+        end
+
         def setup(&block)
           setup_parts << block
         end
@@ -28,7 +36,8 @@ module Spec
           my_methods |= context_superclass.methods
           my_methods
         end
-        protected
+      
+      protected
 
         def method_missing(method_name, *args)
           if context_superclass.respond_to?(method_name)
@@ -37,7 +46,20 @@ module Spec
           super
         end
 
-        private
+      private
+
+        def context_setup_block
+          parts = context_setup_parts.dup
+          add_context_superclass_method(:context_setup, parts)
+          create_block_from_parts(parts)
+        end
+
+        def context_teardown_block
+          parts = context_teardown_parts.dup
+          add_context_superclass_method(:context_teardown, parts)
+          create_block_from_parts(parts)
+        end
+
         def setup_block
           parts = setup_parts.dup
           add_context_superclass_method(:setup, parts)
@@ -73,6 +95,14 @@ module Spec
           @specifications ||= []
         end
 
+        def context_setup_parts
+          @context_setup_parts ||= []
+        end
+
+        def context_teardown_parts
+          @context_teardown_parts ||= []
+        end
+
         def setup_parts
           @setup_parts ||= []
         end
@@ -96,7 +126,7 @@ module Spec
               if part.is_a?(UnboundMethod)
                 part.bind(self).call
               else
-                instance_exec(&part)
+                instance_eval(&part)
               end
             end
           end

data/lib/spec/runner/context_runner.rb

@@ -4,30 +4,43 @@ module Spec
   module Runner
     class ContextRunner
       
-      def initialize(reporter, dry_run, single_spec=nil)
+      def initialize(options)
         @contexts = []
-        @reporter = reporter
-        @dry_run = dry_run
-        @single_spec = single_spec
+        @options = options
       end
     
       def add_context(context)
-        return if !@single_spec.nil? unless context.matches?(@single_spec)
-        context.run_single_spec @single_spec if context.matches?(@single_spec)
+        return if !@options.spec_name.nil? unless context.matches?(@options.spec_name)
+        context.run_single_spec(@options.spec_name) if context.matches?(@options.spec_name)
         @contexts << context
       end
       
+      # Runs all contexts and returns the number of failures.
       def run(exit_when_done)
-        @reporter.start(number_of_specs)
-        @contexts.each do |context|
-          context.run(@reporter, @dry_run)
+        @options.reporter.start(number_of_specs)
+        begin
+          @contexts.each do |context|
+            context.run(@options.reporter, @options.dry_run)
+          end
+        rescue Interrupt
+        ensure
+          @options.reporter.end
         end
-        @reporter.end
-        failure_count = @reporter.dump
+        failure_count = @options.reporter.dump
+        
+        if(failure_count == 0 && !@options.heckle_runner.nil?)
+          heckle_runner = @options.heckle_runner
+          @options.heckle_runner = nil
+          context_runner = self.class.new(@options)
+          context_runner.instance_variable_set(:@contexts, @contexts)
+          heckle_runner.heckle_with(context_runner)
+        end
+        
         if(exit_when_done)
           exit_code = (failure_count == 0) ? 0 : 1
           exit(exit_code)
         end
+        failure_count
       end
     
       def number_of_specs

data/lib/spec/runner/drb_command_line.rb

@@ -0,0 +1,21 @@
+require "drb/drb"
+
+module Spec
+  module Runner
+    # Facade to run specs by connecting to a DRB server
+    class DrbCommandLine
+      # Runs specs on a DRB server. Note that this API is similar to that of
+      # CommandLine - making it possible for clients to use both interchangeably.
+      def self.run(argv, stderr, stdout, exit=false, warn_if_no_files=true)
+        begin
+          DRb.start_service
+          rails_spec_server = DRbObject.new_with_uri("druby://localhost:8989")
+          rails_spec_server.run(argv, stderr, stdout)
+        rescue DRb::DRbConnError
+          stderr.puts "No server is running"
+          exit 1 if exit
+        end
+      end
+    end
+  end
+end

data/lib/spec/runner/execution_context.rb

@@ -17,6 +17,7 @@ module Spec
         def violated(message="")
           raise Spec::Expectations::ExpectationNotMetError.new(message)
         end
+
       end
       include InstanceMethods
     end

data/lib/spec/runner/extensions/kernel.rb

@@ -1,3 +1,5 @@
+require 'spec/runner/extensions/object'
+
 module Kernel
   def context(name, &block)
     context = Spec::Runner::Context.new(name, &block)