rspec 1.2.9 → 1.3.1

data/lib/spec/mocks/message_expectation.rb

@@ -7,7 +7,7 @@ module Spec
       protected :expected_received_count=, :method_block=, :expected_from=
       attr_accessor :error_generator
       protected :error_generator, :error_generator=
-      
+
       def initialize(error_generator, expectation_ordering, expected_from, sym, method_block, expected_received_count=1, opts={}, &implementation)
         @error_generator = error_generator
         @error_generator.opts = opts
@@ -27,8 +27,9 @@ module Spec
         @failed_fast = nil
         @args_to_yield_were_cloned = false
         @return_block = implementation
+        @eval_context = nil
       end
-      
+
       def build_child(expected_from, method_block, expected_received_count, opts={})
         child = clone
         child.expected_from = expected_from
@@ -41,7 +42,7 @@ module Spec
         child.clone_args_to_yield @args_to_yield
         child
       end
-      
+
       def expected_args
         @args_expectation.args
       end
@@ -59,7 +60,7 @@ module Spec
         end
         @return_block = block_given? ? return_block : lambda { value }
       end
-      
+
       # :call-seq:
       #   and_raise()
       #   and_raise(Exception) #any exception class
@@ -74,47 +75,53 @@ module Spec
       def and_raise(exception=Exception)
         @exception_to_raise = exception
       end
-      
+
       def and_throw(symbol)
         @symbol_to_throw = symbol
       end
-      
-      def and_yield(*args)
+
+      def and_yield(*args, &block)
         if @args_to_yield_were_cloned
           @args_to_yield.clear
           @args_to_yield_were_cloned = false
         end
-        
+
+        if block
+          require 'spec/extensions/instance_exec'
+          @eval_context = Object.new
+          @eval_context.extend Spec::Matchers::InstanceExec
+          yield @eval_context
+        end
         @args_to_yield << args
         self
       end
-      
+
       def matches(sym, args)
         @sym == sym and @args_expectation.args_match?(args)
       end
-      
+
       def invoke(*args, &block)
         if @expected_received_count == 0
           @failed_fast = true
           @actual_received_count += 1
           @error_generator.raise_expectation_error @sym, @expected_received_count, @actual_received_count, *args
         end
-        
+
         @order_group.handle_order_constraint self
 
         begin
           Kernel::raise @exception_to_raise unless @exception_to_raise.nil?
           Kernel::throw @symbol_to_throw unless @symbol_to_throw.nil?
-          
-          
+
+
           if !@method_block.nil?
             default_return_val = invoke_method_block(*args)
-          elsif @args_to_yield.size > 0
+          elsif @args_to_yield.size > 0 || @eval_context
             default_return_val = invoke_with_yield(&block)
           else
             default_return_val = nil
           end
-          
+
           if @consecutive
             return invoke_consecutive_return_block(*args, &block)
           elsif @return_block
@@ -131,7 +138,7 @@ module Spec
         @expected_received_count != :any && @expected_received_count > 0 &&
           @actual_received_count >= @expected_received_count
       end
-      
+
       def invoke_return_block(*args, &block)
         args << block unless block.nil?
         # Ruby 1.9 - when we set @return_block to return values
@@ -139,7 +146,7 @@ module Spec
         # a "wrong number of arguments" error
         @return_block.arity == 0 ? @return_block.call : @return_block.call(*args)
       end
-      
+
       protected
 
       def invoke_method_block(*args)
@@ -149,7 +156,7 @@ module Spec
           @error_generator.raise_block_failed_error @sym, detail.message
         end
       end
-      
+
       def invoke_with_yield(&block)
         if block.nil?
           @error_generator.raise_missing_block_error @args_to_yield
@@ -159,67 +166,75 @@ module Spec
           if block.arity > -1 && args_to_yield_this_time.length != block.arity
             @error_generator.raise_wrong_arity_error args_to_yield_this_time, block.arity
           end
-          value = block.call(*args_to_yield_this_time)
+          value = eval_block(*args_to_yield_this_time, &block)
         end
         value
       end
