typo 5.1.3 → 5.1.98

data/vendor/plugins/rspec/lib/spec/mocks/proxy.rb

@@ -4,8 +4,18 @@ module Spec
       DEFAULT_OPTIONS = {
         :null_object => false,
       }
+      
+      @@warn_about_expectations_on_nil = true
+      
+      def self.allow_message_expectations_on_nil
+        @@warn_about_expectations_on_nil = false
+        
+        # ensure nil.rspec_verify is called even if an expectation is not set in the example
+        # otherwise the allowance would effect subsequent examples
+        $rspec_mocks.add(nil) unless $rspec_mocks.nil?
+      end
 
-      def initialize(target, name, options={})
+      def initialize(target, name=nil, options={})
         @target = target
         @name = name
         @error_generator = ErrorGenerator.new target, name
@@ -20,15 +30,27 @@ module Spec
       def null_object?
         @options[:null_object]
       end
+      
+      def as_null_object
+        @options[:null_object] = true
+        @target
+      end
 
-      def add_message_expectation(expected_from, sym, opts={}, &block)
+      def add_message_expectation(expected_from, sym, opts={}, &block)        
         __add sym
-        @expectations << MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil, 1, opts)
+        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)
+        else
+          expectation = 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)
         __add sym
+        warn_if_nil_class sym
         @expectations << NegativeMessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil)
         @expectations.last
       end
@@ -50,6 +72,7 @@ module Spec
         clear_stubs
         reset_proxied_methods
         clear_proxied_methods
+        reset_nil_expectations_warning
       end
 
       def received_message?(sym, *args, &block)
@@ -61,12 +84,19 @@ module Spec
       end
 
       def message_received(sym, *args, &block)
-        if expectation = find_matching_expectation(sym, *args)
-          expectation.invoke(args, block)
-        elsif stub = find_matching_method_stub(sym, *args)
+        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([], block)
+        elsif expectation
+          expectation.invoke(args, block)
         elsif expectation = find_almost_matching_expectation(sym, *args)
-          raise_unexpected_message_args_error(expectation, *args) unless has_negative_expectation?(sym) unless null_object?
+          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?)
         else
           @target.send :method_missing, sym, *args, &block
         end
@@ -87,19 +117,27 @@ module Spec
         define_expected_method(sym)
       end
       
+      def warn_if_nil_class(sym)
+        if proxy_for_nil_class? && @@warn_about_expectations_on_nil          
+          Kernel.warn("An expectation of :#{sym} was set on nil. Called from #{caller[2]}. Use allow_message_expectations_on_nil to disable warnings.")
+        end
+      end
+      
       def define_expected_method(sym)
-        if target_responds_to?(sym) && !metaclass.method_defined?(munge(sym))
+        visibility_string = "#{visibility(sym)} :#{sym}"
+        if target_responds_to?(sym) && !target_metaclass.method_defined?(munge(sym))
           munged_sym = munge(sym)
-          metaclass.instance_eval do
+          target_metaclass.instance_eval do
             alias_method munged_sym, sym if method_defined?(sym.to_s)
           end
           @proxied_methods << sym
         end
         
-        metaclass_eval(<<-EOF, __FILE__, __LINE__)
+        target_metaclass.class_eval(<<-EOF, __FILE__, __LINE__)
           def #{sym}(*args, &block)
             __mock_proxy.message_received :#{sym}, *args, &block
           end
+          #{visibility_string}
         EOF
       end
 
@@ -109,6 +147,18 @@ module Spec
         return @target.respond_to?(sym)
       end
 
+      def visibility(sym)
+        if Mock === @target
+          'public'
+        elsif target_metaclass.private_method_defined?(sym)
+          'private'
+        elsif target_metaclass.protected_method_defined?(sym)
+          'protected'
+        else
+          'public'
+        end
+      end
+
       def munge(sym)
         "proxied_by_rspec__#{sym.to_s}".to_sym
       end
@@ -125,12 +175,8 @@ module Spec
         @proxied_methods.clear
       end
 
-      def metaclass_eval(str, filename, lineno)
-        metaclass.class_eval(str, filename, lineno)
-      end
-      
-      def metaclass
-        (class << @target; self; end)
+      def target_metaclass
+        class << @target; self; end
       end
 
       def verify_expectations
@@ -142,7 +188,7 @@ module Spec
       def reset_proxied_methods
         @proxied_methods.each do |sym|
           munged_sym = munge(sym)
-          metaclass.instance_eval do
+          target_metaclass.instance_eval do
             if method_defined?(munged_sym.to_s)
               alias_method sym, munged_sym
               undef_method munged_sym
