gherkin 2.1.5-java → 2.2.0-java

data/spec/gherkin/lexer/i18n_lexer_spec.rb

@@ -0,0 +1,33 @@
+#encoding: utf-8
+require 'spec_helper'
+
+module Gherkin
+  module Lexer
+    describe I18nLexer 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 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 use English i18n by default" do
+        @lexer.scan("Feature: foo\n")
+        @lexer.i18n_language.iso_code.should == "en"
+      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)
+      end
+    end
+  end
+end

data/spec/gherkin/sexp_recorder.rb

@@ -48,8 +48,6 @@ module Gherkin
         o.value
       elsif(Formatter::Model::Tag === o)
         o.name
-      elsif(Formatter::Model::Statement === o)
-        "APE"
       else
         o
       end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'gherkin'
 require 'stringio'
 require 'gherkin/sexp_recorder'
 require 'gherkin/output_stream_string_io'
+require 'gherkin/json'
 require 'gherkin/shared/lexer_group'
 require 'gherkin/shared/tags_group'
 require 'gherkin/shared/py_string_group'

data/tasks/bench.rake

@@ -124,9 +124,9 @@ class Benchmarker
 
   def run_native_gherkin_no_parser
     require 'gherkin'
-    require 'gherkin/i18n_lexer'
+    require 'gherkin/lexer/i18n_lexer'
     require 'null_listener'
-    lexer = Gherkin::I18nLexer.new(NullListener.new, false)
+    lexer = Gherkin::Lexer::I18nLexer.new(NullListener.new, false)
     @features.each do |feature|
       lexer.scan(File.read(feature), feature, 0)
     end

data/tasks/compile.rake

@@ -10,7 +10,7 @@ CLEAN.include [
   'lib/gherkin/rb_lexer/*.rb',
   'lib/*.dll',
   'ext/**/*.c',
-  'java/src/main/java/gherkin/lexer/*.java',
+  'java/src/main/java/gherkin/lexer/i18n/*.java',
   'java/src/main/resources/gherkin/*.properties',
 ]
 

data/tasks/ikvm.rake

@@ -1,3 +1,4 @@
+require File.dirname(__FILE__) + '/../spec/gherkin/json'
 # To test out the pure Java main program on .NET, execute:
 #
 #   rake ikvm
@@ -28,7 +29,8 @@ namespace :ikvm do
   desc 'Make a .NET .dll'
   task :dll => 'lib/gherkin.jar' do
     mkdir_p 'release' unless File.directory?('release')
-    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:library lib/gherkin.jar -out:release/gherkin-#{GHERKIN_VERSION}.dll")
+    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:library #{JSON_SIMPLE_JAR} -out:release/json-simple.dll")
+    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:library lib/gherkin.jar -out:release/gherkin-#{GHERKIN_VERSION}.dll -reference:release/json-simple.dll")
     cp "release/gherkin-#{GHERKIN_VERSION}.dll", 'lib/gherkin.dll'
   end
 

data/tasks/ragel_task.rb

@@ -28,7 +28,7 @@ class RagelTask
   def target
     {
       'c'    => "ext/gherkin_lexer_#{@i18n.underscored_iso_code}/gherkin_lexer_#{@i18n.underscored_iso_code}.c",
-      'java' => "java/src/main/java/gherkin/lexer/#{@i18n.underscored_iso_code.upcase}.java",
+      'java' => "java/src/main/java/gherkin/lexer/i18n/#{@i18n.underscored_iso_code.upcase}.java",
       'rb'   => "lib/gherkin/rb_lexer/#{@i18n.underscored_iso_code}.rb"
     }[@lang]
   end

data/tasks/release.rake

@@ -2,6 +2,7 @@ namespace :release do
   desc 'Uplad all packages and tag git'
   task :ALL => [:gems, :push_dll, :push_jar, :push_gems, 'git:release']
 
+  desc 'Push all gems to rubygems.org (gemcutter)'
   task :push_gems do
     Dir.chdir('release') do
       Dir['*.gem'].each do |gem_file|
@@ -10,14 +11,25 @@ namespace :release do
     end
   end
 
+  desc 'Push dll to Github'
   task :push_dll => :ikvm do
     Dir.chdir('release') do
       # This requires aslakhellesoy's build of the github gem,
       # which has tekkub's upload command.
-      sh("github upload #{Dir['gherkin*.dll'][0]}")
+      begin
+        sh("github upload gherkin-#{GHERKIN_VERSION}.dll")
+      rescue => e
+        # For some reason we're getting an error even if the upload is successful. Verify that here...
+        head = `curl -I -X HEAD http://github.com/downloads/aslakhellesoy/gherkin/gherkin-#{GHERKIN_VERSION}.dll`
+        if !(head =~ /302 Found/in)
+          e.message << "\n\nUpload of gherkin-#{GHERKIN_VERSION}.dll failed:\n\n#{head}"
+          raise e
+        end
+      end
     end
   end
 
+  desc 'Push jar to cukes.info Maven repo'
   task :push_jar do
     Dir.chdir('java') do
       sh("mvn -Dmaven.wagon.provider.http=httpclient deploy")

data/tasks/rspec.rake

@@ -4,7 +4,6 @@ RSpec::Core::RakeTask.new(:spec)
 task :spec => [:check_dependencies]
 
 RSpec::Core::RakeTask.new(:rcov) do |t|
