cucumber 0.7.0.beta.2 → 0.7.0.beta.3

data/History.txt

@@ -1,3 +1,13 @@
+== 0.7.0.beta.3 (2010-04-23)
+
+=== Changed Features
+* Step Definitions and calling steps from step definitions can again use And and But (was removed in 0.7.0.beta.2) (Aslak Hellesøy)
+
+== 0.7.0.beta.2 (2010-04-21)
+
+=== New Features
+* Depend on Gherkin 1.0.18, which has some bugfixes. (Aslak Hellesøy)
+
 == 0.7.0.beta.1 (2010-04-20)
 
 Treetop is gone and replaced with Ragel. The new Ragel parser lives in the gherkin gem.

data/Rakefile

@@ -16,7 +16,7 @@ begin
     gem.homepage = "http://cukes.info"
     gem.authors = ["Aslak Hellesøy"]
 
-    gem.add_dependency 'gherkin', '= 1.0.18'
+    gem.add_dependency 'gherkin', '= 1.0.20'
     gem.add_dependency 'term-ansicolor', '>= 1.0.4'
     gem.add_dependency 'builder', '>= 2.1.2'
     gem.add_dependency 'diff-lcs', '>= 1.1.2'

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :patch: 0
-:build: beta.2
+:build: beta.3
 :major: 0
 :minor: 7

data/cucumber.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber}
-  s.version = "0.7.0.beta.2"
+  s.version = "0.7.0.beta.3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aslak Helles\303\270y"]
-  s.date = %q{2010-04-21}
+  s.date = %q{2010-04-23}
   s.default_executable = %q{cucumber}
   s.description = %q{A BDD tool written in Ruby}
   s.email = %q{cukes@googlegroups.com}
@@ -537,7 +537,7 @@ Gem::Specification.new do |s|
 
                      (::)   U P G R A D I N G    (::)
 
-Thank you for installing cucumber-0.7.0.beta.2.
+Thank you for installing cucumber-0.7.0.beta.3.
 Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading
 for important information about this release. Happy cuking!
 
@@ -714,7 +714,7 @@ for important information about this release. Happy cuking!
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<gherkin>, ["= 1.0.18"])
+      s.add_runtime_dependency(%q<gherkin>, ["= 1.0.20"])
       s.add_runtime_dependency(%q<term-ansicolor>, [">= 1.0.4"])
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
       s.add_runtime_dependency(%q<diff-lcs>, [">= 1.1.2"])
@@ -727,7 +727,7 @@ for important information about this release. Happy cuking!
       s.add_development_dependency(%q<syntax>, [">= 1.0.0"])
       s.add_development_dependency(%q<spork>, [">= 0.7.5"])
     else
-      s.add_dependency(%q<gherkin>, ["= 1.0.18"])
+      s.add_dependency(%q<gherkin>, ["= 1.0.20"])
       s.add_dependency(%q<term-ansicolor>, [">= 1.0.4"])
       s.add_dependency(%q<builder>, [">= 2.1.2"])
       s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])
@@ -741,7 +741,7 @@ for important information about this release. Happy cuking!
       s.add_dependency(%q<spork>, [">= 0.7.5"])
     end
   else
-    s.add_dependency(%q<gherkin>, ["= 1.0.18"])
+    s.add_dependency(%q<gherkin>, ["= 1.0.20"])
     s.add_dependency(%q<term-ansicolor>, [">= 1.0.4"])
     s.add_dependency(%q<builder>, [">= 2.1.2"])
     s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])

data/features/call_many_steps.feature

@@ -24,7 +24,7 @@ Feature: http://gist.github.com/221223
       """
     And a file named "features/step_definitions/steps.rb" with:
       """
-      Given /^a multiline string:$/ do |s| x=1
+      And /^a multiline string:$/ do |s| x=1
         raise "I got multiline:\n#{s}"
       end
 