@@ -152,6 +198,14 @@ module Spec
           end
         end
       end
+      
+      def proxy_for_nil_class?
+        @target.nil?
+      end
+      
+      def reset_nil_expectations_warning
+        @@warn_about_expectations_on_nil = true if proxy_for_nil_class?
+      end
 
       def find_matching_expectation(sym, *args)
         @expectations.find {|expectation| expectation.matches(sym, args)}

data/vendor/plugins/rspec/lib/spec/mocks/spec_methods.rb

@@ -1,7 +1,7 @@
 module Spec
   module Mocks
     module ExampleMethods
-      include Spec::Mocks::ArgumentConstraintMatchers
+      include Spec::Mocks::ArgumentConstraints
 
       # Shortcut for creating an instance of Spec::Mocks::Mock.
       #
@@ -32,6 +32,14 @@ module Spec
       def stub_everything(name = 'stub')
         mock(name, :null_object => true)
       end
+      
+      # Disables warning messages about expectations being set on nil.
+      #
+      # By default warning messages are issued when expectations are set on nil.  This is to 
+      # prevent false-positives and to catch potential bugs early on.
+      def allow_message_expectations_on_nil
+        Proxy.allow_message_expectations_on_nil
+      end
 
     end
   end

data/vendor/plugins/rspec/lib/spec/mocks.rb

@@ -1,16 +1,5 @@
-require 'spec/mocks/methods'
-require 'spec/mocks/argument_constraint_matchers'
-require 'spec/mocks/spec_methods'
-require 'spec/mocks/proxy'
-require 'spec/mocks/mock'
-require 'spec/mocks/argument_expectation'
-require 'spec/mocks/message_expectation'
-require 'spec/mocks/order_group'
-require 'spec/mocks/errors'
-require 'spec/mocks/error_generator'
+require 'spec/mocks/framework'
 require 'spec/mocks/extensions/object'
-require 'spec/mocks/space'
-
 
 module Spec
   # == Mocks and Stubs

data/vendor/plugins/rspec/lib/spec/rake/spectask.rb

@@ -11,7 +11,7 @@ module Spec
     # A Rake task that runs a set of specs.
     #
     # Example:
-    #  
+    #
     #   Spec::Rake::SpecTask.new do |t|
     #     t.warning = true
     #     t.rcov = true
@@ -87,7 +87,7 @@ module Spec
       # Whether or not to use RCov (default is false)
       # See http://eigenclass.org/hiki.rb?rcov
       attr_accessor :rcov
-      
+
       # Array of commandline options to pass to RCov. Defaults to ['--exclude', 'lib\/spec,bin\/spec'].
       # Ignored if rcov=false
       # Setting the RCOV_OPTS environment variable overrides this.
@@ -107,7 +107,7 @@ module Spec
       # A message to print to stderr when there are failures.
       attr_accessor :failure_message
 
-      # Where RSpec's output is written. Defaults to STDOUT.
+      # Where RSpec's output is written. Defaults to $stdout.
       # DEPRECATED. Use --format FORMAT:WHERE in spec_opts.
       attr_accessor :out
 
@@ -117,7 +117,7 @@ module Spec
       # used, then the list of spec files is the union of the two.
       # Setting the SPEC environment variable overrides this.
       attr_accessor :spec_files
-      
+
       # Use verbose output. If this is set to true, the task will print
       # the executed spec command to stdout. Defaults to false.
       attr_accessor :verbose
@@ -155,30 +155,23 @@ module Spec
               # ruby [ruby_opts] -Ilib -S rcov [rcov_opts] bin/spec -- examples [spec_opts]
               # or
               # ruby [ruby_opts] -Ilib bin/spec examples [spec_opts]
-              cmd = "ruby "
-
-              rb_opts = ruby_opts.clone
-              rb_opts << "-I\"#{lib_path}\""
-              rb_opts << "-S rcov" if rcov
-              rb_opts << "-w" if warning
-              cmd << rb_opts.join(" ")
-              cmd << " "
-              cmd << rcov_option_list
-              cmd << %[ -o "#{rcov_dir}" ] if rcov
-              cmd << %Q|"#{spec_script}"|
-              cmd << " "
-              cmd << "-- " if rcov
-              cmd << spec_file_list.collect { |fn| %["#{fn}"] }.join(' ')
-              cmd << " "
-              cmd << spec_option_list
+              cmd_parts = [RUBY]
+              cmd_parts += ruby_opts
+              cmd_parts << %[-I"#{lib_path}"]
+              cmd_parts << "-S rcov" if rcov
+              cmd_parts << "-w" if warning
+              cmd_parts << rcov_option_list
+              cmd_parts << %[-o "#{rcov_dir}"] if rcov
+              cmd_parts << %["#{spec_script}"]
+              cmd_parts << "--" if rcov
+              cmd_parts += spec_file_list.collect { |fn| %["#{fn}"] }
+              cmd_parts << spec_option_list
               if out