-      
+
+      def eval_block(*args, &block)
+        if @eval_context
+          @eval_context.instance_exec(*args, &block)
+        else
+          block.call(*args)
+        end
+      end
+
       def invoke_consecutive_return_block(*args, &block)
         value = invoke_return_block(*args, &block)
         index = [@actual_received_count, value.size-1].min
         value[index]
       end
-      
+
       def clone_args_to_yield(args)
         @args_to_yield = args.clone
         @args_to_yield_were_cloned = true
       end
-      
+
       def failed_fast?
         @failed_fast
       end
     end
-    
+
     class MessageExpectation < BaseExpectation
 
       def matches_name?(sym)
         @sym == sym
       end
-      
+
       def matches_name_but_not_args(sym, args)
         matches_name?(sym) and not @args_expectation.args_match?(args)
       end
-       
+
       def verify_messages_received
         return if expected_messages_received? || failed_fast?
-    
+
         generate_error
       rescue Spec::Mocks::MockExpectationError => error
         error.backtrace.insert(0, @expected_from)
         Kernel::raise error
       end
-      
+
       def expected_messages_received?
         ignoring_args? || matches_exact_count? ||
            matches_at_least_count? || matches_at_most_count?
       end
-      
+
       def ignoring_args?
         @expected_received_count == :any
       end
-      
+
       def matches_at_least_count?
         @at_least && @actual_received_count >= @expected_received_count
       end
-      
+
       def matches_at_most_count?
         @at_most && @actual_received_count <= @expected_received_count
       end
-      
+
       def matches_exact_count?
         @expected_received_count == @actual_received_count
       end
-      
+
       def similar_messages
         @similar_messages ||= []
       end
@@ -227,7 +242,7 @@ module Spec
       def advise(args, block)
         similar_messages << args
       end
-      
+
       def generate_error
         if similar_messages.empty?
           @error_generator.raise_expectation_error(@sym, @expected_received_count, @actual_received_count, *@args_expectation.args)
@@ -240,17 +255,17 @@ module Spec
         @args_expectation = ArgumentExpectation.new(args, &block)
         self
       end
-      
+
       def exactly(n)
         set_expected_received_count :exactly, n
         self
       end
-      
+
       def at_least(n)
         set_expected_received_count :at_least, n
         self
       end
-      
+
       def at_most(n)
         set_expected_received_count :at_most, n
         self
@@ -260,41 +275,41 @@ module Spec
         @method_block = block if block
         self
       end
-  
+
       def any_number_of_times(&block)
         @method_block = block if block
         @expected_received_count = :any
         self
       end
-  
+
       def never
         @expected_received_count = 0
         self
       end
-  
+
       def once(&block)
         @method_block = block if block
         @expected_received_count = 1
         self
       end
-  
+
       def twice(&block)
         @method_block = block if block
         @expected_received_count = 2
         self
       end
-  
+
       def ordered(&block)
         @method_block = block if block
         @order_group.register(self)
         @ordered = true
         self
       end
-      
+
       def negative_expectation_for?(sym)
         return false
       end
-      
+
       protected
         def set_expected_received_count(relativity, n)
           @at_least = (relativity == :at_least)
@@ -308,22 +323,22 @@ module Spec
               2
           end
         end
-        
+
         def clear_actual_received_count!
           @actual_received_count = 0
         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)
       end
-      
+
       def negative_expectation_for?(sym)
         return @sym == sym
       end
     end
-    
+
   end
 end

data/lib/spec/mocks/methods.rb

@@ -55,6 +55,19 @@ module Spec
         end
       end
       
+      # Record and otherwise ignore all messages that aren't specified,
+      # with +stub+, +stub!+, or +should_receive+.
+      # 
+      # == Returns
+      #   self
+      def as_null_object
+        __mock_proxy.as_null_object
+      end
+      
+      def null_object?
+        __mock_proxy.null_object?
+      end
+      
       def received_message?(sym, *args, &block) #:nodoc:
         __mock_proxy.received_message?(sym.to_sym, *args, &block)
       end
