typo 5.1.3 → 5.1.98

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

@@ -8,6 +8,8 @@ module Spec
       EXAMPLE_FORMATTERS = { # Load these lazily for better speed
                'specdoc' => ['spec/runner/formatter/specdoc_formatter',                'Formatter::SpecdocFormatter'],
                      's' => ['spec/runner/formatter/specdoc_formatter',                'Formatter::SpecdocFormatter'],
+                'nested' => ['spec/runner/formatter/nested_text_formatter',            'Formatter::NestedTextFormatter'],
+                     'n' => ['spec/runner/formatter/nested_text_formatter',            'Formatter::NestedTextFormatter'],
                   'html' => ['spec/runner/formatter/html_formatter',                   'Formatter::HtmlFormatter'],
                      'h' => ['spec/runner/formatter/html_formatter',                   'Formatter::HtmlFormatter'],
               'progress' => ['spec/runner/formatter/progress_bar_formatter',           'Formatter::ProgressBarFormatter'],
@@ -22,10 +24,13 @@ module Spec
       }
 
       STORY_FORMATTERS = {
-        'plain' => ['spec/runner/formatter/story/plain_text_formatter', 'Formatter::Story::PlainTextFormatter'],
-            'p' => ['spec/runner/formatter/story/plain_text_formatter', 'Formatter::Story::PlainTextFormatter'],
-         'html' => ['spec/runner/formatter/story/html_formatter',       'Formatter::Story::HtmlFormatter'],
-            'h' => ['spec/runner/formatter/story/html_formatter',       'Formatter::Story::HtmlFormatter']
+        'plain' => ['spec/runner/formatter/story/plain_text_formatter',   'Formatter::Story::PlainTextFormatter'],
+            'p' => ['spec/runner/formatter/story/plain_text_formatter',   'Formatter::Story::PlainTextFormatter'],
+         'html' => ['spec/runner/formatter/story/html_formatter',         'Formatter::Story::HtmlFormatter'],
+            'h' => ['spec/runner/formatter/story/html_formatter',         'Formatter::Story::HtmlFormatter'],
+     'progress' => ['spec/runner/formatter/story/progress_bar_formatter', 'Formatter::Story::ProgressBarFormatter'],
+            'r' => ['spec/runner/formatter/story/progress_bar_formatter', 'Formatter::Story::ProgressBarFormatter']
+            
       }
 
       attr_accessor(
@@ -46,11 +51,13 @@ module Spec
         :user_input_for_runner,
         :error_stream,
         :output_stream,
+        :before_suite_parts,
+        :after_suite_parts,
         # TODO: BT - Figure out a better name
         :argv
       )
       attr_reader :colour, :differ_class, :files, :example_groups
-
+      
       def initialize(error_stream, output_stream)
         @error_stream = error_stream
         @output_stream = output_stream
@@ -65,9 +72,12 @@ module Spec
         @diff_format  = :unified
         @files = []
         @example_groups = []
+        @result = nil
         @examples_run = false
         @examples_should_be_run = nil
         @user_input_for_runner = nil
+        @before_suite_parts = []
+        @after_suite_parts = []
       end
 
       def add_example_group(example_group)
@@ -80,17 +90,37 @@ module Spec
 
       def run_examples
         return true unless examples_should_be_run?
-        runner = custom_runner || ExampleGroupRunner.new(self)
+        success = true
+        begin
+          runner = custom_runner || ExampleGroupRunner.new(self)
 
-        runner.load_files(files_to_load)
-        if example_groups.empty?
-          true
-        else
-          set_spec_from_line_number if line_number
-          success = runner.run
-          @examples_run = true
-          heckle if heckle_runner
-          success
+          unless @files_loaded
+            runner.load_files(files_to_load)
+            @files_loaded = true
+          end
+
+          # TODO - this has to happen after the files get loaded,
+          # otherwise the before_suite_parts are not populated
+          # from the configuration. There is no spec for this
+          # directly, but stories/configuration/before_blocks.story
+          # will fail if this happens before the files are loaded.
+          before_suite_parts.each do |part|
+            part.call
+          end
+
+          if example_groups.empty?
+            true
+          else
+            set_spec_from_line_number if line_number
+            success = runner.run
+            @examples_run = true
+            heckle if heckle_runner
+            success
+          end
+        ensure
+          after_suite_parts.each do |part|
+            part.call(success)
+          end
         end
       end
 