-                cmd << " "
-                cmd << %Q| > "#{out}"|
+                cmd_parts << %[> "#{out}"]
                 STDERR.puts "The Spec::Rake::SpecTask#out attribute is DEPRECATED and will be removed in a future version. Use --format FORMAT:WHERE instead."
               end
-              if verbose
-                puts cmd
-              end
+              cmd = cmd_parts.join(" ")
+              puts cmd if verbose
               unless system(cmd)
                 STDERR.puts failure_message if failure_message
                 raise("Command #{cmd} failed") if fail_on_error
@@ -210,7 +203,7 @@ module Spec
         STDERR.puts "RSPECOPTS is DEPRECATED and will be removed in a future version. Use SPEC_OPTS instead." if ENV['RSPECOPTS']
         ENV['SPEC_OPTS'] || ENV['RSPECOPTS'] || spec_opts.join(" ") || ""
       end
-      
+
       def evaluate(o) # :nodoc:
         case o
           when Proc then o.call
@@ -232,4 +225,3 @@ module Spec
     end
   end
 end
-

data/vendor/plugins/rspec/lib/spec/rake/verify_rcov.rb

@@ -35,11 +35,11 @@ module RCov
     def define
       desc "Verify that rcov coverage is at least #{threshold}%"
       task @name do
-        total_coverage = nil
+        total_coverage = 0
 
         File.open(index_html).each_line do |line|
-          if line =~ /<tt class='coverage_total'>(\d+\.\d+)%<\/tt>/
-            total_coverage = eval($1)
+          if line =~ /<tt class='coverage_total'>\s*(\d+\.\d+)%\s*<\/tt>/
+            total_coverage = $1.to_f
             break
           end
         end

data/vendor/plugins/rspec/lib/spec/runner/backtrace_tweaker.rb

@@ -27,7 +27,7 @@ module Spec
           /\/lib\/ruby\//,
           /bin\/spec:/,
           /bin\/rcov:/,
-          /lib\/rspec_on_rails/,
+          /lib\/rspec-rails/,
           /vendor\/rails/,
           # TextMate's Ruby and RSpec plugins
           /Ruby\.tmbundle\/Support\/tmruby.rb:/,
@@ -40,15 +40,14 @@ module Spec
       
       def tweak_backtrace(error)
         return if error.backtrace.nil?
-        error.backtrace.collect! do |line|
-          clean_up_double_slashes(line)
-          IGNORE_PATTERNS.each do |ignore|
-            if line =~ ignore
-              line = nil
-              break
+        error.backtrace.collect! do |message|
+          clean_up_double_slashes(message)
+          kept_lines = message.split("\n").select do |line|
+            IGNORE_PATTERNS.each do |ignore|
+              break if line =~ ignore
             end
           end
-          line
+          kept_lines.empty?? nil : kept_lines.join("\n")
         end
         error.backtrace.compact!
       end

data/vendor/plugins/rspec/lib/spec/runner/command_line.rb

@@ -2,25 +2,14 @@ require 'spec/runner/option_parser'
 
 module Spec
   module Runner
-    # Facade to run specs without having to fork a new ruby process (using `spec ...`)
     class CommandLine
       class << self
-        # Runs specs. +argv+ is the commandline args as per the spec commandline API, +err+
-        # and +out+ are the streams output will be written to.
-        def run(instance_rspec_options)
-          # NOTE - this call to init_rspec_options is not spec'd, but neither is any of this
-          # swapping of $rspec_options. That is all here to enable rspec to run against itself
-          # and maintain coverage in a single process. Therefore, DO NOT mess with this stuff
-          # unless you know what you are doing!
-          init_rspec_options(instance_rspec_options)
-          orig_rspec_options = rspec_options
-          begin
-            $rspec_options = instance_rspec_options
-            return $rspec_options.run_examples
-          ensure
-            ::Spec.run = true
-            $rspec_options = orig_rspec_options
-          end
+        def run(tmp_options=Spec::Runner.options)
+          orig_options = Spec::Runner.options
+          Spec::Runner.use tmp_options
+          tmp_options.run_examples
+        ensure
+          Spec::Runner.use orig_options
         end
       end
     end

data/vendor/plugins/rspec/lib/spec/runner/drb_command_line.rb

