gherkin 2.11.7-java → 2.11.8-java

data/.ruby-gemset

@@ -0,0 +1 @@
+cucumber

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p194

data/History.md

@@ -1,3 +1,9 @@
+## [2.11.8](https://github.com/cucumber/gherkin/compare/v2.11.7...v2.11.8)
+
+* [Core] Added Galician (gl) ([#249](https://github.com/cucumber/gherkin/pull/249) son-cativo)
+* [Java, JRuby] Set default i18n when create Parser ([#229](https://github.com/cucumber/gherkin/pull/229) Tomohiko Himura)
+* [Java, JRuby] Filter out code keywords starting with a number: `I18n.code_keywords`. (Aslak Hellesøy)
+
 ## [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)

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.7</version>
+        <version>2.11.8</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)
@@ -150,7 +150,7 @@ And you can try it out with node.js:
 
 Or the json formatter:
 
-    node js/example/json_fomratter_example.js
+    node js/example/json_formatter_example.js
 
 If you're hacking and just want to rebuild the English parser:
 
@@ -214,19 +214,17 @@ Now we're ready to install the Windows rubies:
     unset GHERKIN_JS
 
     # 1.9.3
-    rvm install 1.9.3-p362
-    rvm use 1.9.3-p362
-    rvm gemset create cucumber
-    rvm gemset use cucumber
+    rvm install 1.9.3-p392
+    rvm use 1.9.3-p392
+    rvm gemset use cucumber --create
     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-p362
+    PATH=/usr/local/mingw/bin:$PATH CC=/usr/local/mingw/bin/i686-w64-mingw32-gcc rake-compiler cross-ruby VERSION=1.9.3-p392
 
     # 1.8.7
     CC=gcc-4.2 rvm install 1.8.7-p371
     rvm use 1.8.7-p371
-    rvm gemset create cucumber
-    rvm gemset use cucumber
+    rvm gemset use cucumber --create
     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-p371

data/gherkin.gemspec

@@ -60,14 +60,14 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('multi_json', '~> 1.3')
 
-  s.add_development_dependency('cucumber', '>= 1.2.1')
+  s.add_development_dependency('cucumber', '>= 1.2.5')
   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('rspec', '~> 2.13.0')
   s.add_development_dependency('rubyzip', '>= 0.9.9')
 
   unless ENV['RUBY_CC_VERSION'] || Gherkin::JRUBY
-    s.add_development_dependency('therubyracer', '>= 0.11.2') if ENV['GHERKIN_JS']
+    s.add_development_dependency('therubyracer', '>= 0.11.4') if ENV['GHERKIN_JS']
     # For Documentation:
     s.add_development_dependency('yard', '>= 0.8.3')
     s.add_development_dependency('rdiscount', '>= 1.6.8')

data/install_mingw_os_x.sh

@@ -1,7 +1,5 @@
 #!/bin/sh
-
 mkdir -p /usr/local/mingw
-cd /usr/local/mingw
-# Don't attempt any of the newer versions - they don't work (gcc 4.7.0)
-wget http://downloads.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Automated%20Builds/mingw-w32-1.0-bin_i686-darwin_20110819.tar.bz2
-tar xvfj mingw-w32-1.0-bin_i686-darwin_20110819.tar.bz2
+
+# We need GCC 4.7 in order to build ruby 1.8.7. When we drop support for that we can use a more recent one
+cd /usr/local/mingw && curl --silent --location http://downloads.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Automated%20Builds/mingw-w32-1.0-bin_i686-darwin_20120227.tar.bz2 | tar xvj

data/lib/gherkin/i18n.json

@@ -307,6 +307,20 @@
 	  "and": "*|Et",
 	  "but": "*|Mais"
 	},
+	"gl": {
+	  "name": "Galician",
+	  "native": "galego",
+	  "background": "Contexto",
+	  "feature": "Característica",
+	  "scenario": "Escenario",
+	  "scenario_outline": "Esbozo do escenario",
+	  "examples": "Exemplos",
+	  "given": "*|Dado|Dada|Dados|Dadas",
+	  "when": "*|Cando",
+	  "then": "*|Entón|Logo",
+	  "and": "*|E",
+	  "but": "*|Mais|Pero"
+	},
 	"he": {
 	  "name": "Hebrew",
 	  "native": "עברית",

data/lib/gherkin/i18n.rb

@@ -131,6 +131,7 @@ module Gherkin
     def code_keywords
       result = step_keywords.map{|keyword| self.class.code_keyword_for(keyword)}
       result.delete('*')
+      result.delete_if {|kw| kw =~ /^\d/}
       result
     end
 

data/lib/gherkin/lexer/i18n_lexer.rb

@@ -14,9 +14,10 @@ module Gherkin
       LANGUAGE_PATTERN = /^(\xEF\xBB\xBF)?\s*#\s*language\s*:\s*([a-zA-Z\-]+)/ #:nodoc:
       attr_reader :i18n_language
 
-      def initialize(listener, force_ruby=false)
+      def initialize(listener, force_ruby=false, iso_code='en')
         @listener = listener
         @force_ruby = force_ruby
+        @iso_code = iso_code
       end
 
       def scan(source)
@@ -31,7 +32,7 @@ module Gherkin
       end
 
       def lang(source)
-        key = 'en'
+        key = @iso_code
         source.each_line do |line|
           break unless COMMENT_OR_EMPTY_LINE_PATTERN =~ line
           if LANGUAGE_PATTERN =~ line

data/lib/gherkin/parser/parser.rb

@@ -15,13 +15,13 @@ module Gherkin
       native_impl('gherkin')
 
       # Initialize the parser. +machine_name+ refers to a state machine table.
-      def initialize(formatter, raise_on_error=true, machine_name='root', force_ruby=false)
+      def initialize(formatter, raise_on_error=true, machine_name='root', force_ruby=false, iso_code = 'en')
         @formatter = formatter
         @listener = Listener::FormatterListener.new(@formatter)
         @raise_on_error = raise_on_error
         @machine_name = machine_name
         @machines = []
-        @lexer = Gherkin::Lexer::I18nLexer.new(self, force_ruby)
+        @lexer = Gherkin::Lexer::I18nLexer.new(self, force_ruby, iso_code)
       end
 
       def parse(gherkin, feature_uri, line_offset)

data/lib/gherkin/platform.rb

@@ -2,7 +2,7 @@
 
 module Gherkin
 unless defined?(Gherkin::VERSION)
-  VERSION       = '2.11.7'
+  VERSION       = '2.11.8'
   JRUBY         = defined?(JRUBY_VERSION)
 
   if !JRUBY && !(RUBY_VERSION =~ /^(1\.8\.7|1\.9\.3|2\.0)/)

data/spec/gherkin/i18n_spec.rb

@@ -189,6 +189,7 @@ module Gherkin
       | fa        | Persian             | فارسی             |
       | fi        | Finnish             | suomi             |
       | fr        | French              | français          |
+      | gl        | Galician            | galego            |
       | he        | Hebrew              | עברית             |
       | hi        | Hindi               | हिंदी             |
       | hr        | Croatian            | hrvatski          |
@@ -241,6 +242,11 @@ module Gherkin
       | but (code)       | "Mais"                                                                                                                                                |
 }
         end
+
+        it "should not list keywords that start with a number" do
+          Gherkin::I18n.get('en-old').code_keywords.should include("Ðaðe")
+          Gherkin::I18n.get('en-old').code_keywords.should_not include("7")
+        end
       end
     end
   end

data/spec/gherkin/lexer/i18n_lexer_spec.rb

@@ -4,39 +4,57 @@ require 'spec_helper'
 module Gherkin
   module Lexer
     describe I18nLexer do
-      before do
-        @lexer = Gherkin::Lexer::I18nLexer.new(Gherkin::SexpRecorder.new, false)
-      end
+      context "when default ios_code is 'en'" do
+        before do
+          @lexer = Gherkin::Lexer::I18nLexer.new(Gherkin::SexpRecorder.new, false)
+        end
 
-      it "should store the i18n language of the last scanned feature" do
-        @lexer.scan("# language: fr\n")
-        @lexer.i18n_language.iso_code.should == "fr"
-        @lexer.scan("# language: no\n")
-        @lexer.i18n_language.iso_code.should == "no"
-      end
+        it "should store the i18n language of the last scanned feature" do
+          @lexer.scan("# language: fr\n")
+          @lexer.i18n_language.iso_code.should == "fr"
+          @lexer.scan("# language: no\n")
+          @lexer.i18n_language.iso_code.should == "no"
+        end
 
-      it "should detect language when there are spaces and CRLF" do
-        @lexer.scan("# language: da  \r\n")
-        @lexer.i18n_language.iso_code.should == "da"
-      end
+        it "should detect language when there are spaces and CRLF" do
+          @lexer.scan("# language: da  \r\n")
+          @lexer.i18n_language.iso_code.should == "da"
+        end
 
-      it "should detect language when the language comment is not the first line" do
-        @lexer.scan("# hello\n# language: no\n")
-        @lexer.i18n_language.iso_code.should == "no"
-      end
+        it "should detect language when the language comment is not the first line" do
+          @lexer.scan("# hello\n# language: no\n")
+          @lexer.i18n_language.iso_code.should == "no"
+        end
 
-      it "should detect language when the language is on the third line, and there are empty lines above" do
-        @lexer.scan("# hello\n\n# language: no\n")
-        @lexer.i18n_language.iso_code.should == "no"
-      end
+        it "should detect language when the language is on the third line, and there are empty lines above" do
+          @lexer.scan("# hello\n\n# language: no\n")
+          @lexer.i18n_language.iso_code.should == "no"
+        end
+
+        it "should use English i18n by default" do
+          @lexer.scan("Feature: foo\n")
+          @lexer.i18n_language.iso_code.should == "en"
+        end
 
-      it "should use English i18n by default" do
-        @lexer.scan("Feature: foo\n")
-        @lexer.i18n_language.iso_code.should == "en"
+        it "should === its ruby class, even when the impl is Java" do
+          Gherkin::Lexer::I18nLexer.should === Gherkin::Lexer::I18nLexer.new(Gherkin::SexpRecorder.new, true)
+        end
       end
 
-      it "should === its ruby class, even when the impl is Java" do
-        Gherkin::Lexer::I18nLexer.should === Gherkin::Lexer::I18nLexer.new(Gherkin::SexpRecorder.new, true)
+      context "when default ios_code is 'ja'" do
+        before do
+          @lexer = Gherkin::Lexer::I18nLexer.new(Gherkin::SexpRecorder.new, false, 'ja')
+        end
+
+        it "should store the i18n language of the last scanned feature" do
+          @lexer.scan("# language: en")
+          @lexer.i18n_language.iso_code.should == "en"
+        end
+
+        it "should use Japanese" do
+          @lexer.scan("機能: foo\n")
+          @lexer.i18n_language.iso_code.should == "ja"
+        end
       end
     end
   end

data/tasks/ragel_task.rb

@@ -22,14 +22,16 @@ class RagelTask
   def define_tasks
     deps = [lang_ragel, common_ragel]
     deps.unshift(UGLIFYJS) if(@lang == 'js')
+    sed = Config::CONFIG['host_os'] =~ /linux/i ? "sed -i" : "sed -i ''"
 
     min_target = target.gsub(/\.js$/, '.min.js')
     file target => deps do
       mkdir_p(File.dirname(target)) unless File.directory?(File.dirname(target))
       sh "ragel #{flags} #{lang_ragel} -o #{target}"
+      # Remove absolute paths from ragel-generated sources
+      sh %{#{sed} "s|#{Dir.pwd}/tasks/../||" #{target}}
       if(@lang == 'js')
         # 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}}
         

data/tasks/rspec.rake

@@ -1,6 +1,9 @@
 require 'rspec/core/rake_task'
 
 desc "Run RSpec"
+RSpec::Core::RakeTask.new(:spec)
+
+desc "Run RSpec with RCov"
 RSpec::Core::RakeTask.new(:rcov) do |t|
   t.rcov = true
   t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.11.7
+  version: 2.11.8
   prerelease: 
 platform: java
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,7 +92,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.11.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.11.4
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -199,7 +199,8 @@ files:
 - .mailmap
 - .rbenv-gemsets
 - .rspec
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - .yardopts
 - Gemfile
@@ -361,6 +362,70 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: gherkin-2.11.7
-test_files: []
+summary: gherkin-2.11.8
+test_files:
+- features/escaped_pipes.feature
+- features/feature_parser.feature
+- features/json_formatter.feature
+- features/json_parser.feature
+- features/native_lexer.feature
+- features/parser_with_native_lexer.feature
+- features/pretty_formatter.feature
+- features/step_definitions/eyeball_steps.rb
+- features/step_definitions/gherkin_steps.rb
+- features/step_definitions/json_formatter_steps.rb
+- features/step_definitions/json_parser_steps.rb
+- features/step_definitions/pretty_formatter_steps.rb
+- features/steps_parser.feature
+- features/support/env.rb
+- spec/gherkin/c_lexer_spec.rb
+- spec/gherkin/fixtures/1.feature
+- spec/gherkin/fixtures/comments_in_table.feature
+- spec/gherkin/fixtures/complex.feature
+- spec/gherkin/fixtures/complex.json
+- spec/gherkin/fixtures/complex_for_filtering.feature
+- spec/gherkin/fixtures/complex_with_tags.feature
+- spec/gherkin/fixtures/dos_line_endings.feature
+- 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_pt1.feature
+- spec/gherkin/fixtures/i18n_pt2.feature
+- spec/gherkin/fixtures/i18n_pt3.feature
+- spec/gherkin/fixtures/i18n_pt4.feature
+- spec/gherkin/fixtures/i18n_zh-CN.feature
+- spec/gherkin/fixtures/iso-8859-1.feature
+- spec/gherkin/fixtures/issue_145.feature
+- spec/gherkin/fixtures/scenario_outline_with_tags.feature
+- spec/gherkin/fixtures/scenario_without_steps.feature
+- spec/gherkin/fixtures/simple_with_comments.feature
+- spec/gherkin/fixtures/simple_with_tags.feature
+- spec/gherkin/fixtures/with_bom.feature
+- spec/gherkin/fixtures/with_bom_and_language_spec.feature
+- spec/gherkin/formatter/ansi_escapes_spec.rb
+- spec/gherkin/formatter/filter_formatter_spec.rb
+- spec/gherkin/formatter/json_formatter_spec.rb
+- spec/gherkin/formatter/model_spec.rb
+- spec/gherkin/formatter/pretty_formatter_spec.rb
+- spec/gherkin/formatter/spaces.feature
+- spec/gherkin/formatter/step_printer_spec.rb
+- spec/gherkin/formatter/tabs.feature
+- spec/gherkin/formatter/tag_count_formatter_spec.rb
+- spec/gherkin/i18n_spec.rb
+- spec/gherkin/java_lexer_spec.rb
+- spec/gherkin/json_parser_spec.rb
+- spec/gherkin/lexer/i18n_lexer_spec.rb
+- spec/gherkin/native_lexer_spec.rb
+- spec/gherkin/parser/parser_spec.rb
+- spec/gherkin/rubify_spec.rb
+- spec/gherkin/sexp_recorder.rb
+- spec/gherkin/shared/doc_string_group.rb
+- spec/gherkin/shared/encoding_group.rb
+- spec/gherkin/shared/lexer_group.rb
+- spec/gherkin/shared/row_group.rb
+- spec/gherkin/shared/tags_group.rb
+- spec/gherkin/tag_expression_spec.rb
+- spec/spec_helper.rb
 has_rdoc: 

data/.rvmrc

@@ -1 +0,0 @@
-rvm gemset use cucumber