cucumber 0.6.4 → 0.7.0.beta.1

data/lib/cucumber/ast/tags.rb

@@ -1,3 +1,5 @@
+require 'gherkin/parser/tag_expression'
+
 module Cucumber
   module Ast
     class Tags #:nodoc:
@@ -15,7 +17,7 @@ module Cucumber
       end
 
       def accept_hook?(hook)
-        TagExpression.parse(hook.tag_expressions).eval(@tag_names)
+        Gherkin::Parser::TagExpression.new(hook.tag_expressions).eval(@tag_names)
       end
 
       def to_sexp

data/lib/cucumber/ast/tree_walker.rb

@@ -41,8 +41,8 @@ module Cucumber
         broadcast(tag_name)
       end
 
-      def visit_feature_name(name)
-        broadcast(name)
+      def visit_feature_name(keyword, name)
+        broadcast(keyword, name)
       end
 
       # +feature_element+ is either Scenario or ScenarioOutline
@@ -75,22 +75,6 @@ module Cucumber
       end
 
       def visit_examples_name(keyword, name)
-        unless keyword =~ /:$/
-          message = <<EOS
-
-
-(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)
-
-                    DEPRECATION WARNING
-                    
-Future versions of Cucumber will not recognize #{keyword} 
-unless it is followed by a colon. Make this change in
-your features now to prevent this warning from appearing.
-
-(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)(::)
-EOS
-          announce(message)
-        end
         broadcast(keyword, name)
       end
 

data/lib/cucumber/cli/configuration.rb

@@ -1,7 +1,7 @@
 require 'logger'
 require 'cucumber/cli/options'
 require 'cucumber/constantize'
-require 'cucumber/tag_expression'
+require 'gherkin/parser/tag_expression'
 
 module Cucumber
   module Cli
@@ -26,7 +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])
+        @options[:tag_expression] = Gherkin::Parser::TagExpression.new(@options[:tag_expressions])
         return @args.replace(@options.expanded_args_without_drb) if drb?
 
         set_environment_variables

data/lib/cucumber/cli/options.rb

@@ -1,6 +1,6 @@
 require 'cucumber/cli/profile_loader'
 require 'cucumber/formatter/ansicolor'
-require 'cucumber/tag_expression'
+require 'gherkin/parser/tag_expression'
 
 module Cucumber
   module Cli
@@ -279,6 +279,10 @@ module Cucumber
         @profiles - [@default_profile]
       end
 
+      def filters
+        @options.values_at(:name_regexps, :tag_expressions).select{|v| !v.empty?}.first || []
+      end
+
     protected
 
       attr_reader :options, :profiles, :expanded_args
@@ -286,15 +290,15 @@ module Cucumber
 
     private
 
-    def non_stdout_formats
-      @options[:formats].select {|format, output| output != @out_stream }
-    end
+      def non_stdout_formats
+        @options[:formats].select {|format, output| output != @out_stream }
+      end
 
-    def stdout_formats
-      @options[:formats].select {|format, output| output == @out_stream }
-    end
+      def stdout_formats
+        @options[:formats].select {|format, output| output == @out_stream }
+      end
 
-     def extract_environment_variables
+      def extract_environment_variables
         @args.delete_if do |arg|
           if arg =~ /^(\w+)=(.*)$/
             @options[:env_vars][$1] = $2
@@ -303,10 +307,6 @@ module Cucumber
         end
       end
 
-      def tag_filter(tag_string)
-        tags = TagExpression.parse(tag_string)
-      end
-
       def disable_profile_loading?
         @disable_profile_loading
       end
@@ -325,7 +325,6 @@ module Cucumber
             Options.parse(profile_args, @out_stream, @error_stream, :skip_profile_information  => true)
           )
         end
-
       end
 
       def default_profile_should_be_used?
@@ -367,19 +366,15 @@ module Cucumber
         self
       end
 
-      # TODO: Move to Language
       def list_keywords_and_exit(lang)
-        unless Cucumber::LANGUAGES[lang]
-          raise("No language with key #{lang}")
-        end
-        require 'cucumber/cli/language_help_formatter'
-        LanguageHelpFormatter.list_keywords(@out_stream, lang)
+        require 'gherkin/i18n'
+        @out_stream.write(Gherkin::I18n.get(lang).keyword_table)
         Kernel.exit(0)
       end
 
       def list_languages_and_exit
-        require 'cucumber/cli/language_help_formatter'
-        LanguageHelpFormatter.list_languages(@out_stream)
+        require 'gherkin/i18n'
+        @out_stream.write(Gherkin::I18n.language_table)
         Kernel.exit(0)
       end
 