@@ -104,10 +134,12 @@ module Spec
 
       def colour=(colour)
         @colour = colour
-        if @colour && RUBY_PLATFORM =~ /win32/ ;\
+        if @colour && RUBY_PLATFORM =~ /mswin|mingw/ ;\
           begin ;\
+            replace_output = @output_stream.equal?($stdout) ;\
             require 'rubygems' ;\
             require 'Win32/Console/ANSI' ;\
+            @output_stream = $stdout if replace_output ;\
           rescue LoadError ;\
             warn "You must 'gem install win32console' to use colour on Windows" ;\
             @colour = false ;\
@@ -177,9 +209,11 @@ module Spec
       end
 
       def number_of_examples
-        @example_groups.inject(0) do |sum, example_group|
-          sum + example_group.number_of_examples
+        total = 0
+        @example_groups.each do |example_group|
+          total += example_group.number_of_examples
         end
+        total
       end
 
       def files_to_load
@@ -240,9 +274,9 @@ module Spec
       end
       
       def heckle
-        returns = self.heckle_runner.heckle_with
+        heckle_runner = self.heckle_runner
         self.heckle_runner = nil
-        returns
+        heckle_runner.heckle_with
       end
       
       def sorted_files

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

@@ -26,7 +26,7 @@ module Spec
         if error.nil?
           example_passed(example)
         elsif Spec::Example::ExamplePendingError === error
-          example_pending(example_groups.last, example, error.message)
+          example_pending(example, error.pending_caller, error.message)
         else
           example_failed(example, error)
         end
@@ -34,8 +34,7 @@ module Spec
 
       def failure(example, error)
         backtrace_tweaker.tweak_backtrace(error)
-        example_name = "#{example_groups.last.description} #{example.description}"
-        failure = Failure.new(example_name, error)
+        failure = Failure.new(example, error)
         @failures << failure
         formatters.each do |f|
           f.example_failed(example, @failures.length, failure)
@@ -91,6 +90,7 @@ module Spec
           index + 1
         end
       end
+
       def dump_pending
         formatters.each{|f| f.dump_pending}
       end
@@ -103,29 +103,49 @@ module Spec
       def example_passed(example)
         formatters.each{|f| f.example_passed(example)}
       end
+
+      EXAMPLE_PENDING_DEPRECATION_WARNING = <<-WARNING
+        DEPRECATION NOTICE: RSpec's formatters have changed example_pending
+        to accept three arguments instead of just two. Please see the rdoc
+        for Spec::Runner::Formatter::BaseFormatter#example_pending
+        for more information.
+          
+        Please update any custom formatters to accept the third argument
+        to example_pending. Support for example_pending with two arguments
+        and this warning message will be removed after the RSpec 1.1.5 release.
+      WARNING
       
-      def example_pending(example_group, example, message="Not Yet Implemented")
+      def example_pending(example, pending_caller, message="Not Yet Implemented")
         @pending_count += 1
-        formatters.each do |f|
-          f.example_pending(example_group.description, example, message)
+        formatters.each do |formatter|
+          if formatter_uses_deprecated_example_pending_method?(formatter)
+            Kernel.warn EXAMPLE_PENDING_DEPRECATION_WARNING
+            formatter.example_pending(example, message)
+          else
+            formatter.example_pending(example, message, pending_caller)
+          end
         end
       end
       
+      def formatter_uses_deprecated_example_pending_method?(formatter)
+        formatter.method(:example_pending).arity == 2
+      end
+      
       class Failure
-        attr_reader :exception
+        attr_reader :example, :exception
         
-        def initialize(example_name, exception)
-          @example_name = example_name
+        def initialize(example, exception)
+          @example = example
           @exception = exception
         end
 
         def header
           if expectation_not_met?
-            "'#{@example_name}' FAILED"
+            "'#{example_name}' FAILED"
           elsif pending_fixed?
