kosmas58-cucumber 0.3.11.3 → 0.3.11.6

data/lib/cucumber/ast/scenario.rb

@@ -25,12 +25,14 @@ module Cucumber
         visitor.visit_tags(@tags)
         visitor.visit_scenario_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
 
-        skip = @background && @background.failed?
-        skip_invoke! if skip
-        visitor.step_mother.before_and_after(self, skip) do
+        background_failed = @background && @background.failed?
+        skip_invoke! if background_failed
+        skip_hooks = background_failed || @executed
+        visitor.step_mother.before_and_after(self, skip_hooks) do
           visitor.visit_steps(@steps)
         end
         visitor.visit_exception(@exception, :failed) if @exception
+        @executed = true
       end
 
       # Returns true if one or more steps failed

data/lib/cucumber/ast/scenario_outline.rb

@@ -69,7 +69,12 @@ module Cucumber
       end
 
       def visit_scenario_name(visitor, row)
-        visitor.visit_scenario_name(Cucumber.scenario_keyword, row.name, file_colon_line(row.line), source_indent(first_line_length))
+        visitor.visit_scenario_name(
+          @feature.language.scenario_keyword,
+          row.name, 
+          file_colon_line(row.line), 
+          source_indent(first_line_length)
+        )
       end
 
       def to_sexp

data/lib/cucumber/ast/step.rb

@@ -74,6 +74,10 @@ module Cucumber
         @file_colon_line ||= @feature_element.file_colon_line(@line) unless @feature_element.nil?
       end
 
