gherkin 2.11.2-java → 2.11.3-java

data/.travis.yml

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

data/History.md

@@ -1,3 +1,12 @@
+## [2.11.3](https://github.com/cucumber/gherkin/compare/v2.11.2...v2.11.3)
+
+* [.NET] Upgraded IKVM from 0.46.0.1 to 7.1.4532.2 - quite a version bump! (Aslak Hellesøy)
+* [JavaScript] Added a README to prevent npm warnings. (Aslak Hellesøy)
+* [Ruby] Don't use C++ style comments. ([#191](https://github.com/cucumber/gherkin/pull/191) Sam Goldman)
+* [Core] Fix for Australian language support ([#196](https://github.com/cucumber/gherkin/pull/196) hogfish)
+* [Ruby] Add encoding option to IO.read ([#190](https://github.com/cucumber/gherkin/pull/190), [#192](https://github.com/cucumber/gherkin/issues/192) [#194](https://github.com/cucumber/gherkin/pull/194) HUANG Wei, Levin Alexander)
+* [JavaScript] Can't run on IE because of `const` keyword ([#186](https://github.com/cucumber/gherkin/issues/186) Aslak Hellesøy)
+
 ## [2.11.2](https://github.com/cucumber/gherkin/compare/v2.11.1...v2.11.2)
 
 * [Java] Depend on an external gherkin-jvm-deps jar with repackaged dependencies (Aslak Hellesøy, Rex Hoffman)

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.2</version>
+        <version>2.11.3</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)
@@ -251,6 +251,7 @@ Now we can release:
   * gherkin.gemspec
   * java/pom.xml
   * js/package.json
+  * 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`

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.2"
+  s.version     = "2.11.3"
   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,7 +52,7 @@ 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.0')
+    s.add_development_dependency('rake-compiler', '>= 0.8.1')
   end
   s.files -= Dir['**/.gitignore']
 
@@ -60,7 +60,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('cucumber', '>= 1.2.1')
   s.add_development_dependency('rake', '>= 0.9.2')
-  s.add_development_dependency('bundler', '>= 1.1.5')
+  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('rubyzip', '>= 0.9.9')
 
@@ -73,5 +73,5 @@ Gem::Specification.new do |s|
 
   # 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', '>= 2.1.2')
+  s.add_development_dependency('builder', '>= 3.1.3')
 end

data/lib/gherkin/i18n.json

@@ -128,16 +128,16 @@
 	"en-au": {
 	  "name": "Australian",
 	  "native": "Australian",
-	  "feature": "Crikey",
-	  "background": "Background",
-	  "scenario": "Mate",
-	  "scenario_outline": "Blokes",
-	  "examples": "Cobber",
-	  "given": "*|Ya know how",
-	  "when": "*|When",
-	  "then": "*|Ya gotta",
-	  "and": "*|N",
-	  "but": "*|Cept"
+	  "feature": "Pretty much",
+	  "background": "First off",
+	  "scenario": "Awww, look mate",
+	  "scenario_outline": "Reckon it's like",
+	  "examples": "You'll wanna",
+	  "given": "*|Y'know",
+	  "when": "*|It's just unbelievable",
+	  "then": "*|But at the end of the day I reckon",
+	  "and": "*|Too right",
+	  "but": "*|Yeah nah"
 	},
 	"en-lol": {
 	  "name": "LOLCAT",

data/lib/gherkin/i18n.rb

@@ -11,7 +11,7 @@ module Gherkin
     FEATURE_ELEMENT_KEYS = %w{feature background scenario scenario_outline examples}
     STEP_KEYWORD_KEYS    = %w{given when then and but}
     KEYWORD_KEYS         = FEATURE_ELEMENT_KEYS + STEP_KEYWORD_KEYS
-    LANGUAGES            = JSON.parse(IO.read(File.dirname(__FILE__) + '/i18n.json'))
+    LANGUAGES            = JSON.parse(File.open(File.dirname(__FILE__) + '/i18n.json', 'r:utf-8').read)
 
     class << self
       include Rubify

data/ragel/lexer.c.rl.erb

@@ -221,14 +221,14 @@ static VALUE rb_eGherkinLexingError;
         buff = data;
       }
 
-      // Allocate as a ruby string so that it gets cleaned up by GC
+      /* Allocate as a ruby string so that it gets cleaned up by GC */
       newstr_val = rb_str_new(buff, len);
       newstr = RSTRING_PTR(newstr_val);
 
 
       for (count = 0; count < len; count++) {
         if(buff[count] == 10) {
-          newstr[newstr_count] = '\0'; // terminate new string at first newline found
+          newstr[newstr_count] = '\0'; /* terminate new string at first newline found */
           break;
         } else {
           if (buff[count] == '%') {
@@ -242,7 +242,7 @@ static VALUE rb_eGherkinLexingError;
       }
 
       line = lexer->line_number;
-      lexer_init(lexer); // Re-initialize so we can scan again with the same lexer
+      lexer_init(lexer); /* Re-initialize so we can scan again with the same lexer */
       raise_lexer_error(newstr, line);
     } else {
       rb_funcall(listener, rb_intern("eof"), 0);
@@ -260,7 +260,7 @@ static VALUE
 unindent(VALUE con, int start_col)
 {
   VALUE re;
-  // Gherkin will crash gracefully if the string representation of start_col pushes the pattern past 32 characters
+  /* Gherkin will crash gracefully if the string representation of start_col pushes the pattern past 32 characters */
   char pat[32]; 
   snprintf(pat, 32, "^[\t ]{0,%d}", start_col); 
   re = rb_reg_regcomp(rb_str_new2(pat));
@@ -428,7 +428,7 @@ static VALUE CLexer_scan(VALUE self, VALUE input)
     assert(lexer->content_start <= len && "content starts after data end");
     assert(lexer->mark < len && "mark is after data end");
     
-    // Reset lexer by re-initializing the whole thing
+    /* Reset lexer by re-initializing the whole thing */
     lexer_init(lexer);
 
     if (cs == lexer_error) {

data/tasks/apidoc.rake

@@ -0,0 +1,32 @@
+unless ENV['RUBY_CC_VERSION'] || defined?(JRUBY_VERSION)
+  require 'yard'
+  require 'yard/rake/yardoc_task'
+
+  SITE_DIR = File.expand_path(File.dirname(__FILE__) + '/../../cucumber.github.com')
+  API_DIR  = File.join(SITE_DIR, 'api', 'gherkin', GHERKIN_VERSION)
+
+  namespace :api do
+    file :dir do
+      raise "You need to git clone git@github.com:cucumber/cucumber.github.com.git #{SITE_DIR}" unless File.directory?(SITE_DIR)
+      mkdir_p API_DIR
+    end
+
+    YARD::Templates::Engine.register_template_path(File.expand_path(File.join(File.dirname(__FILE__), 'yard')))
+    YARD::Rake::YardocTask.new(:yard) do |yard|
+      dir = File.join(API_DIR, 'ruby')
+      mkdir_p dir
+      yard.options = ["--out", dir]
+    end
+    task :yard => :dir
+
+    task :mvn_javadoc => :dir do
+      Dir.chdir('java') do
+        sh("mvn javadoc:javadoc")
+        dir = File.join(API_DIR, 'java')
+        mv 'target/site/apidocs', dir
+      end
+    end
+
+    task :doc => [:mvn_javadoc, :yard]
+  end
+end

data/tasks/ikvm.rake

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 namespace :ikvm do
-  IKVM_VERSION    = '0.46.0.1'
+  IKVM_VERSION    = '7.1.4532.2'
   IKVM_DIR        = "ikvm/ikvm-#{IKVM_VERSION}"
   IKVM_ZIP        = "ikvm/ikvmbin-#{IKVM_VERSION}.zip"
   CLOBBER.include(IKVM_DIR, IKVM_ZIP)

data/tasks/ragel_task.rb

@@ -31,6 +31,7 @@ class RagelTask
         # Ragel chokes if we put the escaped triple quotes in .rl, so we'll do the replace with sed after the fact. Lots of backslashes!!
         sed = Config::CONFIG['host_os'] =~ /linux/i ? "sed -i" : "sed -i ''"
         sh %{#{sed} 's/ESCAPED_TRIPLE_QUOTE/\\\\\\\\\\\\"\\\\\\\\\\\\"\\\\\\\\\\\\"/' #{target}}
+        sh %{#{sed} 's/const/var/' #{target}}
         
         # Minify
         sh %{node #{UGLIFYJS} #{target} > #{min_target}}

data/tasks/release.rake

@@ -1,6 +1,6 @@
 namespace :release do
   desc 'Upload all packages and tag git'
-  task :ALL => ['gems:sanity', 'ikvm:check', :mvn_deploy_jar, :mvn_deploy_site, :push_native_gems, :push_npm_package, 'ikvm:push', :release, :push_yard, :symlink_docs, :post_release]
+  task :ALL => ['gems:sanity', 'ikvm:check', :mvn_deploy_jar, :mvn_deploy_site, :push_native_gems, :push_npm_package, 'ikvm:push', :release, 'api:doc', :post_release]
 
   desc 'Push all gems to rubygems.org'
   task :push_native_gems do
@@ -22,28 +22,10 @@ namespace :release do
     end
   end
   
-  desc 'Push javadocs to cukes.info'
-  task :mvn_deploy_site do
-    Dir.chdir('java') do
-      sh("mvn site:site site:deploy")
-    end
-  end
-
   desc 'Push npm package to http://npmjs.org/'
   task :push_npm_package do
     Dir.chdir('js') do
       sh("npm publish")
     end
   end
-  
-  desc 'Push yardoc to http://cukes.info/gherkin/api/#{GHERKIN_VERSION}'
-  task :push_yard => :yard do
-    sh("tar czf release/api-#{GHERKIN_VERSION}.tgz -C doc .")
-    sh("scp release/api-#{GHERKIN_VERSION}.tgz cukes.info:/var/www/gherkin/api/ruby")
-  end
-
-  task :symlink_docs do
-    sh("ssh cukes.info 'cd /var/www/gherkin/api/ruby && mkdir #{GHERKIN_VERSION} && tar xzf api-#{GHERKIN_VERSION}.tgz -C #{GHERKIN_VERSION} && rm -f latest && ln -s #{GHERKIN_VERSION} latest'")
-    sh("ssh cukes.info 'cd /var/www/gherkin/api/java && rm -f latest && ln -s #{GHERKIN_VERSION} latest'")
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.11.2
+  version: 2.11.3
   prerelease: 
 platform: java
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 3.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -188,7 +188,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 3.1.3
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: []
@@ -314,6 +314,7 @@ files:
 - spec/gherkin/shared/tags_group.rb
 - spec/gherkin/tag_expression_spec.rb
 - spec/spec_helper.rb
+- tasks/apidoc.rake
 - tasks/bench.rake
 - tasks/bench/feature_builder.rb
 - tasks/bench/null_listener.rb
@@ -324,7 +325,6 @@ files:
 - tasks/ragel_task.rb
 - tasks/release.rake
 - tasks/rspec.rake
-- tasks/yard.rake
 - tasks/yard/default/layout/html/bubble_32x32.png
 - tasks/yard/default/layout/html/bubble_48x48.png
 - tasks/yard/default/layout/html/footer.erb
@@ -357,7 +357,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: gherkin-2.11.2
+summary: gherkin-2.11.3
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature

data/tasks/yard.rake

@@ -1,7 +0,0 @@
-unless ENV['RUBY_CC_VERSION'] || defined?(JRUBY_VERSION)
-require 'yard'
-require 'yard/rake/yardoc_task'
-
-YARD::Templates::Engine.register_template_path(File.expand_path(File.join(File.dirname(__FILE__), 'yard')))
-YARD::Rake::YardocTask.new(:yard)
-end