-            "'#{@example_name}' FIXED"
+            "'#{example_name}' FIXED"
           else
-            "#{@exception.class.name} in '#{@example_name}'"
+            "#{@exception.class.name} in '#{example_name}'"
           end
         end
         
@@ -137,6 +157,10 @@ module Spec
           @exception.is_a?(Spec::Expectations::ExpectationNotMetError)
         end
 
+        protected
+        def example_name
+          @example.__full_description
+        end
       end
     end
   end

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

@@ -11,7 +11,7 @@ module Spec
       def spec_name_for(file, line_number)
         best_match.clear
         file = File.expand_path(file)
-        rspec_options.example_groups.each do |example_group|
+        Spec::Runner.options.example_groups.each do |example_group|
           consider_example_groups_for_best_match example_group, file, line_number
 
           example_group.examples.each do |example|

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

@@ -185,18 +185,29 @@ module Spec
       end
       
       def register_at_exit_hook # :nodoc:
-        $spec_runner_at_exit_hook_registered ||= nil
-        unless $spec_runner_at_exit_hook_registered
+        unless @already_registered_at_exit_hook
           at_exit do
-            unless $! || Spec.run?; \
-              success = Spec.run; \
-              exit success if Spec.exit?; \
+            unless $! || Spec.run? || Spec::Example::ExampleGroupFactory.all_registered?(options.example_groups)
+              success = Spec.run
+              exit success if Spec.exit?
             end
           end
-          $spec_runner_at_exit_hook_registered = true
+          @already_registered_at_exit_hook = true
+        end
+      end
+
+      def options # :nodoc:
+        @options ||= begin
+          parser = ::Spec::Runner::OptionParser.new($stderr, $stdout)
+          parser.order!(ARGV)
+          parser.options
         end
       end
       
+      def use options
+        @options = options
+      end
+
     end
   end
 end

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

@@ -1,9 +1,9 @@
 class Regexp
   def step_name
-    self.source
+    self.source.gsub '\\$', '$$'
   end
   
   def arg_regexp
     ::Spec::Story::Step::PARAM_OR_GROUP_PATTERN
   end
-end
+end

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

@@ -4,6 +4,6 @@ class String
   end
   
   def arg_regexp
-    ::Spec::Story::Step::PARAM_PATTERN
+    ::Spec::Story::Step::PARAM_OR_GROUP_PATTERN
   end
-end
+end

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

@@ -26,9 +26,9 @@ module Spec
           @story_file = path
         end
         
-        def run
+        def run(story_runner=Spec::Story::Runner.story_runner)
           raise "You must set a path to the file with the story. See the RDoc." if @story_file.nil?
-          mediator = Spec::Story::Runner::StoryMediator.new(steps, Spec::Story::Runner.story_runner, @options)
+          mediator = Spec::Story::Runner::StoryMediator.new(steps, story_runner, @options)
           parser = Spec::Story::Runner::StoryParser.new(mediator)
 
           story_text = File.read(@story_file)          

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

@@ -11,6 +11,12 @@ module Spec
           run_story_ignoring_scenarios(scenario.story, world)
           
           world.start_collecting_errors
+
+          unless scenario.body
+            @listeners.each { |l| l.scenario_pending(scenario.story.title, scenario.name, '') }
+            return true
+          end
+          
           world.instance_eval(&scenario.body)
           if world.errors.empty?
             @listeners.each { |l| l.scenario_succeeded(scenario.story.title, scenario.name) }
@@ -19,8 +25,10 @@ module Spec
               @listeners.each { |l| l.scenario_pending(scenario.story.title, scenario.name, e.message) }
             else
               @listeners.each { |l| l.scenario_failed(scenario.story.title, scenario.name, e) }
+              return false
             end
           end
+          true
         end
         
         def add_listener(listener)

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

@@ -38,6 +38,14 @@
           current_scenario.add_step Step.new('Then', name)
         end
         
+        def last_step
+          current_scenario.last_step
+        end
+        
+        def add_to_last(name)
+          last_step.name << name
+        end
+        
         def run_stories
           stories.each { |story| @runner.instance_eval(&story) }
         end