+      def language
+        @feature_element.language
+      end
+
       def dom_id
         @dom_id ||= file_colon_line.gsub(/\//, '_').gsub(/\./, '_').gsub(/:/, '_')
       end

data/lib/cucumber/ast/step_invocation.rb

@@ -88,7 +88,8 @@ module Cucumber
       end
 
       def actual_keyword
-        if [Cucumber.keyword_hash['and'], Cucumber.keyword_hash['but']].index(@step.keyword) && previous
+        repeat_keywords = [language.but_keywords, language.and_keywords].flatten
+        if repeat_keywords.index(@step.keyword) && previous
           previous.actual_keyword
         else
           keyword
@@ -123,6 +124,10 @@ module Cucumber
         @step.backtrace_line
       end
 
+      def language
+        @step.language
+      end
+
       def to_sexp
         [:step_invocation, @step.line, @step.keyword, @name, (@multiline_arg.nil? ? nil : @multiline_arg.to_sexp)].compact
       end

data/lib/cucumber/cli/configuration.rb

@@ -4,15 +4,16 @@ module Cucumber
 
     class Configuration
       BUILTIN_FORMATS = {
-        'html'     => 'Cucumber::Formatter::Html',
-        'pretty'   => 'Cucumber::Formatter::Pretty',
-        'profile'  => 'Cucumber::Formatter::Profile',
-        'progress' => 'Cucumber::Formatter::Progress',
-        'rerun'    => 'Cucumber::Formatter::Rerun',
-        'usage'    => 'Cucumber::Formatter::Usage',
-        'junit'    => 'Cucumber::Formatter::Junit'
+        'html'      => 'Cucumber::Formatter::Html',
+        'pretty'    => 'Cucumber::Formatter::Pretty',
+        'profile'   => 'Cucumber::Formatter::Profile',
+        'progress'  => 'Cucumber::Formatter::Progress',
+        'rerun'     => 'Cucumber::Formatter::Rerun',
+        'usage'     => 'Cucumber::Formatter::Usage',
+        'junit'     => 'Cucumber::Formatter::Junit',
+        'tag_cloud' => 'Cucumber::Formatter::TagCloud',
+        'steps'     => 'Cucumber::Formatter::Steps'
       }
-      DEFAULT_FORMAT = 'pretty'
       DRB_FLAG = '--drb'
       PROFILE_SHORT_FLAG = '-p'
       PROFILE_LONG_FLAG = '--profile'
@@ -26,15 +27,21 @@ module Cucumber
 
         @paths          = []
         @options        = default_options
-
-        @active_format  = DEFAULT_FORMAT
       end
 
       def parse!(args)
-        @args = args.empty? ? args_from_profile('default') : args
+        args.concat(%w{--profile default}) if args.empty?
+        @args = args
         expand_profiles_into_args
         return if parse_drb
 
+        @args.each do |arg|
+          if arg =~ /^(\w+)=(.*)$/
+            ENV[$1] = $2
+            @args.delete(arg)
+          end
+        end
+
         @args.extend(::OptionParser::Arguable)
 
         @args.options do |opts|
@@ -69,7 +76,7 @@ module Cucumber
             end
           end
           opts.on("-f FORMAT", "--format FORMAT",
-            "How to format features (Default: #{DEFAULT_FORMAT})",
+            "How to format features (Default: pretty)",
             "Available formats: #{BUILTIN_FORMATS.keys.sort.join(", ")}",
             "FORMAT can also be the fully qualified class name of",
             "your own custom formatter. If the class isn't loaded,",
@@ -79,7 +86,7 @@ module Cucumber
             "foo/bar_zap.rb. You can place the file with this relative",
             "path underneath your features/support directory or anywhere",
             "on Ruby's LOAD_PATH, for example in a Ruby gem.") do |v|
-            @options[:formats][v] = @out_stream
+            @options[:formats] << [v, @out_stream]
             @active_format = v
           end
           opts.on("-o", "--out [FILE|DIR]",
@@ -87,7 +94,8 @@ module Cucumber
             "applies to the previously specified --format, or the",
             "default format if no format is specified. Check the specific",
             "formatter's docs to see whether to pass a file or a dir.") do |v|
-            @options[:formats][@active_format] = v
+            @options[:formats] << ['pretty', nil] if @options[:formats].empty?
+            @options[:formats][-1][1] = v
           end
           opts.on("-t TAGS", "--tags TAGS",
             "Only execute the features or scenarios with the specified tags.",
@@ -176,7 +184,7 @@ module Cucumber
           end
         end.parse!
 
-        @options[:formats]['pretty'] = @out_stream if @options[:formats].empty?
+        arrange_formats
 
         @options[:snippets] = true if !@quiet && @options[:snippets].nil?
         @options[:source]   = true if !@quiet && @options[:source].nil?
@@ -211,14 +219,6 @@ module Cucumber
         @drb
       end
 
-      def load_language
-        if Cucumber.language_incomplete?(@options[:lang])
-          list_keywords_and_exit(@options[:lang])
-        else
-          Cucumber.load_language(@options[:lang])
-        end
-      end
-
       def parse_tags(tag_string)
         tag_names = tag_string.split(",")
         excludes, includes = tag_names.partition{|tag| tag =~ /^~/}
@@ -232,7 +232,9 @@ module Cucumber
 
       def build_formatter_broadcaster(step_mother)
         return Formatter::Pretty.new(step_mother, nil, @options) if @options[:autoformat]
-        formatters = @options[:formats].map do |format, out|
+        formatters = @options[:formats].map do |format_and_out|
+          format = format_and_out[0]
+          out    = format_and_out[1]
           if String === out # file name
             unless File.directory?(out)
               out = File.open(out, Cucumber.file_mode('w'))
@@ -292,6 +294,14 @@ module Cucumber
 
     protected
 
+      def arrange_formats
+        @options[:formats] << ['pretty', @out_stream] if @options[:formats].empty?
+        @options[:formats] = @options[:formats].sort_by{|f| f[1] == @out_stream ? -1 : 1}
+        if @options[:formats].length > 1 && @options[:formats][1][1] == @out_stream
+          raise "All but one formatter must use --out, only one can print to STDOUT"
+        end
+      end
+
       def remove_excluded_files_from(files)
         files.reject! {|path| @options[:excludes].detect {|pattern| path =~ pattern } }
       end
@@ -377,6 +387,7 @@ Defined profiles in cucumber.yml:
         return @cucumber_yml
       end
 
+      # TODO: Move to Language
       def list_keywords_and_exit(lang)
         unless Cucumber::LANGUAGES[lang]
           raise("No language with key #{lang}")
@@ -398,9 +409,9 @@ Defined profiles in cucumber.yml:
         {
           :strict       => false,
           :require      => nil,
-          :lang         => 'en',
+          :lang         => nil,
           :dry_run      => false,
-          :formats      => {},
+          :formats      => [],
           :excludes     => [],
           :include_tags => [],
           :exclude_tags => [],

data/lib/cucumber/cli/main.rb

@@ -2,6 +2,7 @@ require 'optparse'
 require 'cucumber'
 require 'ostruct'
 require 'cucumber/parser'
+require 'cucumber/feature_file'
 require 'cucumber/formatter/color_io'
 require 'cucumber/cli/language_help_formatter'
 require 'cucumber/cli/configuration'
@@ -41,13 +42,11 @@ module Cucumber
             configuration.parse!(@args)
           end
         end
-        configuration.load_language
         step_mother.options = configuration.options
 
+        features = load_plain_text_features
         require_files
         enable_diffing
-      
-        features = load_plain_text_features
 
         visitor = configuration.build_formatter_broadcaster(step_mother)
         step_mother.visitor = visitor # Needed to support World#announce
@@ -63,11 +62,11 @@ module Cucumber
 
       def load_plain_text_features
         features = Ast::Features.new
-        parser = Parser::FeatureParser.new
 
         verbose_log("Features:")
         configuration.feature_files.each do |f|
-          feature = parser.parse_file(f, configuration.options)
+          feature_file = FeatureFile.new(f)
+          feature = feature_file.parse(configuration.options)
           if feature
             features.add_feature(feature)
             verbose_log("  * #{f}")

data/lib/cucumber/formatter/console.rb

@@ -59,6 +59,18 @@ module Cucumber
       end
 
       def print_stats(features)
+        
+        @failures = step_mother.scenarios(:failed).select { |s| s.is_a?(Cucumber::Ast::Scenario) }
+        
+        if !@failures.empty?
+          @io.puts format_string("Failing Scenarios:", :failed)
+          @failures.each do |failure|
+            @io.puts format_string("cucumber " + failure.file_colon_line, :failed) +
+            format_string(" # Scenario: " + failure.name, :comment)
+          end
+          @io.puts
+        end
+        
         @io.print dump_count(step_mother.scenarios.length, "scenario")
         print_status_counts{|status| step_mother.scenarios(status)}
 

data/lib/cucumber/formatter/html.rb

@@ -54,7 +54,8 @@ module Cucumber
       end
 
       def visit_comment_line(comment_line)
-        @builder.text!(comment_line.strip + "\n")
+        @builder.text!(comment_line)
+        @builder.br
       end
 
       def visit_feature(feature)
@@ -73,7 +74,7 @@ module Cucumber
         @builder.h2 do |h2|
           @builder.span(lines[0], :class => 'val')
         end
-        @builder.p do
+        @builder.p(:class => 'narrative') do
           lines[1..-1].each do |line|
             @builder.text!(line.strip)
             @builder.br

data/lib/cucumber/formatter/junit.rb

@@ -31,13 +31,14 @@ module Cucumber
           @testsuite << @builder.target!
         end
 
-        File.open(@feature_filename, 'w') { |file| file.write(@testsuite.target!) }
+        basename = File.basename(feature.file)[0...-File.extname(feature.file).length]
+        feature_filename = File.join(@reportdir, "TEST-#{basename}.xml")
+        File.open(feature_filename, 'w') { |file| file.write(@testsuite.target!) }
       end
 
       def visit_feature_name(name)
         lines = name.split(/\r?\n/)
         @feature_name = lines[0].sub(/Feature\:/, '').strip
-        @feature_filename = convert_to_file_name(@feature_name)
       end
 
       def visit_scenario_name(keyword, name, file_colon_line, source_indent)
@@ -65,10 +66,6 @@ module Cucumber
 
       private
 
-      def convert_to_file_name(feature_name)
-        File.join(@reportdir, "TEST-" + feature_name.gsub(/[^\w_\.]/, '_') + ".xml")
-      end
-
       def format_exception(exception)
         (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
       end

data/lib/cucumber/formatter/pretty.rb

@@ -48,10 +48,8 @@ module Cucumber
       end
 
       def visit_comment_line(comment_line)
-        unless comment_line.blank?
-          @io.puts(comment_line.indent(@indent)) 
-          @io.flush
-        end
+        @io.puts(comment_line.indent(@indent)) 
+        @io.flush
       end
 
       def visit_tags(tags)

data/lib/cucumber/formatter/profile.rb

@@ -17,7 +17,7 @@ module Cucumber
         super
       end
 
-      def visit_step_name(keyword, step_match, status, source_indent, background)
+      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
         duration = Time.now - @step_duration
         super
 

data/lib/cucumber/languages.yml

@@ -91,14 +91,14 @@
   native: Česky
   encoding: UTF-8
   feature: Požadavek
-  background: Pozadí
+  background: Pozadí|Kontext
   scenario: Scénář
-  scenario_outline: Náčrt Scénáře
+  scenario_outline: Náčrt Scénáře|Osnova scénáře
   examples: Příklady
   given: Pokud
   when: Když
   then: Pak
-  and: A
+  and: A|A také
   but: Ale
   space_after_keyword: true
 "da":

data/lib/cucumber/parser/feature.rb

@@ -10,17 +10,13 @@ module Cucumber
       include Treetop::Runtime
 
       def root
-        @root || :feature
+        @root || :feature_sub
       end
 
-      include I18n
-
-      include Table
-
-      module Feature0
+      module FeatureSub0
       end
 
-      module Feature1
+      module FeatureSub1
         def white
           elements[0]
         end
@@ -55,7 +51,7 @@ module Cucumber
 
       end
 
-      module Feature2
+      module FeatureSub2
         def has_tags?(tag_names)
           tags.has_tags?(tag_names)
         end
@@ -74,10 +70,10 @@ module Cucumber
         end
       end
 
-      def _nt_feature
+      def _nt_feature_sub
         start_index = index
-        if node_cache[:feature].has_key?(index)
-          cached = node_cache[:feature][index]
+        if node_cache[:feature_sub].has_key?(index)
+          cached = node_cache[:feature_sub][index]
           @index = cached.interval.end if cached
           return cached
         end
@@ -139,7 +135,7 @@ module Cucumber
                     end
                     if s7.last
                       r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
-                      r7.extend(Feature0)
+                      r7.extend(FeatureSub0)
                     else
                       self.index = i7
                       r7 = nil
@@ -181,14 +177,14 @@ module Cucumber
         end
         if s0.last
           r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-          r0.extend(Feature1)
-          r0.extend(Feature2)
+          r0.extend(FeatureSub1)
+          r0.extend(FeatureSub2)
         else
           self.index = i0
           r0 = nil
         end
 
-        node_cache[:feature][start_index] = r0
+        node_cache[:feature_sub][start_index] = r0
 
         return r0
       end
@@ -1346,7 +1342,7 @@ module Cucumber
 
       module LinesToKeyword2
         def build
-          self.text_value.split("\n").map{|s| s.strip }.join("\n")
+          self.text_value.split("\n").map{|s| s.strip}.join("\n")
         end
       end
 

data/lib/cucumber/parser/feature.tt

@@ -7,10 +7,8 @@ module Cucumber
     # Treetop will then generate the parser in-memory. When you're happy, just generate
     # the rb file with tt feature.tt
     grammar Feature
-      include I18n
-      include Table
 
-      rule feature
+      rule feature_sub
         white 
         comment 
         white 

data/lib/cucumber/parser/i18n.tt

@@ -1,35 +1,42 @@
 module Cucumber
   module Parser
-    grammar I18n
+    module I18n
+      grammar <%= keywords('grammar_name', true) %>
+        include Feature
+        include Table
 
-      rule background_keyword
-        (<%= keywords('background') %>) ':'
-      end
+        rule feature
+          feature_sub
+        end
 
-      rule scenario_keyword
-        (<%= keywords('scenario') %>) ':'
-      end
+        rule background_keyword
+          (<%= keywords('background') %>) ':'
+        end
 
-      rule scenario_outline_keyword
-        (<%= keywords('scenario_outline') %>) ':'
-      end
+        rule scenario_keyword
+          (<%= keywords('scenario') %>) ':'
+        end
 
-      rule step_keyword
-        (<%= keywords('given') %>) /
-        (<%= keywords('when') %>) /
-        (<%= keywords('then') %>) /
-        (<%= keywords('and') %>) /
-        (<%= keywords('but') %>)
-      end
+        rule scenario_outline_keyword
+          (<%= keywords('scenario_outline') %>) ':'
+        end
 
-      rule keyword_space
-        <%= keywords('space_after_keyword', true) ? 'space+' : 'space*' %>
-      end
+        rule step_keyword
+          (<%= keywords('given') %>) /
+          (<%= keywords('when') %>) /
+          (<%= keywords('then') %>) /
+          (<%= keywords('and') %>) /
+          (<%= keywords('but') %>)
+        end
 
-      rule examples_keyword
-        (<%= keywords('examples') %>) ':'?
-      end
+        rule keyword_space
+          <%= keywords('space_after_keyword', true) ? 'space+' : 'space*' %>
+        end
 
+        rule examples_keyword
+          (<%= keywords('examples') %>) ':'?
+        end
+      end
     end
   end
 end

data/lib/cucumber/parser/treetop_ext.rb

@@ -12,80 +12,19 @@ end
 
 module Cucumber
   module Parser
-    class Filter
-      def initialize(lines, options)
-        @lines = lines
-        @include_tags = options[:include_tags] || []
-        @exclude_tags = options[:exclude_tags] || []
-        @name_regexps = options[:name_regexps] || []
-      end
-
-      def accept?(syntax_node)
-        at_line?(syntax_node) &&
-        matches_tags?(syntax_node) &&
-        matches_names?(syntax_node)
-      end
-
-      def accept_example?(syntax_node, outline)
-        (at_line?(syntax_node) || outline_at_line?(outline)) && 
-        (matches_names?(syntax_node) || outline_matches_names?(outline))
-      end
-      
-      def at_line?(syntax_node)
-        @lines.nil? || @lines.empty? || @lines.detect{|line| syntax_node.at_line?(line)}
-      end
-
-      def outline_at_line?(syntax_node)
-         @lines.nil? || @lines.empty? || @lines.detect{|line| syntax_node.outline_at_line?(line)}
-      end
-
-      def matches_tags?(syntax_node)
-        !excluded_by_tags?(syntax_node) &&
-        included_by_tags?(syntax_node)
-      end
-
-      def included_by_tags?(syntax_node)
-        @include_tags.empty? || syntax_node.has_tags?(@include_tags)
-      end
-
-      def excluded_by_tags?(syntax_node)
-        @exclude_tags.any? && syntax_node.has_tags?(@exclude_tags)
-      end
-      
-      def outline_matches_names?(syntax_node)
-        @name_regexps.nil? || @name_regexps.empty? || @name_regexps.detect{|name_regexp| syntax_node.outline_matches_name?(name_regexp)}
-      end
-      
-      def matches_names?(syntax_node)
-        @name_regexps.nil? || @name_regexps.empty? || @name_regexps.detect{|name_regexp| syntax_node.matches_name?(name_regexp)}
+    class SyntaxError < StandardError
+      def initialize(parser, file, line_offset)
+        tf = parser.terminal_failures
+        expected = tf.size == 1 ? tf[0].expected_string.inspect : "one of #{tf.map{|f| f.expected_string.inspect}.uniq*', '}"
+        line = parser.failure_line + line_offset
+        message = "#{file}:#{line}:#{parser.failure_column}: Parse error, expected #{expected}."
+        super(message)
       end
     end
-
-    module TreetopExt      
-      FILE_COLON_LINE_PATTERN = /^([\w\W]*?):([\d:]+)$/
-
-      # Parses a file and returns a Cucumber::Ast
-      def parse_file(file, options)
-        _, path, lines = *FILE_COLON_LINE_PATTERN.match(file)
-        if path
-          lines = lines.split(':').map { |line| line.to_i }
-        else
-          path = file
-        end
-        filter = Filter.new(lines, options)
-
-        loader = lambda { |io| parse_or_fail(io.read, filter, path) }
-        feature = if path =~ /^http/
-          require 'open-uri'
-          open(path, &loader)
-        else
-          File.open(path, Cucumber.file_mode('r'), &loader) 
-        end
-        feature
-      end
-
-      def parse_or_fail(string, filter=nil, file=nil, line_offset=0)
-        parse_tree = parse(string)
+    
+    module TreetopExt
+      def parse_or_fail(source, file=nil, filter=nil, line_offset=0)
+        parse_tree = parse(source)
         if parse_tree.nil?
           raise Cucumber::Parser::SyntaxError.new(self, file, line_offset)
         else
@@ -95,16 +34,6 @@ module Cucumber
         end
       end
     end
-
-    class SyntaxError < StandardError
-      def initialize(parser, file, line_offset)
-        tf = parser.terminal_failures
-        expected = tf.size == 1 ? tf[0].expected_string.inspect : "one of #{tf.map{|f| f.expected_string.inspect}.uniq*', '}"
-        line = parser.failure_line + line_offset
-        message = "#{file}:#{line}:#{parser.failure_column}: Parse error, expected #{expected}."
-        super(message)
-      end
-    end
   end
 end
 
@@ -115,7 +44,7 @@ module Treetop
         input.line_of(interval.first)
       end
     end
-    
+
     class CompiledParser
       include Cucumber::Parser::TreetopExt
     end

data/lib/cucumber/parser.rb

@@ -3,36 +3,4 @@ require 'cucumber/platform'
 require 'cucumber/ast'
 require 'cucumber/parser/treetop_ext'
 require 'cucumber/parser/table'
-
-module Cucumber
-  # Classes in this module parse feature files and translate the parse tree 
-  # (concrete syntax tree) into an abstract syntax tree (AST) using
-  # <a href="http://martinfowler.com/dslwip/EmbeddedTranslation.html">Embedded translation</a>.
-  #
-  # The AST is built by the various <tt>#build</tt> methods in the parse tree.
-  #
-  # The AST classes are defined in the Cucumber::Ast module.
-  module Parser
-    def self.load_parser(keywords)
-      Loader.new(keywords)
-    end
-    
-    class Loader
-      def initialize(keywords)
-        @keywords = keywords
-        i18n_tt = File.expand_path(File.dirname(__FILE__) + '/parser/i18n.tt')
-        template = File.open(i18n_tt, Cucumber.file_mode('r')).read
-        erb = ERB.new(template)
-        grammar = erb.result(binding)
-        Treetop.load_from_string(grammar)
-        require 'cucumber/parser/feature'
-      end
-
-      def keywords(key, raw=false)
-        return @keywords[key] if raw
-        values = @keywords[key].split('|')
-        values.map{|value| "'#{value}'"}.join(" / ")
-      end
-    end
-  end
-end
+require 'cucumber/parser/feature'