@@ -9,7 +9,7 @@ module Spec
       def self.run(options)
         begin
           DRb.start_service
-          spec_server = DRbObject.new_with_uri("druby://localhost:8989")
+          spec_server = DRbObject.new_with_uri("druby://127.0.0.1:8989")
           spec_server.run(options.argv, options.error_stream, options.output_stream)
         rescue DRb::DRbConnError => e
           options.error_stream.puts "No server is running"

data/vendor/plugins/rspec/lib/spec/runner/formatter/base_formatter.rb

@@ -19,8 +19,7 @@ module Spec
         end
 
         # This method is invoked at the beginning of the execution of each example_group.
-        # +name+ is the name of the example_group and +first+ is true if it is the
-        # first example_group - otherwise it's false.
+        # +example_group+ is the example_group.
         #
         # The next method to be invoked after this is #example_failed or #example_finished
         def add_example_group(example_group)
@@ -46,7 +45,9 @@ module Spec
         # been provided a block), or when an ExamplePendingError is raised.
         # +message+ is the message from the ExamplePendingError, if it exists, or the
         # default value of "Not Yet Implemented"
-        def example_pending(example_group_description, example, message)
+        # +pending_caller+ is the file and line number of the spec which
+        # has called the pending method
+        def example_pending(example, message, pending_caller)
         end
 
         # This method is invoked after all of the examples have executed. The next method

data/vendor/plugins/rspec/lib/spec/runner/formatter/base_text_formatter.rb

@@ -15,19 +15,14 @@ module Spec
           super
           if where.is_a?(String)
             @output = File.open(where, 'w')
-          elsif where == STDOUT
-            @output = Kernel
-            def @output.flush
-              STDOUT.flush
-            end
           else
             @output = where
           end
           @pending_examples = []
         end
         
-        def example_pending(example_group_description, example, message)
-          @pending_examples << ["#{example_group_description} #{example.description}", message]
+        def example_pending(example, message, pending_caller)
+          @pending_examples << [example.__full_description, message, pending_caller]
         end
         
         def dump_failure(counter, failure)
@@ -75,13 +70,14 @@ module Spec
             @output.puts "Pending:"
             @pending_examples.each do |pending_example|
               @output.puts "#{pending_example[0]} (#{pending_example[1]})" 
+              @output.puts "  Called from #{pending_example[2]}"
             end
           end
           @output.flush
         end
         
         def close
-          if IO === @output
+          if IO === @output && @output != $stdout
             @output.close 
           end
         end
@@ -112,7 +108,7 @@ module Spec
 
         def output_to_tty?
           begin
-            @output == Kernel || @output.tty?
+            @output.tty? || ENV.has_key?("AUTOTEST")
           rescue NoMethodError
             false
           end

data/vendor/plugins/rspec/lib/spec/runner/formatter/failing_example_groups_formatter.rb

@@ -4,19 +4,15 @@ module Spec
   module Runner
     module Formatter
       class FailingExampleGroupsFormatter < BaseTextFormatter
-        def add_example_group(example_group)
-          super
-          @example_group_description_parts = example_group.description_parts
-        end
-
         def example_failed(example, counter, failure)
-          if @example_group_description_parts
-            description_parts = @example_group_description_parts.collect do |description|
+          if @example_group
+            description_parts = @example_group.description_parts.collect do |description|
               description =~ /(.*) \(druby.*\)$/ ? $1 : description
             end
             @output.puts ::Spec::Example::ExampleGroupMethods.description_text(*description_parts)
+
             @output.flush
-            @example_group_description_parts = nil
+            @example_group = nil
           end
         end
 

data/vendor/plugins/rspec/lib/spec/runner/formatter/html_formatter.rb

@@ -9,18 +9,22 @@ module Spec
         
         def initialize(options, output)
           super
-          @current_example_group_number = 0
-          @current_example_number = 0
+          @example_group_number = 0
+          @example_number = 0
+        end
+        
+        def method_missing(sym, *args)
+          # no-op
         end
 
         # The number of the currently running example_group
-        def current_example_group_number
-          @current_example_group_number
+        def example_group_number
+          @example_group_number
         end
         
         # The number of the currently running example (a global counter)
-        def current_example_number
-          @current_example_number
+        def example_number
+          @example_number
         end
         
         def start(example_count)
@@ -35,14 +39,14 @@ module Spec
           super
           @example_group_red = false
           @example_group_red = false
-          @current_example_group_number += 1
-          unless current_example_group_number == 1
+          @example_group_number += 1
+          unless example_group_number == 1
             @output.puts "  </dl>"
             @output.puts "</div>"
           end
           @output.puts "<div class=\"example_group\">"
           @output.puts "  <dl>"
