cucumber 0.5.3 → 0.6.0

data/lib/cucumber/parser/py_string.rb

@@ -49,7 +49,10 @@ module Cucumber
         start_index = index
         if node_cache[:py_string].has_key?(index)
           cached = node_cache[:py_string][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -137,7 +140,10 @@ module Cucumber
         start_index = index
         if node_cache[:open_py_string].has_key?(index)
           cached = node_cache[:open_py_string][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -218,7 +224,10 @@ module Cucumber
         start_index = index
         if node_cache[:close_py_string].has_key?(index)
           cached = node_cache[:close_py_string][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 

data/lib/cucumber/parser/table.rb

@@ -40,7 +40,10 @@ module Cucumber
         start_index = index
         if node_cache[:table].has_key?(index)
           cached = node_cache[:table][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -104,7 +107,10 @@ module Cucumber
         start_index = index
         if node_cache[:table_row].has_key?(index)
           cached = node_cache[:table_row][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 
@@ -231,7 +237,10 @@ module Cucumber
         start_index = index
         if node_cache[:cell].has_key?(index)
           cached = node_cache[:cell][index]
-          @index = cached.interval.end if cached
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
           return cached
         end
 

data/lib/cucumber/rb_support/rb_dsl.rb

@@ -52,20 +52,20 @@ module Cucumber
 
       # Registers a proc that will run before each Scenario. You can register as 
       # as you want (typically from ruby scripts under <tt>support/hooks.rb</tt>).
-      def Before(*tag_names, &proc)
-        RbDsl.register_rb_hook('before', tag_names, proc)
+      def Before(*tag_expressions, &proc)
+        RbDsl.register_rb_hook('before', tag_expressions, proc)
       end
 
       # Registers a proc that will run after each Scenario. You can register as 
       # as you want (typically from ruby scripts under <tt>support/hooks.rb</tt>).
-      def After(*tag_names, &proc)
-        RbDsl.register_rb_hook('after', tag_names, proc)
+      def After(*tag_expressions, &proc)
+        RbDsl.register_rb_hook('after', tag_expressions, proc)
       end
 
       # Registers a proc that will run after each Step. You can register as 
       # as you want (typically from ruby scripts under <tt>support/hooks.rb</tt>).
-      def AfterStep(*tag_names, &proc)
-        RbDsl.register_rb_hook('after_step', tag_names, proc)
+      def AfterStep(*tag_expressions, &proc)
+        RbDsl.register_rb_hook('after_step', tag_expressions, proc)
       end
 
       # Registers a proc that will be called with a step definition argument if it 

data/lib/cucumber/rb_support/rb_hook.rb

@@ -2,12 +2,11 @@ module Cucumber
   module RbSupport
     # Wrapper for Before, After and AfterStep hooks
     class RbHook
-      attr_accessor :tag_name_lists
-      attr_reader :tag_names
-      
-      def initialize(rb_language, tag_names, proc)
+      attr_reader :tag_expressions
+
+      def initialize(rb_language, tag_expressions, proc)
         @rb_language = rb_language
-        @tag_names = tag_names
+        @tag_expressions = tag_expressions
         @proc = proc
       end
 

data/lib/cucumber/rb_support/rb_language.rb

@@ -121,7 +121,7 @@ module Cucumber
       end
 
       def load_code_file(code_file)
-        require code_file # This will cause self.add_step_definition, self.add_hook, and self.add_transform to be called from RbDsl
+        require File.expand_path(code_file) # This will cause self.add_step_definition, self.add_hook, and self.add_transform to be called from RbDsl
       end
 
       protected

data/lib/cucumber/tag_expression.rb

@@ -0,0 +1,41 @@
+module Cucumber
+  class TagExpression
+    attr_reader :limits
+
+    def self.parse(tag_expressions)
+      tag_expressions.inject(TagExpression.new) { |e, expr| e.add(expr.strip.split(/\s*,\s*/)); e }
+    end
+
+    def initialize
+      @ands = []
+      @limits = {}
+    end
+
+    def add(tags)
+      negatives, positives = tags.partition{|tag| tag =~ /^~/}
+      positive_limits = Hash[*positives.map{|positive| tag, limit = positive.split(':'); [tag, limit ? limit.to_i : nil]}.flatten]
+      @limits.merge!(positive_limits)
+      @ands << (negatives + positive_limits.keys)
+    end
+
+    def eval(tags)
+      return true if @ands.flatten.empty?
+      vars = Hash[*tags.map{|tag| [tag, true]}.flatten]
+      !!Kernel.eval(ruby_expression)
+    end
+
+  private
+
+    def ruby_expression
+      "(" + @ands.map do |ors|
+        ors.map do |tag|
+          if tag =~ /^~(.*)/
+            "!vars['#{$1}']"
+          else
+            "vars['#{tag}']"
+          end
+        end.join("||")
+      end.join(")&&(") + ")"
+    end
+  end
+end

data/spec/cucumber/ast/feature_spec.rb

@@ -14,9 +14,14 @@ module Cucumber
         dsl.extend RbSupport::RbDsl
 
         feature = create_feature(dsl)
+        if Cucumber::WINDOWS
+          feature_file_path = "features\\pretty_printing.feature"
+        else
+          feature_file_path = "features/pretty_printing.feature"
+        end
         feature.to_sexp.should == 
         [:feature,
-          "features/pretty_printing.feature",
+          feature_file_path,
           "Pretty printing", 
           [:comment, "# My feature comment\n"], 
           [:tag, "one"], 
@@ -37,8 +42,24 @@ module Cucumber
                   [:cell, "4444"], [:cell, "55555"], [:cell, "666666"]]]], 
             [:step_invocation, 11, "Given", "a happy step with an inline arg:", 
               [:py_string, "\n I like\nCucumber sandwich\n"]], 
-            [:step_invocation, 12, "Given", "a failing step"]]]
+            [:step_invocation, 12, "Given", "a failing step"]]]          
       end
