gherkin 1.0.1 → 1.0.2

data/.mailmap

@@ -0,0 +1,2 @@
+Gregory Hnatiuk <ghnatiuk@gmail.com>
+Mike Sassak <msassak@gmail.com>

data/History.txt

@@ -0,0 +1,9 @@
+== 1.0.2 (2009-12-30)
+
+== Bugfixes
+* Build passes on Ruby 1.9.2 (Aslak Hellesøy)
+
+== New features
+* New command line based on trollop. Commands: reformat, stats. (Aslak Hellesøy)
+* I18nLexer#scan sets #language to the I18n for the language scanned (Mike Sassak)
+* I18n#adverbs, brings I18n to parity with Cucumber::Parser::NaturalLanguage (Mike Sassak)

data/README.rdoc

@@ -1,54 +1,25 @@
 = Gherkin
 
-Fast Gherkin lexer based on Ragel. 
+Fast Gherkin lexer and parser based on Ragel. Gherkin is two things:
 
-Gherkin is the language that has evolved out of the Cucumber project. Cucumber currently uses
-Treetop, which is too slow for larger projects.
+* The language that has evolved out of the Cucumber project.
+* This library
 
-This project will *not* include code to build an AST. Instead, this lexer will have an API
-that makes it possible to plug in a builder that can build an AST.
-
-== Testing
+== Running RSpec and Cucumber tests
 
 rake clean spec cucumber
 
-== Cleaning generated code
-
-rake clobber
-
 == Release process
 
-Run just "rake clean spec cucumber" for each platform (1.8.6, 1.8.7, 1.9, jruby) to make sure all is green.
-
-1) rvm 1.8.7
-2) Bump version in the VERSION file
-3) rake clean jar compile
-2) rake gemspec
-3) git commit -a -m "Release vX.Y.Z"
-4) rake release
-5) ./nativegems.sh
-6) gem push pkg/... (for each native gem)
-
-TODO: Also build windows gem with dll using rake-compiler. MinGW gem can be done on OS X/Linux, but
-the one for the old Ruby one-click installers must be built with Visual Studio/nmake.
-
-== Build windows gems on OS X
-
-* http://www.copiousfreetime.org/articles/2008/10/12/building-gems-for-windows.html
-* rake-compiler docs
-
-== Notes
-
-Ragel supports Ruby, but it's much slower than C. The ruby target will be used for development.
-The final version will use C for MRI and Java for JRuby.
-
-== Ragel links
-
-* http://www.complang.org/ragel/
-* http://dev.sipdoc.net/attachments/2/ragel_talk.pdf 
-* http://lambda-the-ultimate.org/node/1125
-* http://www.zedshaw.com/essays/ragel_state_charts.html
-* http://www.devchix.com/2008/01/13/a-hello-world-for-ruby-on-ragel-60/
+* Run "rake clean spec cucumber" for each platform (1.8.6, 1.8.7, 1.9, jruby) to make sure all is green.
+* rvm 1.8.7
+* Bump version in the VERSION file
+* rake clean jar compile
+* rake gemspec
+* git commit -a -m "Release vX.Y.Z"
+* rake release
+* ./nativegems.sh
+* gem push pkg/... (for each native gem)
 
 == Note on Patches/Pull Requests
  
@@ -57,7 +28,7 @@ The final version will use C for MRI and Java for JRuby.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
   future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
