cucumber 0.5.3 → 0.6.0

data/lib/cucumber/ast.rb

@@ -1,5 +1,4 @@
 require 'cucumber/ast/comment'
-require 'cucumber/ast/tags'
 require 'cucumber/ast/features'
 require 'cucumber/ast/feature'
 require 'cucumber/ast/background'

data/lib/cucumber/ast/feature.rb

@@ -2,8 +2,9 @@ module Cucumber
   module Ast
     # Represents the root node of a parsed feature.
     class Feature #:nodoc:
-      attr_accessor :file, :language
+      attr_accessor :language
       attr_writer :features
+      attr_reader :file
       attr_reader :name
 
       def initialize(background, comment, tags, name, feature_elements)
@@ -44,21 +45,17 @@ module Cucumber
         "#{file_colon_line(line)}:in `#{step_name}'"
       end
 
+      def file=(file)
+        file = file.gsub(/\//, '\\') if Cucumber::WINDOWS && file && !ENV['CUCUMBER_FORWARD_SLASH_PATHS']
+        @file = file
+      end
+      
       def file_colon_line(line)
         "#{@file}:#{line}"
       end
 
-      def tag_count(tag)
-        if @tags.respond_to?(:count)
-          @tags.count(tag) # 1.9
-        else
-          @tags.select{|t| t == tag}.length  # 1.8
-        end
-      end
-
-      def feature_and_children_tag_count(tag)
-        children_tag_count = @feature_elements.inject(0){|count, feature_element| count += feature_element.tag_count(tag)}
-        children_tag_count + tag_count(tag)
+      def tag_locations(tag)
+        @feature_elements.select{|feature_element| feature_element.tagged_with?(tag)}
       end
 
       def short_name

data/lib/cucumber/ast/feature_element.rb

@@ -1,5 +1,5 @@
 require 'enumerator'
-require 'cucumber/ast/tags'
+require 'cucumber/tag_expression'
 
 module Cucumber
   module Ast
@@ -49,15 +49,15 @@ module Cucumber
       end
 
       def accept_hook?(hook)
-        Tags.matches?(source_tag_names, hook.tag_name_lists)
+        TagExpression.parse(hook.tag_expressions).eval(source_tag_names)
       end
 
       def source_tag_names
         (@tags.tag_names + (@feature ? @feature.source_tag_names : [])).uniq
       end
 
-      def tag_count(tag)
-        @feature.tag_count(tag) == 0 ? @tags.count(tag) : @feature.tag_count(tag)
+      def tagged_with?(tag)
+        source_tag_names.index(tag)
       end
 
       def language

data/lib/cucumber/ast/features.rb

@@ -31,8 +31,8 @@ module Cucumber
         @duration = Time.now - start
       end
 
-      def tag_count(tag)
-        @features.inject(0){|count, feature| count += feature.feature_and_children_tag_count(tag)}
+      def tag_locations(tag)
+        @features.map{|feature| feature.tag_locations(tag)}.flatten
       end
 
     end

data/lib/cucumber/ast/table.rb

@@ -410,6 +410,7 @@ module Cucumber
       end
 
       def to_s(options = {}) #:nodoc:
+        require 'cucumber/formatter/pretty'
         options = {:color => true, :indent => 2, :prefixes => TO_S_PREFIXES}.merge(options)
         io = StringIO.new
 

data/lib/cucumber/ast/tags.rb

@@ -1,92 +1,6 @@
-require 'set'
-
 module Cucumber
   module Ast
-
-    # Holds the names of tags parsed from a feature file:
-    #
-    #   @invoice @release_2
-    #
-    # This gets stored internally as <tt>["invoice", "release_2"]</tt>
-    #
     class Tags #:nodoc:
-      class And #:nodoc:
-        def initialize(tag_names)
-          if String === tag_names # They still come in as single strings on cuke4duke some times. Not sure why...
-            raise "Commas in tags??? #{tag_names.inspect}" if tag_names =~ /,/ # just in case...
-            tag_names = [tag_names] 
-          end
-          @negative_tags, @positive_tags = tag_names.partition{|tag_name| Tags.exclude_tag?(tag_name)}
-          @negative_tags = Tags.strip_negative_char(@negative_tags)
-        end
-
-        def matches?(tag_names)
-          included?(tag_names) && !excluded?(tag_names)
-        end
-
-        private
-
-        def excluded?(tag_names)
-          (@negative_tags & tag_names).any?
-        end
-
-        def included?(tag_names)
-          positive_tag_set = Set.new(@positive_tags)
-          tag_names_set = Set.new(tag_names)
-          positive_tag_set.subset?(tag_names_set)
-        end
-      end
-
-      class Or #:nodoc:
-        def initialize(tag_exp)
-          @exp = tag_exp
-        end
-
-        def matches?(tag_names)
-          @exp.inject(false){|matches, tag_exp| matches || tag_exp.matches?(tag_names)}
-        end
-      end
-
-      class << self
-        EXCLUDE_PATTERN = /^~/
-
-        def matches?(source_tag_names, tag_name_lists)
-          validate_tags(tag_name_lists)
-          tag_name_lists.empty? ? true : check_if_tags_match(source_tag_names, tag_name_lists)
-        end
-
-        def exclude_tag?(tag_name)
-          tag_name =~ EXCLUDE_PATTERN
-        end
-
-        def strip_negative_char(tag_names)
-          tag_names.map{|name| name[1..-1]}
-        end
-
-        def parse_tags(tags_string)
-          tags_string.split(',')
-        end
-
-        private
-
-        def validate_tags(tag_name_lists)
-          all_tag_names = tag_name_lists.flatten
-          exclude_tag_names, include_tag_names = all_tag_names.partition{|tag_name| exclude_tag?(tag_name)}
-          exclude_tag_names = strip_negative_char(exclude_tag_names)
-          check_at_sign_prefix(exclude_tag_names + include_tag_names)
-        end
-
-        def check_if_tags_match(source_tag_names, tag_name_lists)
-          tag_exp = Or.new(tag_name_lists.map{|tag_name_list| And.new(tag_name_list) })
-          tag_exp.matches?(source_tag_names)
-        end
-
-        def check_at_sign_prefix(tag_names)
-          tag_names.each{|tag_name| raise "Tag names must start with an @ sign. The following tag name didn't: #{tag_name.inspect}" unless tag_name[0..0] == '@'}
-        end
-
-      end
-
       attr_reader :tag_names
 
       def initialize(line, tag_names)
@@ -101,17 +15,7 @@ module Cucumber
       end
 
       def accept_hook?(hook)
-        self.class.matches?(@tag_names, hook.tag_name_lists)
-      end
-
-      def count(tag)
-        # See discussion:
-        # http://github.com/weplay/cucumber/commit/2dc592acdf3f7c1a0c333a8164649936bb82d983
-        if @tag_names.respond_to?(:count) && @tag_names.method(:count).arity > 0
-          @tag_names.count(tag) # 1.9
-        else
-          @tag_names.select{|t| t == tag}.length  # 1.8
-        end
+        TagExpression.parse(hook.tag_expressions).eval(@tag_names)
       end
 
       def to_sexp

data/lib/cucumber/cli/configuration.rb

@@ -1,6 +1,7 @@
 require 'logger'
 require 'cucumber/cli/options'
 require 'cucumber/constantize'
+require 'cucumber/tag_expression'
 
 module Cucumber
   module Cli
@@ -25,6 +26,7 @@ module Cucumber
         arrange_formats
         raise("You can't use both --strict and --wip") if strict? && wip?
 
+        @options[:tag_expression] = TagExpression.parse(@options[:tag_expressions])
         return @args.replace(@options.expanded_args_without_drb) if drb?
 
         set_environment_variables
@@ -57,7 +59,7 @@ module Cucumber
       def drb_port
         @options[:drb_port].to_i if @options[:drb_port]
       end
-      
+
       def build_runner(step_mother, io)
         Ast::TreeWalker.new(step_mother, formatters(step_mother), @options, io)
       end

data/lib/cucumber/cli/main.rb

@@ -7,13 +7,10 @@ require 'cucumber/feature_file'
 require 'cucumber/formatter/color_io'
 require 'cucumber/cli/configuration'
 require 'cucumber/cli/drb_client'
-require 'cucumber/ast/tags'
 
 module Cucumber
   module Cli
     class Main
-      FAILURE = 1
-
       class << self
         def step_mother
           @step_mother ||= StepMother.new
@@ -55,36 +52,36 @@ module Cucumber
 
         enable_diffing
 
+        tag_excess = tag_excess(features)
+        configuration.options[:tag_excess] = tag_excess # Hack to make it available in console.rb - later: stick on Run instance.
+
         runner = configuration.build_runner(step_mother, @out_stream)
         step_mother.visitor = runner # Needed to support World#announce
+        
         runner.visit_features(features)
 
-        failure = if exceeded_tag_limts?(features)
-            FAILURE
-          elsif configuration.wip?
-            step_mother.scenarios(:passed).any?
-          else
-            step_mother.scenarios(:failed).any? ||
-            (configuration.strict? && (step_mother.steps(:undefined).any? || step_mother.steps(:pending).any?))
-          end
+        failure = if tag_excess.any?
+          true
+        elsif configuration.wip?
+          step_mother.scenarios(:passed).any?
+        else
+          step_mother.scenarios(:failed).any? ||
+          (configuration.strict? && (step_mother.steps(:undefined).any? || step_mother.steps(:pending).any?))
+        end
       rescue ProfilesNotDefinedError, YmlLoadError, ProfileNotFound => e
         @error_stream.puts e.message
         true
       end
 
-      def exceeded_tag_limts?(features)
-        exceeded = false
-        configuration.options[:tag_names].each do |tag_list|
-          tag_list.each do |tag_name, limit|
-            if !Ast::Tags.exclude_tag?(tag_name) && limit
-              tag_count = features.tag_count(tag_name)
-              if tag_count > limit.to_i
-                exceeded = true
-              end
-            end
+      def tag_excess(features)
+        configuration.options[:tag_expression].limits.map do |tag_name, tag_limit|
+          tag_locations = features.tag_locations(tag_name)
+          if tag_limit && (tag_locations.length > tag_limit)
+            [tag_name, tag_limit, tag_locations]
+          else
+            nil
           end
-        end
-        exceeded
+        end.compact
       end
 
       def configuration

data/lib/cucumber/cli/options.rb

@@ -1,5 +1,6 @@
 require 'cucumber/cli/profile_loader'
 require 'cucumber/formatter/ansicolor'
+require 'cucumber/tag_expression'
 
 module Cucumber
   module Cli
@@ -29,7 +30,7 @@ module Cucumber
       FORMAT_HELP = (BUILTIN_FORMATS.keys.sort.map do |key|
         "  #{key}#{' ' * (max - key.length)} : #{BUILTIN_FORMATS[key][1]}"
       end) + ["Use --format rerun --out features.txt to write out failing",
-        "features. You can rerun them with cucumber @features.txt.",
+        "features. You can rerun them with cucumber @rerun.txt.",
         "FORMAT can also be the fully qualified class name of",
         "your own custom formatter. If the class isn't loaded,",
         "Cucumber will attempt to require a file with a relative",
@@ -102,7 +103,7 @@ module Cucumber
           opts.banner = ["Usage: cucumber [options] [ [FILE|DIR|URL][:LINE[:LINE]*] ]+", "",
             "Examples:",
             "cucumber examples/i18n/en/features",
-            "cucumber @features.txt (See --format rerun)",
+            "cucumber @rerun.txt (See --format rerun)",
             "cucumber examples/i18n/it/features/somma.feature:6:98:113",
             "cucumber -s -i http://rubyurl.com/eeCl", "", "",
           ].join("\n")
@@ -163,8 +164,7 @@ module Cucumber
             "Limit WIP: Positive tags can be given a threshold to limit the",
             "number of occurrences. Example: --tags @qa:3 will fail if there",
             "are more than 3 occurrences of the @qa tag.") do |v|
-            tag_names = parse_tags(v)
-            @options[:tag_names] << tag_names
+            @options[:tag_expressions] << v
           end
           opts.on("-n NAME", "--name NAME",
             "Only execute the feature elements which match part of the given name.",
@@ -184,7 +184,7 @@ module Cucumber
             @profiles << v
           end
           opts.on(NO_PROFILE_SHORT_FLAG, NO_PROFILE_LONG_FLAG,
-            "Disables all profile laoding to avoid using the 'default' profile.") do |v|
+            "Disables all profile loading to avoid using the 'default' profile.") do |v|
             @disable_profile_loading = true
           end
           opts.on("-c", "--[no-]color",
@@ -299,17 +299,8 @@ module Cucumber
         end
       end
 
-      def parse_tags(tag_string)
-        tag_names = Ast::Tags.parse_tags(tag_string)
-        parse_tag_limits(tag_names)
-      end
-
-      def parse_tag_limits(tag_names)
-        tag_names.inject({}) do |dict, tag|
-          tag, limit = tag.split(':')
-          dict[tag] = limit.nil? ? limit : limit.to_i
-          dict
-        end
+      def tag_filter(tag_string)
+        tags = TagExpression.parse(tag_string)
       end
 
       def disable_profile_loading?
@@ -348,7 +339,7 @@ module Cucumber
         @options[:require] += other_options[:require]
         @options[:excludes] += other_options[:excludes]
         @options[:name_regexps] += other_options[:name_regexps]
-        @options[:tag_names] += other_options[:tag_names]
+        @options[:tag_expressions] += other_options[:tag_expressions]
         @options[:env_vars] = other_options[:env_vars].merge(@options[:env_vars])
         if @options[:paths].empty?
           @options[:paths] = other_options[:paths]
@@ -403,7 +394,7 @@ module Cucumber
           :dry_run      => false,
           :formats      => [],
           :excludes     => [],
-          :tag_names    => [],
+          :tag_expressions  => [],
           :name_regexps => [],
           :env_vars     => {},
           :diff_enabled => true

data/lib/cucumber/filter.rb

@@ -1,9 +1,11 @@
+require 'cucumber/tag_expression'
+
 module Cucumber
   # Filters the AST based on --tags and --name
   class Filter #:nodoc:
     def initialize(lines, options)
       @lines = lines
-      @tag_name_lists = options[:tag_names] ? options[:tag_names].map{|tags_with_limit| tags_with_limit.keys } : []
+      @tag_expression = options[:tag_expression] || TagExpression.new
       @name_regexps = options[:name_regexps] || []
     end
 
@@ -27,7 +29,7 @@ module Cucumber
     end
 
     def matches_tags?(syntax_node)
-      syntax_node.matches_tags?(@tag_name_lists)
+      syntax_node.matches_tags?(@tag_expression)
     end
 
     def outline_matches_names?(syntax_node)

data/lib/cucumber/formatter/console.rb

@@ -124,34 +124,14 @@ module Cucumber
         end
       end
 
-      def print_tag_limit_warnings(options)
-        if @tag_occurrences
-          first_tag = true
-          options[:tag_names].each do |tag_list|
-            tag_list.each do |tag_name, limit|
-              unless Ast::Tags.exclude_tag?(tag_name)
-                tag_frequency = @tag_occurrences[tag_name].size
-                if limit && tag_frequency > limit
-                  @io.puts if first_tag
-                  first_tag = false
-                  @io.puts format_string("#{tag_name} occurred #{tag_frequency} times, but the limit was set to #{limit}", :failed)
-                  @tag_occurrences[tag_name].each {|location| @io.puts format_string("  #{location}", :failed)}
-                  @io.flush
-                end
-              end
-            end
-          end
-        end
-      end
-
-      def record_tag_occurrences(feature_element, options)
-        @tag_occurrences ||= Hash.new{|k,v| k[v] = []}
-        options[:tag_names].each do |tag_list|
-          tag_list.each do |tag_name, limit|
-            if !Ast::Tags.exclude_tag?(tag_name) && feature_element.tag_count(tag_name) > 0
-              @tag_occurrences[tag_name] << feature_element.file_colon_line
-            end
-          end
+      def print_tag_limit_warnings(features)
+        first_tag = true
+        @options[:tag_excess].each do |tag_name, tag_limit, tag_locations|
+          @io.puts if first_tag
+          first_tag = false
+          @io.puts format_string("#{tag_name} occurred #{tag_locations.length} times, but the limit was set to #{tag_limit}", :failed)
+          tag_locations.each {|tag_location| @io.puts format_string("  #{tag_location.file_colon_line}", :failed)}
+          @io.flush
         end
       end
 

data/lib/cucumber/formatter/html.rb

@@ -236,7 +236,7 @@ module Cucumber
         if status == :undefined
           step_multiline_class = @step.multiline_arg ? @step.multiline_arg.class : nil
           @builder.pre do |pre|
-            pre << @step_mother.snippet_text(keyword,step_match.instance_variable_get("@name") || '',step_multiline_class)
+            pre << @step_mother.snippet_text(@step.actual_keyword,step_match.instance_variable_get("@name") || '',step_multiline_class)
           end
         end
         @builder << '</li>'