gherkin 1.0.4 → 1.0.5

data/History.txt

@@ -1,3 +1,11 @@
+== 1.0.5 (2009-04-08)
+
+=== New Features
+* New .NET build of gherkin - an ikvmc build of gherkin.jar to gherkin.dll. (Aslak Hellesøy)
+
+=== Bugfixes
+* Made parsers reusable so that the same instance can parse several features. (Aslak Hellesøy)
+
 == 1.0.4 (2009-04-07)
 
 === New features

data/README.rdoc

@@ -28,16 +28,22 @@ E.g. in Bash, export RL_LANG="en,fr,no". This can be quite helpful when modifyin
 
 == Release process
 
+* Bump version in the VERSION file
+* Do a file search and replace from old version number to new one.
 * Run "rake clean spec cucumber" for each platform (1.8.6, 1.8.7, 1.9, jruby) to make sure all is green.
 * rvm 1.8.7
-* Bump version in the VERSION file
 * rake clean jar compile
 * rake gemspec
 * git commit -a -m "Release vX.Y.Z"
 * rake gemcutter:release
+* rake git:release
 * ./nativegems.sh
 * gem push pkg/... (for each native gem)
 * cd java && mvn deploy
+* rake ikvm
+* Upload pkg/gherkin-X.Y.Z.dll to Github: http://github.com/aslakhellesoy/gherkin/downloads
+
+* Announce on Cucumber list, IRC and Twitter.
 
 == Configuring Rake-Compiler for cross compilation
 In order to build Windows binaries (so we can release Windows gems from OS X/Linux) we need to set up rake-compiler.

data/Rakefile

@@ -3,6 +3,10 @@ require 'rbconfig'
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
+require 'yaml'
+
+config = YAML.load_file('VERSION.yml')
+GHERKIN_VERSION = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
 
 begin
   require 'jeweler'
@@ -16,11 +20,12 @@ begin
     gem.executables = ["gherkin"]
     gem.add_dependency "trollop", ">= 1.15"
     gem.add_development_dependency "rspec", ">= 1.3.0"
-    gem.add_development_dependency "cucumber", ">= 0.6.2"
+    gem.add_development_dependency "cucumber", ">= 0.6.4"
     gem.add_development_dependency "rake-compiler", ">= 0.7.0" unless defined?(JRUBY_VERSION)
-    gem.add_development_dependency "albacore", ">= 0.1.0"
+    gem.add_development_dependency "albacore", ">= 0.1.2"
     
     gem.files -= FileList['dotnet/**/*']
+    gem.files -= FileList['ikvm/**/*']
     gem.files -= FileList['java/**/*']
     case ENV['PLATFORM']
     when 'java'

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 4
+:patch: 5
 :major: 1

data/gherkin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gherkin}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Helles\303\270y"]
-  s.date = %q{2010-04-07}
+  s.date = %q{2010-04-08}
   s.default_executable = %q{gherkin}
   s.description = %q{A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.}
   s.email = %q{cukes@googlegroups.com}
@@ -81,6 +81,7 @@ Gem::Specification.new do |s|
      "features/steps_parser.feature",
      "features/support/env.rb",
      "gherkin.gemspec",
+     "ikvm/.gitignore",
      "java/.gitignore",
      "java/Gherkin.iml",
      "java/src/main/java/gherkin/lexer/.gitignore",
@@ -194,6 +195,7 @@ Gem::Specification.new do |s|
      "tasks/bench/null_listener.rb",
      "tasks/compile.rake",
      "tasks/cucumber.rake",
+     "tasks/ikvm.rake",
      "tasks/ragel_task.rb",
      "tasks/rdoc.rake",
      "tasks/rspec.rake"
@@ -231,22 +233,22 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<trollop>, [">= 1.15"])
       s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0.6.2"])
+      s.add_development_dependency(%q<cucumber>, [">= 0.6.4"])
       s.add_development_dependency(%q<rake-compiler>, [">= 0.7.0"])
-      s.add_development_dependency(%q<albacore>, [">= 0.1.0"])
+      s.add_development_dependency(%q<albacore>, [">= 0.1.2"])
     else
       s.add_dependency(%q<trollop>, [">= 1.15"])
       s.add_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_dependency(%q<cucumber>, [">= 0.6.2"])
+      s.add_dependency(%q<cucumber>, [">= 0.6.4"])
       s.add_dependency(%q<rake-compiler>, [">= 0.7.0"])
-      s.add_dependency(%q<albacore>, [">= 0.1.0"])
+      s.add_dependency(%q<albacore>, [">= 0.1.2"])
     end
   else
     s.add_dependency(%q<trollop>, [">= 1.15"])
     s.add_dependency(%q<rspec>, [">= 1.3.0"])
-    s.add_dependency(%q<cucumber>, [">= 0.6.2"])
+    s.add_dependency(%q<cucumber>, [">= 0.6.4"])
     s.add_dependency(%q<rake-compiler>, [">= 0.7.0"])
-    s.add_dependency(%q<albacore>, [">= 0.1.0"])
+    s.add_dependency(%q<albacore>, [">= 0.1.2"])
   end
 end
 

data/ikvm/.gitignore

@@ -0,0 +1,3 @@
+bin
+*.pidb
+*.userprefs

data/lib/gherkin/parser/parser.rb

@@ -7,7 +7,7 @@ module Gherkin
     end
 
     class Parser