data/lib/cucumber/feature_file.rb

@@ -1,5 +1,7 @@
-require 'cucumber/parser/natural_language'
-require 'cucumber/filter'
+require 'cucumber/parser/gherkin_builder'
+require 'gherkin/parser/filter_listener'
+require 'gherkin/parser/parser'
+require 'gherkin/i18n_lexer'
 
 module Cucumber
   class FeatureFile
@@ -22,11 +24,26 @@ module Cucumber
     # If +options+ contains tags, the result will
     # be filtered.
     def parse(step_mother, options)
-      filter = Filter.new(@lines, options)
-      language = Parser::NaturalLanguage.get(step_mother, (lang || 'en'))
-      language.parse(source, @path, filter)
+      filters = @lines || options.filters
+
+      builder         = Cucumber::Parser::GherkinBuilder.new
+      filter_listener = Gherkin::Parser::FilterListener.new(builder, filters)
+      parser          = Gherkin::Parser::Parser.new(filter_listener, true, "root")
+      lexer           = Gherkin::I18nLexer.new(parser, false)
+
+      begin
+        lexer.scan(source)
+        ast = builder.ast
+        return nil if ast.nil? # Filter caused nothing to match
+        ast.language = lexer.i18n_language
+        ast.file = @path
+        ast
+      rescue Gherkin::LexingError => e
+        e.message.insert(0, "#{@path}: ")
+        raise e
+      end
     end
-    
+
     def source
       @source ||= if @path =~ /^http/
         require 'open-uri'
@@ -43,6 +60,7 @@ module Cucumber
     end
     
     def lang
+      # TODO: Gherkin has logic for this. Remove.
       line_one = source.split(/\n/)[0]
       if line_one =~ LANGUAGE_PATTERN
         $1.strip
@@ -51,4 +69,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/lib/cucumber/formatter/ansicolor.rb

@@ -1,4 +1,9 @@
-require 'term/ansicolor'
+begin
+  require 'term/ansicolor'
+rescue LoadError
+  require 'rubygems'
+  require 'term/ansicolor'
+end
 require 'cucumber/platform'
 
 if Cucumber::IRONRUBY

data/lib/cucumber/formatter/console.rb

@@ -22,7 +22,7 @@ module Cucumber
         end
 
         format = format_for(status, :param)
-        line = keyword + " " + step_match.format_args(format) + comment
+        line = keyword + step_match.format_args(format) + comment
         format_string(line, status)
       end
 
@@ -63,9 +63,10 @@ module Cucumber
       end
 
       def print_stats(features, profiles = [])
-        @failures = step_mother.scenarios(:failed).select { |s| s.is_a?(Cucumber::Ast::Scenario) }
+        @failures = step_mother.scenarios(:failed).select { |s| s.is_a?(Cucumber::Ast::Scenario) || s.is_a?(Cucumber::Ast::OutlineTable::ExampleRow) }
+        @failures.collect! { |s| (s.is_a?(Cucumber::Ast::OutlineTable::ExampleRow)) ? s.scenario_outline : s }
 
-        if !@failures.empty?
+        if !@failures.empty?          
           @io.puts format_string("Failing Scenarios:", :failed)
           @failures.each do |failure|
             profiles_string = profiles.empty? ? '' : (profiles.map{|profile| "-p #{profile}" }).join(' ') + ' '

data/lib/cucumber/formatter/html.rb

@@ -1,3 +1,4 @@
+require 'erb'
 require 'cucumber/formatter/ordered_xml_markup'
 require 'cucumber/formatter/duration'
 require 'cucumber/formatter/io'
@@ -109,11 +110,11 @@ module Cucumber
         @builder.span(tag_name, :class => 'tag')
       end
   
-      def feature_name(name)
+      def feature_name(keyword, name)
         lines = name.split(/\r?\n/)
         return if lines.empty?
         @builder.h2 do |h2|
-          @builder.span(lines[0], :class => 'val')
+          @builder.span(keyword + ': ' + lines[0], :class => 'val')
         end
         @builder.p(:class => 'narrative') do
           lines[1..-1].each do |line|
@@ -383,11 +384,14 @@ module Cucumber
         features.each do |feature|
           #get background steps
           if feature.instance_variable_get("@background")
-            background = feature.instance_variable_get("@background").instance_variable_get("@steps").instance_variable_get("@steps")
-            count += background.size
+            background = feature.instance_variable_get("@background")
+            background.init
+            background_steps = background.instance_variable_get("@steps").instance_variable_get("@steps")
+            count += background_steps.size
           end
           #get scenarios
           feature.instance_variable_get("@feature_elements").each do |scenario|
