gherkin 2.5.1-x86-mingw32 → 2.5.2-x86-mingw32

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gherkin (2.5.1)
+    gherkin (2.5.2)
       json (>= 1.4.6)
 
 GEM
@@ -29,8 +29,8 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    term-ansicolor (1.0.6)
-    therubyracer (0.9.4)
+    term-ansicolor (1.0.7)
+    therubyracer (0.9.8)
       libv8 (~> 3.3.10)
     yard (0.7.2)
 
@@ -39,7 +39,7 @@ PLATFORMS
 
 DEPENDENCIES
   builder (>= 2.1.2)
-  bundler (>= 1.0.18)
+  bundler (>= 1.0.21)
   cucumber (>= 1.1.0)
   gherkin!
   rake (>= 0.9.2)
@@ -47,5 +47,5 @@ DEPENDENCIES
   rdiscount (>= 1.6.8)
   rspec (>= 2.6.0)
   term-ansicolor (>= 1.0.6)
-  therubyracer (>= 0.9.4)
+  therubyracer (>= 0.9.8)
   yard (>= 0.7.2)

data/History.md

@@ -1,3 +1,12 @@
+## [2.5.2](https://github.com/cucumber/gherkin/compare/v2.5.1...v2.5.2)
+
+### New Features
+
+* Added synonyms for Portuguese. (Rodrigo Dumont)
+* Added synonyms for Italian. (Alessandro Mencarini)
+* Added synonyms for Spanish. (Nahuel Garbezza)
+* Added synonyms for French. (Julein Biezemans)
+
 ## [2.5.1](https://github.com/cucumber/gherkin/compare/v2.5.0...v2.5.1)
 
 ### New Features

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/cucumber/gherkin.png)](http://travis-ci.org/cucumber/gherkin)
+
 A fast lexer and parser for the Gherkin language based on Ragel. Gherkin is two things:
 
 * The language that has evolved out of the Cucumber project.
@@ -52,7 +54,7 @@ The jar file is in the central Maven repo.
     <dependency>
         <groupId>info.cukes</groupId>
         <artifactId>gherkin</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)
@@ -207,9 +209,9 @@ Make sure you have openssl installed first.
   * java/pom.xml
   * ikvm/Gherkin/Gherkin.csproj (2 places)
   * js/package.json
-* Run bundle update, so Gemfile.lock gets updated with the changes.
+* Run `bundle update`, so Gemfile.lock gets updated with the changes.
 * Commit changes, otherwise you will get an error at the end when a tag is made.
-* bundle exec rake gems:prepare && ./build_native_gems.sh && bundle exec rake release:ALL
+* Run `bundle exec rake gems:prepare && ./build_native_gems.sh && bundle exec rake release:ALL`
   * The specs intermittently fail with a segfault from therubyracer. Running specs can be disabled with SKIP_JS_SPECS=true
 * Announce on Cucumber list, IRC and Twitter.
 

data/gherkin.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "gherkin"
-  s.version     = "2.5.1"
+  s.version     = "2.5.2"
   s.authors     = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Hellesøy"]
   s.description = "A fast Gherkin lexer/parser based on the Ragel State Machine Compiler."
   s.summary     = "#{s.name}-#{s.version}"
@@ -43,16 +43,15 @@ Gem::Specification.new do |s|
   end
   s.files -= Dir['**/.gitignore']
 
-  # Hack because json is released as two different versions for MRI and JRuby :-/
-  s.add_dependency('json', '>= 1.4.6')
+  s.add_runtime_dependency('json', '>= 1.4.6')
 
   s.add_development_dependency('cucumber', '>= 1.1.0')
   s.add_development_dependency('rake', '>= 0.9.2')
-  s.add_development_dependency('bundler', '>= 1.0.18')
+  s.add_development_dependency('bundler', '>= 1.0.21')
   s.add_development_dependency('rspec', '>= 2.6.0')
 
   unless ENV['RUBY_CC_VERSION'] || defined?(JRUBY_VERSION)
-    s.add_development_dependency('therubyracer', '>= 0.9.4') if ENV['GHERKIN_JS']
+    s.add_development_dependency('therubyracer', '>= 0.9.8') if ENV['GHERKIN_JS']
     # For Documentation:
     s.add_development_dependency('yard', '>= 0.7.2')
     s.add_development_dependency('rdiscount', '>= 1.6.8')