+
+      it "should store OS specific file paths" do
+        step_mother = StepMother.new
+        step_mother.load_natural_language('en')
+        step_mother.load_programming_language('rb')
+        dsl = Object.new 
+        dsl.extend RbSupport::RbDsl
+        feature = create_feature(dsl)
+
+        if Cucumber::WINDOWS
+          feature.file.should == 'features\pretty_printing.feature'
+        else
+          feature.file.should == 'features/pretty_printing.feature'
+        end                
+      end
+
     end
   end
 end

data/spec/cucumber/ast/scenario_outline_spec.rb

@@ -61,13 +61,6 @@ module Cucumber
         visitor.should_receive(:visit_table_row).exactly(3).times
         visitor.visit_feature_element(@scenario_outline)
       end
-
-      it "should pretty print" do
-        require 'cucumber/formatter/pretty'
-        formatter = Formatter::Pretty.new(@step_mother, STDOUT, {:comment => true, :tag_names => {}})
-        visitor = TreeWalker.new(@step_mother, [formatter])
-        visitor.visit_feature_element(@scenario_outline)
-      end
     end
   end
 end

data/spec/cucumber/cli/options_spec.rb

@@ -91,11 +91,11 @@ module Cli
 
       context '-t TAGS --tags TAGS' do
         it "designates tags prefixed with ~ as tags to be excluded" do
-          after_parsing('--tags ~@foo,@bar') { options[:tag_names].should == [{'~@foo' => nil, '@bar' => nil}] }
+          after_parsing('--tags ~@foo,@bar') { options[:tag_expressions].should == ['~@foo,@bar'] }
         end
 
         it "stores tags passed with different --tags seperately" do
-          after_parsing('--tags @foo --tags @bar') { options[:tag_names].should == [{'@foo' => nil}, {'@bar' => nil}] }
+          after_parsing('--tags @foo --tags @bar') { options[:tag_expressions].should == ['@foo', '@bar'] }
         end
       end
 
@@ -162,7 +162,7 @@ module Cli
         it "combines the tag names of both" do
           given_cucumber_yml_defined_as('baz' => %w[-t @bar])
           options.parse!(%w[--tags @foo -p baz])
-          options[:tag_names].should == [{'@foo' => nil}, {'@bar' => nil}]
+          options[:tag_expressions].should == ["@foo", "@bar"]
         end
 
         it "only takes the paths from the original options, and disgregards the profiles" do

data/spec/cucumber/formatter/html_spec.rb

@@ -219,6 +219,16 @@ module Cucumber
 
           it { @doc.css('.embed img').first.attributes['src'].to_s.should == "snapshot.jpeg" }
         end
+        
+        describe "with an undefined Given step then an undefined And step" do
+          define_feature(<<-FEATURE)
+            Scenario:
+              Given some undefined step
+              And another undefined step
+            FEATURE
+            
+          it { @doc.css('pre').map { |pre| /^(Given|And)/.match(pre.text)[1] }.should == ["Given", "Given"] }
+        end
       
       end
     end

data/spec/cucumber/formatter/spec_helper.rb

@@ -27,7 +27,8 @@ module Cucumber
       def load_features(content)
         feature_file = FeatureFile.new('spec.feature', content)
         features = Ast::Features.new
-        features.add_feature feature_file.parse(@step_mother, {})
+        feature = feature_file.parse(@step_mother, {})
+        features.add_feature(feature)
         features
       end
     

