gherkin 2.11.6-x86-mingw32 → 2.11.7-x86-mingw32

data/.travis.yml

@@ -1,7 +1,6 @@
 before_install: gem install bundler -v 1.2.3
 rvm: 
   - 1.9.3
-  - 1.9.2
   - 1.8.7
   - jruby
 # whitelist

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 gemspec
 
 # gem 'cucumber', :path => '../cucumber'

data/History.md

@@ -1,3 +1,16 @@
+## [2.11.7](https://github.com/cucumber/gherkin/compare/v2.11.6...v2.11.7)
+
+* [Java, JRuby] Fix ArrayOutOfBoundException in JSONFormatter ([#239](https://github.com/cucumber/gherkin/issues/239) Joseph Hughes)
+* [Java, Ruby] JSONFormatter outputs prettyfied json (Oleg Sukhodolsky)
+* [Java, JRuby] JSONFormatter.appendDuration(), TagExpression.isEmpty() added to match ruby versions ([#234](https://github.com/cucumber/gherkin/issues/234) Oleg Sukhodolsky)
+* [Core] New: Greek ([#237](https://github.com/cucumber/gherkin/issues/237), [#244](https://github.com/cucumber/gherkin/issues/244) Konstantinos Rousis)
+* [Core] New: Old English (Englisc) added ([#240](https://github.com/cucumber/gherkin/issues/240), [#241](https://github.com/cucumber/gherkin/issues/241) Sean Miller)
+* [JRuby] fixed problem with passing StringIO to PrettyFormatter (Oleg Sukhodolsky)
+* [Ruby] MultiJson is used insted of JSon ([#235](https://github.com/cucumber/gherkin/issues/235) Erik Michaels-Ober)
+* [Ruby] TagExpression.eval() deprecated, TagExpression.evaluate() added to replace it. ([#238](https://github.com/cucumber/gherkin/issues/238) Oleg Sukhodolsky)
+* [Ruby] File name is displayed on parse error ([#247](https://github.com/cucumber/gherkin/issues/247), [#248](https://github.com/cucumber/gherkin/issues/248) @lukaso)
+* [Java, JRuby] Fix IndexOutOfBound exception in PrettyFormatter ([#175](https://github.com/cucumber/gherkin/issues/175), [#242](https://github.com/cucumber/gherkin/issues/242) Matheus Neves, Oleg Sukhodolsky)
+
 ## [2.11.6](https://github.com/cucumber/gherkin/compare/v2.11.5...v2.11.6)
 
 * [JavaScript] Add duration value to json formatter ([#204](https://github.com/cucumber/gherkin/pull/204) Rick Beyer)

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.11.6</version>
+        <version>2.11.7</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)
@@ -128,6 +128,7 @@ In order to build and test Gherkin for JavaScript you must install:
 
 * Node.js (0.6.17 or higher with npm)
 * Ragel with JavaScript support: http://github.com/dominicmarks/ragel-js
+  * Make sure you have gcc/g++ 4.6 (4.7 is to strict to build ragel-js)
   * Make sure you have `autoconf` and `automake` (`brew install automake`)
   * Make sure you have the official ragel (`brew install ragel`)
   * Make sure you have kelbt (`brew install kelbt`). If that fails, install manually from http://www.complang.org/kelbt/
@@ -135,9 +136,13 @@ In order to build and test Gherkin for JavaScript you must install:
   * `make && make install`
 * Define the GHERKIN_JS environment variable in your shell (any value will do)
 
+Update gems (to install gems which are needed only for js support):
+
+    bundle update
+
 Now you can build the JavaScript with:
 
-    rake js
+    bundle exec rake js
 
 And you can try it out with node.js:
 
@@ -171,6 +176,7 @@ You must also download NuGet.exe from [CodePlex](http://nuget.codeplex.com/relea
 
     # The key is at https://nuget.org/account
     mono --runtime=v4.0.30319 /usr/local/nuget/NuGet.exe SetApiKey xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx
+    (Note: you may need to run 'mozroots --import --sync' to help mono trusts https setificate, see http://monomvc.wordpress.com/2012/03/06/nuget-on-mono/ for more information)
 
 Now you can build the .NET dll with:
 
@@ -251,7 +257,7 @@ Now we can release:
 * Make sure GHERKIN_JS is defined (see JavaScript section above)
 * Bump version in:
   * This file (Installation/Java section)
-  * gherkin.gemspec
+  * lib/gherkin/platform.rb
   * java/pom.xml
   * js/package.json
   * History.md
@@ -260,7 +266,7 @@ Now we can release:
 * Run `i686-w64-mingw32-gcc -v && bundle exec rake gems:prepare && ./build_native_gems.sh && bundle exec rake release:ALL`
 
 ## Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Run `bundle install` to install dependencies.
 * Run `rake` to make sure all the tests are passing.

data/examples/parse_and_output_json.rb

@@ -1,7 +1,7 @@
 require 'gherkin/parser/parser'
 require 'gherkin/formatter/json_formatter'
 require 'stringio'
-require 'json'
+require 'multi_json'
 
 # This example reads a couple of features and outputs them as JSON.
 
@@ -16,4 +16,4 @@ sources.each do |s|
 end
 
 formatter.done
-puts JSON.pretty_generate(JSON.parse(io.string))
+puts MultiJson.dump(MultiJson.load(io.string), :pretty => true)

data/features/.cucumber/stepdefs.json

@@ -1,243 +1,243 @@
 [
   {
-    "file_colon_line": "features/step_definitions/eyeball_steps.rb:1",
-    "flags": "",
     "source": "^they have arrived$",
+    "flags": "",
+    "file_colon_line": "features/step_definitions/eyeball_steps.rb:1",
     "steps": [
       {
+        "name": "they have arrived",
         "args": [
 
-        ],
-        "name": "they have arrived"
+        ]
       }
     ]
   },
   {
-    "file_colon_line": "features/step_definitions/gherkin_steps.rb:1",
-    "flags": "",
     "source": "^a \"(ruby|native)\" \"([^\\\"]*)\" parser$",
+    "flags": "",
+    "file_colon_line": "features/step_definitions/gherkin_steps.rb:1",
     "steps": [
 
     ]
   },
   {
-    "file_colon_line": "features/step_definitions/gherkin_steps.rb:5",
-    "flags": "",
     "source": "^the\\ following\\ text\\ is\\ parsed:$",
+    "flags": "",
+    "file_colon_line": "features/step_definitions/gherkin_steps.rb:5",
     "steps": [
       {
+        "name": "the following text is parsed:",
         "args": [
 
-        ],
-        "name": "the following text is parsed:"
+        ]
       }
     ]
   },
   {
-    "file_colon_line": "features/step_definitions/gherkin_steps.rb:9",
-    "flags": "",
     "source": "^there\\ should\\ be\\ no\\ parse\\ errors$",
+    "flags": "",
+    "file_colon_line": "features/step_definitions/gherkin_steps.rb:9",
     "steps": [
       {
+        "name": "there should be no parse errors",
         "args": [
 
-        ],
-        "name": "there should be no parse errors"
+        ]
       }
     ]
   },
   {
-    "file_colon_line": "features/step_definitions/gherkin_steps.rb:13",
-    "flags": "",
     "source": "^there should be a parse error on (line \\d+)$",
+    "flags": "",
+    "file_colon_line": "features/step_definitions/gherkin_steps.rb:13",
     "steps": [
       {
+        "name": "there should be a parse error on line 1",
         "args": [
           {
             "offset": 33,
             "val": "line 1"
           }
-        ],
-        "name": "there should be a parse error on line 1"
+        ]
       }
     ]
   },
   {
-    "file_colon_line": "features/step_definitions/gherkin_steps.rb:17",
-    "flags": "",
     "source": "^there should be parse errors on (lines .*)$",
+    "flags": "",
+    "file_colon_line": "features/step_definitions/gherkin_steps.rb:17",
     "steps": [
       {
+        "name": "there should be parse errors on lines 1 and 2",
         "args": [
           {
             "offset": 32,
             "val": "lines 1 and 2"
           }
-        ],
-        "name": "there should be parse errors on lines 1 and 2"
+        ]
       },
       {
+        "name": "there should be parse errors on lines 1 through 3",
         "args": [
           {
             "offset": 32,
             "val": "lines 1 through 3"
           }
-        ],
-        "name": "there should be parse errors on lines 1 through 3"
+        ]
       },
       {
+        "name": "there should be parse errors on lines 10 and 17",
         "args": [
           {
             "offset": 32,
             "val": "lines 10 and 17"
           }
-        ],
-        "name": "there should be parse errors on lines 10 and 17"
+        ]
       },
       {
+        "name": "there should be parse errors on lines 3 and 5",
         "args": [
           {
             "offset": 32,
             "val": "lines 3 and 5"
           }
-        ],
-        "name": "there should be parse errors on lines 3 and 5"
+        ]
       },
       {
+        "name": "there should be parse errors on lines 5, 10 and 12",
         "args": [
           {
             "offset": 32,
             "val": "lines 5, 10 and 12"
           }
-        ],
-        "name": "there should be parse errors on lines 5, 10 and 12"
+        ]
       }
     ]
   },
   {
-    "file_colon_line": "features/step_definitions/json_formatter_steps.rb:13",
-    "flags": "",
     "source": "^a JSON formatter$",
+    "flags": "",
+    "file_colon_line": "features/step_definitions/json_formatter_steps.rb:13",
     "steps": [
 
     ]
   },
   {
-    "file_colon_line": "features/step_definitions/json_formatter_steps.rb:18",
-    "flags": "",
     "source": "^the outputted JSON should be:$",
+    "flags": "",
+    "file_colon_line": "features/step_definitions/json_formatter_steps.rb:18",
     "steps": [
       {
+        "name": "the outputted JSON should be:",
         "args": [
 
-        ],
-        "name": "the outputted JSON should be:"
+        ]
       }
     ]
   },
   {
-    "file_colon_line": "features/step_definitions/json_parser_steps.rb:5",
-    "flags": "",
     "source": "^a PrettyFormatter$",
+    "flags": "",
+    "file_colon_line": "features/step_definitions/json_parser_steps.rb:6",
     "steps": [
 
     ]
   },
   {
-    "file_colon_line": "features/step_definitions/json_parser_steps.rb:10",
-    "flags": "",
     "source": "^a JSON lexer$",
+    "flags": "",
+    "file_colon_line": "features/step_definitions/json_parser_steps.rb:11",
     "steps": [
 
     ]
   },
   {
-    "file_colon_line": "features/step_definitions/json_parser_steps.rb:14",
-    "flags": "",
     "source": "^the following JSON is parsed:$",
+    "flags": "",
+    "file_colon_line": "features/step_definitions/json_parser_steps.rb:15",
     "steps": [
       {
+        "name": "the following JSON is parsed:",
         "args": [
 
-        ],
-        "name": "the following JSON is parsed:"
+        ]
       }
     ]
   },
   {
-    "file_colon_line": "features/step_definitions/json_parser_steps.rb:18",
-    "flags": "",
     "source": "^the outputted text should be:$",
+    "flags": "",
+    "file_colon_line": "features/step_definitions/json_parser_steps.rb:19",
     "steps": [
       {
+        "name": "the outputted text should be:",
         "args": [
 
-        ],
-        "name": "the outputted text should be:"
+        ]
       }
     ]
   },
   {
-    "file_colon_line": "features/step_definitions/pretty_formatter_steps.rb:50",
-    "flags": "",
     "source": "^I have Cucumber's source code next to Gherkin's$",
+    "flags": "",
+    "file_colon_line": "features/step_definitions/pretty_formatter_steps.rb:50",
     "steps": [
       {
+        "name": "I have Cucumber's source code next to Gherkin's",
         "args": [
 
-        ],
-        "name": "I have Cucumber's source code next to Gherkin's"
+        ]
       }
     ]
   },
   {
-    "file_colon_line": "features/step_definitions/pretty_formatter_steps.rb:55",
-    "flags": "",
     "source": "^I find all of the \\.feature files$",
+    "flags": "",
+    "file_colon_line": "features/step_definitions/pretty_formatter_steps.rb:55",
     "steps": [
       {
+        "name": "I find all of the .feature files",
         "args": [
 
-        ],
-        "name": "I find all of the .feature files"
+        ]
       }
     ]
   },
   {
-    "file_colon_line": "features/step_definitions/pretty_formatter_steps.rb:59",
-    "flags": "",
     "source": "^I send each prettified original through the \"([^\"]*)\" machinery$",
+    "flags": "",
+    "file_colon_line": "features/step_definitions/pretty_formatter_steps.rb:59",
     "steps": [
       {
+        "name": "I send each prettified original through the \"json\" machinery",
         "args": [
           {
             "offset": 45,
             "val": "json"
           }
-        ],
-        "name": "I send each prettified original through the \"json\" machinery"
+        ]
       },
       {
+        "name": "I send each prettified original through the \"pretty\" machinery",
         "args": [
           {
             "offset": 45,
             "val": "pretty"
           }
-        ],
-        "name": "I send each prettified original through the \"pretty\" machinery"
+        ]
       }
     ]
   },
   {
-    "file_colon_line": "features/step_definitions/pretty_formatter_steps.rb:83",
-    "flags": "",
     "source": "^the machinery output should be identical to the prettified original$",
+    "flags": "",
+    "file_colon_line": "features/step_definitions/pretty_formatter_steps.rb:83",
     "steps": [
       {
+        "name": "the machinery output should be identical to the prettified original",
         "args": [
 
-        ],
-        "name": "the machinery output should be identical to the prettified original"
+        ]
       }
     ]
   }

data/features/step_definitions/json_formatter_steps.rb

@@ -16,13 +16,13 @@ Given /^a JSON formatter$/ do
 end
 
 Then /^the outputted JSON should be:$/ do |expected_json|
-  require 'json'
+  require 'multi_json'
   @formatter.done
   actual_json = @out.string
   puts actual_json
-  puts JSON.pretty_generate(JSON.parse(actual_json))
-  expected = JSON.parse(expected_json)
-  actual   = JSON.parse(actual_json)
+  puts MultiJson.dump(MultiJson.load(actual_json), :pretty => true)
+  expected = MultiJson.load(expected_json)
+  actual   = MultiJson.load(actual_json)
   actual.should == expected
 end
 

data/features/step_definitions/json_parser_steps.rb

@@ -1,6 +1,7 @@
 require 'stringio'
 require 'gherkin/formatter/pretty_formatter'
 require 'gherkin/json_parser'
+require 'multi_json'
 
 Given /^a PrettyFormatter$/ do
   @io = StringIO.new
@@ -12,7 +13,7 @@ Given /^a JSON lexer$/ do
 end
 
 Given /^the following JSON is parsed:$/ do |text|
-  @json_parser.parse(JSON.pretty_generate(JSON.parse(text)))
+  @json_parser.parse(MultiJson.dump(MultiJson.load(text), :pretty => true))
 end
 
 Then /^the outputted text should be:$/ do |expected_text|