data/lib/gherkin/i18n.yml

@@ -204,7 +204,7 @@
   scenario: Escenario
   scenario_outline: Esquema del escenario
   examples: Ejemplos
-  given: "*|Dado"
+  given: "*|Dado|Dada|Dados|Dadas"
   when: "*|Cuando"
   then: "*|Entonces"
   and: "*|Y"
@@ -243,7 +243,7 @@
   scenario: Scénario
   scenario_outline: Plan du scénario|Plan du Scénario
   examples: Exemples
-  given: "*|Soit|Etant donné"
+  given: "*|Soit|Etant donné|Etant donnée|Etant donnés|Etant données|Étant donné|Étant donnée|Étant donnés|Étant données"
   when: "*|Quand|Lorsque|Lorsqu'<"
   then: "*|Alors"
   and: "*|Et"
@@ -306,7 +306,7 @@
   feature: Eiginleiki
   background: Bakgrunnur
   scenario: Atburðarás
-  scenario_outline: Lýsing Atburðarásar|Lýsing Dæma 
+  scenario_outline: Lýsing Atburðarásar|Lýsing Dæma
   examples: Dæmi|Atburðarásir
   given: "*|Ef"
   when: "*|Þegar"
@@ -321,7 +321,7 @@
   scenario: Scenario
   scenario_outline: Schema dello scenario
   examples: Esempi
-  given: "*|Dato"
+  given: "*|Dato|Data|Dati|Date"
   when: "*|Quando"
   then: "*|Allora"
   and: "*|E"
@@ -438,7 +438,7 @@
   scenario: Cenário|Cenario
   scenario_outline: Esquema do Cenário|Esquema do Cenario
   examples: Exemplos
-  given: "*|Dado"
+  given: "*|Dado|Dada|Dados|Dadas"
   when: "*|Quando"
   then: "*|Então|Entao"
   and: "*|E"

data/spec/gherkin/fixtures/i18n_fr2.feature

@@ -0,0 +1,8 @@
+#language:fr
+Fonctionnalité: i18n
+
+  Scénario: Le French
+    Etant donné qqch
+    Etant donnée qqch 
+    Etant donnés qqch
+    Etant données qqch

data/spec/gherkin/i18n_spec.rb

@@ -26,6 +26,21 @@ module Gherkin
         ]
       end
 
+      it "should recognize keywords that are a little ambiguous" do
+        lexer = Gherkin::Lexer::I18nLexer.new(@listener, false)
+        scan_file(lexer, "i18n_fr2.feature")
+        @listener.to_sexp.should == [
+          [:comment, "#language:fr", 1],
+          [:feature, "Fonctionnalité", "i18n", "", 2],
+          [:scenario, "Scénario", "Le French", "", 4],
+          [:step, "Etant donné ", "qqch", 5],
+          [:step, "Etant donnée ", "qqch", 6],
+          [:step, "Etant donnés ", "qqch", 7],
+          [:step, "Etant données ", "qqch", 8],
+          [:eof]
+        ]
+      end
+
       it "should parse languages without a space after keywords" do
         lexer = Gherkin::Lexer::I18nLexer.new(@listener, false)
         scan_file(lexer, "i18n_zh-CN.feature")
