aslakhellesoy-cucumber 0.1.99.19 → 0.1.99.20

data/History.txt

@@ -76,6 +76,7 @@ pure Ruby users have been enjoying for a while.
 ** Full jar and simple jar
 
 == Bugfixes
+* Depend on polyglot version (0.2.4) to avoid masking require errors. (Aslak Hellesøy).
 * -n option does not suppress the line info for a Scenario Outline (#175 Aslak Hellesøy)
 * Errors with rspec-rails matchers in cucumber 0.1.99 (#173 David Chelimsky)
 * Can't use an empty string as a table value in a scenario outline (#172 Aslak Hellesøy)

data/Manifest.txt

@@ -113,7 +113,6 @@ examples/jbehave/src/main/java/cukes/jbehave/examples/trader/model/Stock.java
 examples/jbehave/src/main/java/cukes/jbehave/examples/trader/model/Trader.java
 examples/jbehave/src/main/java/cukes/jbehave/examples/trader/persistence/TraderPersister.java
 examples/jbehave/src/main/java/cukes/jbehave/examples/trader/scenarios/TraderSteps.java
-examples/jbehave/target/maven-archiver/pom.properties
 examples/selenium/Rakefile
 examples/selenium/features/search.feature
 examples/selenium/features/step_definitons/stories_steps.rb
@@ -190,6 +189,7 @@ lib/cucumber/ast/py_string.rb
 lib/cucumber/ast/scenario.rb
 lib/cucumber/ast/scenario_outline.rb
 lib/cucumber/ast/step.rb
+lib/cucumber/ast/steps.rb
 lib/cucumber/ast/table.rb
 lib/cucumber/ast/tags.rb
 lib/cucumber/ast/visitor.rb
@@ -204,6 +204,9 @@ lib/cucumber/core_ext/string.rb
 lib/cucumber/formatter.rb
 lib/cucumber/formatter/ansicolor.rb
 lib/cucumber/formatter/console.rb
+lib/cucumber/formatter/cucumber.css
+lib/cucumber/formatter/cucumber.sass
+lib/cucumber/formatter/html.rb
 lib/cucumber/formatter/pretty.rb
 lib/cucumber/formatter/profile.rb
 lib/cucumber/formatter/progress.rb

data/config/hoe.rb

@@ -58,7 +58,12 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
-  p.extra_deps = [ ['term-ansicolor', '>= 1.0.3'], ['treetop', '>= 1.2.4'], ['diff-lcs', '>= 1.1.2'] ]
+  p.extra_deps = [ 
+    ['term-ansicolor', '>= 1.0.3'], 
+    ['treetop', '>= 1.2.4'], 
+    ['polyglot', '>= 0.2.4'], # Remove this when Treetop no longer loads polyglot by default. 
+    ['diff-lcs', '>= 1.1.2'] 
+  ]
 
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
   

data/examples/self_test/features/support/tag_count_formatter.rb

@@ -0,0 +1,25 @@
+module Tag
+  # Custom formatter that reports occurrences of each tag
+  class Count < Cucumber::Ast::Visitor
+    def initialize(step_mother, io, options)
+      super(step_mother)
+      @io = io
+      @counts = Hash.new{|h,k| h[k] = 0}
+    end
+
+    def visit_features(features)
+      super
+      print_summary
+    end
+
+    def visit_tag_name(tag_name)
+      @counts[tag_name] += 1
+    end
+    
+    def print_summary
+      matrix = @counts.to_a.sort{|paira, pairb| paira[0] <=> pairb[0]}.transpose
+      table = Cucumber::Ast::Table.new(matrix)
+      Cucumber::Formatter::Pretty.new(@step_mother, @io, {}).visit_multiline_arg(table, :tag)
+    end
+  end
+end

data/examples/tickets/features/177/3.feature

@@ -1,4 +1,4 @@
-Matt's example with a comment before a step
+Feature: Matt's example with a comment before a step
 
 Scenario: Upload an image for an artist and create a concert in the process
   Given I am logged in to my account

data/features/custom_formatter.feature

@@ -0,0 +1,11 @@
+Feature: Custom Formatter
+
+  Scenario: count tags
+    When I run cucumber --format Tag::Count features
+    Then it should fail with
+      """
+      | four | one | three | two |
+      | 1    | 1   | 2     | 1   |
+
+      """
+    

data/lib/cucumber/ast.rb

@@ -5,6 +5,7 @@ require 'cucumber/ast/feature'
 require 'cucumber/ast/scenario'
 require 'cucumber/ast/scenario_outline'
 require 'cucumber/ast/background'
+require 'cucumber/ast/steps'
 require 'cucumber/ast/step'
 require 'cucumber/ast/table'
 require 'cucumber/ast/py_string'

data/lib/cucumber/ast/examples.rb

@@ -7,7 +7,7 @@ module Cucumber
 
       def accept(visitor)
         visitor.visit_examples_name(@keyword, @name)
-        @outline_table.accept(visitor, nil)
+        visitor.visit_outline_table(@outline_table)
       end
 
       def each_example_row(&proc)

data/lib/cucumber/ast/scenario.rb

@@ -2,11 +2,12 @@ module Cucumber
   module Ast
     class Scenario
       attr_writer :feature, :background
-      
+
       def initialize(comment, tags, line, keyword, name, steps)
         @comment, @tags, @line, @keyword, @name = comment, tags, line, keyword, name
         steps.each {|step| step.scenario = self}
         @steps = steps
+        @steps_helper = Steps.new(self)
       end
 
       def status
@@ -26,10 +27,15 @@ module Cucumber
         visitor.visit_comment(@comment)
         visitor.visit_tags(@tags)
         visitor.visit_scenario_name(@keyword, @name, file_line(@line), source_indent(text_length))
+        visitor.visit_steps(@steps_helper)
+
+        @feature.scenario_executed(self) if @feature && !@executed
+        @executed = true
+      end
 
+      def accept_steps(visitor)
         prior_world = @background ? @background.world : nil
         visitor.world(self, prior_world) do |world|
-
           previous = @background ? @background.status : :passed
           @steps.each do |step|
             step.previous = previous
@@ -38,8 +44,6 @@ module Cucumber
             previous = step.status
           end
         end
-        @feature.scenario_executed(self) if @feature && !@executed
-        @executed = true
       end
 
       def source_indent(text_length)

data/lib/cucumber/ast/scenario_outline.rb

@@ -31,9 +31,8 @@ module Cucumber
         visitor.visit_comment(@comment)
         visitor.visit_tags(@tags)
         visitor.visit_scenario_name(@keyword, @name, file_line(@line), source_indent(text_length))
-        @steps.each do |step|
-          visitor.visit_step(step)
-        end
+        visitor.visit_steps(@steps_helper)
+
         @examples_array.each do |examples|
           visitor.visit_examples(examples)
         end

data/lib/cucumber/ast/steps.rb

@@ -0,0 +1,13 @@
+module Cucumber
+  module Ast
+    class Steps
+      def initialize(scenario)
+        @scenario = scenario
+      end
+
+      def accept(visitor)
+        @scenario.accept_steps(visitor)
+      end
+    end
+  end
+end

data/lib/cucumber/ast/visitor.rb

@@ -11,7 +11,7 @@ module Cucumber
       def world(scenario, world = nil, &proc)
         @step_mother.world(scenario, world, &proc)
       end
-      
+
       def new_world
         @step_mother.new_world
       end
@@ -57,7 +57,7 @@ module Cucumber
       def visit_feature_element(feature_element)
         feature_element.accept(self)
       end
-      
+
       def visit_background(background)
         background.accept(self)
       end
@@ -69,9 +69,17 @@ module Cucumber
       def visit_examples_name(keyword, name)
       end
 
+      def visit_outline_table(outline_table)
+        outline_table.accept(self, nil)
+      end
+
       def visit_scenario_name(keyword, name, file_line, source_indent)
       end
 
+      def visit_steps(steps)
+        steps.accept(self)
+      end
+
       def visit_step(step)
         step.accept(self)
       end

data/lib/cucumber/cli/configuration.rb

@@ -201,10 +201,11 @@ module Cucumber
     
       def formatter_class(format)
         case format
-        when 'pretty'   then Formatter::Pretty
-        when 'progress' then Formatter::Progress
-        when 'profile'  then Formatter::Profile
-        when 'rerun'    then Formatter::Rerun
+          when 'pretty'   then Formatter::Pretty
+          when 'progress' then Formatter::Progress
+          when 'profile'  then Formatter::Profile
+          when 'rerun'    then Formatter::Rerun
+          when 'html'     then Formatter::Html
         else
           constantize(format)
         end

data/lib/cucumber/formatter.rb

@@ -1 +1 @@
-%w{pretty progress profile rerun}.each{|n| require "cucumber/formatter/#{n}"}
+%w{pretty progress profile rerun html}.each{|n| require "cucumber/formatter/#{n}"}

data/lib/cucumber/formatter/cucumber.css

@@ -0,0 +1,55 @@
+
+
+
+
+
+.cucumber {
+  background: black;
+  color: white;
+  padding: 1em;
+}
+.cucumber .passed {
+  color: green;
+}
+.cucumber .undefined {
+  color: yellow;
+}
+.cucumber .pending {
+  color: yellow;
+}
+.cucumber .failed {
+  color: red;
+}
+.cucumber .skipped {
+  color: cyan;
+}
+.cucumber .outline {
+  color: cyan;
+}
+.cucumber .param {
+  font-weight: bold;
+}
+.cucumber a {
+  text-decoration: none;
+  color: inherit;
+}
+.cucumber a:hover {
+  text-decoration: underline;
+}
+.cucumber a:visited {
+  font-weight: normal;
+}
+.cucumber ol {
+  list-style: none;
+}
+.cucumber .stats {
+  margin: 2em;
+}
+.cucumber .summary ul.features li {
+  display: inline;
+}
+.cucumber .backtrace {
+  margin-top: 0;
+  margin-bottom: 0;
+  margin-left: 1em;
+}

data/lib/cucumber/formatter/cucumber.sass

@@ -0,0 +1,49 @@
+# cucumber.css is generated from cucumber.sass
+# Regenerate with the following command:
+#
+#   sass -t expanded lib/cucumber/formatter/cucumber.sass > lib/cucumber/formatter/cucumber.css
+#
+.cucumber
+  :background black
+  :color white
+  :padding 1em
+
+  .passed
+    :color green
+  .undefined
+    :color yellow
+  .pending
+    :color yellow
+  .failed
+    :color red
+  .skipped
+    :color cyan
+  .outline
+    :color cyan
+  .param
+    :font-weight bold
+
+  a
+    :text-decoration none
+    :color inherit
+
+    &:hover
+      :text-decoration underline
+    &:visited
+      :font-weight normal
+
+  ol
+    :list-style none
+
+  .stats
+    :margin 2em
+
+  .summary
+    ul.features
+      li
+        :display inline
+
+  .backtrace
+    :margin-top 0
+    :margin-bottom 0
+    :margin-left 1em

data/lib/cucumber/formatter/html.rb

@@ -0,0 +1,121 @@
+require 'builder'
+
+module Cucumber
+  module Formatter
+    class Html < Ast::Visitor
+      def initialize(step_mother, io, options)
+        super(step_mother)
+        @builder = Builder::XmlMarkup.new(:target => io, :indent => 2)
+      end
+      
+      def visit_features(features)
+        # <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+        @builder.declare!(
+          :DOCTYPE,
+          :html, 
+          :PUBLIC, 
+          '-//W3C//DTD XHTML 1.0 Strict//EN', 
+          'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
+        )
+        @builder.html(:xmlns => 'http://www.w3.org/1999/xhtml') do
+          @builder.head do
+            @builder.title 'Cucumber'
+            inline_css
+          end
+          @builder.body do
+            @builder.div(:class => 'cucumber') do
+              super
+            end
+          end
+        end
+      end
+
+      def visit_feature(feature)
+        @builder.div(:class => 'feature') do
+          super
+        end
+      end
+
+      def visit_feature_name(name)
+        lines = name.split(/\r?\n/)
+        @builder.h2(lines[0])
+        @builder.p do
+          lines[1..-1].each do |line|
+            @builder.text!(line.strip)
+            @builder.br
+          end
+        end
+      end
+
+      def visit_background(background)
+        @builder.div(:class => 'background') do
+          @builder.ol do
+            super
+          end
+        end
+      end
+
+      def visit_feature_element(feature_element)
+        @builder.div(:class => 'scenario') do
+          super
+        end
+        @open_step_list = true
+      end
+      
+      def visit_scenario_name(keyword, name, file_line, source_indent)
+        @builder.h3("#{keyword} #{name}")
+      end
+
+      def visit_outline_table(outline_table)
+        @builder.table do
+          super(outline_table)
+        end
+      end
+
+      def visit_examples_name(keyword, name)
+        @builder.h4("#{keyword} #{name}")
+      end
+
+      def visit_steps(scenarios)
+        @builder.ol do
+          super
+        end
+      end
+
+      def visit_step_name(keyword, step_name, status, step_definition, source_indent)
+        @builder.li("#{keyword} #{step_name}", :class => status)
+      end
+
+      def visit_multiline_arg(multiline_arg, status)
+        if Ast::Table === multiline_arg
+          @builder.table do
+            super(multiline_arg, status)
+          end
+        else
+          @builder.p do
+            super(multiline_arg, status)
+          end
+        end
+      end
+
+      def visit_table_row(table_row, status)
+        @builder.tr do
+          super(table_row, status)
+        end
+      end
+
+      def visit_table_cell_value(value, width, status)
+        @builder.td(value, :class => status)
+      end
+
+      private
+
+      def inline_css
+        @builder.style(:type => 'text/css') do
+          @builder.text!(File.read(File.dirname(__FILE__) + '/cucumber.css'))
+        end
+      end
+
+    end
+  end
+end

data/lib/cucumber/languages.yml

@@ -258,8 +258,11 @@
   name: Portuguese
   native: português
   encoding: UTF-8
+  background: Contexto
   feature: Característica
   scenario: Cenário
+  scenario_outline: Esquema do Cenário
+  examples: Exemplos
   given: Dado
   when: Quando
   then: Então

data/lib/cucumber/parser/feature.rb

@@ -670,27 +670,13 @@ module Cucumber
                   s0 << r7
                   if r7
                     i8 = index
-                    s9, i9 = [], index
-                    loop do
-                      r10 = _nt_eol
-                      if r10
-                        s9 << r10
-                      else
-                        break
-                      end
-                    end
-                    if s9.empty?
-                      self.index = i9
-                      r9 = nil
-                    else
-                      r9 = SyntaxNode.new(input, i9...index, s9)
-                    end
+                    r9 = _nt_white
                     if r9
                       r8 = r9
                     else
-                      r11 = _nt_eof
-                      if r11
-                        r8 = r11
+                      r10 = _nt_eof
+                      if r10
+                        r8 = r10
                       else
                         self.index = i8
                         r8 = nil
@@ -698,11 +684,11 @@ module Cucumber
                     end
                     s0 << r8
                     if r8
-                      r12 = _nt_steps
-                      s0 << r12
-                      if r12
-                        r13 = _nt_white
-                        s0 << r13
+                      r11 = _nt_steps
+                      s0 << r11
+                      if r11
+                        r12 = _nt_white
+                        s0 << r12
                       end
                     end
                   end

data/lib/cucumber/parser/feature.tt

@@ -77,7 +77,7 @@ module Cucumber
       end
 
       rule scenario
-        comment tags white scenario_keyword space* name:line_to_eol (eol+ / eof) steps white {
+        comment tags white scenario_keyword space* name:line_to_eol (white / eof) steps white {
           def build
             Ast::Scenario.new(
               comment.build, 

data/lib/cucumber/version.rb

@@ -3,7 +3,7 @@ module Cucumber #:nodoc:
     MAJOR = 0
     MINOR = 1
     TINY  = 99
-    PATCH = 19 # Set to nil for official release
+    PATCH = 20 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/rails_generators/cucumber/templates/env.rb

@@ -1,5 +1,5 @@
 # Sets up the Rails environment for Cucumber
-ENV["RAILS_ENV"] = "test"
+ENV["RAILS_ENV"] ||= "test"
 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
 require 'cucumber/rails/world'
 require 'cucumber/formatters/unicode' # Comment out this line if you don't want Cucumber Unicode support

data/spec/cucumber/parser/feature_parser_spec.rb

@@ -123,6 +123,14 @@ Feature: hi
             [:scenario, 3, "Scenario:", "Hello"]]
         end
 
+        it "should allow whitespace lines after the Scenario line" do
+          parse(%{Feature: Foo
+
+Scenario: bar
+
+  Given baz})
+        end
+            
         it "should have steps" do
           parse("Feature: Hi\nScenario: Hello\nGiven I am a step\n").to_sexp.should ==
           [:feature, "Feature: Hi",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.1.99.19
+  version: 0.1.99.20
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-02 00:00:00 -08:00
+date: 2009-02-04 00:00:00 -08:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,6 +30,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.4
     version: 
+- !ruby/object:Gem::Dependency 
+  name: polyglot
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.4
+    version: 
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
   version_requirement: 
@@ -177,7 +186,6 @@ files:
 - examples/jbehave/src/main/java/cukes/jbehave/examples/trader/model/Trader.java
 - examples/jbehave/src/main/java/cukes/jbehave/examples/trader/persistence/TraderPersister.java
 - examples/jbehave/src/main/java/cukes/jbehave/examples/trader/scenarios/TraderSteps.java
-- examples/jbehave/target/maven-archiver/pom.properties
 - examples/selenium/Rakefile
 - examples/selenium/features/search.feature
 - examples/selenium/features/step_definitons/stories_steps.rb
@@ -196,6 +204,7 @@ files:
 - examples/self_test/features/sample.feature
 - examples/self_test/features/step_definitions/sample_steps.rb
 - examples/self_test/features/support/env.rb
+- examples/self_test/features/support/tag_count_formatter.rb
 - examples/test_unit/Rakefile
 - examples/test_unit/features/step_definitions/test_unit_steps.rb
 - examples/test_unit/features/test_unit.feature
@@ -220,6 +229,7 @@ files:
 - features/background.feature
 - features/cucumber_cli.feature
 - features/cucumber_cli_outlines.feature
+- features/custom_formatter.feature
 - features/report_called_undefined_steps.feature
 - features/step_definitions/cucumber_steps.rb
 - features/step_definitions/extra_steps.rb
@@ -252,6 +262,7 @@ files:
 - lib/cucumber/ast/scenario.rb
 - lib/cucumber/ast/scenario_outline.rb
 - lib/cucumber/ast/step.rb
+- lib/cucumber/ast/steps.rb
 - lib/cucumber/ast/table.rb
 - lib/cucumber/ast/tags.rb
 - lib/cucumber/ast/visitor.rb
@@ -266,6 +277,9 @@ files:
 - lib/cucumber/formatter.rb
 - lib/cucumber/formatter/ansicolor.rb
 - lib/cucumber/formatter/console.rb
+- lib/cucumber/formatter/cucumber.css
+- lib/cucumber/formatter/cucumber.sass
+- lib/cucumber/formatter/html.rb
 - lib/cucumber/formatter/pretty.rb
 - lib/cucumber/formatter/profile.rb
 - lib/cucumber/formatter/progress.rb