cucumber 0.5.3 → 0.6.0

data/lib/cucumber/formatter/pdf.rb

@@ -89,10 +89,6 @@ module Cucumber
         @pdf.move_down(30)
       end
 
-      def before_feature_element(feature_element)
-        record_tag_occurrences(feature_element, @options)
-      end
-      
       def after_feature_element(feature_element)
         flush
       end

data/lib/cucumber/formatter/pretty.rb

@@ -67,7 +67,6 @@ module Cucumber
       end
 
       def before_feature_element(feature_element)
-        record_tag_occurrences(feature_element, @options)
         @indent = 2
         @scenario_indent = 2
       end
@@ -230,7 +229,7 @@ module Cucumber
         print_stats(features)
         print_snippets(@options)
         print_passing_wip(@options)
-        print_tag_limit_warnings(@options)
+        print_tag_limit_warnings(features)
       end
     end
   end

data/lib/cucumber/formatter/progress.rb

@@ -19,10 +19,6 @@ module Cucumber
         print_summary(features)
       end
 
-      def before_feature_element(feature_element)
-        record_tag_occurrences(feature_element, @options)
-      end
-
       def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
         progress(status)
         @status = status
@@ -50,7 +46,7 @@ module Cucumber
         print_stats(features)
         print_snippets(@options)
         print_passing_wip(@options)