@@ -66,14 +79,6 @@ module Spec
       def rspec_reset #:nodoc:
         __mock_proxy.reset
       end
-      
-      def as_null_object
-        __mock_proxy.as_null_object
-      end
-      
-      def null_object?
-        __mock_proxy.null_object?
-      end
 
     private
 

data/lib/spec/mocks/proxy.rb

@@ -40,13 +40,16 @@ module Spec
       def add_message_expectation(expected_from, sym, opts={}, &block)        
         __add sym
         warn_if_nil_class sym
-        if existing_stub = @stubs.detect {|s| s.sym == sym }
-          expectation = existing_stub.build_child(expected_from, block_given?? block : nil, 1, opts)
+        @expectations << build_expectation(expected_from, sym, opts, &block)
+        @expectations.last
+      end
+
+      def build_expectation(expected_from, sym, opts, &block)
+        if stub = find_matching_method_stub(sym) 
+          stub.build_child(expected_from, block_given?? block : nil, 1, opts)
         else
-          expectation = MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil, 1, opts)
+          MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil, 1, opts)
         end
-        @expectations << expectation
-        @expectations.last
       end
 
       def add_negative_message_expectation(expected_from, sym, &block)
@@ -64,7 +67,6 @@ module Spec
 
       def remove_stub(message)
         message = message.to_sym
-        
         if stub_to_remove = @stubs.detect { |s| s.matches_name?(message) }
           reset_proxied_method(message)
           @stubs.delete(stub_to_remove)
@@ -92,7 +94,7 @@ module Spec
       end
 
       def has_negative_expectation?(sym)
-        @expectations.detect {|expectation| expectation.negative_expectation_for?(sym)}
+        @expectations.any? {|expectation| expectation.negative_expectation_for?(sym)}
       end
       
       def record_message_received(sym, args, block)
@@ -103,21 +105,41 @@ module Spec
         expectation = find_matching_expectation(sym, *args)
         stub = find_matching_method_stub(sym, *args)
 
-        if (stub && expectation && expectation.called_max_times?) || (stub && !expectation)
-          if expectation = find_almost_matching_expectation(sym, *args)
-            expectation.advise(args, block) unless expectation.expected_messages_received?
-          end
-          stub.invoke(*args, &block)
+        if ok_to_invoke_stub?(stub, expectation)
+          record_stub(stub, sym, args, &block)
         elsif expectation
-          expectation.invoke(*args, &block)
+          invoke_expectation(expectation, *args, &block)
         elsif expectation = find_almost_matching_expectation(sym, *args)
-          expectation.advise(args, block) if null_object? unless expectation.expected_messages_received?
-          raise_unexpected_message_args_error(expectation, *args) unless (has_negative_expectation?(sym) or null_object?)
+          record_almost_matching_expectation(expectation, sym, *args, &block)
+        elsif @target.is_a?(Class)
+          @target.superclass.send(sym, *args, &block)
         else
           @target.__send__ :method_missing, sym, *args, &block
         end
       end
 
+      def record_stub(stub, sym, args, &block)
+        almost_matching_expectation(sym, *args) do |e|
+          e.advise(args, block)
+        end
+        stub.invoke(*args, &block)
+      end
+
+      def invoke_expectation(expectation, *args, &block)
+        expectation.invoke(*args, &block)
+      end
+
+      def record_almost_matching_expectation(expectation, sym, *args, &block)
+        expectation.advise(args, block)
+        unless (null_object? or has_negative_expectation?(sym))
+          raise_unexpected_message_args_error(expectation, *args)
+        end
+      end
+
+      def ok_to_invoke_stub?(stub, expectation)
+        stub && (!expectation || expectation.called_max_times?)
+      end
+
       def raise_unexpected_message_args_error(expectation, *args)
         @error_generator.raise_unexpected_message_args_error expectation, *args
       end
@@ -201,15 +223,11 @@ module Spec
       end
 
       def verify_expectations
-        @expectations.each do |expectation|
-          expectation.verify_messages_received
-        end
+        @expectations.map {|e| e.verify_messages_received}
       end
 
       def reset_proxied_methods