data/spec/cucumber/tag_expression_spec.rb

@@ -0,0 +1,127 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'cucumber/tag_expression'
+
+module Cucumber
+  module Ast
+    describe TagExpression do
+      context "no tags" do
+        before(:each) do
+          @e = TagExpression.new
+        end
+
+        it "should match @foo" do
+          @e.eval(['@foo']).should == true
+        end
+
+        it "should match empty tags" do
+          @e.eval([]).should == true
+        end
+      end
+
+      context "@foo" do
+        before(:each) do
+          @e = TagExpression.new
+          @e.add(['@foo'])
+        end
+
+        it "should match @foo" do
+          @e.eval(['@foo']).should == true
+        end
+
+        it "should not match @bar" do
+          @e.eval(['@bar']).should == false
+        end
+      end
+
+      context "!@foo" do
+        before(:each) do
+          @e = TagExpression.new
+          @e.add(['~@foo'])
+        end
+
+        it "should match @bar" do
+          @e.eval(['@bar']).should == true
+        end
+
+        it "should not match @foo" do
+          @e.eval(['@foo']).should == false
+        end
+      end
+
+      context "@foo || @bar" do
+        before(:each) do
+          @e = TagExpression.new
+          @e.add(['@foo', '@bar'])
+        end
+
+        it "should match @foo" do
+          @e.eval(['@foo']).should == true
+        end
+
+        it "should match @bar" do
+          @e.eval(['@bar']).should == true
+        end
+
+        it "should not match @zap" do
+          @e.eval(['@zap']).should == false
+        end
+      end
+
+      context "(@foo || @bar) && !@zap" do
+        before(:each) do
+          @e = TagExpression.new
+          @e.add(['@foo', '@bar'])
+          @e.add(['~@zap'])
+        end
+
+        it "should match @foo" do
+          @e.eval(['@foo']).should == true
+        end
+
+        it "should not match @foo @zap" do
+          @e.eval(['@foo', '@zap']).should == false
+        end
+      end
+
+      context "(@foo:3 || !@bar:4) && @zap:5" do
+        before(:each) do
+          @e = TagExpression.new
+          @e.add(['@foo:3', '~@bar'])
+          @e.add(['@zap:5'])
+        end
+
+        it "should count tags for positive tags" do
+          @e.limits.should == {'@foo' => 3, '@zap' => 5}
+        end
+
+        it "should match @foo @zap" do
+          @e.eval(['@foo', '@zap']).should == true
+        end
+      end
+
+      context "Parsing '@foo:3,~@bar', '@zap:5'" do
+        before(:each) do
+          @e = TagExpression.parse([' @foo:3 , ~@bar ', ' @zap:5 '])
+        end
+
+        it "should split and trim" do
+          @e.__send__(:ruby_expression).should == "(!vars['@bar']||vars['@foo'])&&(vars['@zap'])"
+        end
+
+        it "should have limits" do
+          @e.limits.should == {"@zap"=>5, "@foo"=>3}
+        end
+      end
+
+      context "Parsing ''" do
+        before(:each) do
+          @e = TagExpression.parse([''])
+        end
+
+        it "should ignore empty tags" do
+          @e.eval("@foo").should == true
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-22 00:00:00 +01:00
+date: 2010-01-03 00:00:00 +01:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,7 +80,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 1.4.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: prawn
@@ -90,7 +90,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.1
+        version: 0.6.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -110,7 +110,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.4
+        version: 0.7.5
     version: 
 description: A BDD tool written in Ruby
 email: cukes@googlegroups.com
@@ -194,6 +194,7 @@ files:
 - examples/i18n/fr/features/addition.feature
 - examples/i18n/fr/features/addition2.feature
 - examples/i18n/fr/features/step_definitions/calculatrice_steps.rb
+- examples/i18n/fr/features/support/env.rb
 - examples/i18n/fr/lib/calculatrice.rb
 - examples/i18n/he/Rakefile
 - examples/i18n/he/features/addition.feature
@@ -221,6 +222,7 @@ files:
 - examples/i18n/ja/features/addition.feature
 - examples/i18n/ja/features/division.feature
 - examples/i18n/ja/features/step_definitons/calculator_steps.rb
+- examples/i18n/ja/features/support/env.rb
 - examples/i18n/ja/lib/calculator.rb
 - examples/i18n/ko/.gitignore
 - examples/i18n/ko/Rakefile
@@ -285,6 +287,7 @@ files:
 - examples/i18n/sr/Rakefile
 - examples/i18n/sr/features/sabiranje.feature
 - examples/i18n/sr/features/step_definitons/calculator_steps.rb