+            scenario.init
             #get steps
             steps = scenario.instance_variable_get("@steps").instance_variable_get("@steps")
             count += steps.size
@@ -417,7 +421,6 @@ module Cucumber
         step_name = step_match.format_args(lambda{|param| %{<span class="param">#{param}</span>}})
         @builder.div(:class => 'step_name') do |div|
           @builder.span(keyword, :class => 'keyword')
-          @builder.text!(' ')
           @builder.span(:class => 'step val') do |name|
             name << h(step_name).gsub(/&lt;span class=&quot;(.*?)&quot;&gt;/, '<span class="\1">').gsub(/&lt;\/span&gt;/, '</span>')
           end            

data/lib/cucumber/formatter/junit.rb

@@ -49,15 +49,16 @@ module Cucumber
         @in_background = false
       end
 
-      def feature_name(name)
+      def feature_name(keyword, name)
         raise UnNamedFeatureError.new(@current_feature.file) if name.empty?
         lines = name.split(/\r?\n/)
-        @feature_name = lines[0].sub(/Feature\:/, '').strip
+        @feature_name = lines[0]
       end
 
       def scenario_name(keyword, name, file_colon_line, source_indent)
+        # TODO: What's all this ugly weird code doing? Why not just use keyword and name????
         scenario_name = name.strip.delete(".\r\n")
-        scenario_name = "Unnamed scenario" if name.blank?
+        scenario_name = "Unnamed scenario" if name == ""
         @scenario = scenario_name
         description = "Scenario"
         description << " outline" if keyword.include?('Scenario Outline')
@@ -73,7 +74,7 @@ module Cucumber
         
         duration = Time.now - @steps_start
         if steps.failed?
-          steps.each { |step| @output += "#{step.keyword} #{step.name}\n" }
+          steps.each { |step| @output += "#{step.keyword}#{step.name}\n" }
           @output += "\nMessage:\n"
         end
         build_testcase(duration, steps.status, steps.exception)

data/lib/cucumber/formatter/pdf.rb

@@ -94,12 +94,11 @@ module Cucumber
         puts "\ndone"
       end
 
-      def feature_name(name)
+      def feature_name(keyword, name)
         @pdf.start_new_page
-        name["Feature:"] = "" if name["Feature:"]
         names = name.split("\n")
         @pdf.fill_color GREY
-        @pdf.text('Feature', :align => :center)
+        @pdf.text(keyword, :align => :center)
         @pdf.fill_color BLACK
         names.each_with_index do |nameline, i|
           case i

data/lib/cucumber/formatter/pretty.rb

@@ -60,8 +60,8 @@ module Cucumber
         @indent = 1
       end
 
-      def feature_name(name)
-        @io.puts(name)
+      def feature_name(keyword, name)
+        @io.puts("#{keyword}: #{name}")
         @io.puts
         @io.flush
       end
@@ -102,7 +102,7 @@ module Cucumber
         puts unless @visiting_first_example_name
         @visiting_first_example_name = false
         names = name.strip.empty? ? [name.strip] : name.split("\n")
-        @io.puts("    #{keyword} #{names[0]}")
+        @io.puts("    #{keyword}: #{names[0]}")
         names[1..-1].each {|s| @io.puts "      #{s}" } unless names.empty?
         @io.flush
         @indent = 6
@@ -119,7 +119,7 @@ module Cucumber
       end
       
       def scenario_name(keyword, name, file_colon_line, source_indent)
-        print_feature_element_name keyword, name, file_colon_line, source_indent
+        print_feature_element_name(keyword, name, file_colon_line, source_indent)
       end
 
       def before_step(step)
@@ -210,7 +210,7 @@ module Cucumber
       def print_feature_element_name(keyword, name, file_colon_line, source_indent)
         @io.puts if @scenario_indent == 6
         names = name.empty? ? [name] : name.split("\n")
-        line = "#{keyword} #{names[0]}".indent(@scenario_indent)
+        line = "#{keyword}: #{names[0]}".indent(@scenario_indent)
         @io.print(line)
         if @options[:source]
           line_comment = " # #{file_colon_line}".indent(source_indent)

data/lib/cucumber/formatter/usage.rb

@@ -69,7 +69,7 @@ module Cucumber
         @io.print format_string(stepdef_key.regexp_source, stepdef_key.status)
         if @options[:source]
           indent = max_length - stepdef_key.regexp_source.jlength
-          line_comment = "    # #{stepdef_key.file_colon_line}".indent(indent)
+          line_comment = "   # #{stepdef_key.file_colon_line}".indent(indent)
           @io.print(format_string(line_comment, :comment))
         end
         @io.puts
@@ -98,7 +98,7 @@ module Cucumber
       end
 
       def max_step_length
-        @stepdef_to_match.values.flatten.map do |step|
+        @stepdef_to_match.values.to_a.flatten.map do |step|
           step[:keyword].jlength + step[:step_match].format_args.jlength
         end.max
       end

data/lib/cucumber/parser.rb

@@ -1,8 +1,2 @@
-require 'erb'
 require 'cucumber/platform'
 require 'cucumber/ast'
-require 'cucumber/parser/treetop_ext'
-require 'cucumber/parser/common'
-require 'cucumber/parser/table'
-require 'cucumber/parser/py_string'
-require 'cucumber/parser/feature'

data/lib/cucumber/parser/gherkin_builder.rb

@@ -0,0 +1,142 @@
+require 'cucumber/ast'
+
+module Cucumber
+  module Parser
+    # This class conforms to the Gherkin event API and builds the
+    # "legacy" AST. It will be replaced later when we have a new "clean"
+    # AST.
+    class GherkinBuilder
+
+      def ast
+        @feature || @multiline_arg
+      end
+
+      def tag(name, line)
+        @tags ||= []
+        @tags << name
+      end
+
+      def comment(content, line)
+        @comments ||= []
+        @comments << content
+      end
+
+      def feature(keyword, name, line)
+        @feature = Ast::Feature.new(
+          nil, 
+          Ast::Comment.new(grab_comments!('')), 
+          Ast::Tags.new(nil, grab_tags!('')),
+          keyword,
+          name,
+          []
+        )
+      end
+
+      def background(keyword, name, line)
+        @background = Ast::Background.new(
+          Ast::Comment.new(grab_comments!('')), 
+          line, 
+          keyword, 
+          name, 
+          steps=[]
+        )
+        @feature.background = @background
+        @background.feature = @feature
+        @step_container = @background
+      end
+
+      def scenario(keyword, name, line)
+        grab_table!
+        scenario = Ast::Scenario.new(
+          @background, 
+          Ast::Comment.new(grab_comments!('')), 
+          Ast::Tags.new(nil, grab_tags!('')), 
+          line, 
+          keyword, 
+          name, 
+          steps=[]
+        )
+        @feature.add_feature_element(scenario)
+        @background.feature_elements << scenario if @background
+        @step_container = scenario
+      end
+
+      def scenario_outline(keyword, name, line)
+        grab_table!
+        scenario_outline = Ast::ScenarioOutline.new(
+          @background, 
+          Ast::Comment.new(grab_comments!('')), 
+          Ast::Tags.new(nil, grab_tags!('')), 
+          line, 
+          keyword, 
+          name, 
+          steps=[],
+          example_sections=[]
+        )
+        @feature.add_feature_element(scenario_outline)
+        @background.feature_elements << scenario_outline if @background
+        @step_container = scenario_outline
+      end
+
+      def examples(keyword, name, line)
+        grab_table!
+        @examples_fields = [Ast::Comment.new(grab_comments!('')), line, keyword, name]
+      end
+
+      def step(keyword, name, line)
+        grab_table!
+        @table_owner = Ast::Step.new(line, keyword, name)
+        @step_container.add_step(@table_owner)
+      end
+
+      def row(row, line)
+        @rows ||= []
+        @rows << row
+        class << row
+          attr_accessor :line
+        end
+        row.line = line
+      end
+
+      def py_string(string, line)
+        @multiline_arg = Ast::PyString.new(string)
+        @table_owner.multiline_arg = @multiline_arg if @table_owner
+      end
+
+      def eof
+        grab_table!
+      end
+
+      def syntax_error(state, event, legal_events, line)
+        # raise "SYNTAX ERROR"
+      end
+
+    private
+
+      def grab_table!
+        return if @rows.nil? 
+        if @examples_fields
+          @examples_fields << @rows
+          @step_container.add_examples(@examples_fields)
+          @examples_fields = nil
+        else
+          @multiline_arg = Ast::Table.new(@rows)
+          @table_owner.multiline_arg = @multiline_arg if @table_owner
+        end
+        @rows = nil
+      end
+
+      def grab_tags!(indent)
+        tags = @tags ? @tags : []
+        @tags = nil
+        tags
+      end
+
+      def grab_comments!(indent)
+        comments = @comments ? indent + @comments.join("\n#{indent}") : ''
+        @comments = nil
+        comments
+      end
+    end
+  end
+end