aslakhellesoy-cucumber 0.1.99.17 → 0.1.99.18

data/History.txt

@@ -57,9 +57,24 @@ Scenario Outlines, the rich command line, the nice output format and everything
 pure Ruby users have been enjoying for a while.
 
 == TODO Before 0.2 release
+* Make sure all features and specs pass on Windows, JRuby and Ruby 1.9
 * Verify that custom formatters work - write a feature for it
 * Implement at least a basic HTML formatter
 * Run a single cucumber feature from rake "rake features FEATURE=/path/to/feature:line"
+* Wiki page about running subsets
+** file:line
+*** scenario (or step within)
+*** scenario outline
+*** scenario outline examples
+*** line in an example table
+*** background (same as whole file)
+*** fix bugs in any of those cases (there are some)
+** --tags
+*** Link to page about tags
+* Tags with arguments
+* cucumber.jar + examples
+** Remove need for -S cucumber
+** Full jar and simple jar
 
 == Bugfixes
 * -n option does not suppress the line info for a Scenario Outline (#175 Aslak Hellesøy)
@@ -94,7 +109,7 @@ pure Ruby users have been enjoying for a while.
 * Run cucumber --language LANG help to see keywords for a given language. (Aslak Hellesøy)
 * Multiline arguments (tables and """ strings) are printed in the output. (Aslak Hellesøy)
 * It's no longer necessary to compile the Treetop grammar when adding a new language. Localised parser is generated at runtime. (Aslak Hellesøy)
-* New --guess option tries to guess the best step definition match instead of raising Cucumber::Multiple.  (Jake Howerton)
+* New --guess option tries to guess the best step definition match instead of raising Cucumber::Multiple. (Jake Howerton)
 
 === Removed features
 * "GivenScenario" is gone. Instead you can call Steps from Steps, or wait for "Background (#153)"

data/Manifest.txt

@@ -138,8 +138,9 @@ 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
+examples/tickets/features/177/1.feature
+examples/tickets/features/177/2.feature
+examples/tickets/features/177/3.feature
 examples/tickets/features/180.feature
 examples/tickets/features/lib/eatting_machine.rb
 examples/tickets/features/lib/pantry.rb

data/examples/i18n/README.textile

@@ -3,7 +3,7 @@ h1. Internationalisation (i18n) examples
 Under this directory you'll find examples of Cucumber features written in
 many of the natural languages Cucumber supports. 
 
-For a full list of what languages Cucumber supports - run <pre>cucumber --help</pre>
+For a full list of what languages Cucumber supports - run <pre>cucumber --language help</pre>
 
 h2. Running all the examples
 

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

@@ -0,0 +1,18 @@
+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
+  And there is one Artist named "Pixies"
+  And there is one Venue
+  When I visit the page for the Artist
+  And I follow "add a photo"
+  And I upload an Image
+  # Search on select concert page
+  And I press "Search Pixies concerts" 
+  And I follow "Add a new Concert"
+  And I fill in new Concert information
+  And I press "Preview"
+  And I press "Add concert"
+  # No artists appear in this photo
+  And I press "Submit" 
+  Then my Concert should exist with 1 Image

data/lib/cucumber/cli/language_help_formatter.rb

@@ -4,7 +4,9 @@ module Cucumber
   module Cli
     class LanguageHelpFormatter < Formatter::Pretty
       INCOMPLETE = %{
-This language is incomplete. Please translate the missing words in
+The Cucumber grammar has evolved since this translation was written.
+Please help us complete the translation by translating the missing words in
+
 #{Cucumber::LANGUAGE_FILE}
 
 Then contribute back to the Cucumber project. Details here:
@@ -20,12 +22,11 @@ http://wiki.github.com/aslakhellesoy/cucumber/spoken-languages
       end
 
       def self.list_keywords(io, lang)
-        Cucumber.load_language(lang)
         raw = Cucumber::KEYWORD_KEYS.map do |key|
           [key, Cucumber::LANGUAGES[lang][key]]
         end
         table = Ast::Table.new(raw)
-        new(nil, io, {:incomplete => Cucumber.language_incomplete?}, '').visit_multiline_arg(table, :passed)
+        new(nil, io, {:incomplete => Cucumber.language_incomplete?(lang)}, '').visit_multiline_arg(table, :passed)
       end
 
       def visit_multiline_arg(table, status)

data/lib/cucumber/parser/feature.rb

@@ -879,20 +879,24 @@ module Cucumber
       end
 
       module Step0
+        def comment
+          elements[0]
+        end
+
         def step_keyword
-          elements[1]
+          elements[2]
         end
 
         def name
-          elements[3]
+          elements[4]
         end
 
         def multi
-          elements[5]
+          elements[6]
         end
 
         def white
-          elements[6]
+          elements[7]
         end
       end
 
@@ -915,75 +919,79 @@ module Cucumber
         end
 
         i0, s0 = index, []
-        s1, i1 = [], index
-        loop do
-          r2 = _nt_space
-          if r2
-            s1 << r2
-          else
-            break
-          end
-        end
-        r1 = SyntaxNode.new(input, i1...index, s1)
+        r1 = _nt_comment
         s0 << r1
         if r1
-          r3 = _nt_step_keyword
-          s0 << r3
-          if r3
-            s4, i4 = [], index
-            loop do
-              r5 = _nt_space
-              if r5
-                s4 << r5
-              else
-                break
-              end
+          s2, i2 = [], index
+          loop do
+            r3 = _nt_space
+            if r3
+              s2 << r3
+            else
+              break
             end
-            r4 = SyntaxNode.new(input, i4...index, s4)
+          end
+          r2 = SyntaxNode.new(input, i2...index, s2)
+          s0 << r2
+          if r2
+            r4 = _nt_step_keyword
             s0 << r4
             if r4
-              r6 = _nt_line_to_eol
-              s0 << r6
-              if r6
-                i7 = index
-                s8, i8 = [], index
-                loop do
-                  r9 = _nt_eol
-                  if r9
-                    s8 << r9
-                  else
-                    break
-                  end
-                end
-                if s8.empty?
-                  self.index = i8
-                  r8 = nil
-                else
-                  r8 = SyntaxNode.new(input, i8...index, s8)
-                end
-                if r8
-                  r7 = r8
+              s5, i5 = [], index
+              loop do
+                r6 = _nt_space
+                if r6
+                  s5 << r6
                 else
-                  r10 = _nt_eof
-                  if r10
-                    r7 = r10
-                  else
-                    self.index = i7
-                    r7 = nil
-                  end
+                  break
                 end
+              end
+              r5 = SyntaxNode.new(input, i5...index, s5)
+              s0 << r5
+              if r5
+                r7 = _nt_line_to_eol
                 s0 << r7
                 if r7
-                  r12 = _nt_multiline_arg
-                  if r12
-                    r11 = r12
+                  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
+                  if r9
+                    r8 = r9
                   else
-                    r11 = SyntaxNode.new(input, index...index)
+                    r11 = _nt_eof
+                    if r11
+                      r8 = r11
+                    else
+                      self.index = i8
+                      r8 = nil
+                    end
                   end
-                  s0 << r11
-                  if r11
-                    r13 = _nt_white
-                    s0 << r13
+                  s0 << r8
+                  if r8
+                    r13 = _nt_multiline_arg
+                    if r13
+                      r12 = r13
+                    else
+                      r12 = SyntaxNode.new(input, index...index)
+                    end
+                    s0 << r12
+                    if r12
+                      r14 = _nt_white
+                      s0 << r14
+                    end
                   end
                 end
               end

data/lib/cucumber/parser/feature.tt

@@ -116,7 +116,7 @@ module Cucumber
       end
 
       rule step
-        space* step_keyword space* name:line_to_eol (eol+ / eof) multi:multiline_arg? white {
+        comment space* step_keyword space* name:line_to_eol (eol+ / eof) multi:multiline_arg? white {
           def build
             if multi.respond_to?(:build)
               Ast::Step.new(step_keyword.line, step_keyword.text_value, name.text_value, multi.build)

data/lib/cucumber/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.1.99.17
+  version: 0.1.99.18
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -202,8 +202,9 @@ files:
 - examples/tickets/Rakefile
 - examples/tickets/cucumber.yml
 - examples/tickets/features/172.feature
-- examples/tickets/features/177-1.feature
-- examples/tickets/features/177-2.feature
+- examples/tickets/features/177/1.feature
+- examples/tickets/features/177/2.feature
+- examples/tickets/features/177/3.feature
 - examples/tickets/features/180.feature
 - examples/tickets/features/lib/eatting_machine.rb
 - examples/tickets/features/lib/pantry.rb