typo 5.0.2 → 5.0.3.98

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

@@ -39,6 +39,8 @@ module Spec
                                                     @expected_received_count < values.size
         end
         @return_block = block_given? ? return_block : lambda { value }
+        # Ruby 1.9 - see where this is used below
+        @ignore_args = !block_given?
       end
       
       # :call-seq:
@@ -128,9 +130,14 @@ module Spec
       
       def invoke_return_block(args, block)
         args << block unless block.nil?
-        value = @return_block.call(*args)
-    
-        value
+        # Ruby 1.9 - when we set @return_block to return values
+        # regardless of arguments, any arguments will result in
+        # a "wrong number of arguments" error
+        if @ignore_args
+          @return_block.call()
+        else
+          @return_block.call(*args)
+        end
       end
     end
     

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

@@ -183,6 +183,20 @@ module Spec
       def configure
         yield configuration
       end
+      
+      def register_at_exit_hook # :nodoc:
+        $spec_runner_at_exit_hook_registered ||= nil
+        unless $spec_runner_at_exit_hook_registered
+          at_exit do
+            unless $! || Spec.run?; \
+              success = Spec.run; \
+              exit success if Spec.exit?; \
+            end
+          end
+          $spec_runner_at_exit_hook_registered = true
+        end
+      end
+      
     end
   end
 end

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

@@ -98,6 +98,9 @@ EOF
             scenario_ended
           end
 
+          def step_upcoming(type, description, *args)
+          end
+
           def step_succeeded(type, description, *args)
             print_step('passed', type, description, *args) # TODO: uses succeeded CSS class
           end
@@ -112,11 +115,12 @@ EOF
           
           def print_step(klass, type, description, *args)
             spans = args.map { |arg| "<span class=\"param\">#{arg}</span>" }
+            desc_string = description.step_name
+            arg_regexp = description.arg_regexp           
             i = -1
-            inner = type.to_s.capitalize + ' ' + description.gsub(::Spec::Story::Step::PARAM_PATTERN) { |param| spans[i+=1] }
+            inner = type.to_s.capitalize + ' ' + desc_string.gsub(arg_regexp) { |param| spans[i+=1] }
             @output.puts "                <li class=\"#{klass}\">#{inner}</li>"
           end
-
         end
       end
     end

data/vendor/plugins/rspec/lib/spec/runner/formatter/story/plain_text_formatter.rb

@@ -20,6 +20,7 @@ module Spec
           end
 
           def story_started(title, narrative)
+            @current_story_title = title
             @output.puts "Story: #{title}\n\n"
             narrative.each_line do |line|
               @output.print "  "
@@ -33,6 +34,7 @@ module Spec
           end
 
           def scenario_started(story_title, scenario_name)
+            @current_scenario_name = scenario_name
             @scenario_already_failed = false
             @output.print "\n\n  Scenario: #{scenario_name}"
             @scenario_ok = true
@@ -43,12 +45,12 @@ module Spec
           end
         
           def scenario_failed(story_title, scenario_name, err)
+            @options.backtrace_tweaker.tweak_backtrace(err)
             @failed_scenarios << [story_title, scenario_name, err] unless @scenario_already_failed
             @scenario_already_failed = true
           end
         
           def scenario_pending(story_title, scenario_name, msg)
-            @pending_steps << [story_title, scenario_name, msg]
             @pending_scenario_count += 1 unless @scenario_already_failed
             @scenario_already_failed = true
           end
@@ -58,8 +60,8 @@ module Spec
             unless @pending_steps.empty?
               @output.puts "\nPending Steps:"
               @pending_steps.each_with_index do |pending, i|
-                title, scenario_name, msg = pending
-                @output.puts "#{i+1}) #{title} (#{scenario_name}): #{msg}"
+                story_name, scenario_name, msg = pending
+                @output.puts "#{i+1}) #{story_name} (#{scenario_name}): #{msg}"
               end
             end
             unless @failed_scenarios.empty?
@@ -70,17 +72,21 @@ module Spec
     #{i+1}) #{title} (#{scenario_name}) FAILED
     #{err.class}: #{err.message}
     #{err.backtrace.join("\n")}
-    ]
+]
               end
-            end
+            end            
           end
-        
+
+          def step_upcoming(type, description, *args)
+          end
+                  
           def step_succeeded(type, description, *args)
             found_step(type, description, false, *args)
           end
         
           def step_pending(type, description, *args)
             found_step(type, description, false, *args)
+            @pending_steps << [@current_story_title, @current_scenario_name, description]
             @output.print " (PENDING)"
             @scenario_ok = false
           end
@@ -101,13 +107,15 @@ module Spec
         private
 
           def found_step(type, description, failed, *args)
+            desc_string = description.step_name
+            arg_regexp = description.arg_regexp
             text = if(type == @previous_type)
               "\n    And "
             else
               "\n\n    #{type.to_s.capitalize} "
             end
             i = -1