+- examples/i18n/sr/features/support/env.rb
 - examples/i18n/sr/lib/calculator.rb
 - examples/i18n/tr/.gitignore
 - examples/i18n/tr/Rakefile
@@ -573,6 +576,7 @@ files:
 - lib/cucumber/step_definition_light.rb
 - lib/cucumber/step_match.rb
 - lib/cucumber/step_mother.rb
+- lib/cucumber/tag_expression.rb
 - lib/cucumber/webrat/element_locator.rb
 - lib/cucumber/webrat/table_locator.rb
 - lib/cucumber/wire_support/configuration.rb
@@ -595,7 +599,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/ast/tree_walker_spec.rb
 - spec/cucumber/broadcaster_spec.rb
 - spec/cucumber/cli/configuration_spec.rb
@@ -606,7 +609,6 @@ files:
 - spec/cucumber/core_ext/proc_spec.rb
 - spec/cucumber/formatter/ansicolor_spec.rb
 - spec/cucumber/formatter/color_io_spec.rb
-- spec/cucumber/formatter/console_spec.rb
 - spec/cucumber/formatter/duration_spec.rb
 - spec/cucumber/formatter/html_spec.rb
 - spec/cucumber/formatter/junit_spec.rb
@@ -619,6 +621,7 @@ files:
 - spec/cucumber/sell_cucumbers.feature
 - spec/cucumber/step_match_spec.rb
 - spec/cucumber/step_mother_spec.rb
+- spec/cucumber/tag_expression_spec.rb
 - spec/cucumber/treetop_parser/empty_feature.feature
 - spec/cucumber/treetop_parser/empty_scenario.feature
 - spec/cucumber/treetop_parser/empty_scenario_outline.feature
@@ -650,7 +653,7 @@ post_install_message: |+
   
                        (::)   U P G R A D I N G    (::)
   
-  Thank you for installing cucumber-0.5.3.
+  Thank you for installing cucumber-0.6.0.
   Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading
   for important information about this release. Happy cuking!
   
@@ -691,7 +694,6 @@ test_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/ast/tree_walker_spec.rb
 - spec/cucumber/broadcaster_spec.rb
 - spec/cucumber/cli/configuration_spec.rb
@@ -702,7 +704,6 @@ test_files:
 - spec/cucumber/core_ext/proc_spec.rb
 - spec/cucumber/formatter/ansicolor_spec.rb
 - spec/cucumber/formatter/color_io_spec.rb
-- spec/cucumber/formatter/console_spec.rb
 - spec/cucumber/formatter/duration_spec.rb
 - spec/cucumber/formatter/html_spec.rb
 - spec/cucumber/formatter/junit_spec.rb
@@ -714,6 +715,7 @@ test_files:
 - spec/cucumber/rb_support/regexp_argument_matcher_spec.rb
 - spec/cucumber/step_match_spec.rb
 - spec/cucumber/step_mother_spec.rb
+- spec/cucumber/tag_expression_spec.rb
 - spec/cucumber/wire_support/configuration_spec.rb
 - spec/cucumber/wire_support/wire_exception_spec.rb
 - spec/cucumber/wire_support/wire_language_spec.rb
@@ -746,6 +748,7 @@ test_files:
 - examples/i18n/fi/features/step_definitons/laskin_steps.rb
 - examples/i18n/fi/lib/laskin.rb
 - examples/i18n/fr/features/step_definitions/calculatrice_steps.rb
+- examples/i18n/fr/features/support/env.rb
 - examples/i18n/fr/lib/calculatrice.rb
 - examples/i18n/he/features/step_definitons/calculator_steps.rb
 - examples/i18n/he/lib/calculator.rb
@@ -756,6 +759,7 @@ test_files:
 - examples/i18n/it/features/step_definitons/calcolatrice_steps.rb
 - examples/i18n/it/lib/calcolatrice.rb
 - examples/i18n/ja/features/step_definitons/calculator_steps.rb
+- examples/i18n/ja/features/support/env.rb
 - examples/i18n/ja/lib/calculator.rb
 - examples/i18n/ko/features/step_definitons/calculator_steps.rb
 - examples/i18n/ko/lib/calculator.rb
@@ -783,6 +787,7 @@ test_files:
 - examples/i18n/sk/features/step_definitons/calculator_steps.rb
 - examples/i18n/sk/lib/calculator.rb
 - examples/i18n/sr/features/step_definitons/calculator_steps.rb
+- examples/i18n/sr/features/support/env.rb
 - examples/i18n/sr/lib/calculator.rb
 - examples/i18n/sr-latn/features/step_definitons/calculator_steps.rb
 - examples/i18n/sr-latn/lib/calculator.rb