@@ -34,7 +34,7 @@ Feature: http://gist.github.com/221223
 
       Given /^I call a multiline string with (.*)$/ do |s| x=1
         steps %Q{
-          Given a multiline string:
+          And a multiline string:
             \"\"\"
             hello
             #{s}

data/features/language_help.feature

@@ -20,6 +20,8 @@ Feature: Language help
             | given (code)     | "Dado"                                     |
             | when (code)      | "Quando"                                   |
             | then (code)      | "Então", "Entao"                           |
+            | and (code)       | "E"                                        |
+            | but (code)       | "Mas"                                      |
 
       """
   Scenario: List languages

data/lib/cucumber/ast/py_string.rb

@@ -49,13 +49,13 @@ module Cucumber
         @string = string
       end
 
-      def to_s
+      def to_step_definition_arg
         @string
       end
 
       def accept(visitor)
         return if Cucumber.wants_to_quit
-        visitor.visit_py_string(to_s)
+        visitor.visit_py_string(@string)
       end
       
       def arguments_replaced(arguments) #:nodoc:
@@ -73,7 +73,7 @@ module Cucumber
 
       # For testing only
       def to_sexp #:nodoc:
-        [:py_string, to_s]
+        [:py_string, to_step_definition_arg]
       end
     end
   end

data/lib/cucumber/ast/table.rb

@@ -80,6 +80,10 @@ module Cucumber
         @conversion_procs = conversion_procs
       end
 
+      def to_step_definition_arg
+        dup
+      end
+
       # Creates a copy of this table, inheriting any column mappings.
       # registered with #map_headers!
       #

data/lib/cucumber/cli/options.rb

@@ -161,6 +161,9 @@ module Cucumber
             "several times, and this represents logical AND. Example: --tags @foo,~@bar --tags @zap.",
             "This represents the boolean expression (@foo || !@bar) && @zap.",
             "\n",
+            "Beware that if you want to use several negative tags to exclude several tags",
+            "you have to use logical AND: --tags ~@fixme --tags @buggy.",
+            "\n",
             "Positive tags can be given a threshold to limit the number of occurrences.", 
             "Example: --tags @qa:3 will fail if there are more than 3 occurrences of the @qa tag.",
             "This can be practical if you are practicing Kanban or CONWIP.") do |v|

data/lib/cucumber/rb_support/rb_step_definition.rb

@@ -49,7 +49,6 @@ module Cucumber
       end
 
       def invoke(args)
-        args = args.map{|arg| Ast::PyString === arg ? arg.to_s : arg}
         begin
           args = @rb_language.execute_transforms(args)
           @rb_language.current_world.cucumber_instance_exec(true, regexp_source, *args, &@proc)

data/lib/cucumber/step_match.rb

@@ -20,7 +20,7 @@ module Cucumber
 
     def invoke(multiline_arg)
       all_args = args
-      all_args << multiline_arg.dup if multiline_arg
+      all_args << multiline_arg.to_step_definition_arg if multiline_arg
       @step_definition.invoke(all_args)
     end
 

data/lib/cucumber/step_mother.rb

@@ -188,23 +188,44 @@ module Cucumber
     #     Given I have 8 cukes in my belly
     #     Then I should not be thirsty
     #   })
-    def invoke_steps(steps_text, natural_language)
-      ored_keywords = natural_language.step_keywords.map{|kw| Regexp.escape(kw)}.join("|")
-      # TODO Gherkin:
-      # This a bit hacky and fragile. When we move to Gherkin we should replace this entire method body
-      # with a call to the parser - parsing the body of a scenario. We may need to put the parser/policy in the
-      # appropriate state (the same state it's in after parsing a Scenario: line).
-      steps_text.strip.split(/(?=^\s*(?:#{ored_keywords}))/).map { |step| step.strip }.each do |step|
-        output = step.match(/^\s*(#{ored_keywords})([^\n]+)(\n.*)?$/m)
-
-        action, step_name, table_or_string = output[1], output[2], output[3]
-        if table_or_string.to_s.strip =~ /^\|/
-          table_or_string = table(table_or_string) 
-        elsif table_or_string.to_s.strip =~ /^"""/
-          table_or_string = py_string(table_or_string.gsub(/^\n/, ""))
+    def invoke_steps(steps_text, i18n)
+      lexer = i18n.lexer(Gherkin::Parser::Parser.new(StepInvoker.new(self), true, 'steps'))
+      lexer.scan(steps_text)
+    end
+
+    class StepInvoker
+      def initialize(step_mother)
+        @step_mother = step_mother
+      end
+
+      def step(keyword, name, line)
+        invoke
+        @name = name
+      end
+
+      def py_string(string, line)
+        @multiline = Ast::PyString.new(string)
+      end
+
+      def row(row, line)
+        @rows ||= []
+        @rows << row
+      end
+
+      def eof
+        invoke
+      end
+
+      private
+      
+      def invoke
+        if @name
+          @multiline = Ast::Table.new(@rows) if @multiline.nil? && @rows
+          @step_mother.invoke(*[@name, @multiline].compact) 
+          @name = nil
+          @multiline = nil
+          @rows = nil
         end
-        args = [step_name, table_or_string].compact
-        invoke(*args)
       end
     end
 

data/spec/cucumber/ast/py_string_spec.rb

@@ -13,7 +13,7 @@ module Cucumber
         it "should return a new py_string with arguments replaced with values" do
           py_string_with_replaced_arg = @ps.arguments_replaced({'<book>' => 'Life is elsewhere', '<qty>' => '5'})
                 
-          py_string_with_replaced_arg.to_s.should == "Life is elsewhere\n5\n"
+          py_string_with_replaced_arg.to_step_definition_arg.should == "Life is elsewhere\n5\n"
         end
         
         it "should not change the original py_string" do
@@ -26,7 +26,7 @@ module Cucumber
           ps = PyString.new("'<book>'")
           py_string_with_replaced_arg = ps.arguments_replaced({'<book>' => nil}) 
           
-          py_string_with_replaced_arg.to_s.should == "''"
+          py_string_with_replaced_arg.to_step_definition_arg.should == "''"
         end
 
         it "should recognise when just a subset of a cell is delimited" do

data/spec/cucumber/ast/step_spec.rb

@@ -59,7 +59,7 @@ module Cucumber
         cells = invocation_table.cells_rows[1]
         step_invocation = step.step_invocation_from_cells(cells)
         
-        step_invocation.instance_variable_get('@multiline_arg').to_s.should == 'taste_juicy color_green'
+        step_invocation.instance_variable_get('@multiline_arg').to_step_definition_arg.should == 'taste_juicy color_green'
       end
     end
   end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 7
   - 0
   - beta
-  - 2
-  version: 0.7.0.beta.2
+  - 3
+  version: 0.7.0.beta.3
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 +02:00
+date: 2010-04-23 00:00:00 +02:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +29,8 @@ dependencies:
         segments: 
         - 1
         - 0
-        - 18
-        version: 1.0.18
+        - 20
+        version: 1.0.20
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -718,7 +718,7 @@ post_install_message: |+
   
                        (::)   U P G R A D I N G    (::)
   
-  Thank you for installing cucumber-0.7.0.beta.2.
+  Thank you for installing cucumber-0.7.0.beta.3.
   Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading
   for important information about this release. Happy cuking!