-            text << description.gsub(::Spec::Story::Step::PARAM_PATTERN) { |param| args[i+=1] }
+            text << desc_string.gsub(arg_regexp) { |param| args[i+=1] }
             @output.print(failed ? red(text) : green(text))
 
             if type == :'given scenario'

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

@@ -15,6 +15,10 @@ module Spec
       attr_reader :options
 
       OPTIONS = {
+        :pattern => ["-p", "--pattern [PATTERN]","Limit files loaded to those matching this pattern. Defaults to '**/*_spec.rb'",
+                                                 "Separate multiple patterns with commas.",
+                                                 "Applies only to directories named on the command line (files",
+                                                 "named explicitly on the command line will be loaded regardless)."],
         :diff =>    ["-D", "--diff [FORMAT]", "Show diff of objects that are expected to be equal when they are not",
                                              "Builtin formats: unified|u|context|c",
                                              "You can also specify a custom differ class",
@@ -84,11 +88,11 @@ module Spec
         @out_stream = out
         @options = Options.new(@error_stream, @out_stream)
 
-        @spec_parser = SpecParser.new
         @file_factory = File
 
         self.banner = "Usage: spec (FILE|DIRECTORY|GLOB)+ [options]"
         self.separator ""
+        on(*OPTIONS[:pattern]) {|pattern| @options.filename_pattern = pattern}
         on(*OPTIONS[:diff]) {|diff| @options.parse_diff(diff)}
         on(*OPTIONS[:colour]) {@options.colour = true}
         on(*OPTIONS[:example]) {|example| @options.parse_example(example)}
@@ -124,10 +128,6 @@ module Spec
           blk.call(file) if blk
         end
 
-        if @options.line_number
-          set_spec_from_line_number
-        end
-
         @options
       end
 
@@ -193,37 +193,9 @@ module Spec
         exit if stdout?
       end      
 
-      def set_spec_from_line_number
-        if @options.examples.empty?
-          if @options.files.length == 1
-            if @file_factory.file?(@options.files[0])
-              source = @file_factory.open(@options.files[0])
-              example = @spec_parser.spec_name_for(source, @options.line_number)
-              @options.parse_example(example)
-            elsif @file_factory.directory?(@options.files[0])
-              @error_stream.puts "You must specify one file, not a directory when using the --line option"
-              exit(1) if stderr?
-            else
-              @error_stream.puts "#{@options.files[0]} does not exist"
-              exit(2) if stderr?
-            end
-          else
-            @error_stream.puts "Only one file can be specified when using the --line option: #{@options.files.inspect}"
-            exit(3) if stderr?
-          end
-        else
-          @error_stream.puts "You cannot use both --line and --example"
-          exit(4) if stderr?
-        end
-      end
-
       def stdout?
         @out_stream == $stdout
       end
-
-      def stderr?
-        @error_stream == $stderr
-      end
     end
   end
 end

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

@@ -29,6 +29,7 @@ module Spec
       }
 
       attr_accessor(
+        :filename_pattern,
         :backtrace_tweaker,
         :context_lines,
         :diff_format,
@@ -53,6 +54,7 @@ module Spec
       def initialize(error_stream, output_stream)
         @error_stream = error_stream
         @output_stream = output_stream
+        @filename_pattern = "**/*_spec.rb"
         @backtrace_tweaker = QuietBacktraceTweaker.new
         @examples = []
         @colour = false
@@ -84,6 +86,7 @@ module Spec
         if example_groups.empty?
           true
         else
+          set_spec_from_line_number if line_number
           success = runner.run
           @examples_run = true
           heckle if heckle_runner
@@ -101,10 +104,14 @@ module Spec
 
       def colour=(colour)
         @colour = colour
-        begin; \
-          require 'Win32/Console/ANSI' if @colour && PLATFORM =~ /win32/; \
-        rescue LoadError ; \
-          raise "You must gem install win32console to use colour on Windows" ; \
+        if @colour && RUBY_PLATFORM =~ /win32/ ;\
+          begin ;\
+            require 'rubygems' ;\
+            require 'Win32/Console/ANSI' ;\
+          rescue LoadError ;\
+            warn "You must 'gem install win32console' to use colour on Windows" ;\
+            @colour = false ;\
+          end
         end
       end
 
@@ -175,6 +182,22 @@ module Spec
         end
       end
 
+      def files_to_load
+        result = []
+        sorted_files.each do |file|
+          if File.directory?(file)
+            filename_pattern.split(",").each do |pattern|
+              result += Dir[File.expand_path("#{file}/#{pattern.strip}")]
+            end
+          elsif File.file?(file)
+            result << file
+          else
+            raise "File or directory not found: #{file}"
+          end
+        end
+        result
+      end
+      
       protected
       def examples_should_be_run?
         return @examples_should_be_run unless @examples_should_be_run.nil?
@@ -205,20 +228,6 @@ module Spec
         end
       end
       
-      def files_to_load
-        result = []
-        sorted_files.each do |file|
-          if test ?d, file
-            result += Dir[File.expand_path("#{file}/**/*.rb")]
-          elsif test ?f, file
-            result << file
-          else
-            raise "File or directory not found: #{file}"
-          end
-        end
-        result
-      end
-      
       def custom_runner
         return nil unless custom_runner?
         klass_name, arg = ClassAndArgumentsParser.parse(user_input_for_runner)
@@ -248,6 +257,30 @@ module Spec
         require 'spec/expectations/differs/default'
         self.differ_class = Spec::Expectations::Differs::Default
       end
+
+      def set_spec_from_line_number
+        if examples.empty?
+          if files.length == 1
+            if File.directory?(files[0])
+              error_stream.puts "You must specify one file, not a directory when using the --line option"
+              exit(1) if stderr?
+            else
+              example = SpecParser.new.spec_name_for(files[0], line_number)
+              @examples = [example]
+            end
+          else
+            error_stream.puts "Only one file can be specified when using the --line option: #{files.inspect}"
+            exit(3) if stderr?
+          end
+        else
+          error_stream.puts "You cannot use both --line and --example"
+          exit(4) if stderr?
+        end
+      end
+
+      def stderr?
+        @error_stream == $stderr
+      end
     end
   end
 end

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

@@ -2,14 +2,28 @@ module Spec
   module Runner
     # Parses a spec file and finds the nearest example for a given line number.
     class SpecParser
-      def spec_name_for(io, line_number)
-        source  = io.read
-        example_group, example_group_line = example_group_at_line(source, line_number)
-        example, example_line = example_at_line(source, line_number)
-        if example_group && example && (example_group_line < example_line)
-          "#{example_group} #{example}"
-        elsif example_group
-          example_group
+      attr_reader :best_match
+
+      def initialize
+        @best_match = {}
+      end
+
+      def spec_name_for(file, line_number)
+        best_match.clear
+        file = File.expand_path(file)
+        rspec_options.example_groups.each do |example_group|
+          consider_example_groups_for_best_match example_group, file, line_number
+
+          example_group.examples.each do |example|
+            consider_example_for_best_match example, example_group, file, line_number
+          end
+        end
+        if best_match[:example_group]
+          if best_match[:example]
+            "#{best_match[:example_group].description} #{best_match[:example].description}"
+          else
+            best_match[:example_group].description
+          end
         else
           nil
         end
@@ -17,36 +31,40 @@ module Spec
 
     protected
 
-      def example_group_at_line(source, line_number)
-        find_above(source, line_number, /^\s*(context|describe)\s+(.*)\s+do/)
-      end
-
-      def example_at_line(source, line_number)
-        find_above(source, line_number, /^\s*(specify|it)\s+(.*)\s+do/)
+      def consider_example_groups_for_best_match(example_group, file, line_number)
+        parsed_backtrace = parse_backtrace(example_group.registration_backtrace)
+        parsed_backtrace.each do |example_file, example_line|
+          if is_best_match?(file, line_number, example_file, example_line)
+            best_match.clear
+            best_match[:example_group] = example_group
+            best_match[:line] = example_line
+          end
+        end
       end
 
-      # Returns the context/describe or specify/it name and the line number
-      def find_above(source, line_number, pattern)
-        lines_above_reversed(source, line_number).each_with_index do |line, n|
-          return [parse_description($2), line_number-n] if line =~ pattern
+      def consider_example_for_best_match(example, example_group, file, line_number)
+        parsed_backtrace = parse_backtrace(example.implementation_backtrace)
+        parsed_backtrace.each do |example_file, example_line|
+          if is_best_match?(file, line_number, example_file, example_line)
+            best_match.clear
+            best_match[:example_group] = example_group
+            best_match[:example] = example
+            best_match[:line] = example_line
+          end
         end
-        nil
       end
 
-      def lines_above_reversed(source, line_number)
-        lines = source.split("\n")
-        lines[0...line_number].reverse
+      def is_best_match?(file, line_number, example_file, example_line)
+        file == File.expand_path(example_file) &&
+        example_line <= line_number &&
+        example_line > best_match[:line].to_i
       end
-      
-      def parse_description(str)
-        return str[1..-2] if str =~ /^['"].*['"]$/
-        if matches = /^['"](.*)['"](,.*)?$/.match(str)
-          return ::Spec::Example::ExampleGroupMethods.description_text(matches[1])
-        end
-        if matches = /^(.*)\s*,\s*['"](.*)['"](,.*)?$/.match(str)
-          return ::Spec::Example::ExampleGroupMethods.description_text(matches[1], matches[2])
+
+      def parse_backtrace(backtrace)
+        backtrace.collect do |trace_line|
+          split_line = trace_line.split(':')
+          [split_line[0], Integer(split_line[1])]
         end
-        return str
       end
     end
   end

data/vendor/plugins/rspec/lib/spec/story/extensions.rb

@@ -1 +1,3 @@
 require 'spec/story/extensions/main'
+require 'spec/story/extensions/string'
+require 'spec/story/extensions/regexp'