@@ -64,7 +72,7 @@
             title = @title
             narrative = @narrative
             scenarios = @scenarios.collect { |scenario| scenario.to_proc }
-            options = @options.merge(:steps => @step_group)
+            options = @options.merge(:steps_for => @step_group)
             lambda do
               Story title, narrative, options do
                 scenarios.each { |scenario| instance_eval(&scenario) }
@@ -100,9 +108,15 @@
           def add_step(step)
             @steps << step
           end
+          
+          def last_step
+            @steps.last
+          end
         end
         
         class Step
+          attr_reader :name
+          
           def initialize(type, name)
             @type = type
             @name = name

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

@@ -26,6 +26,7 @@ module Spec
         def process_line(line)
           line.strip!
           case line
+          when /^#/                 then @state.comment(line)
           when /^Story: /           then @state.story(line)
           when /^Scenario: /        then @state.scenario(line)
           when /^Given:? /          then @state.given(line)
@@ -72,6 +73,10 @@ module Spec
         def create_then(name)
           @story_mediator.create_then(name)
         end
+        
+        def add_to_last(line)
+          @story_mediator.add_to_last("\n#{line}")
+        end
 
         def transition_to(key)
           @state = states[key]
@@ -136,6 +141,9 @@ module Spec
           def other(line)
             # no-op - supports header text before the first story in a file
           end
+          
+          def comment(line)
+          end
         end
         
         class StartingState < State
@@ -199,6 +207,10 @@ module Spec
           def given(line)
             @parser.create_given(remove_tag_from(:given, line))
           end
+          
+          def other(line)
+            @parser.add_to_last(line)
+          end
         end
         
         class WhenState < State
@@ -209,6 +221,10 @@ module Spec
           def event(line)
             @parser.create_when(remove_tag_from(:when ,line))
           end
+
+          def other(line)
+            @parser.add_to_last(line)
+          end
         end
 
         class ThenState < State
@@ -219,6 +235,10 @@ module Spec
           def outcome(line)
             @parser.create_then(remove_tag_from(:then ,line))
           end
+
+          def other(line)
+            @parser.add_to_last(line)
+          end
         end
 
       end

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

@@ -36,6 +36,7 @@ module Spec
         def run_stories
           return if @stories.empty?
           @listeners.each { |l| l.run_started(scenarios.size) }
+          success = true
           @stories.each do |story|
             story.assign_steps_to(World)
             @current_story = story
@@ -45,7 +46,7 @@ module Spec
               type = story[:type] || Object
               args = story[:args] || []
               world = @world_creator.create(type, *args)
-              @scenario_runner.run(scenario, world)
+              success = success & @scenario_runner.run(scenario, world)
             end
             @listeners.each { |l| l.story_ended(story.title, story.narrative) }
             World.step_mother.clear
@@ -53,6 +54,7 @@ module Spec
           unique_steps = (World.step_names.collect {|n| Regexp === n ? n.source : n.to_s}).uniq.sort
           @listeners.each { |l| l.collected_steps(unique_steps) }
           @listeners.each { |l| l.run_ended }
+          return success
         end
         
         def add_listener(listener)

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

@@ -10,16 +10,16 @@ module Spec
     module Runner
       class << self
         def run_options # :nodoc:
-          @run_options ||= ::Spec::Runner::OptionParser.parse(ARGV, $stderr, $stdout)
+          Spec::Runner.options
         end
         
         def story_runner # :nodoc:
           unless @story_runner
-            @story_runner = StoryRunner.new(scenario_runner, world_creator)
+            @story_runner = create_story_runner
             run_options.story_formatters.each do |formatter|
               register_listener(formatter)
             end
-            Runner.register_exit_hook
+            self.register_exit_hook
           end
           @story_runner
         end
@@ -32,6 +32,10 @@ module Spec
           @world_creator ||= World
         end
         
+        def create_story_runner
+          Runner::StoryRunner.new(scenario_runner, world_creator)
+        end
+        
         # Use this to register a customer output formatter.
         def register_listener(listener)
           story_runner.add_listener(listener) # run_started, story_started, story_ended, #run_ended
@@ -41,9 +45,8 @@ module Spec
         
         def register_exit_hook # :nodoc:
           at_exit do