@@ -130,21 +145,21 @@ module Gherkin
 
         it "should print keywords for a given language" do
           ("\n" + Gherkin::I18n.get('fr').keyword_table).should == %{
-      | feature          | "Fonctionnalité"                       |
-      | background       | "Contexte"                             |
-      | scenario         | "Scénario"                             |
-      | scenario_outline | "Plan du scénario", "Plan du Scénario" |
-      | examples         | "Exemples"                             |
-      | given            | "* ", "Soit ", "Etant donné "          |
-      | when             | "* ", "Quand ", "Lorsque ", "Lorsqu'"  |
-      | then             | "* ", "Alors "                         |
-      | and              | "* ", "Et "                            |
-      | but              | "* ", "Mais "                          |
-      | given (code)     | "Soit", "Etantdonné"                   |
-      | when (code)      | "Quand", "Lorsque", "Lorsqu"           |
-      | then (code)      | "Alors"                                |
-      | and (code)       | "Et"                                   |
-      | but (code)       | "Mais"                                 |
+      | feature          | "Fonctionnalité"                                                                                                                                      |
+      | background       | "Contexte"                                                                                                                                            |
+      | scenario         | "Scénario"                                                                                                                                            |
+      | scenario_outline | "Plan du scénario", "Plan du Scénario"                                                                                                                |
+      | examples         | "Exemples"                                                                                                                                            |
+      | given            | "* ", "Soit ", "Etant donné ", "Etant donnée ", "Etant donnés ", "Etant données ", "Étant donné ", "Étant donnée ", "Étant donnés ", "Étant données " |
+      | when             | "* ", "Quand ", "Lorsque ", "Lorsqu'"                                                                                                                 |
+      | then             | "* ", "Alors "                                                                                                                                        |
+      | and              | "* ", "Et "                                                                                                                                           |
+      | but              | "* ", "Mais "                                                                                                                                         |
+      | given (code)     | "Soit", "Etantdonné", "Etantdonnée", "Etantdonnés", "Etantdonnées", "Étantdonné", "Étantdonnée", "Étantdonnés", "Étantdonnées"                        |
+      | when (code)      | "Quand", "Lorsque", "Lorsqu"                                                                                                                          |
+      | then (code)      | "Alors"                                                                                                                                               |
+      | and (code)       | "Et"                                                                                                                                                  |
+      | but (code)       | "Mais"                                                                                                                                                |
 }
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
   prerelease: 
 platform: x86-mingw32
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-23 00:00:00.000000000Z
+date: 2011-10-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2164923900 !ruby/object:Gem::Requirement
+  requirement: &2168628280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2164923900
+  version_requirements: *2168628280
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2164923160 !ruby/object:Gem::Requirement
+  requirement: &2168623680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2164923160
+  version_requirements: *2168623680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164922380 !ruby/object:Gem::Requirement
+  requirement: &2168621600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,21 +45,21 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2164922380
+  version_requirements: *2168621600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164921160 !ruby/object:Gem::Requirement
+  requirement: &2168620020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.18
+        version: 1.0.21
   type: :development
   prerelease: false
-  version_requirements: *2164921160
+  version_requirements: *2168620020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164920300 !ruby/object:Gem::Requirement
+  requirement: &2168600960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,21 +67,21 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2164920300
+  version_requirements: *2168600960
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2164919340 !ruby/object:Gem::Requirement
+  requirement: &2168574960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *2164919340
+  version_requirements: *2168574960
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2164918600 !ruby/object:Gem::Requirement
+  requirement: &2168554280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2164918600
+  version_requirements: *2168554280
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2164917420 !ruby/object:Gem::Requirement
+  requirement: &2168550460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2164917420
+  version_requirements: *2168550460
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2164916620 !ruby/object:Gem::Requirement
+  requirement: &2168547300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2164916620
+  version_requirements: *2168547300
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2164915540 !ruby/object:Gem::Requirement
+  requirement: &2168531700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,7 +122,7 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *2164915540
+  version_requirements: *2168531700
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: []
@@ -211,6 +211,7 @@ files:
 - spec/gherkin/fixtures/examples_with_only_header.feature
 - spec/gherkin/fixtures/hantu_pisang.feature
 - spec/gherkin/fixtures/i18n_fr.feature
+- spec/gherkin/fixtures/i18n_fr2.feature
 - spec/gherkin/fixtures/i18n_no.feature
 - spec/gherkin/fixtures/i18n_zh-CN.feature
 - spec/gherkin/fixtures/scenario_outline_with_tags.feature
@@ -376,7 +377,7 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: gherkin-2.5.1
+summary: gherkin-2.5.2
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature
@@ -403,6 +404,7 @@ test_files:
 - spec/gherkin/fixtures/examples_with_only_header.feature
 - spec/gherkin/fixtures/hantu_pisang.feature
 - spec/gherkin/fixtures/i18n_fr.feature
+- spec/gherkin/fixtures/i18n_fr2.feature
 - spec/gherkin/fixtures/i18n_no.feature
 - spec/gherkin/fixtures/i18n_zh-CN.feature
 - spec/gherkin/fixtures/scenario_outline_with_tags.feature