cucumber 0.3.102 → 0.3.103

data/History.txt

@@ -1,3 +1,21 @@
+== 2009-09-24
+
+This release gives you back some of the control over the Rails environment that was accidentally taken away from you in the 
+previous release.
+
+Using this release on a Rails project requires a rerun of script/generate cucumber.
+
+=== New Features
+* Added a new @no-txn tag to selectively turn off transactions for a particlular scenario.
+* Added back a way to globally turn off transactions.
+* Renamed @allow_rescue tag to @allow-rescue.
+
+=== Bugfixes
+* Gracefully handle cases when optional regexp groups are not matched. Ex: /should( not)? be flashed '([^']*?)'$/ (Aslak Hellesøy)
+
+=== Changed Features
+* The Formatter API has completely changed. Formatters are no longer a double-dispacth visitor - just a single-dispatch listener (#438 Matt Wynne)
+
 == 2009-09-22
 
 This release has some changes in the Rails support, so make sure you run "script/generate cucumber" after you upgrade.

data/Manifest.txt

@@ -329,6 +329,7 @@ lib/cucumber/ast/step_collection.rb
 lib/cucumber/ast/step_invocation.rb
 lib/cucumber/ast/table.rb
 lib/cucumber/ast/tags.rb
+lib/cucumber/ast/tree_walker.rb
 lib/cucumber/ast/visitor.rb
 lib/cucumber/broadcaster.rb
 lib/cucumber/cli/configuration.rb
@@ -385,13 +386,14 @@ lib/cucumber/rails/test_unit.rb
 lib/cucumber/rails/world.rb
 lib/cucumber/rake/task.rb
 lib/cucumber/rb_support/rb_dsl.rb
-lib/cucumber/rb_support/rb_group.rb
 lib/cucumber/rb_support/rb_hook.rb
 lib/cucumber/rb_support/rb_language.rb
 lib/cucumber/rb_support/rb_step_definition.rb
 lib/cucumber/rb_support/rb_transform.rb
 lib/cucumber/rb_support/rb_world.rb
+lib/cucumber/rb_support/regexp_argument_matcher.rb
 lib/cucumber/rspec_neuter.rb
+lib/cucumber/step_argument.rb
 lib/cucumber/step_match.rb
 lib/cucumber/step_mother.rb
 lib/cucumber/version.rb
@@ -420,6 +422,7 @@ spec/cucumber/ast/scenario_spec.rb
 spec/cucumber/ast/step_collection_spec.rb
 spec/cucumber/ast/step_spec.rb
 spec/cucumber/ast/table_spec.rb
+spec/cucumber/ast/tree_walker_spec.rb
 spec/cucumber/broadcaster_spec.rb
 spec/cucumber/cli/configuration_spec.rb
 spec/cucumber/cli/drb_client_spec.rb
@@ -427,7 +430,6 @@ spec/cucumber/cli/main_spec.rb
 spec/cucumber/cli/options_spec.rb
 spec/cucumber/cli/profile_loader_spec.rb
 spec/cucumber/core_ext/proc_spec.rb
-spec/cucumber/core_ext/string_spec.rb
 spec/cucumber/formatter/ansicolor_spec.rb
 spec/cucumber/formatter/color_io_spec.rb
 spec/cucumber/formatter/duration_spec.rb
@@ -436,7 +438,9 @@ spec/cucumber/formatter/progress_spec.rb
 spec/cucumber/parser/feature_parser_spec.rb
 spec/cucumber/parser/table_parser_spec.rb
 spec/cucumber/rb_support/rb_step_definition_spec.rb
+spec/cucumber/rb_support/regexp_argument_matcher_spec.rb
 spec/cucumber/sell_cucumbers.feature
+spec/cucumber/step_match_spec.rb
 spec/cucumber/step_mother_spec.rb
 spec/cucumber/treetop_parser/empty_feature.feature
 spec/cucumber/treetop_parser/empty_scenario.feature

data/examples/java/README.textile

@@ -11,8 +11,8 @@ h2. Running the scenarios
 
 Open a shell in this directory (java) and execute the following command:
 
-<pre><code>
-ant
-</code></pre>
+<pre>ant</pre>
 
 There is a deliberate error. See if you can fix it!
+
+Also see "Cuke4Duke":http://wiki.github.com/aslakhellesoy/cuke4duke for more powerful JVM and Java support for Cucumber.

data/examples/self_test/features/sample.feature

@@ -12,7 +12,7 @@ Feature: Sample
     Given passing
       |a|b|
       |c|d|
-  
+
   @four
   Scenario: Failing
     Given failing

data/examples/self_test/features/search_sample.feature

@@ -20,7 +20,7 @@ Feature: search examples
     Examples:
       | state   |
       | passing |
-  
+
   Scenario Outline: no match in name but in examples
     Given <state> without a table
     Examples: Hantu Pisang

data/features/custom_formatter.feature

@@ -8,7 +8,7 @@ Feature: Custom Formatter
       | 1           | 1                                    | 1     | 1     | 1    | 2            | 1           | 2             | 1           | 2      | 1    |
 
       """
-  
+
     Scenario: my own formatter
       Given a standard Cucumber project directory structure
       And a file named "features/f.feature" with:
@@ -25,13 +25,13 @@ Feature: Custom Formatter
       And a file named "features/support/ze/formator.rb" with:
         """
         module Ze
-          class Formator < Cucumber::Ast::Visitor
+          class Formator
             def initialize(step_mother, io, options)
-              super(step_mother)
+              @step_mother = step_mother
               @io = io
             end
 
-            def visit_scenario_name(keyword, name, file_colon_line, source_indent)
+            def scenario_name(keyword, name, file_colon_line, source_indent)
               @io.puts "$ #{name.upcase}"
             end
           end

data/features/steps_formatter.feature

@@ -8,7 +8,8 @@ Feature: --formatter steps option - Steps Formatter
 
   Scenario: Printing steps
     When I run cucumber -f steps features
-    Then it should pass with
+    Then STDERR should be empty
+    And it should pass with
     """
     features/step_definitions/steps_lib1.rb
       /^I defined a first step$/           # features/step_definitions/steps_lib1.rb:1

data/lib/cucumber/ast.rb

@@ -13,6 +13,7 @@ require 'cucumber/ast/py_string'
 require 'cucumber/ast/outline_table'
 require 'cucumber/ast/examples'
 require 'cucumber/ast/visitor'
+require 'cucumber/ast/tree_walker'
 
 module Cucumber
   # Classes in this module represent the Abstract Syntax Tree (AST)

data/lib/cucumber/ast/table.rb

@@ -389,11 +389,11 @@ module Cucumber
 
         c = Term::ANSIColor.coloring?
         Term::ANSIColor.coloring = options[:color]
-        f = Formatter::Pretty.new(nil, io, options)
-        f.instance_variable_set('@indent', options[:indent])
-        f.visit_multiline_arg(self)
+        formatter = Formatter::Pretty.new(nil, io, options)
+        formatter.instance_variable_set('@indent', options[:indent])
+        TreeWalker.new(nil, [formatter]).visit_multiline_arg(self)
+        
         Term::ANSIColor.coloring = c
-
         io.rewind
         s = "\n" + io.read + (" " * (options[:indent] - 2))
         s

data/lib/cucumber/ast/tree_walker.rb

@@ -0,0 +1,185 @@
+module Cucumber
+  module Ast
+    # Walks the AST, executing steps and notifying listeners
+    class TreeWalker
+      attr_accessor :options #:nodoc:
+      attr_reader   :step_mother #:nodoc:
+
+      def initialize(step_mother, listeners = [], options = {}, io = STDOUT)
+        @step_mother, @listeners, @options, @io = step_mother, listeners, options, io
+      end
+
+      def visit_features(features)
+        warn "The listener(s) (#{deprecated_listeners.map{ |l| l.class }}) appear to support the legacy Ast::Visitor interface, which is no longer supported." if deprecated_listeners.any?
+        broadcast(features) do
+          features.accept(self)
+        end
+      end
+
+      def visit_feature(feature)
+        broadcast(feature) do
+          feature.accept(self)
+        end
+      end
+
+      def visit_comment(comment)
+        broadcast(comment) do
+          comment.accept(self)
+        end
+      end
+
+      def visit_comment_line(comment_line)
+        broadcast(comment_line)
+      end
+
+      def visit_tags(tags)
+        broadcast(tags) do
+          tags.accept(self)
+        end
+      end
+
+      def visit_tag_name(tag_name)
+        broadcast(tag_name)
+      end
+
+      def visit_feature_name(name)
+        broadcast(name)
+      end
+
+      # +feature_element+ is either Scenario or ScenarioOutline
+      def visit_feature_element(feature_element)
+        broadcast(feature_element) do
+          feature_element.accept(self)
+        end
+      end
+
+      def visit_background(background)
+        broadcast(background) do
+          background.accept(self)
+        end
+      end
+
+      def visit_background_name(keyword, name, file_colon_line, source_indent)
+        broadcast(keyword, name, file_colon_line, source_indent)
+      end
+
+      def visit_examples_array(examples_array)
+        broadcast(examples_array) do
+          examples_array.accept(self)
+        end
+      end
+
+      def visit_examples(examples)
+        broadcast(examples) do
+          examples.accept(self)
+        end
+      end
+
+      def visit_examples_name(keyword, name)
+        broadcast(keyword, name)
+      end
+
+      def visit_outline_table(outline_table)
+        broadcast(outline_table) do
+          outline_table.accept(self)
+        end
+      end
+
+      def visit_scenario_name(keyword, name, file_colon_line, source_indent)
+        broadcast(keyword, name, file_colon_line, source_indent)
+      end
+
+      def visit_steps(steps)
+        broadcast(steps) do
+          steps.accept(self)
+        end
+      end
+
+      def visit_step(step)
+        broadcast(step) do
+          step.accept(self)
+        end
+      end
+
+      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+        broadcast(keyword, step_match, multiline_arg, status, exception, source_indent, background) do
+          visit_step_name(keyword, step_match, status, source_indent, background)
+          visit_multiline_arg(multiline_arg) if multiline_arg
+          visit_exception(exception, status) if exception
+        end
+      end
+
+      def visit_step_name(keyword, step_match, status, source_indent, background) #:nodoc:
+        broadcast(keyword, step_match, status, source_indent, background)
+      end
+
+      def visit_multiline_arg(multiline_arg) #:nodoc:
+        broadcast(multiline_arg) do
+          multiline_arg.accept(self)
+        end
+      end
+
+      def visit_exception(exception, status) #:nodoc:
+        broadcast(exception, status)
+      end
+
+      def visit_py_string(string)
+        broadcast(string)
+      end
+
+      def visit_table_row(table_row)
+        broadcast(table_row) do
+          table_row.accept(self)
+        end
+      end
+
+      def visit_table_cell(table_cell)
+        broadcast(table_cell) do
+          table_cell.accept(self)
+        end
+      end
+
+      def visit_table_cell_value(value, status)
+        broadcast(value, status)
+      end
+
+      # Print +announcement+. This method can be called from within StepDefinitions.
+      def announce(announcement)
+        broadcast(announcement)
+      end
+      
+      private
+      
+      def broadcast(*args, &block)
+        message = extract_method_name_from(caller)
+        message.gsub!('visit_', '')
+        
+        unless block_given?
+          send_to_all(message, *args)
+          return
+        end
+        
+        send_to_all("before_#{message}", *args)
+        yield if block_given?
+        send_to_all("after_#{message}", *args)
+      end
+      
+      def send_to_all(message, *args)
+        @listeners.each do |listener|
+          if listener.respond_to?(message)
+            listener.__send__(message, *args)
+          end
+        end
+      end
+      
+      def extract_method_name_from(call_stack)
+        call_stack[0].match(/in `(.*)'/).captures[0]
+      end
+      
+      def deprecated_listeners
+        @listeners.select{ |l| l.respond_to?(:visit_features) }
+      end
+      
+    end
+  end
+end

data/lib/cucumber/ast/visitor.rb

@@ -1,115 +1,11 @@
 module Cucumber
   module Ast
-    # Base class for formatters. This class just walks the tree depth first.
-    # Just override the methods you care about. Remember to call super if you
-    # override a method.
     class Visitor
-      attr_accessor :options #:nodoc:
-      attr_reader :step_mother #:nodoc:
+      DEPRECATION_WARNING = "Cucumber::Ast::Visitor is deprecated and will be removed. You no longer need to inherit from this class."
 
       def initialize(step_mother)
-        @options = {}
-        @step_mother = step_mother
+        raise(DEPRECATION_WARNING)
       end
-
-      def visit_features(features)
-        features.accept(self)
-      end
-
-      def visit_feature(feature)
-        feature.accept(self)
-      end
-
-      def visit_comment(comment)
-        comment.accept(self)
-      end
-
-      def visit_comment_line(comment_line)
-      end
-
-      def visit_tags(tags)
-        tags.accept(self)
-      end
-
-      def visit_tag_name(tag_name)
-      end
-
-      def visit_feature_name(name)
-      end
-
-      # +feature_element+ is either Scenario or ScenarioOutline
-      def visit_feature_element(feature_element)
-        feature_element.accept(self)
-      end
-
-      def visit_background(background)
-        background.accept(self)
-      end
-
-      def visit_background_name(keyword, name, file_colon_line, source_indent)
-      end
-
-      def visit_examples_array(examples_array)
-        examples_array.accept(self)
-      end
-
-      def visit_examples(examples)
-        examples.accept(self)
-      end
-
-      def visit_examples_name(keyword, name)
-      end
-
-      def visit_outline_table(outline_table)
-        @table = outline_table
-        outline_table.accept(self)
-      end
-
-      def visit_scenario_name(keyword, name, file_colon_line, source_indent)
-      end
-
-      def visit_steps(steps)
-        steps.accept(self)
-      end
-
-      def visit_step(step)
-        step.accept(self)
-      end
-
-      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
-        visit_step_name(keyword, step_match, status, source_indent, background)
-        visit_multiline_arg(multiline_arg) if multiline_arg
-        visit_exception(exception, status) if exception
-      end
-
-      def visit_step_name(keyword, step_match, status, source_indent, background) #:nodoc:
-      end
-
-      def visit_multiline_arg(multiline_arg) #:nodoc:
-        multiline_arg.accept(self)
-      end
-
-      def visit_exception(exception, status) #:nodoc:
-      end
-
-      def visit_py_string(string)
-      end
-
-      def visit_table_row(table_row)
-        table_row.accept(self)
-      end
-
-      def visit_table_cell(table_cell)
-        table_cell.accept(self)
-      end
-
-      def visit_table_cell_value(value, status)
-      end
-
-      # Print +announcement+. This method can be called from within StepDefinitions.
-      def announce(announcement)
-      end
-
     end
   end
 end