-            Runner.story_runner.run_stories unless $!
+            exit Runner.story_runner.run_stories unless $!
           end
-          # TODO exit with non-zero status if run fails
         end
         
         def dry_run

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

@@ -1,58 +1,70 @@
 module Spec
   module Story
     class Step
-      PARAM_PATTERN = /(\$\w*)/
-      PARAM_OR_GROUP_PATTERN = /(\$\w*)|\(.*?\)/
+      PARAM_PATTERN = /([^\\]|^)(\$(?!\$)\w*)/
+      PARAM_OR_GROUP_PATTERN = /(\$(?!\$)\w*)|\(.*?\)/
       
       attr_reader :name
+      
       def initialize(name, &block)
-        @name = name
-        assign_expression(name)
-        init_module(name, &block)
+        init_name(name)
+        init_expression(name)
+        block_given? ? init_module(name, &block) : set_pending
       end
 
       def perform(instance, *args)
+        raise Spec::Example::ExamplePendingError.new("Not Yet Implemented") if pending?
         instance.extend(@mod)
         instance.__send__(sanitize(@name), *args)
       end
 
-      def init_module(name, &block)
-        sanitized_name = sanitize(name)
-        @mod = Module.new do
-          define_method(sanitized_name, &block)
-        end
+      def matches?(name)
+        !(name.strip =~ @expression).nil?
       end
+            
+      def parse_args(name)
+        name.strip.match(@expression)[1..-1]
+      end
+
+      private
       
       def sanitize(a_string_or_regexp)
         return a_string_or_regexp.source if Regexp == a_string_or_regexp
         a_string_or_regexp.to_s
       end
-      
 
-      def matches?(name)
-        !(matches = name.match(@expression)).nil?
+      def init_module(name, &block)
+        sanitized_name = sanitize(name)
+        @mod = Module.new do
+          define_method(sanitized_name, &block)
+        end
       end
-            
-      def parse_args(name)
-        name.match(@expression)[1..-1]
+    
+      def set_pending
+        @pending = true
+      end
+      
+      def pending?
+        @pending == true
       end
-
-      private
       
-        def assign_expression(string_or_regexp)
-          if String === string_or_regexp
-            expression = string_or_regexp.dup
-            expression.gsub! '(', '\('
-            expression.gsub! ')', '\)'
-          elsif Regexp === string_or_regexp
-            expression = string_or_regexp.source
-          end
-          while expression =~ PARAM_PATTERN
-            expression.gsub!($1, "(.*?)")
-          end
-          @expression = Regexp.new("^#{expression}$")
+      def init_name(name)
+        @name = name
+      end
+    
+      def init_expression(string_or_regexp)
+        if String === string_or_regexp
+          expression = string_or_regexp.dup
+          %w<? ( ) [ ] { } ^ !>.each {|c| expression.gsub! c, "\\#{c}"}
+        elsif Regexp === string_or_regexp
+          expression = string_or_regexp.source
+        end
+        while expression =~ PARAM_PATTERN
+          expression.sub!($2, "(.*?)")
         end
+        @expression = Regexp.new("\\A#{expression}\\Z", Regexp::MULTILINE)
+      end
 
     end
   end
-end
+end

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

@@ -13,7 +13,8 @@ module Spec
         @steps.add(type, step)
       end
       
-      def find(type, name)
+      def find(type, unstripped_name)
+        name = unstripped_name.strip
         if @steps.find(type, name).nil?
           @steps.add(type,
           Step.new(name) do

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

@@ -19,17 +19,14 @@ module Spec
       end
       
       def assign_steps_to(assignee)
-        if @params[:steps]
-          assignee.use(@params[:steps])
-        else
-          case keys = @params[:steps_for]
-          when Symbol
-            keys = [keys]
-          when nil
-            keys = []
-          end
-          keys.each do |key|
-            assignee.use(steps_for(key))
+        if steps=@params[:steps_for]
+          steps = [steps] unless steps.is_a?(Array)
+          steps.each do |step|
+            if step.is_a?(StepGroup)
+              assignee.use(step)
+            else
+              assignee.use(steps_for(step))
+            end
           end
         end
       end