-      def self.new(listener, raise_on_error=false, machine_name='root')
+      def self.new(listener, raise_on_error=true, machine_name='root')
         if defined?(JRUBY_VERSION)
           require 'gherkin.jar'
           Java::GherkinParser::Parser.new(listener, raise_on_error, machine_name)
@@ -21,7 +21,8 @@ module Gherkin
         @listener = listener
         @raise_on_error = raise_on_error
         @machines = []
-        push_machine(machine_name)
+        @machine_name = machine_name
+        push_machine(@machine_name)
       end
 
       # Doesn't yet fall back to super
@@ -30,6 +31,10 @@ module Gherkin
         if(event(method.to_s, args[-1]))
           @listener.send(method, *args)
         end
+        if method == :eof
+          pop_machine
+          push_machine(@machine_name)
+        end
       end
 
       def event(ev, line)

data/ragel/lexer.java.rl.erb

@@ -140,7 +140,7 @@ public class <%= @i18n.sanitized_key.capitalize %> implements Lexer {
 
   %% write data noerror;
 
-  public void scan(CharSequence inputSequence) {
+  public void scan(CharSequence inputSequence) throws Exception {
     String input = inputSequence.toString() + "\n%_FEATURE_END_%";
     byte[] data = input.getBytes();
     int cs, p = 0, pe = data.length;

data/spec/gherkin/parser/parser_spec.rb

@@ -30,6 +30,21 @@ module Gherkin
         @parser = Parser.new(@listener, false)
         @parser.background("Background", "Content", 1)
       end
+
+      [true, false].each do |native|
+        it "should be reusable for several feature files (native lexer: #{native})" do
+          listener = mock('listener', :null_object => true)
+          parser = Parser.new(listener, true)
+          lexer = I18nLexer.new(parser, native)
+          feature = <<-EOF
+Feature: foo
+  Scenario: bar
+    Given zap
+EOF
+          lexer.scan(feature)
+          lexer.scan(feature)
+        end
+      end
     end
   end
 end

data/tasks/compile.rake

@@ -15,7 +15,9 @@ CLEAN.include [
 ]
 
 desc "Compile the Java extensions"
-task :jar do
+task :jar => 'lib/gherkin.jar'
+
+file 'lib/gherkin.jar' => Dir['java/src/main/java/**/*.java'] do
   sh("mvn -f java/pom.xml package")
 end
 

data/tasks/ikvm.rake

@@ -0,0 +1,47 @@
+# To test out the pure Java main program on .NET, execute:
+#
+#   rake ikvm
+#
+# Just print dots:
+#
+#   [mono] pkg/gherkin.exe features
+#
+# Pretty print all to STDOUT:
+#
+#   [mono] pkg/gherkin.exe features pretty
+#
+# To test out the pure C# main program on .NET, execute:
+#
+#   rake ikvm (you need this to generate all the .dll files needed for the next step)
+#
+# Then build ikvm/Gherkin.sln. Then:
+#
+#   [mono] mono ikvm/Gherkin/bin/Debug/Gherkin.exe features/steps_parser.feature
+#
+namespace :ikvm do
+  desc 'Make a .NET .exe'
+  task :exe => 'pkg/gherkin.exe'
+
+  desc 'Make a .NET .dll'
+  task :dll => 'pkg/gherkin.dll'
+
+  file 'pkg/gherkin.exe' => 'lib/gherkin.jar' do
+    mkdir_p 'pkg' unless File.directory?('pkg')
+    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:exe lib/gherkin.jar -out:pkg/gherkin-#{GHERKIN_VERSION}.exe")
+  end
+
+  file 'pkg/gherkin.dll' => 'lib/gherkin.jar' do
+    mkdir_p 'pkg' unless File.directory?('pkg')
+    sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:library lib/gherkin.jar -out:pkg/gherkin-#{GHERKIN_VERSION}.dll")
+  end
+
+  desc 'Copy the IKVM .dll files over to the pkg dir'
+  task :copy_ikvm_dlls do
+    Dir['/usr/local/ikvm/bin/{IKVM.OpenJDK.Core,IKVM.OpenJDK.Text,IKVM.Runtime}.dll'].each do |dll|
+      cp dll, 'pkg'
+    end
+  end
+end
+
+task :ikvm => ['ikvm:exe', 'ikvm:dll', 'ikvm:copy_ikvm_dlls']
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Mike Sassak
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 +02:00
+date: 2010-04-08 00:00:00 +02:00
 default_executable: gherkin
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,8 +56,8 @@ dependencies:
         segments: 
         - 0
         - 6
-        - 2
-        version: 0.6.2
+        - 4
+        version: 0.6.4
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -84,8 +84,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 0
-        version: 0.1.0
+        - 2
+        version: 0.1.2
   type: :development
   version_requirements: *id005
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
@@ -199,6 +199,7 @@ files:
 - features/steps_parser.feature
 - features/support/env.rb
 - gherkin.gemspec
+- ikvm/.gitignore
 - java/.gitignore
 - java/Gherkin.iml
 - java/src/main/java/gherkin/lexer/.gitignore
@@ -312,6 +313,7 @@ files:
 - tasks/bench/null_listener.rb
 - tasks/compile.rake
 - tasks/cucumber.rake
+- tasks/ikvm.rake
 - tasks/ragel_task.rb
 - tasks/rdoc.rake
 - tasks/rspec.rake