aslakhellesoy-cucumber 0.3.11.3 → 0.3.11.5

data/lib/cucumber/feature_file.rb

@@ -0,0 +1,47 @@
+require 'cucumber/parser/i18n/language'
+require 'cucumber/filter'
+
+module Cucumber
+  class FeatureFile
+    FILE_COLON_LINE_PATTERN = /^([\w\W]*?):([\d:]+)$/
+    LANGUAGE_PATTERN = /language:\s*(.*)/
+
+    # The +uri+ argument can ba a path or a path:line1:line2 etc.
+    def initialize(uri, source=nil)
+      @source = source
+      _, @path, @lines = *FILE_COLON_LINE_PATTERN.match(uri)
+      if @path
+        @lines = @lines.split(':').map { |line| line.to_i }
+      else
+        @path = uri
+      end
+    end
+    
+    # Parses a file and returns a Cucumber::Ast
+    # If +options+ contains tags, the result will
+    # be filtered.
+    def parse(options={})
+      filter = Filter.new(@lines, options)
+      language = Parser::I18n::Language[lang || options[:lang] || 'en']
+      language.parse(source, @path, filter)
+    end
+    
+    def source
+      @source ||= if @path =~ /^http/
+        require 'open-uri'
+        open(@path).read
+      else
+        File.open(@path, Cucumber.file_mode('r')).read 
+      end
+    end
+    
+    def lang
+      line_one = source.split(/\n/)[0]
+      if line_one =~ LANGUAGE_PATTERN
+        $1.strip
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/cucumber/filter.rb

@@ -0,0 +1,50 @@
+module Cucumber
+  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)}
+    end
+  end
+end

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/cucumber.css

@@ -6,6 +6,22 @@
   background: white;
   padding: 1em;
 }
+.cucumber h1, .cucumber h2, .cucumber h3, .cucumber h4, .cucumber ol, .cucumber li, .cucumber pre, .cucumber p {
+  font-size: 1em;
+  padding: 0px;
+  margin: 0px;
+}
+.cucumber div.feature {
+  border: 1px solid;
+  padding: 2px;
+  margin: 4px;
+}
+.cucumber div.feature div.background, .cucumber div.feature div.scenario, .cucumber div.feature p {
+  padding: 0em 0em 0em 1em;
+}
+.cucumber div.feature div.background div.examples, .cucumber div.feature div.scenario div.examples, .cucumber div.feature p div.examples {
+  padding: 0em 0em 0em 1em;
+}
 .cucumber .stats {
   margin: 2em;
 }
@@ -27,16 +43,7 @@
 .cucumber a:visited {
   font-weight: normal;
 }
-.cucumber div.background, .cucumber div.scenario {
-  border: 1px solid;
-  padding: 2px;
-  margin: 4px;
-}
-.cucumber div.background h3, .cucumber div.background h4, .cucumber div.scenario h3, .cucumber div.scenario h4 {
-  padding: 0px;
-  margin: 0px;
-}
-.cucumber div.background div.examples, .cucumber div.scenario div.examples {
+.cucumber a div.examples {
   border: 1px solid;
   padding: 2px;
   margin: 4px;
@@ -70,12 +77,10 @@
 }
 .cucumber ol {
   list-style: none;
-  margin-left: 0;
-  padding-left: 0;
 }
 .cucumber ol li {
-  margin: 5px 0 5px 5px;
-  padding: 0.3em;
+  margin: 0em 0em 0em 1em;
+  padding: 0em 0em 0em 0.2em;
 }
 .cucumber ol li span.param {
   font-weight: bold;

data/lib/cucumber/formatter/cucumber.sass

@@ -29,6 +29,21 @@
   :font-size 0.7em
   :background white
   :padding 1em
+  
+  h1, h2, h3, h4, ol, li, pre, p
+    :font-size 1em
+    :padding 0px
+    :margin 0px
+
+  div.feature
+    :border 1px solid 
+    :padding 2px
+    :margin 4px
+
+    div.background, div.scenario, p
+      :padding 0em 0em 0em 1em
+      div.examples
+        :padding 0em 0em 0em 1em
 
   .stats
     :margin 2em
@@ -52,14 +67,6 @@
     &:visited
       :font-weight normal
 
-  div.background, div.scenario
-    :border 1px solid 
-    :padding 2px
-    :margin 4px
-    
-    h3, h4
-      :padding 0px
-      :margin 0px
     div.examples
       :border 1px solid 
       :padding 2px
@@ -67,7 +74,7 @@
 
   table
     :border-collapse collapse
-
+    
     td, th
       :font-size 0.7em
       :border 1px solid #AAAAAA
@@ -89,12 +96,10 @@
 
   ol
     :list-style none
-    :margin-left 0
-    :padding-left 0
   
     li
-      :margin 5px 0 5px 5px
-      :padding 0.3em
+      :margin 0em 0em 0em 1em
+      :padding 0em 0em 0em 0.2em
       span.param
         :font-weight bold
     li.failed

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
@@ -191,7 +192,7 @@ module Cucumber
 
       def visit_py_string(string)
         @builder.pre(:class => 'val') do |pre|
-          @builder.text!(string)
+          @builder.text!('  ' + string)
         end
       end
 

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/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'

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