-  t.pattern = 'spec/**/*_spec.rb'
   t.rcov = true
   t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
     - 2
-    - 1
-    - 5
-  version: 2.1.5
+    - 2
+    - 0
+  version: 2.2.0
 platform: java
 authors: 
   - Mike Sassak
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-17 00:00:00 +02:00
+date: 2010-07-26 00:00:00 +02:00
 default_executable: gherkin
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -72,9 +72,9 @@ dependencies:
           - !ruby/object:Gem::Version 
             segments: 
               - 0
-              - 8
-              - 5
-            version: 0.8.5
+              - 9
+              - 0
+            version: 0.9.0
     type: :development
     version_requirements: *id004
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
@@ -114,8 +114,9 @@ files:
   - features/support/env.rb
   - ikvm/.gitignore
   - java/.gitignore
-  - java/src/main/java/gherkin/lexer/.gitignore
+  - java/src/main/java/gherkin/lexer/i18n/.gitignore
   - java/src/main/resources/gherkin/.gitignore
+  - json-simple-1.1.dll
   - lib/.gitignore
   - lib/gherkin.jar
   - lib/gherkin.rb
@@ -132,10 +133,11 @@ files:
   - lib/gherkin/formatter/pretty_formatter.rb
   - lib/gherkin/formatter/regexp_filter.rb
   - lib/gherkin/formatter/tag_count_formatter.rb
+  - lib/gherkin/formatter/tag_filter.rb
   - lib/gherkin/i18n.rb
   - lib/gherkin/i18n.yml
-  - lib/gherkin/i18n_lexer.rb
   - lib/gherkin/json_parser.rb
+  - lib/gherkin/lexer/i18n_lexer.rb
   - lib/gherkin/listener/event.rb
   - lib/gherkin/listener/formatter_listener.rb
   - lib/gherkin/native.rb
@@ -186,10 +188,11 @@ files:
   - spec/gherkin/formatter/spaces.feature
   - spec/gherkin/formatter/tabs.feature
   - spec/gherkin/formatter/tag_count_formatter_spec.rb
-  - spec/gherkin/i18n_lexer_spec.rb
   - spec/gherkin/i18n_spec.rb
   - spec/gherkin/java_lexer_spec.rb
+  - spec/gherkin/json.rb
   - spec/gherkin/json_parser_spec.rb
+  - spec/gherkin/lexer/i18n_lexer_spec.rb
   - spec/gherkin/output_stream_string_io.rb
   - spec/gherkin/parser/parser_spec.rb
   - spec/gherkin/rb_lexer_spec.rb
@@ -245,9 +248,9 @@ summary: Fast Gherkin lexer/parser
 test_files: 
   - spec/spec_helper.rb
   - spec/gherkin/c_lexer_spec.rb
-  - spec/gherkin/i18n_lexer_spec.rb
   - spec/gherkin/i18n_spec.rb
   - spec/gherkin/java_lexer_spec.rb
+  - spec/gherkin/json.rb
   - spec/gherkin/json_parser_spec.rb
   - spec/gherkin/output_stream_string_io.rb
   - spec/gherkin/rb_lexer_spec.rb
@@ -259,6 +262,7 @@ test_files:
   - spec/gherkin/formatter/model_spec.rb
   - spec/gherkin/formatter/pretty_formatter_spec.rb
   - spec/gherkin/formatter/tag_count_formatter_spec.rb
+  - spec/gherkin/lexer/i18n_lexer_spec.rb
   - spec/gherkin/parser/parser_spec.rb
   - spec/gherkin/shared/lexer_group.rb
   - spec/gherkin/shared/py_string_group.rb

data/lib/gherkin/i18n_lexer.rb

@@ -1,38 +0,0 @@
-require 'gherkin/i18n'
-require 'gherkin/native'
-
-module Gherkin
-  I18nLexerNotFound = Class.new(LoadError)
-  LexingError = Class.new(StandardError)
-
-  # The main entry point to lexing Gherkin source.
-  class I18nLexer
-    native_impl('gherkin')
-
-    LANGUAGE_PATTERN = /language\s*:\s*(.*)/ #:nodoc:
-    attr_reader :i18n_language
-
-    def initialize(listener, force_ruby=false)
-      @listener = listener
-      @force_ruby = force_ruby
-    end
-
-    def scan(source)
-      create_delegate(source).scan(source)
-    end
-
-  private
-
-    def create_delegate(source)
-      @i18n_language = lang(source)
-      @i18n_language.lexer(@listener, @force_ruby)
-    end
-
-    def lang(source)
-      line_one = source.split(/\n/)[0]
-      match = LANGUAGE_PATTERN.match(line_one)
-      I18n.get(match ? match[1] : 'en')
-    end
-
-  end
-end

data/spec/gherkin/i18n_lexer_spec.rb

@@ -1,26 +0,0 @@
-#encoding: utf-8
-require 'spec_helper'
-
-module Gherkin
-  describe I18nLexer do
-    before do
-      @lexer = Gherkin::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 use English i18n by default" do
-      @lexer.scan("Feature: foo\n")
-      @lexer.i18n_language.iso_code.should == "en"
-    end
-
-    it "should === its ruby class, even when the impl is Java" do
-      Gherkin::I18nLexer.should === Gherkin::I18nLexer.new(Gherkin::SexpRecorder.new, true)
-    end
-  end
-end