+* Commit, do not mess with Rakefile, VERSION, or History.txt.
   (if you want to have your own version, that is fine but
    bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.

data/Rakefile

@@ -8,28 +8,24 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "gherkin"
-    gem.summary = %Q{Fast Gherkin lexer}
-    gem.description = %Q{A fast Gherkin lexer in Ragel}
+    gem.summary = %Q{Fast Gherkin lexer/parser}
+    gem.description = %Q{A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.}
     gem.email = "cukes@googlegroups.com"
     gem.homepage = "http://github.com/aslakhellesoy/gherkin"
     gem.authors = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Hellesøy"]
-    gem.default_executable = "gherkin"
-    gem.executables = ["gherkin", "gherkin-purdy"]
-    gem.add_development_dependency "rspec", "1.2.9"
-    gem.add_development_dependency "cucumber", "0.4.4"
-    gem.add_development_dependency "rake-compiler", "0.6.0" unless defined?(JRUBY_VERSION)
+    gem.executables = ["gherkin"]
+    gem.add_dependency "trollop", ">= 1.15"
+    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "cucumber", ">= 0.5.1"
+    gem.add_development_dependency "rake-compiler", ">= 0.7.0" unless defined?(JRUBY_VERSION)
     
     case ENV['PLATFORM']
-    when 'universal-java-1.5'
-      gem.platform = 'universal-java-1.5'
+    when 'java'
+      gem.platform = 'java'
       gem.files += FileList['lib/gherkin.jar']
       gem.extensions = []
-    when 'i386-mswin32'
-      gem.platform = 'i386-mswin32'
-      gem.files += FileList['lib/*.so']
-      gem.extensions = []
-    when 'i386-mingw32'
-      gem.platform = 'i386-mingw32'
+    when 'i386-mswin32', 'i386-mingw32'
+      gem.platform = ENV['PLATFORM']
       gem.files += FileList['lib/*.so']
       gem.extensions = []
     else
@@ -42,10 +38,10 @@ begin
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+  warn "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+Dir['tasks/**/*.rake'].each { |rake| load File.expand_path(rake) }
 
 task :default  => [:spec, :cucumber]
 task :spec     => defined?(JRUBY_VERSION) ? :jar : :compile

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 1
+:patch: 2
 :major: 1

data/bin/gherkin

@@ -1,10 +1,5 @@
 #!/usr/bin/env ruby
 $:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
 
-require 'gherkin'
-require 'gherkin/tools/pretty_printer'
-
-listener = Gherkin::Tools::PrettyPrinter.new(STDOUT)
-parser = Gherkin::Parser.new(listener, true) # We could skip the parser here, if we don't want to verify well-formedness
-lexer = Gherkin::I18nLexer.new(parser)
-lexer.scan(IO.read(ARGV[0]))
+require 'gherkin/cli/main'
+Gherkin::Cli::Main.run(ARGV)

data/features/feature_parser.feature

@@ -3,9 +3,9 @@ Feature: Gherkin Feature lexer
   In order to make it easy to control the Gherkin syntax
   As a Gherkin developer bent on Gherkin world-domination
   I want a feature lexer that uses a feature parser to
-    make all the syntax decisions for me
+  make all the syntax decisions for me
 
-  Background:
+  Background: 
     Given a "en", "ruby" "root" parser
 
   Scenario: Correctly formed feature
@@ -22,13 +22,13 @@ Feature: Gherkin Feature lexer
         Background: 
           Given I have a transmogrifier
           And I am a member of G.R.O.S.S
-        
+      
         Scenario: Whoozit to whatzit transmogrification
           Given I have a whoozit
           When I put it in the transmogrifier
           And I press the "transmogrify" button
           Then I should have a whatzit
-
+      
         Scenario Outline: Imaginary Beings
           Given I have a <boring being>
           When I transmogrify it with the incantation:
@@ -36,7 +36,7 @@ Feature: Gherkin Feature lexer
           ALAKAZAM!
           \"\"\"
           Then I should have an <exciting being>
-
+      
           Examples:
           | boring being | exciting being |
           | Sparrow      | Alicanto       |
@@ -60,8 +60,8 @@ Feature: Gherkin Feature lexer
           When I read it
           Then I should be amused
       """
-   Then there should be no parse errors
-   
+    Then there should be no parse errors
+
   Scenario: Keyword before feature
     Given the following text is parsed:
       """
@@ -91,7 +91,7 @@ Feature: Gherkin Feature lexer
         Then it shouldn't work
       """
     Then there should be parse errors on lines 5, 10 and 12
-      
+
   Scenario: Tables
     Given the following text is parsed:
       """
@@ -124,48 +124,48 @@ Feature: Gherkin Feature lexer
             \"\"\" # Not interpreted as a pystring, just plain text
             Oh hai
             \"\"\"
-
+      
             La la la
-
+      
             Examples:
             | one | two |
             | foo | bar |
-
+      
             \"\"\"
             Oh Hello
             \"\"\"
- 
+      
             # Body of the scenario outline starts below
             Given <something> 
             And something <else>
- 
+      
             # The real examples table
             Examples: 
             | something | else |
             | orange | apple |
       """
-      Then there should be no parse errors
+    Then there should be no parse errors
 
   Scenario: Scenario Outline with multiple Example groups
     Given the following text is parsed:
       """
       Feature: Outline Sample
-
+      
         Scenario: I have no steps
-
+      
         Scenario Outline: Test state
           Given <state> without a table
           Given <other_state> without a table
-
+      
           Examples: Rainbow colours
-            |  state   | other_state |
-            | missing |  passing|
-            | passing| passing |
-            | failing | passing |
+            | state   | other_state |
+            | missing | passing     |
+            | passing | passing     |
+            | failing | passing     |
           
           Examples: Only passing
-            |  state   | other_state |
-            | passing  | passing |
+            | state   | other_state |
+            | passing | passing     |
       """
     Then there should be no parse errors
 
@@ -175,20 +175,20 @@ Feature: Gherkin Feature lexer
       Feature: Test
         Scenario Outline: with step tables
           Given I have the following fruits in my pantry
-            |    name     | quantity |
-            | cucumbers   |    10    |
-            | strawberrys |    5     |
-            | apricots    |    7     |
-
+            | name        | quantity |
+            | cucumbers   | 10       |
+            | strawberrys | 5        |
+            | apricots    | 7        |
+      
           When I eat <number> <fruits> from the pantry
           Then I should have <left> <fruits> in the pantry
-
+      
           Examples:
-            | number |   fruits   | left |
-            |   2    | cucumbers  |  8   |
-            |   4    | strawberrys|  1   |
-            |   2    | apricots   |  5   |
-
+            | number | fruits      | left |
+            | 2      | cucumbers   | 8    |
+            | 4      | strawberrys | 1    |
+            | 2      | apricots    | 5    |
+      
         Scenario Outline: placeholder in a multiline string
           Given my shopping list
             \"\"\"
@@ -198,9 +198,9 @@ Feature: Gherkin Feature lexer
             \"\"\"
               Must buy some cucumbers
             \"\"\"
-    
+      
           Examples:
-            |  fruits   |
+            | fruits    |
             | cucumbers |
       """
     Then there should be no parse errors

data/features/native_lexer.feature

@@ -1,6 +1,6 @@
 Feature: Native (C/Java) Lexer
 
-  Background:
+  Background: 
     Given a "en", "native" "root" parser
 
   Scenario: Parsing an empty feature
@@ -9,7 +9,7 @@ Feature: Native (C/Java) Lexer
       Feature: blah
       """
     Then there should be no parse errors
-  
+
   Scenario: Parsing a comment
     Given the following text is parsed:
       """

data/features/parser_with_native_lexer.feature

@@ -4,7 +4,7 @@ Feature: Gherkin Feature lexer/parser
   I want a feature lexer that uses a feature parser to
   make all the syntax decisions for me
 
-  Background:
+  Background: 
     Given a "en", "native" "root" parser
 
   Scenario: Correctly formed feature
@@ -27,7 +27,7 @@ Feature: Gherkin Feature lexer/parser
           When I put it in the transmogrifier
           And I press the "transmogrify" button
           Then I should have a whatzit
-
+      
         Scenario Outline: Imaginary Beings
           Given I have a <boring being>
           When I transmogrify it with the incantation:
@@ -35,7 +35,7 @@ Feature: Gherkin Feature lexer/parser
           ALAKAZAM!
           \"\"\"
           Then I should have an <exciting being>
-
+      
           Examples:
           | boring being | exciting being |
           | Sparrow      | Alicanto       |
@@ -59,8 +59,8 @@ Feature: Gherkin Feature lexer/parser
           When I read it
           Then I should be amused
       """
-   Then there should be no parse errors
-   
+    Then there should be no parse errors
+
   Scenario: Keyword before feature
     When the following text is parsed:
       """
@@ -90,7 +90,7 @@ Feature: Gherkin Feature lexer/parser
         Then it shouldn't work
       """
     Then there should be parse errors on lines 5, 10 and 12
-      
+
   Scenario: Tables
     When the following text is parsed:
       """
@@ -123,44 +123,44 @@ Feature: Gherkin Feature lexer/parser
             \"\"\" # Not interpreted as a pystring, just plain text
             Oh hai
             \"\"\"
-
+      
             La la la
-
+      
             Examples:
             | one | two |
             | foo | bar |
-
+      
             \"\"\"
             Oh Hello
             \"\"\"
- 
+      
             # Body of the scenario outline starts below
             Given <something> 
             And something <else>
- 
+      
             # The real examples table
             Examples: 
             | something | else |
             | orange | apple |
       """
-      Then there should be no parse errors
+    Then there should be no parse errors
 
   Scenario: Scenario Outline with multiple Example groups
     When the following text is parsed:
       """
       Feature: Outline Sample
-
+      
         Scenario: I have no steps
-
+      
         Scenario Outline: Test state
           Given <state> without a table
           Given <other_state> without a table
-
+      
           Examples: Rainbow colours
-            |  state   | other_state |
-            | missing |  passing|
-            | passing| passing |
-            | failing | passing |
+            | state   | other_state |
+            | missing | passing     |
+            | passing | passing     |
+            | failing | passing     |
           
           Examples: Only passing
             |  state   | other_state |
@@ -174,20 +174,20 @@ Feature: Gherkin Feature lexer/parser
       Feature: Test
         Scenario Outline: with step tables
           Given I have the following fruits in my pantry
-            |    name     | quantity |
-            | cucumbers   |    10    |
-            | strawberrys |    5     |
-            | apricots    |    7     |
-
+            | name        | quantity |
+            | cucumbers   | 10       |
+            | strawberrys | 5        |
+            | apricots    | 7        |
+      
           When I eat <number> <fruits> from the pantry
           Then I should have <left> <fruits> in the pantry
-
+      
           Examples:
-            | number |   fruits   | left |
-            |   2    | cucumbers  |  8   |
-            |   4    | strawberrys|  1   |
-            |   2    | apricots   |  5   |
-
+            | number | fruits      | left |
+            | 2      | cucumbers   | 8    |
+            | 4      | strawberrys | 1    |
+            | 2      | apricots    | 5    |
+      
         Scenario Outline: placeholder in a multiline string
           Given my shopping list
             \"\"\"
@@ -197,9 +197,9 @@ Feature: Gherkin Feature lexer/parser
             \"\"\"
               Must buy some cucumbers
             \"\"\"
-    
+      
           Examples:
-            |  fruits   |
+            | fruits    |
             | cucumbers |
       """
     Then there should be no parse errors