-          @output.puts "  <dt id=\"example_group_#{current_example_group_number}\">#{h(example_group.description)}</dt>"
+          @output.puts "  <dt id=\"example_group_#{example_group_number}\">#{h(example_group.description)}</dt>"
           @output.flush
         end
 
@@ -53,7 +57,7 @@ module Spec
         end
 
         def example_started(example)
-          @current_example_number += 1
+          @example_number += 1
         end
 
         def example_passed(example)
@@ -67,7 +71,7 @@ module Spec
           failure_style = failure.pending_fixed? ? 'pending_fixed' : 'failed'
           @output.puts "    <script type=\"text/javascript\">makeRed('rspec-header');</script>" unless @header_red
           @header_red = true
-          @output.puts "    <script type=\"text/javascript\">makeRed('example_group_#{current_example_group_number}');</script>" unless @example_group_red
+          @output.puts "    <script type=\"text/javascript\">makeRed('example_group_#{example_group_number}');</script>" unless @example_group_red
           @example_group_red = true
           move_progress
           @output.puts "    <dd class=\"spec #{failure_style}\">"
@@ -81,9 +85,9 @@ module Spec
           @output.flush
         end
 
-        def example_pending(example_group_description, example, message)
+        def example_pending(example, message, pending_caller)
           @output.puts "    <script type=\"text/javascript\">makeYellow('rspec-header');</script>" unless @header_red
-          @output.puts "    <script type=\"text/javascript\">makeYellow('example_group_#{current_example_group_number}');</script>" unless @example_group_red
+          @output.puts "    <script type=\"text/javascript\">makeYellow('example_group_#{example_group_number}');</script>" unless @example_group_red
           move_progress
           @output.puts "    <dd class=\"spec not_implemented\"><span class=\"not_implemented_spec_name\">#{h(example.description)} (PENDING: #{h(message)})</span></dd>"
           @output.flush
@@ -106,7 +110,7 @@ module Spec
         def percent_done
           result = 100.0
           if @example_count != 0
-            result = ((current_example_number).to_f / @example_count.to_f * 1000).to_i / 10.0
+            result = ((example_number).to_f / @example_count.to_f * 1000).to_i / 10.0
           end
           result
         end

data/vendor/plugins/rspec/lib/spec/runner/formatter/nested_text_formatter.rb

@@ -0,0 +1,65 @@
+require 'spec/runner/formatter/base_text_formatter'
+
+module Spec
+  module Runner
+    module Formatter
+      class NestedTextFormatter < BaseTextFormatter
+        attr_reader :previous_nested_example_groups
+        def initialize(options, where)
+          super
+          @previous_nested_example_groups = []
+        end
+
+        def add_example_group(example_group)
+          super
+
+          current_nested_example_groups = described_example_group_chain
+          current_nested_example_groups.each_with_index do |nested_example_group, i|
+            unless nested_example_group == previous_nested_example_groups[i]
+              output.puts "#{'  ' * i}#{nested_example_group.description_args}"
+            end
+          end
+
+          @previous_nested_example_groups = described_example_group_chain
+        end
+
+        def example_failed(example, counter, failure)
+          message = if failure.expectation_not_met?
+            "#{current_indentation}#{example.description} (FAILED - #{counter})"
+          else
+            "#{current_indentation}#{example.description} (ERROR - #{counter})"
+          end
+
+          output.puts(failure.expectation_not_met? ? red(message) : magenta(message))
+          output.flush
+        end
+
+        def example_passed(example)
+          message = "#{current_indentation}#{example.description}"
+          output.puts green(message)
+          output.flush
+        end
+
+        def example_pending(example, message, pending_caller)
+          super
+          output.puts yellow("#{current_indentation}#{example.description} (PENDING: #{message})")
+          output.flush
+        end
+
+        def current_indentation
+          '  ' * previous_nested_example_groups.length
+        end
+
+        def described_example_group_chain
+          example_group_chain = []
+          example_group.__send__(:each_ancestor_example_group_class) do |example_group_class|
+            unless example_group_class.description_args.empty?
+              example_group_chain << example_group_class
+            end
+          end
+          example_group_chain
+        end
+      end
+    end
+  end
+end

data/vendor/plugins/rspec/lib/spec/runner/formatter/profile_formatter.rb

@@ -41,6 +41,10 @@ module Spec
           end
           @output.flush
         end
+        
+        def method_missing(sym, *args)
+          # ignore
+        end
       end
     end
   end