gherkin 2.11.5-x86-mswin32 → 2.11.6-x86-mswin32

data/.travis.yml

@@ -1,4 +1,4 @@
-before_install: gem install bundler -v 1.2.1
+before_install: gem install bundler -v 1.2.3
 rvm: 
   - 1.9.3
   - 1.9.2

data/History.md

@@ -1,3 +1,16 @@
+## [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)
+* [JavaScript] Fix for JS Lexer ([#215](https://github.com/cucumber/gherkin/pull/215) Alexis Hevia)
+* [JavaScript] Failing JS Features ([#228](https://github.com/cucumber/gherkin/issues/228) Aslak Hellesøy)
+* [Core] Better Slovak ([#208](https://github.com/cucumber/gherkin/pull/208) Michal Kvasnicak)
+* [Core] New: Tatar ([#213](https://github.com/cucumber/gherkin/pull/213) Valeriy Utyaganov)
+* [Core] New: Telugu ([#218](https://github.com/cucumber/gherkin/pull/218) srinivasvedantam)
+* [Core] New: Hindi ([#222](https://github.com/cucumber/gherkin/pull/222) Kumar Harsh)
+* [Java] Fix JSON formatter ([#216](https://github.com/cucumber/gherkin/pull/216), [#195](https://github.com/cucumber/gherkin/pull/195) Joseph Hughes, Rex Hoffman)
+* [Ruby,Java] Gherkin does not seem to parse BOM when feature contains language specification. ([#211](https://github.com/cucumber/gherkin/issues/211), [#212](https://github.com/cucumber/gherkin/pull/212) Rob Westgeest)
+* [Java] Fixed a couple of build problems ([#226](https://github.com/cucumber/gherkin/pull/226), [#227](https://github.com/cucumber/gherkin/pull/227) signed)
+
 ## [2.11.5](https://github.com/cucumber/gherkin/compare/v2.11.4...v2.11.5)
 
 * [Core] Czech translation cleaned a little bit up. ([#202](https://github.com/cucumber/gherkin/pull/202) Jakub Linhart)

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.5</version>
+        <version>2.11.6</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)
@@ -65,8 +65,8 @@ Get the dll from [NuGet](http://nuget.org/List/Packages/gherkin)
 
 ## API Docs
 
-* [Ruby](http://cukes.info/gherkin/api/ruby/latest/)
-* [Java](http://cukes.info/gherkin/api/java/latest/apidocs/index.html)
+* [Ruby](http://cukes.info/api/gherkin/yardoc/)
+* [Java](http://cukes.info/api/gherkin/javadoc/)
 
 ## Hacking: Installing the toolchain
 
@@ -174,7 +174,7 @@ You must also download NuGet.exe from [CodePlex](http://nuget.codeplex.com/relea
 
 Now you can build the .NET dll with:
 
-	mkdir release
+    mkdir release
     rake ikvm
     rake release/nuspec/lib/gherkin.dll
 
@@ -184,7 +184,7 @@ This should build `release/nuspec/lib/gherkin.dll`
 
 In order to build Windows binaries (so we can release Windows gems from OS X/Linux) we first need to install MinGW:
 
-	./install_mingw_os_x.sh
+    ./install_mingw_os_x.sh
 
 Now, make sure you have openssl installed - it's needed to build the rubies.
 
@@ -194,6 +194,9 @@ Next, we're going to install Ruby 1.8.7 and Ruby 1.9.3 for MinGW. We need both v
 OS X Lion (or later) doesn't ship with an LLVM free gcc, which you will need in order to install ruby 1.8.7. We can install it with:
 
     brew install https://raw.github.com/Homebrew/homebrew-dupes/master/apple-gcc42.rb
+    export PATH=/usr/local/mingw/bin:$PATH
+    # Test that it's on your PATH
+    i686-w64-mingw32-gcc -v
 
 For more info see:
 
@@ -205,22 +208,22 @@ Now we're ready to install the Windows rubies:
     unset GHERKIN_JS
 
     # 1.9.3
-    rvm install 1.9.3-p194
-    rvm use 1.9.3-p194
+    rvm install 1.9.3-p362
+    rvm use 1.9.3-p362
     rvm gemset create cucumber
     rvm gemset use cucumber
     gem install bundler
     bundle install
-    PATH=/usr/local/mingw/bin:$PATH CC=/usr/local/mingw/bin/i686-w64-mingw32-gcc rake-compiler cross-ruby VERSION=1.9.3-p194
+    PATH=/usr/local/mingw/bin:$PATH CC=/usr/local/mingw/bin/i686-w64-mingw32-gcc rake-compiler cross-ruby VERSION=1.9.3-p362
 
     # 1.8.7
-    CC=gcc-4.2 rvm install 1.8.7-p352
-    rvm use 1.8.7-p352
+    CC=gcc-4.2 rvm install 1.8.7-p371
+    rvm use 1.8.7-p371
     rvm gemset create cucumber
     rvm gemset use cucumber
     gem install bundler
     bundle install
-    PATH=/usr/local/mingw/bin:$PATH CC=/usr/local/mingw/bin/i686-w64-mingw32-gcc rake-compiler cross-ruby VERSION=1.8.7-p352
+    PATH=/usr/local/mingw/bin:$PATH CC=/usr/local/mingw/bin/i686-w64-mingw32-gcc rake-compiler cross-ruby VERSION=1.8.7-p371
 
 Now you can build Windows gems:
 
@@ -254,20 +257,18 @@ Now we can release:
   * History.md
 * 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.
-* Run `bundle exec rake gems:prepare && ./build_native_gems.sh && bundle exec rake release:ALL`
+* 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 rake ragel:rb to generate all the I18n lexers
+* Run `bundle install` to install dependencies.
+* Run `rake` to make sure all the tests are passing.
 * 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.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)
+* Add tests for it. This is important so I don't break it in a future version unintentionally.
+* Commit, do not mess with History.md.
 * Send me a pull request. Bonus points for topic branches.
 
 ## Copyright
 
-Copyright (c) 2009-2012 Mike Sassak, Gregory Hnatiuk, Aslak Hellesøy. See LICENSE for details.
+Copyright (c) 2009-2013 Mike Sassak, Gregory Hnatiuk, Aslak Hellesøy. See LICENSE for details.

data/cucumber.yml

@@ -2,3 +2,4 @@ default: --format pretty --tags ~@pending,~@wip --strict --color --dotcucumber f
 wip: --format pretty --tags @wip --wip features
 pending: --format pretty --tags @pending,~@native_lexer
 travis: --format pretty --tags ~@cucumber-source-available
+javascript: --format pretty --tags ~@no-javascript

data/features/parser_with_native_lexer.feature

@@ -120,7 +120,7 @@ Feature: Gherkin Feature lexer/parser
         Feature: Documentation is fun
           Scenario Outline: With lots of docs
             We need lots of embedded documentation for some reason 
-            \"\"\" # Not interpreted as a pystring, just plain text
+            \"\"\" # Not interpreted as a docstring, just plain text
             Oh hai
             \"\"\"
       

data/features/pretty_formatter.feature

@@ -9,6 +9,7 @@ Feature: Pretty Formatter
     When I send each prettified original through the "pretty" machinery
     Then the machinery output should be identical to the prettified original
 
+  @no-javascript
   Scenario: Parse all the features in Cucumber with JSON
     Given I have Cucumber's source code next to Gherkin's
     And I find all of the .feature files

data/gherkin.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   # When both are building OK, do a `bundle exec rake install` in both cucumber and gherkin projects, revert the changes in the first 2 steps 
   # and release both projects. Do this for both ruby 1.8.7, ruby 1.9.3 and jruby.
   #
-  s.version     = "2.11.5"
+  s.version     = "2.11.6"
   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}"
@@ -52,26 +52,26 @@ Gem::Specification.new do |s|
     s.files += Dir['lib/gherkin/rb_lexer/*.rb']
     s.files += Dir['ext/**/*.c']
     s.extensions = Dir['ext/**/extconf.rb']
-    s.add_development_dependency('rake-compiler', '>= 0.8.1')
+    s.add_development_dependency('rake-compiler', '>= 0.8.2')
   end
   s.files -= Dir['**/.gitignore']
 
-  s.add_runtime_dependency('json', '>= 1.4.6')
+  s.add_runtime_dependency('json', '>= 1.7.6')
 
   s.add_development_dependency('cucumber', '>= 1.2.1')
-  s.add_development_dependency('rake', '>= 0.9.2')
-  s.add_development_dependency('bundler', '>= 1.2.1') # Make sure it's in sync with /.travis.yml
-  s.add_development_dependency('rspec', '~> 2.11.0')
+  s.add_development_dependency('rake', '>= 10.0.3')
+  s.add_development_dependency('bundler', '>= 1.2.3') # Make sure it's in sync with /.travis.yml
+  s.add_development_dependency('rspec', '~> 2.12.0')
   s.add_development_dependency('rubyzip', '>= 0.9.9')
 
   unless ENV['RUBY_CC_VERSION'] || defined?(JRUBY_VERSION)
-    s.add_development_dependency('therubyracer', '>= 0.10.2') if ENV['GHERKIN_JS']
+    s.add_development_dependency('therubyracer', '>= 0.11.2') if ENV['GHERKIN_JS']
     # For Documentation:
-    s.add_development_dependency('yard', '>= 0.8.2.1')
+    s.add_development_dependency('yard', '>= 0.8.3')
     s.add_development_dependency('rdiscount', '>= 1.6.8')
   end
 
   # Only needed by Cucumber. Remove when Cucumber no longer needs those.
   s.add_development_dependency('term-ansicolor', '>= 1.0.7')
-  s.add_development_dependency('builder', '>= 3.1.3')
+  s.add_development_dependency('builder', '>= 3.1.4')
 end

data/lib/gherkin/README.md

@@ -1,7 +1,7 @@
-The i18n.json file uses "ISO 639-1":http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes and "ISO 3166 alpha-2":http://en.wikipedia.org/wiki/ISO_3166-1 (region - if applicable):
+The i18n.json file uses [ISO 639-1](http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) and [ISO 3166 alpha-2](http://en.wikipedia.org/wiki/ISO_3166-1) (region - if applicable):
 
 If you want several aliases for a keyword, just separate them
-with a | character. The * is a step keyword alias for all translations.
+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.
+If you do *not* want a trailing space after a keyword, end it with a `<` character.
 (See Chinese for examples).

data/lib/gherkin/formatter/hashable.rb

@@ -2,7 +2,13 @@ module Gherkin
   module Formatter
     class Hashable
       def to_hash
-        instance_variables.inject({}) do |hash, ivar|
+        ivars = instance_variables
+        # When tests are runn with therubyracer (JavaScript), an extra field might
+        # exist - added by Ref::WeakReference
+        # https://github.com/bdurand/ref/blob/master/lib/ref/weak_reference/pure_ruby.rb
+        # Remove it - we don't want it in the JSON.
+        ivars.delete(:@__weak_backreferences__)
+        ivars.inject({}) do |hash, ivar|
           value = instance_variable_get(ivar)
           value = value.to_hash if value.respond_to?(:to_hash)
           if Array === value

data/lib/gherkin/formatter/json_formatter.rb

@@ -61,6 +61,17 @@ module Gherkin
       def result(result)
         @current_step_or_hook['result'] = result.to_hash
       end
+      
+      def append_duration(timestamp)
+      	#check to make sure result exists (scenario outlines do not have results yet)
+      	if !@current_step_or_hook['result'].nil?
+        	#convert to nanoseconds
+        	timestamp = timestamp * 1000000000
+        	rshash = @current_step_or_hook['result'].to_hash
+        	rshash['duration'] = timestamp.to_i
+        	@current_step_or_hook['result'] = rshash
+       	end
+      end
 
       def before(match, result)
         add_hook(match, result, "before")

data/lib/gherkin/i18n.json

@@ -237,20 +237,20 @@
 	  "and": "*|Ja",
 	  "but": "*|Kuid"
 	},
-    "fa": {
-        "name": "Persian",
-        "native": "فارسی",
-        "feature": "وِیژگی",
-        "background": "زمینه",
-        "scenario": "سناریو",
-        "scenario_outline": "الگوی سناریو",
-        "examples": "نمونه ها",
-        "given": "*|با فرض",
-        "when": "*|هنگامی",
-        "then": "*|آنگاه",
-        "and": "*|و",
-        "but": "*|اما"
-    },
+	"fa": {
+	  "name": "Persian",
+	  "native": "فارسی",
+	  "feature": "وِیژگی",
+	  "background": "زمینه",
+	  "scenario": "سناریو",
+	  "scenario_outline": "الگوی سناریو",
+	  "examples": "نمونه ها",
+	  "given": "*|با فرض",
+	  "when": "*|هنگامی",
+	  "then": "*|آنگاه",
+	  "and": "*|و",
+	  "but": "*|اما"
+	},
 	"fi": {
 	  "name": "Finnish",
 	  "native": "suomi",
@@ -293,6 +293,20 @@
 	  "and": "*|וגם",
 	  "but": "*|אבל"
 	},
+	"hi": {
+	  "name": "Hindi",
+	  "native": "हिंदी",
+	  "feature": "रूप लेख",
+	  "background": "पृष्ठभूमि",
+	  "scenario": "परिदृश्य",
+	  "scenario_outline": "परिदृश्य रूपरेखा",
+	  "examples": "उदाहरण",
+	  "given": "*|अगर|यदि|चूंकि",
+	  "when": "*|जब",
+	  "then": "*|तब",
+	  "and": "*|और|तथा",
+	  "but": "*|पर"
+	},
 	"hr": {
 	  "name": "Croatian",
 	  "native": "hrvatski",
@@ -534,15 +548,15 @@
 	"sk": {
 	  "name": "Slovak",
 	  "native": "Slovensky",
-	  "feature": "Požiadavka",
+	  "feature": "Požiadavka|Funkcia|Vlastnosť",
 	  "background": "Pozadie",
 	  "scenario": "Scenár",
-	  "scenario_outline": "Náčrt Scenáru",
+	  "scenario_outline": "Náčrt Scenáru|Náčrt Scenára|Osnova Scenára",
 	  "examples": "Príklady",
-	  "given": "*|Pokiaľ",
-	  "when": "*|Keď",
-	  "then": "*|Tak",
-	  "and": "*|A",
+	  "given": "*|Pokiaľ|Za predpokladu",
+	  "when": "*|Keď|Ak",
+	  "then": "*|Tak|Potom",
+	  "and": "*|A|A tiež|A taktiež|A zároveň",
 	  "but": "*|Ale"
 	},
 	"sr-Latn": {
@@ -573,6 +587,20 @@
 	  "and": "*|И",
 	  "but": "*|Али"
 	},
+	"tl": {
+	  "name": "Telugu",
+	  "native": "తెలుగు",
+	  "feature": "గుణము",
+	  "background": "నేపథ్యం",
+	  "scenario": "సన్నివేశం",
+	  "scenario_outline": "కథనం",
+	  "examples": "ఉదాహరణలు",
+	  "given": "*|చెప్పబడినది",
+	  "when": "*|ఈ పరిస్థితిలో",
+	  "then": "*|అప్పుడు",
+	  "and": "*|మరియు",
+	  "but": "*|కాని"
+	},
 	"tr": {
 	  "name": "Turkish",
 	  "native": "Türkçe",
@@ -587,6 +615,20 @@
 	  "and": "*|Ve",
 	  "but": "*|Fakat|Ama"
 	},
+	"tt": {
+	  "name": "Tatar",
+	  "native": "Татарча",
+	  "feature": "Мөмкинлек|Үзенчәлеклелек",
+	  "background": "Кереш",
+	  "scenario": "Сценарий",
+	  "scenario_outline": "Сценарийның төзелеше",
+	  "examples": "Үрнәкләр|Мисаллар",
+	  "given": "*|Әйтик",
+	  "when": "*|Әгәр",
+	  "then": "*|Нәтиҗәдә",
+	  "and": "*|Һәм|Вә",
+	  "but": "*|Ләкин|Әмма"
+	},
 	"uk": {
 	  "name": "Ukrainian",
 	  "native": "Українська",
@@ -657,4 +699,4 @@
 	  "and": "*|而且<|並且<|同時<",
 	  "but": "*|但是<"
 	}
-}
+}