-        print_tag_limit_warnings(@options)
+        print_tag_limit_warnings(features)
       end
 
       CHARS = {

data/lib/cucumber/formatter/rerun.rb

@@ -1,3 +1,5 @@
+require 'cucumber/formatter/io'
+
 module Cucumber
   module Formatter
     # The formatter used for <tt>--format rerun</tt>

data/lib/cucumber/formatter/unicode.rb

@@ -3,10 +3,10 @@ require 'cucumber/platform'
 require 'cucumber/formatter/ansicolor'
 $KCODE='u' unless Cucumber::RUBY_1_9
 
-if Cucumber::WINDOWS && `cmd /c chcp` =~ /(\d+)/
+if Cucumber::WINDOWS
   require 'iconv'
-  codepage = $1.to_i
-  Cucumber::CODEPAGE = "cp#{codepage}"
+  require 'Win32/Console/ANSI'
+  Cucumber::CODEPAGE = "cp#{Win32::Console::OutputCP()}"
 
   module Cucumber
     module WindowsOutput #:nodoc:
@@ -32,9 +32,9 @@ if Cucumber::WINDOWS && `cmd /c chcp` =~ /(\d+)/
         end
       end
 
-      Kernel.extend(self)
-      STDOUT.extend(self)
-      STDERR.extend(self)
+      Kernel.extend(self) if STDOUT.tty?
+      STDOUT.extend(self) if STDOUT.tty?
+      STDERR.extend(self) if STDERR.tty?
     end
   end
 end

data/lib/cucumber/language_support/language_methods.rb

@@ -38,7 +38,6 @@ module Cucumber
       end
 
       def add_hook(phase, hook)
-        hook.tag_name_lists = hook.tag_names.map {|tag_string| Ast::Tags.parse_tags(tag_string)}
         hooks[phase.to_sym] << hook
         hook
       end

data/lib/cucumber/parser/common.rb

@@ -14,7 +14,10 @@ module Cucumber
         start_index = index
         if node_cache[:white].has_key?(index)
           cached = node_cache[:white][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -50,7 +53,10 @@ module Cucumber
         start_index = index
         if node_cache[:space].has_key?(index)
           cached = node_cache[:space][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -73,7 +79,10 @@ module Cucumber
         start_index = index
         if node_cache[:eol].has_key?(index)
           cached = node_cache[:eol][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -136,7 +145,10 @@ module Cucumber
         start_index = index
         if node_cache[:eof].has_key?(index)
           cached = node_cache[:eof][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 

data/lib/cucumber/parser/feature.rb

@@ -1,6 +1,8 @@
 # Autogenerated from a Treetop grammar. Edits may be lost.
 
 
+require 'cucumber/ast/tags'
+
 module Cucumber
   module Parser
     # TIP: When you hack on the grammar, just delete feature.rb in this directory.
@@ -73,7 +75,10 @@ module Cucumber
         start_index = index
         if node_cache[:feature_sub].has_key?(index)
           cached = node_cache[:feature_sub][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -223,7 +228,10 @@ module Cucumber
         start_index = index
         if node_cache[:tags].has_key?(index)
           cached = node_cache[:tags][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -303,7 +311,10 @@ module Cucumber
         start_index = index
         if node_cache[:tag].has_key?(index)
           cached = node_cache[:tag][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -372,7 +383,10 @@ module Cucumber
         start_index = index
         if node_cache[:comment].has_key?(index)
           cached = node_cache[:comment][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -416,7 +430,10 @@ module Cucumber
         start_index = index
         if node_cache[:comment_line].has_key?(index)
           cached = node_cache[:comment_line][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -491,8 +508,8 @@ module Cucumber
           steps.at_line?(line)
         end
 
-        def matches_tags?(tag_names)
-          Ast::Tags.matches?(self.parent.tags.tag_names, tag_names)
+        def matches_tags?(tag_expression)
+          tag_expression.eval(self.parent.tags.tag_names)
         end
 
         def build
@@ -510,7 +527,10 @@ module Cucumber
         start_index = index
         if node_cache[:background].has_key?(index)
           cached = node_cache[:background][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -613,7 +633,10 @@ module Cucumber
         start_index = index
         if node_cache[:feature_elements].has_key?(index)
           cached = node_cache[:feature_elements][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -687,10 +710,10 @@ module Cucumber
           tags.at_line?(line)
         end
 
-        def matches_tags?(tag_names)
+        def matches_tags?(tag_expression)
           feature_tag_names = self.parent.parent.tags.tag_names
           source_tag_names = (feature_tag_names + tags.tag_names).uniq
-          Ast::Tags.matches?(source_tag_names, tag_names)
+          tag_expression.eval(source_tag_names)
         end
 
         def matches_name?(regexp_to_match)
@@ -714,7 +737,10 @@ module Cucumber
         start_index = index
         if node_cache[:scenario].has_key?(index)
           cached = node_cache[:scenario][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -826,10 +852,10 @@ module Cucumber
           steps.at_line?(line)
         end
 
-        def matches_tags?(tag_names)
+        def matches_tags?(tag_expression)
           feature_tag_names = self.parent.parent.tags.tag_names
           source_tag_names = (feature_tag_names + tags.tag_names).uniq
-          Ast::Tags.matches?(source_tag_names, tag_names)
+          tag_expression.eval(source_tag_names)
         end
 
         def matches_name?(regexp_to_match)
@@ -858,7 +884,10 @@ module Cucumber
         start_index = index
         if node_cache[:scenario_outline].has_key?(index)
           cached = node_cache[:scenario_outline][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -938,7 +967,10 @@ module Cucumber
         start_index = index
         if node_cache[:steps].has_key?(index)
           cached = node_cache[:steps][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -1000,7 +1032,10 @@ module Cucumber
         start_index = index
         if node_cache[:step].has_key?(index)
           cached = node_cache[:step][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -1120,7 +1155,10 @@ module Cucumber
         start_index = index
         if node_cache[:examples_sections].has_key?(index)
           cached = node_cache[:examples_sections][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -1194,7 +1232,10 @@ module Cucumber
         start_index = index
         if node_cache[:examples].has_key?(index)
           cached = node_cache[:examples][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -1270,7 +1311,10 @@ module Cucumber
         start_index = index
         if node_cache[:multiline_arg].has_key?(index)
           cached = node_cache[:multiline_arg][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -1300,7 +1344,10 @@ module Cucumber
         start_index = index
         if node_cache[:line_to_eol].has_key?(index)
           cached = node_cache[:line_to_eol][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -1369,7 +1416,10 @@ module Cucumber
         start_index = index
         if node_cache[:lines_to_keyword].has_key?(index)
           cached = node_cache[:lines_to_keyword][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -1446,7 +1496,10 @@ module Cucumber
         start_index = index
         if node_cache[:reserved_words_and_symbols].has_key?(index)
           cached = node_cache[:reserved_words_and_symbols][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -1520,7 +1573,10 @@ module Cucumber
         start_index = index
         if node_cache[:py_string].has_key?(index)
           cached = node_cache[:py_string][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -1608,7 +1664,10 @@ module Cucumber
         start_index = index
         if node_cache[:open_py_string].has_key?(index)
           cached = node_cache[:open_py_string][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -1689,7 +1748,10 @@ module Cucumber
         start_index = index
         if node_cache[:close_py_string].has_key?(index)
           cached = node_cache[:close_py_string][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -1741,7 +1803,10 @@ module Cucumber
         start_index = index
         if node_cache[:white].has_key?(index)
           cached = node_cache[:white][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 

data/lib/cucumber/parser/feature.tt

@@ -1,3 +1,5 @@
+require 'cucumber/ast/tags'
+
 module Cucumber
   module Parser
     # TIP: When you hack on the grammar, just delete feature.rb in this directory.
@@ -76,8 +78,8 @@ module Cucumber
             steps.at_line?(line)
           end
 
-          def matches_tags?(tag_names)
-            Ast::Tags.matches?(self.parent.tags.tag_names, tag_names)
+          def matches_tags?(tag_expression)
+            tag_expression.eval(self.parent.tags.tag_names)
           end
 
           def build
@@ -116,10 +118,10 @@ module Cucumber
             tags.at_line?(line)
           end
 
-          def matches_tags?(tag_names)
+          def matches_tags?(tag_expression)
             feature_tag_names = self.parent.parent.tags.tag_names
             source_tag_names = (feature_tag_names + tags.tag_names).uniq
-            Ast::Tags.matches?(source_tag_names, tag_names)
+            tag_expression.eval(source_tag_names)
           end
 
           def matches_name?(regexp_to_match)
@@ -153,10 +155,10 @@ module Cucumber
             steps.at_line?(line)
           end
 
-          def matches_tags?(tag_names)
+          def matches_tags?(tag_expression)
             feature_tag_names = self.parent.parent.tags.tag_names
             source_tag_names = (feature_tag_names + tags.tag_names).uniq
-            Ast::Tags.matches?(source_tag_names, tag_names)
+            tag_expression.eval(source_tag_names)
           end
 
           def matches_name?(regexp_to_match)