-        @proxied_methods.each do |sym|
-          reset_proxied_method(sym)
-        end
+        @proxied_methods.map {|sym| reset_proxied_method(sym)}
       end
 
       def reset_proxied_method(sym)
@@ -236,10 +254,15 @@ module Spec
         @expectations.find {|expectation| expectation.matches(sym, args)}
       end
 
+      def almost_matching_expectation(sym, *args, &block)
+        if e = find_almost_matching_expectation(sym, *args)
+          yield e
+        end
+      end
+
       def find_almost_matching_expectation(sym, *args)
         @expectations.find {|expectation| expectation.matches_name_but_not_args(sym, args)}
       end
-
     end
   end
 end

data/lib/spec/runner/backtrace_tweaker.rb

@@ -38,8 +38,9 @@ module Spec
     # Tweaks raised Exceptions to mask noisy (unneeded) parts of the backtrace
     class QuietBacktraceTweaker < BacktraceTweaker
       unless defined?(IGNORE_PATTERNS)
-        spec_files = Dir["lib/*"].map do |path| 
-          subpath = path[1..-1]
+        root_dir = File.expand_path(File.join(__FILE__, '..', '..', '..', '..'))
+        spec_files = Dir["#{root_dir}/lib/*"].map do |path|
+          subpath = path[root_dir.length..-1]
           /#{subpath}/
         end
         IGNORE_PATTERNS = spec_files + [

data/lib/spec/runner/configuration.rb

@@ -154,6 +154,14 @@ module Spec
       def ignored_backtrace_patterns # :nodoc:
         @ignored_backtrace_patterns ||= []
       end
+
+      def suppress_deprecation_warnings!
+        @suppress_deprecation_warnings = true
+      end
+
+      def suppress_deprecation_warnings?
+        @suppress_deprecation_warnings ||= false
+      end
       
     private
     

data/lib/spec/runner/differs/default.rb

@@ -4,7 +4,7 @@ require 'pp'
 module Spec
   module Expectations
     module Differs
-      unless defined?(Default)
+      unless defined?(Spec::Expectations::Differs::Default)
         class Default
           def initialize(options)
             @options = options

data/lib/spec/runner/drb_command_line.rb

@@ -4,16 +4,21 @@ module Spec
   module Runner
     # Facade to run specs by connecting to a DRB server
     class DrbCommandLine
+
+      def self.port(options)
+        (options.drb_port || ENV["RSPEC_DRB"] || 8989).to_i
+      end
+
       # 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(options)
         begin
           begin; \
             DRb.start_service("druby://localhost:0"); \
-          rescue SocketError; \
+          rescue SocketError, Errno::EADDRNOTAVAIL; \
             DRb.start_service("druby://:0"); \
           end
-          spec_server = DRbObject.new_with_uri("druby://127.0.0.1:8989")
+          spec_server = DRbObject.new_with_uri("druby://127.0.0.1:#{port(options)}")
           spec_server.run(options.argv, options.error_stream, options.output_stream)
           true
         rescue DRb::DRbConnError
@@ -21,6 +26,7 @@ module Spec
           false
         end
       end
+
     end
   end
 end

data/lib/spec/runner/example_group_runner.rb

@@ -22,9 +22,8 @@ module Spec
         example_groups.each do |example_group|
           success = success & example_group.run(@options)
         end
-        return success
-      ensure
         finish
+        success
       end
 
     protected

data/lib/spec/runner/formatter/nested_text_formatter.rb

@@ -4,6 +4,9 @@ module Spec
   module Runner
     module Formatter
       class NestedTextFormatter < BaseTextFormatter
+
+        INDENT = '  '
+
         def initialize(options, where)
           super
           @last_nested_descriptions = []
@@ -13,8 +16,8 @@ module Spec
           super
 
           example_group.nested_descriptions.each_with_index do |nested_description, i|
-            unless nested_description == @last_nested_descriptions[i]
-              output.puts "#{'  ' * i}#{nested_description}"
+            unless example_group.nested_descriptions[0..i] == @last_nested_descriptions[0..i]
+              output.puts "#{INDENT*i}#{nested_description}"
             end
           end
 
@@ -39,7 +42,7 @@ module Spec
         end
 
         def current_indentation
-          '  ' * @last_nested_descriptions.length
+          INDENT*@last_nested_descriptions.length
         end
       end
     end

data/lib/spec/runner/option_parser.rb

@@ -80,6 +80,7 @@ module Spec
         :runner => ["-U", "--runner RUNNER", "Use a custom Runner."],
         :debug => ["-u", "--debugger", "Enable ruby-debugging."],
         :drb => ["-X", "--drb", "Run examples via DRb. (For example against script/spec_server)"],
+        :drb_port => ["--port PORT", "Port for DRb server. (Ignored without --drb)"],
         :version => ["-v", "--version", "Show version"],
         :help => ["-h", "--help", "You're looking at it"]
       }
