gherkin 2.6.0-x86-mswin32 → 2.6.1-x86-mswin32

data/.travis.yml

@@ -0,0 +1,14 @@
+rvm: 
+  - 1.9.3
+  - 1.9.2
+  - 1.8.7
+# whitelist
+branches:
+  only:
+    - master
+# Needed to build lexers
+before_script: sudo apt-get install -y ragel
+
+notifications:
+  email:
+    - cukes-devs@googlegroups.com

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gherkin (2.6.0)
+    gherkin (2.6.1)
       json (>= 1.4.6)
 
 GEM

data/History.md

@@ -1,3 +1,9 @@
+## [2.6.1](https://github.com/cucumber/gherkin/compare/v2.6.0...v2.6.1)
+
+### Bugfixes
+
+* Fixed a regression on 1.8.7 (Aslak Hellesøy)
+
 ## [2.6.0](https://github.com/cucumber/gherkin/compare/v2.5.4...v2.6.0)
 
 ### Changed Features

data/README.md

@@ -54,7 +54,7 @@ The jar file is in the central Maven repo.
     <dependency>
         <groupId>info.cukes</groupId>
         <artifactId>gherkin</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)

data/cucumber.yml

@@ -1,3 +1,4 @@
 default: --format pretty --tags ~@pending,~@wip --strict --color features
 wip: --format pretty --tags @wip --wip features
 pending: --format pretty --tags @pending,~@native_lexer
+travis: --format pretty --tags ~@cucumber-source-available

data/features/pretty_formatter.feature

@@ -1,3 +1,4 @@
+@cucumber-source-available
 Feature: Pretty Formatter
   In order to have pretty gherkin
   I want to verify that all prettified cucumber features parse OK

data/features/step_definitions/gherkin_steps.rb

@@ -16,7 +16,7 @@ end
 
 Then /^there should be parse errors on (lines .*)$/ do |lines|
   lines.each do |line|
-    Then "there should be a parse error on line #{line}"
+    step "there should be a parse error on line #{line}"
   end
 end
 

data/gherkin.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.name        = "gherkin"
   # If bumping the major version here, comment out the cucumber dependency below and uncomment in the Gemfile to build against a local cucumber.
-  s.version     = "2.6.0"
+  s.version     = "2.6.1"
   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}"

data/lib/gherkin/i18n.yml

@@ -1,12 +1,11 @@
 # encoding: UTF-8
 #
-# We use ISO 639-1 (language) and ISO 3166 alpha-2 (region - if appliccable):
+# We use ISO 639-1 (language) and ISO 3166 alpha-2 (region - if applicable):
 # http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
 # http://en.wikipedia.org/wiki/ISO_3166-1
 #
 # If you want several aliases for a keyword, just separate them
-# with a | character. Make sure there are no ambiguities in the
-# keywords.
+# with a | character. The * is a step keyword alias for all translations.
 #
 # If you do *not* want a trailing space after a keyword, end it with a < character.
 # (See Chinese for examples).

data/lib/gherkin/listener/formatter_listener.rb

@@ -57,7 +57,7 @@ module Gherkin
 
       def step(keyword, name, line)
         replay_step_or_examples
-        @stash.basic_statement do |comments|
+        @stash.basic_statement do |comments, id|
           @current_builder = Formatter::Model::Step::Builder.new(comments, keyword, name, line)
         end
       end

data/tasks/cucumber.rake

@@ -3,7 +3,8 @@ unless ENV['RUBY_CC_VERSION']
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber) do |t|
-  t.cucumber_opts = "--profile default"
+  profile = ENV['TRAVIS'] ? 'travis' : 'default'
+  t.cucumber_opts = "--profile #{profile}"
 end
 
 namespace :cucumber do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
   prerelease: 
 platform: x86-mswin32
 authors:
@@ -15,7 +15,7 @@ date: 2011-10-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156121220 !ruby/object:Gem::Requirement
+  requirement: &2168558660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2156121220
+  version_requirements: *2168558660
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156106120 !ruby/object:Gem::Requirement
+  requirement: &2168536400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *2156106120
+  version_requirements: *2168536400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156083380 !ruby/object:Gem::Requirement
+  requirement: &2168535720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2156083380
+  version_requirements: *2168535720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156044640 !ruby/object:Gem::Requirement
+  requirement: &2168534840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 1.0.21
   type: :development
   prerelease: false
-  version_requirements: *2156044640
+  version_requirements: *2168534840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156026560 !ruby/object:Gem::Requirement
+  requirement: &2168533700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2156026560
+  version_requirements: *2168533700
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2156022440 !ruby/object:Gem::Requirement
+  requirement: &2168532360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *2156022440
+  version_requirements: *2168532360
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156000840 !ruby/object:Gem::Requirement
+  requirement: &2168531180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2156000840
+  version_requirements: *2168531180
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2155995480 !ruby/object:Gem::Requirement
+  requirement: &2168529620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2155995480
+  version_requirements: *2168529620
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2155987580 !ruby/object:Gem::Requirement
+  requirement: &2168473540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2155987580
+  version_requirements: *2168473540
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2155980820 !ruby/object:Gem::Requirement
+  requirement: &2168472040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,7 +122,7 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *2155980820
+  version_requirements: *2168472040
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: []
@@ -135,6 +135,7 @@ files:
 - .rbenv-gemsets
 - .rspec
 - .rvmrc
+- .travis.yml
 - .yardopts
 - Gemfile
 - Gemfile.lock
@@ -377,7 +378,7 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: gherkin-2.6.0
+summary: gherkin-2.6.1
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature