aslakhellesoy-cucumber 0.2.3.3 → 0.2.3.4

data/History.txt

@@ -6,13 +6,17 @@ several times, passing a Proc and extending the world object of the previous one
 The problem was that there was no nice way to ensure the order in which these procs were called, which
 led to some unexpected situations. In this release you can only register a single World proc. If you
 want to extend a world with certain modules, you simply call the #World method with the module(s)
-you wish to extend the World with. The Sinatra example illustrates how to do this.
+you wish to extend the World with. The Sinatra example illustrates how to do this. Also check out
+the RDoc for Cucumber::StepMother#World.
 
 The Visitor API (which is used for formatters) has also changed slightly. However, we have tried to
 do this in a backwards compatible way, so if you have custom formatters for Cucumber 0.2 they should
 still work.
 
 === New features
+* Field value steps for Webrat (Jack Chen)
+* Added translation for Bulgarian (Krasimir Angelov)
+* Updated translation for Polish (#273 Grzegorz Marszałek)
 * Only a single World proc can be registered. World extension now happens by calling #World with ruby modules.
 * Portuguese uses Funcionalidade in stead of Característica and accented words are aliased with unaccented ones (Alexandre da Silva and Felipe Coury).
 * The usage formatter also prints unused step definitions (Aslak Hellesøy)
@@ -22,6 +26,10 @@ still work.
 * Support description string for Backgrounds (#271 Joseph Wilk)
 
 === Bugfixes
+* Fixed dependency on internal files in rspec breaks cucumber w/ rspec-1.2.4 (#291 Aslak Hellesøy)
+* Fix color use when using autotest on Linux. (Hans de Graaff)
+* Fixed incorrect calculation of pystring indentation (#279 Eugene Naydanov)
+* Fixed --format html leads to an error (#252 Aslak Hellesøy)
 * Fixed Background runs twice (#255 Aslak Hellesøy)
 * Fixed Background Transactions and :xx (#270 Aslak Hellesøy)
 * Fixed Autospec failing with cucumber 0.2 (#254 Aslak Hellesøy)

data/Manifest.txt

@@ -21,6 +21,14 @@ examples/i18n/ar/Rakefile
 examples/i18n/ar/features/addition.feature
 examples/i18n/ar/features/step_definitons/calculator_steps.rb
 examples/i18n/ar/lib/calculator.rb
+examples/i18n/bg/Rakefile
+examples/i18n/bg/features/addition.feature
+examples/i18n/bg/features/consecutive_calculations.feature
+examples/i18n/bg/features/division.feature
+examples/i18n/bg/features/step_definitons/calculator_steps.rb
+examples/i18n/bg/features/support/env.rb
+examples/i18n/bg/features/support/world.rb
+examples/i18n/bg/lib/calculator.rb
 examples/i18n/da/Rakefile
 examples/i18n/da/features/step_definitons/kalkulator_steps.rb
 examples/i18n/da/features/summering.feature
@@ -169,7 +177,6 @@ examples/test_unit/Rakefile
 examples/test_unit/features/step_definitions/test_unit_steps.rb
 examples/test_unit/features/test_unit.feature
 examples/tickets/Rakefile
-examples/tickets/cucumber.yml
 examples/tickets/features/172.feature
 examples/tickets/features/177/1.feature
 examples/tickets/features/177/2.feature
@@ -181,6 +188,9 @@ examples/tickets/features/246.feature
 examples/tickets/features/248.feature
 examples/tickets/features/270/back.feature
 examples/tickets/features/270/back.steps.rb
+examples/tickets/features/279/py_string_indent.feature
+examples/tickets/features/279/py_string_indent.steps.rb
+examples/tickets/features/279/wrong.feature_
 examples/tickets/features/lib/eatting_machine.rb
 examples/tickets/features/lib/pantry.rb
 examples/tickets/features/scenario_outline.feature
@@ -296,7 +306,6 @@ spec/cucumber/ast/scenario_spec.rb
 spec/cucumber/ast/step_collection_spec.rb
 spec/cucumber/ast/step_spec.rb
 spec/cucumber/ast/table_spec.rb
-spec/cucumber/ast/tags_spec.rb
 spec/cucumber/broadcaster_spec.rb
 spec/cucumber/cli/configuration_spec.rb
 spec/cucumber/cli/main_spec.rb

data/examples/i18n/bg/Rakefile

@@ -0,0 +1,6 @@
+$:.unshift(File.dirname(__FILE__) + '/../../../lib')
+require 'cucumber/rake/task'
+
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = "--language bg"
+end

data/examples/i18n/bg/features/addition.feature

@@ -0,0 +1,11 @@
+Функционалност: Събиране на числа
+  За да не го правят наум
+  Потребителите
+  Трябва да могат да събират числа с калкулатора
+
+  Сценарий: Събиране на две цели числа
+    Дадено е че съм въвел 50
+    И съм въвел 70
+    Когато натисна "+"
+    То резултата трябва да е равен на 120
+

data/examples/i18n/bg/features/consecutive_calculations.feature

@@ -0,0 +1,18 @@
+Функционалост: Последователни изчисления
+  За да не го правят наум
+  Потребителите
+  Трябва да могат да извършват последователни изчисления с калкулатора
+
+  Предистория:
+    Дадено е че съм събрал 3 и 5
+
+  Сценарий: събиране с резултата от последната операция
+    Когато въведа 4
+    И натисна "+"
+    То резултата трябва да е равен на 12
+
+  Сценарий: делене с резултата от последната операция  
+    Когато въведа 2
+    И натисна "/"
+    То резултата трябва да е равен на 4
+

data/examples/i18n/bg/features/division.feature

@@ -0,0 +1,16 @@
+Фунцкционалност: Делене на числа
+  За да не го правят наум
+  Потребителите
+  Трябва да могат да разделят числа с калкулатора
+
+  Рамка на сценарий: Делене на цели числа
+    Дадено е че съм въвел <делимо>
+    И е че съм въвел <делител>
+    Когато натисна "/"
+    То резултата трябва да е равен на <частно>
+
+  Примери:
+    | делимо  | делител  | частно  |
+    | 100     | 2        | 50      |
+    | 28      | 7        | 4       |
+    | 0       | 5        | 0       |

data/examples/i18n/bg/features/step_definitons/calculator_steps.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+Дадено /въвел (\d+)/ do |x|
+  calc.push x.to_i
+end
+
+Когато /^въведа (\d+)/ do |x|
+  calc.push x.to_i
+end
+
+Когато /натисна "(.*)"/ do |op|
+  calc.send op
+end
+
+То /резултата трябва да е равен на (\d+)/ do |result|
+  calc.result.should == result.to_f
+end
+
+Дадено /събрал (\d+) и (\d+)/ do |x, y|
+  Дадено %{въвел #{x}}
+  Дадено %{въвел #{y}}  
+  Дадено %{натисна "+"}
+end
+

data/examples/i18n/bg/features/support/env.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+require 'spec/expectations'
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'cucumber/formatter/unicode'
+require 'calculator'
+$KCODE='u' unless Cucumber::RUBY_1_9

data/examples/i18n/bg/features/support/world.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+module LazyCalc
+  def calc
+    @calc ||= Calculator.new
+  end
+end
+
+World(LazyCalc)

data/examples/i18n/bg/lib/calculator.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+class Calculator
+  def initialize
+    @stack = []
+  end
+
+  def push(arg)
+    @stack.push arg
+  end
+
+  def result
+    @stack.last
+  end
+
+  def +
+    @stack.push @stack.pop + @stack.pop
+  end
+
+  def /
+    divisor, dividend = [@stack.pop, @stack.pop] # Hm, @stack.pop(2) doesn't work
+    @stack.push dividend / divisor
+  end
+end

data/examples/tickets/Rakefile

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:pretty) do |t|
-  t.cucumber_opts = "--format pretty"
+  t.cucumber_opts = "--format pretty -q"
 end
 
 Cucumber::Rake::Task.new(:html) do |t|

data/examples/tickets/features/279/py_string_indent.feature

@@ -0,0 +1,25 @@
+Feature: pystring indentaion testcase
+
+  Scenario: example of correct indentation
+    Given multiline string
+         """
+           I'm a cucumber and I'm ok
+         I sleep all night and test all day
+         """
+    Then string is
+      """
+        I'm a cucumber and I'm ok
+      I sleep all night and test all day
+      """						      
+
+  Scenario: example of wrong indentation
+    Given I am in tickets/features/279
+    When I run cucumber -q wrong.feature_
+    Then it should fail with
+      """
+
+      """
+    And STDERR should match
+      """
+      wrong.feature_:8:10: Parse error
+      """

data/examples/tickets/features/279/py_string_indent.steps.rb

@@ -0,0 +1,11 @@
+require 'spec/expectations'
+
+require File.dirname(__FILE__) + '/../../../../features/step_definitions/cucumber_steps.rb'
+
+Given /^multiline string$/ do |string|
+  @string = string
+end
+
+Then /^string is$/ do |string|
+  @string.should == string
+end

data/examples/tickets/features/279/wrong.feature_

@@ -0,0 +1,11 @@
+Feature: pystring indentaion testcase
+
+  Scenario: example of wrong indentation
+    Given multiline string
+
+
+	 
+         """
+           I'm a cucumber and I'm ok
+         I sleep all night and test all day
+         """

data/features/cucumber_cli_outlines.feature

@@ -58,6 +58,9 @@ Feature: Cucumber command line
 
       """
 
+  # There are 10 characters in the progress, but only 8 reported steps. Needs investigation.
+  # Looks like we're outputting too many characters.
+  @buggy
   Scenario: Run all with progress formatter
     When I run cucumber -q --format progress features/outline_sample.feature
     Then it should fail with

data/features/step_definitions/cucumber_steps.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 Given /^I am in (.*)$/ do |dir|
   @dir = dir
 end
@@ -5,8 +7,10 @@ end
 When /^I run cucumber (.*)$/ do |cmd|
   @dir ||= 'self_test'
   full_dir ||= File.expand_path(File.dirname(__FILE__) + "/../../examples/#{@dir}")
+  @stderr = Tempfile.new('cucumber')
+  @stderr.close
   Dir.chdir(full_dir) do
-    @full_cmd = "#{Cucumber::RUBY_BINARY} #{Cucumber::BINARY} --no-color #{cmd}"
+    @full_cmd = "#{Cucumber::RUBY_BINARY} #{Cucumber::BINARY} --no-color #{cmd} 2> #{@stderr.path}"
     @out = `#{@full_cmd}`
     @status = $?.exitstatus
   end
@@ -32,3 +36,7 @@ end
 Then /^"(.*)" should match$/ do |file, text|
   IO.read(file).should =~ Regexp.new(text)
 end
+
+Then /^STDERR should match$/ do |text|
+  Then %{"#{@stderr.path}" should match}, text
+end

data/lib/cucumber/ast/examples.rb

@@ -10,18 +10,10 @@ module Cucumber
         visitor.visit_outline_table(@outline_table)
       end
 
-      def descend?(visitor)
-        @outline_table.descend?(visitor)
-      end
-
       def skip_invoke!
         @outline_table.skip_invoke!
       end
 
-      def matches_scenario_names?(scenario_names)
-        scenario_names.detect{|name| name == @name}
-      end
-
       def each_example_row(&proc)
         @outline_table.cells_rows[1..-1].each(&proc)
       end

data/lib/cucumber/ast/feature.rb

@@ -19,18 +19,10 @@ module Cucumber
         visitor.visit_feature_name(@name)
         visitor.visit_background(@background) if @background
         @feature_elements.each do |feature_element|
-          visitor.visit_feature_element(feature_element) if feature_element.descend?(visitor)
+          visitor.visit_feature_element(feature_element)
         end
       end
 
-      def descend?(visitor)
-        @feature_elements.detect{ |feature_element| feature_element.descend?(visitor) }
-      end
-
-      def has_tags?(tags)
-        @tags.has_tags?(tags)
-      end
-
       def next_feature_element(feature_element, &proc)
         index = @feature_elements.index(feature_element)
         next_one = @feature_elements[index+1]

data/lib/cucumber/ast/feature_element.rb

@@ -12,10 +12,6 @@ module Cucumber
       @keyword.jlength + @name.jlength
     end
 
-    def has_tags?(tags)
-      @tags.has_tags?(tags) || @feature.has_tags?(tags)
-    end
-
     def matches_scenario_names?(scenario_names)
       scenario_names.detect{|name| name == @name}
     end

data/lib/cucumber/ast/features.rb

@@ -18,7 +18,7 @@ module Cucumber
 
       def accept(visitor)
         @features.each do |feature|
-          visitor.visit_feature(feature) if feature.descend?(visitor)
+          visitor.visit_feature(feature)
         end
       end
     end

data/lib/cucumber/ast/outline_table.rb

@@ -10,21 +10,11 @@ module Cucumber
 
       def accept(visitor)
         cells_rows.each_with_index do |row, n|
-          if n == 0 || matches?(visitor, row)
-            visitor.visit_table_row(row)
-          end
+          visitor.visit_table_row(row)
         end
         nil
       end
 
-      def descend?(visitor)
-        cells_rows.detect{|cells_row| cells_row.descend?(visitor)}
-      end
-      
-      def matches?(visitor, cells)
-        @scenario_outline.matches_tags_and_name?(visitor)
-      end
-      
       def skip_invoke!
         example_rows.each do |cells|
           cells.skip_invoke!
@@ -46,10 +36,6 @@ module Cucumber
           @step_invocations = scenario_outline.step_invocations(self)
         end
         
-        def descend?(visitor)
-          @table.matches?(visitor, self)
-        end
-
         def skip_invoke!
           @step_invocations.each do |step_invocation|
             step_invocation.skip_invoke!

data/lib/cucumber/ast/scenario.rb

@@ -22,12 +22,6 @@ module Cucumber
         @background.feature = feature if @background
       end
 
-      def descend?(visitor)
-        visitor.included_by_tags?(self) &&
-        !visitor.excluded_by_tags?(self) &&
-        visitor.matches_scenario_names?(self)
-      end
-
       def accept(visitor)
         visitor.visit_comment(@comment)
         visitor.visit_tags(@tags)

data/lib/cucumber/ast/scenario_outline.rb

@@ -30,16 +30,6 @@ module Cucumber
         @background.feature = feature if @background
       end
 
-      def descend?(visitor)
-        @examples_array.detect { |examples| examples.descend?(visitor) }
-      end
-
-      def matches_tags_and_name?(visitor)
-        visitor.included_by_tags?(self) &&
-        !visitor.excluded_by_tags?(self) &&
-        visitor.matches_scenario_names?(self)
-      end
-
       def accept(visitor)
         visitor.visit_comment(@comment)
         visitor.visit_tags(@tags)
@@ -48,7 +38,7 @@ module Cucumber
 
         skip_invoke! if @background && @background.failed?
         @examples_array.each do |examples|
-          visitor.visit_examples(examples) if examples.descend?(visitor)
+          visitor.visit_examples(examples)
         end
       end
 

data/lib/cucumber/ast/tags.rb

@@ -11,10 +11,6 @@ module Cucumber
         @line, @tag_names = line, tag_names
       end
 
-      def has_tags?(tags)
-        (@tag_names & tags).any?
-      end
-
       def accept(visitor)
         @tag_names.each do |tag_name|
           visitor.visit_tag_name(tag_name)

data/lib/cucumber/ast/visitor.rb

@@ -10,16 +10,6 @@ module Cucumber
         @step_mother = step_mother
       end
 
-      def included_by_tags?(node)
-        tags = options[:include_tags] || []
-        tags.empty? || node.has_tags?(tags)
-      end
-
-      def excluded_by_tags?(node)
-        tags = options[:exclude_tags] || []
-        tags.any? && node.has_tags?(tags)
-      end
-
       def matches_scenario_names?(node)
         scenario_names = options[:scenario_names] || []
         scenario_names.empty? || node.matches_scenario_names?(scenario_names)

data/lib/cucumber/cli/main.rb

@@ -52,8 +52,11 @@ module Cucumber
 
         verbose_log("Features:")
         configuration.feature_files.each do |f|
-          features.add_feature(parser.parse_file(f))
-          verbose_log("  * #{f}")
+          feature = parser.parse_file(f, configuration.options)
+          if feature
+            features.add_feature(feature)
+            verbose_log("  * #{f}")
+          end
         end
         verbose_log("\n"*2)
         features
@@ -89,7 +92,7 @@ module Cucumber
 
       def enable_diffing
         if configuration.diff_enabled? && defined?(::Spec)
-          require 'spec/expectations/differs/default'
+          require 'spec/runner/differs/default'
           options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
           ::Spec::Expectations.differ = ::Spec::Expectations::Differs::Default.new(options)
         end

data/lib/cucumber/formatter/ansicolor.rb

@@ -19,7 +19,7 @@ elsif Cucumber::WINDOWS && Cucumber::JRUBY
   end
 end
 
-Term::ANSIColor.coloring = false if !STDOUT.tty?
+Term::ANSIColor.coloring = false if !STDOUT.tty? and not ENV.has_key?("AUTOTEST")
 
 module Cucumber
   module Formatter

data/lib/cucumber/formatter/html.rb

@@ -102,7 +102,7 @@ module Cucumber
       def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
         @status = status
         @builder.li(:id => @step_id, :class => status) do
-          super
+          super(keyword, step_match, multiline_arg, status, exception, source_indent, background)
         end
       end
 

data/lib/cucumber/languages.yml

@@ -299,8 +299,11 @@
   native: polski
   encoding: UTF-8
   feature: Właściwość
+  background: Założenia
   scenario: Scenariusz
-  given: Dane
+  scenario_outline: Szablon scenariusza
+  examples: Przykłady
+  given: Zakładając
   when: Jeżeli
   then: Wtedy
   and: Oraz
@@ -435,3 +438,18 @@
   and: 그리고
   but: 하지만
   space_after_keyword: false
+"bg":
+  name: Bulgarian
+  native: български
+  encoding: UTF-8
+  feature: Функционалност
+  background: Предистория
+  scenario: Сценарий
+  scenario_outline: Рамка на сценарий
+  examples: Примери
+  given: Дадено
+  when: Когато
+  then: То
+  and: И
+  but: Но
+  space_after_keyword: true  

data/lib/cucumber/parser/feature.rb

@@ -56,15 +56,21 @@ module Cucumber
       end
 
       module Feature2
+        def has_tags?(tag_names)
+          tags.has_tags?(tag_names)
+        end
+        
         def build(filter)
-          background = bg.respond_to?(:build) ? bg.build : nil
-          Ast::Feature.new(
-            background, 
-            comment.build, 
-            tags.build, 
-            header.text_value, 
-            feature_elements.build(background, filter)
-          )
+          if(filter.nil? || feature_elements.accept?(filter))
+            background = bg.respond_to?(:build) ? bg.build : nil
+            Ast::Feature.new(
+              background, 
+              comment.build, 
+              tags.build, 
+              header.text_value, 
+              feature_elements.build(background, filter)
+            )
+          end
         end
       end
 
@@ -209,10 +215,17 @@ module Cucumber
           ts.elements.detect{|e| e.tag.line == line}
         end
 
+        def has_tags?(tags)
+          tag_names.detect{|tag_name| tags.index(tag_name)}
+        end
+
         def build
-          tag_names = ts.elements.map{|e| e.tag.tag_name.text_value}
           Ast::Tags.new(ts.line, tag_names)
         end
+        
+        def tag_names
+          ts.elements.map{|e| e.tag.tag_name.text_value}
+        end
       end
 
       def _nt_tags
@@ -569,6 +582,10 @@ module Cucumber
       end
 
       module FeatureElements0
+        def accept?(filter)
+          filter.nil? || elements.empty? || elements.detect{|feature_element| filter.accept?(feature_element)}
+        end
+        
         def build(background, filter)
           elements.map do |feature_element|
             if filter.nil? || filter.accept?(feature_element)
@@ -656,6 +673,15 @@ module Cucumber
           tags.at_line?(line)
         end
 
+        def has_tags?(tag_names)
+          feature_tags = self.parent.parent.tags
+          tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
+        end
+
+        def matches_name?(name_to_match)
+          name.text_value == name_to_match
+        end
+
         def build(background, filter)
           Ast::Scenario.new(
             background,
@@ -785,6 +811,15 @@ module Cucumber
           steps.at_line?(line)
         end
 
+        def has_tags?(tag_names)
+          feature_tags = self.parent.parent.tags
+          tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
+        end
+
+        def matches_name?(name_to_match)
+          name.text_value == name_to_match
+        end
+
         def build(background, filter)
           Ast::ScenarioOutline.new(
             background,
@@ -1044,7 +1079,7 @@ module Cucumber
         end
 
         def build(filter, scenario_outline)
-          elements.map do |e| 
+          elements.map do |e|
             if(filter.nil? || filter.accept?(e) || filter.outline_at_line?(scenario_outline))
               e.build(filter, scenario_outline)
             end
@@ -1105,6 +1140,14 @@ module Cucumber
           table.at_line?(line)
         end
 
+        def has_tags?(tag_names)
+          true
+        end
+
+        def outline_at_line?(line)
+          true
+        end
+
         def build(filter, scenario_outline)
           [examples_keyword.line, examples_keyword.text_value, name.text_value, table.raw(filter, scenario_outline)]
         end
@@ -1358,7 +1401,7 @@ module Cucumber
       end
 
       module OpenPyString0
-        def white
+        def indent
           elements[0]
         end
 
@@ -1369,11 +1412,11 @@ module Cucumber
 
       module OpenPyString1
         def indentation
-          white.text_value.length
+          indent.text_value.length
         end
 
         def line
-          white.line
+          indent.line
         end
       end
 
@@ -1386,32 +1429,41 @@ module Cucumber
         end
 
         i0, s0 = index, []
-        r1 = _nt_white
+        s1, i1 = [], index
+        loop do
+          r2 = _nt_space
+          if r2
+            s1 << r2
+          else
+            break
+          end
+        end
+        r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
         s0 << r1
         if r1
           if input.index('"""', index) == index
-            r2 = instantiate_node(SyntaxNode,input, index...(index + 3))
+            r3 = instantiate_node(SyntaxNode,input, index...(index + 3))
             @index += 3
           else
             terminal_parse_failure('"""')
-            r2 = nil
+            r3 = nil
           end
-          s0 << r2
-          if r2
-            s3, i3 = [], index
+          s0 << r3
+          if r3
+            s4, i4 = [], index
             loop do
-              r4 = _nt_space
-              if r4
-                s3 << r4
+              r5 = _nt_space
+              if r5
+                s4 << r5
               else
                 break
               end
             end
-            r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
-            s0 << r3
-            if r3
-              r5 = _nt_eol
-              s0 << r5
+            r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+            s0 << r4
+            if r4
+              r6 = _nt_eol
+              s0 << r6
             end
           end
         end
@@ -1544,4 +1596,4 @@ module Cucumber
     end
 
   end
-end
+end

data/lib/cucumber/parser/feature.tt

@@ -20,15 +20,21 @@ module Cucumber
         bg:background? 
         feature_elements
         comment? {
+          def has_tags?(tag_names)
+            tags.has_tags?(tag_names)
+          end
+          
           def build(filter)
-            background = bg.respond_to?(:build) ? bg.build : nil
-            Ast::Feature.new(
-              background, 
-              comment.build, 
-              tags.build, 
-              header.text_value, 
-              feature_elements.build(background, filter)
-            )
+            if(filter.nil? || feature_elements.accept?(filter))
+              background = bg.respond_to?(:build) ? bg.build : nil
+              Ast::Feature.new(
+                background, 
+                comment.build, 
+                tags.build, 
+                header.text_value, 
+                feature_elements.build(background, filter)
+              )
+            end
           end
         }
       end
@@ -39,10 +45,17 @@ module Cucumber
             ts.elements.detect{|e| e.tag.line == line}
           end
 
+          def has_tags?(tags)
+            tag_names.detect{|tag_name| tags.index(tag_name)}
+          end
+
           def build
-            tag_names = ts.elements.map{|e| e.tag.tag_name.text_value}
             Ast::Tags.new(ts.line, tag_names)
           end
+          
+          def tag_names
+            ts.elements.map{|e| e.tag.tag_name.text_value}
+          end
         }
       end
 
@@ -78,6 +91,10 @@ module Cucumber
 
       rule feature_elements
         (scenario / scenario_outline)* {
+          def accept?(filter)
+            filter.nil? || elements.empty? || elements.detect{|feature_element| filter.accept?(feature_element)}
+          end
+          
           def build(background, filter)
             elements.map do |feature_element|
               if filter.nil? || filter.accept?(feature_element)
@@ -96,6 +113,15 @@ module Cucumber
             tags.at_line?(line)
           end
 
+          def has_tags?(tag_names)
+            feature_tags = self.parent.parent.tags
+            tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
+          end
+
+          def matches_name?(name_to_match)
+            name.text_value == name_to_match
+          end
+
           def build(background, filter)
             Ast::Scenario.new(
               background,
@@ -123,6 +149,15 @@ module Cucumber
             steps.at_line?(line)
           end
 
+          def has_tags?(tag_names)
+            feature_tags = self.parent.parent.tags
+            tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
+          end
+
+          def matches_name?(name_to_match)
+            name.text_value == name_to_match
+          end
+
           def build(background, filter)
             Ast::ScenarioOutline.new(
               background,
@@ -174,7 +209,7 @@ module Cucumber
           end
 
           def build(filter, scenario_outline)
-            elements.map do |e| 
+            elements.map do |e|
               if(filter.nil? || filter.accept?(e) || filter.outline_at_line?(scenario_outline))
                 e.build(filter, scenario_outline)
               end
@@ -190,6 +225,14 @@ module Cucumber
             table.at_line?(line)
           end
 
+          def has_tags?(tag_names)
+            true
+          end
+
+          def outline_at_line?(line)
+            true
+          end
+
           def build(filter, scenario_outline)
             [examples_keyword.line, examples_keyword.text_value, name.text_value, table.raw(filter, scenario_outline)]
           end
@@ -217,13 +260,13 @@ module Cucumber
       end
 
       rule open_py_string
-        white '"""' space* eol {
+        indent:space* '"""' space* eol {
           def indentation
-            white.text_value.length
+            indent.text_value.length
           end
 
           def line
-            white.line
+            indent.line
           end
         }
       end
@@ -242,4 +285,4 @@ module Cucumber
 
     end
   end
-end
+end

data/lib/cucumber/parser/table.rb

@@ -18,7 +18,7 @@ module Cucumber
           elements.detect{|table_row| table_row.at_line?(line)}
         end
 
-        def build
+        def build(filter=nil)
           Ast::Table.new(raw)
         end
 

data/lib/cucumber/parser/table.tt

@@ -14,7 +14,7 @@ module Cucumber
             elements.detect{|table_row| table_row.at_line?(line)}
           end
 
-          def build
+          def build(filter=nil)
             Ast::Table.new(raw)
           end
 

data/lib/cucumber/parser/treetop_ext.rb

@@ -13,20 +13,42 @@ end
 module Cucumber
   module Parser
     class Filter
-      def initialize(lines)
+      def initialize(lines, options)
         @lines = lines
+        @include_tags = options[:include_tags] || []
+        @exclude_tags = options[:exclude_tags] || []
+        @names        = options[:scenario_names] || []
       end
 
       def accept?(syntax_node)
-        at_line?(syntax_node) # || more to come...
+        at_line?(syntax_node) &&
+        matches_tags?(syntax_node) &&
+        matches_names?(syntax_node)
       end
 
       def at_line?(syntax_node)
-        @lines.detect{|line| syntax_node.at_line?(line)}
+        @lines.nil? || @lines.empty? || @lines.detect{|line| syntax_node.at_line?(line)}
       end
 
       def outline_at_line?(syntax_node)
-        @lines.detect{|line| syntax_node.outline_at_line?(line)}
+         @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 matches_names?(syntax_node)
+        @names.nil? || @names.empty? || @names.detect{|name| syntax_node.matches_name?(name)}
       end
     end
 
@@ -34,15 +56,14 @@ module Cucumber
       FILE_COLON_LINE_PATTERN = /^([\w\W]*?):([\d:]+)$/
 
       # Parses a file and returns a Cucumber::Ast
-      def parse_file(file)
+      def parse_file(file, options)
         _, path, lines = *FILE_COLON_LINE_PATTERN.match(file)
         if path
           lines = lines.split(':').map { |line| line.to_i }
-          filter = Filter.new(lines)
         else
           path = file
-          filter = nil
         end
+        filter = Filter.new(lines, options)
 
         loader = lambda { |io| parse_or_fail(io.read, filter, path) }
         feature = if path =~ /^http/
@@ -59,8 +80,8 @@ module Cucumber
         if parse_tree.nil?
           raise Cucumber::Parser::SyntaxError.new(self, file, line_offset)
         else
-          ast = parse_tree.build(filter)
-          ast.file = file
+          ast = parse_tree.build(filter) # may return nil if it doesn't match filter.
+          ast.file = file unless ast.nil?
           ast
         end
       end

data/lib/cucumber/version.rb

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

data/rails_generators/cucumber/templates/webrat_steps.rb

@@ -106,6 +106,22 @@ Then /^I should not see "([^\"]*)"$/ do |text|
 <% end -%>
 end
 
+Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
+  <% if framework == :rspec -%>
+    field_labeled(field).value.should =~ /#{value}/
+  <% else -%>
+    assert_match(/#{value}/, field_labeled(field).value)
+  <% end -%>
+end
+
+Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, value|
+  <% if framework == :rspec -%>
+    field_labeled(field).value.should_not =~ /#{value}/
+  <% else -%>
+    assert_no_match(/#{value}/, field_labeled(field).value)
+  <% end -%>
+end
+    
 Then /^the "([^\"]*)" checkbox should be checked$/ do |label|
 <% if framework == :rspec -%>
   field_labeled(label).should be_checked

data/spec/cucumber/cli/main_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 require 'yaml'
-require 'spec/expectations/differs/default'
+require 'spec/runner/differs/default'
 
 module Cucumber
 module Cli

data/spec/cucumber/parser/feature_parser_spec.rb

@@ -13,19 +13,11 @@ module Cucumber
       end
 
       def parse_file(file)
-        @parser.parse_file(File.dirname(__FILE__) + "/../treetop_parser/" + file)
+        @parser.parse_file(File.dirname(__FILE__) + "/../treetop_parser/" + file, {})
       end
 
       def parse_example_file(file)
-        @parser.parse_file(File.dirname(__FILE__) + "/../../../examples/" + file)
-      end
-
-      describe "Header" do
-        it "should parse Feature with blurb" do
-          parse(%{Feature: hi
-with blurb
-})
-        end
+        @parser.parse_file(File.dirname(__FILE__) + "/../../../examples/" + file, {})
       end
 
       describe "Comments" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.2.3.3
+  version: 0.2.3.4
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-07 00:00:00 -07:00
+date: 2009-04-13 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,6 +108,14 @@ files:
 - examples/i18n/ar/features/addition.feature
 - examples/i18n/ar/features/step_definitons/calculator_steps.rb
 - examples/i18n/ar/lib/calculator.rb
+- examples/i18n/bg/Rakefile
+- examples/i18n/bg/features/addition.feature
+- examples/i18n/bg/features/consecutive_calculations.feature
+- examples/i18n/bg/features/division.feature
+- examples/i18n/bg/features/step_definitons/calculator_steps.rb
+- examples/i18n/bg/features/support/env.rb
+- examples/i18n/bg/features/support/world.rb
+- examples/i18n/bg/lib/calculator.rb
 - examples/i18n/da/Rakefile
 - examples/i18n/da/features/step_definitons/kalkulator_steps.rb
 - examples/i18n/da/features/summering.feature
@@ -256,7 +264,6 @@ files:
 - examples/test_unit/features/step_definitions/test_unit_steps.rb
 - examples/test_unit/features/test_unit.feature
 - examples/tickets/Rakefile
-- examples/tickets/cucumber.yml
 - examples/tickets/features/172.feature
 - examples/tickets/features/177/1.feature
 - examples/tickets/features/177/2.feature
@@ -268,6 +275,9 @@ files:
 - examples/tickets/features/248.feature
 - examples/tickets/features/270/back.feature
 - examples/tickets/features/270/back.steps.rb
+- examples/tickets/features/279/py_string_indent.feature
+- examples/tickets/features/279/py_string_indent.steps.rb
+- examples/tickets/features/279/wrong.feature_
 - examples/tickets/features/lib/eatting_machine.rb
 - examples/tickets/features/lib/pantry.rb
 - examples/tickets/features/scenario_outline.feature
@@ -383,7 +393,6 @@ files:
 - spec/cucumber/ast/step_collection_spec.rb
 - spec/cucumber/ast/step_spec.rb
 - spec/cucumber/ast/table_spec.rb
-- spec/cucumber/ast/tags_spec.rb
 - spec/cucumber/broadcaster_spec.rb
 - spec/cucumber/cli/configuration_spec.rb
 - spec/cucumber/cli/main_spec.rb

data/examples/tickets/cucumber.yml

@@ -1,3 +0,0 @@
-default: --format pretty
-html: --format html --out features.html
-progress: --format progress -i -n

data/spec/cucumber/ast/tags_spec.rb

@@ -1,19 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-module Cucumber
-  module Ast
-    describe Tags do
-      before do
-        @tags = Tags.new(-1, %w{one two three})
-      end
-
-      it "should be among other tags" do
-        @tags.should have_tags(%w{one})
-      end
-
-      it "should not be among other tags with irrelevent tag" do
-        @tags.should_not have_tags(%w{bacon})
-      end
-    end
-  end
-end