@@ -113,6 +114,7 @@ module Spec
         on(*OPTIONS[:runner])           {|runner|  @options.user_input_for_runner = runner}
         on(*OPTIONS[:debug])            {@options.debug = true}
         on(*OPTIONS[:drb])              {}
+        on(*OPTIONS[:drb_port])         {|port| @options.drb_port = port}
         on(*OPTIONS[:version])          {parse_version}
         on("--autospec")                {@options.autospec = true}
         on_tail(*OPTIONS[:help])        {parse_help}

data/lib/spec/runner/options.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+require 'rbconfig'
 
 module Spec
   module Runner
@@ -50,7 +51,8 @@ module Spec
         :argv
       )
       attr_reader :colour, :differ_class, :files, :examples, :example_groups
-
+      attr_writer :drb_port
+      
       def initialize(error_stream, output_stream)
         @error_stream = error_stream
         @output_stream = output_stream
@@ -183,7 +185,7 @@ module Spec
 
       def colour=(colour)
         @colour = colour
-        if @colour && RUBY_PLATFORM =~ /mswin|mingw/ ;\
+        if @colour && Config::CONFIG['host_os'] =~ /mswin|mingw/ ;\
           begin ;\
             replace_output = @output_stream.equal?($stdout) ;\
             require 'rubygems' unless ENV['NO_RUBYGEMS'] ;\
@@ -289,6 +291,10 @@ module Spec
         @dry_run == true
       end
 
+      def drb_port
+        @drb_port.to_i if defined?(@drb_port)
+      end
+      
     protected
 
       def define_predicate_matchers

data/lib/spec/stubs/cucumber.rb

@@ -1,5 +1,5 @@
 # This plugs RSpec's mocking/stubbing framework into cucumber
 require 'spec/mocks'
-Before {$rspec_stubs ||= Spec::Mocks::Space.new}
-After  {$rspec_stubs.reset_all}
+Before {$rspec_mocks ||= Spec::Mocks::Space.new}
+After  {$rspec_mocks.reset_all}
 World(Spec::Mocks::ExampleMethods)

data/lib/spec/version.rb

@@ -2,8 +2,8 @@ module Spec # :nodoc:
   module VERSION # :nodoc:
     unless defined? MAJOR
       MAJOR  = 1
-      MINOR  = 2
-      TINY   = 9
+      MINOR  = 3
+      TINY   = 1
       PRE    = nil
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/spec/autotest/autotest_helper.rb

@@ -5,4 +5,4 @@ rescue LoadError
   raise "You must install ZenTest to use autotest"
 end
 require 'autotest/rspec'
-require 'spec/autotest/autotest_matchers'
+require 'autotest/autotest_matchers'

data/spec/autotest/discover_spec.rb

@@ -1,8 +1,8 @@
-require 'spec/autotest/autotest_helper'
+require 'autotest/autotest_helper'
 
 describe Autotest::Rspec, "discovery" do
   it "adds the rspec autotest plugin" do
     Autotest.should_receive(:add_discovery)
-    load File.expand_path(File.dirname(__FILE__) + "/../../lib/autotest/discover.rb")
+    load File.expand_path("../../../lib/autotest/discover.rb", __FILE__)
   end
 end