gherkin 1.0.29-java → 1.0.30-java

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.30 (2010-05-18)
+
+=== New Features
+* Native gems for IronRuby. Bundles IKVM OpenJDK dlls as well as ikvmc-compiled gherkin.dll. Experimental! (Aslak Hellesøy)
+
 == 1.0.29 (2010-05-18)
 
 === Bugfixes

data/Rakefile

@@ -20,7 +20,7 @@ begin
     gem.executables = ["gherkin"]
     gem.add_dependency "trollop", ">= 1.16.2"
     gem.add_development_dependency "rspec", ">= 1.3.0"
-#    gem.add_development_dependency "cucumber", ">= 0.7.2"
+    gem.add_development_dependency "cucumber", ">= 0.7.2"
     gem.add_development_dependency "rake-compiler", ">= 0.7.0" unless defined?(JRUBY_VERSION)
 
     gem.files -= FileList['ikvm/**/*']
@@ -34,6 +34,10 @@ begin
       gem.platform = ENV['PLATFORM']
       gem.files += FileList['lib/*/*.so']
       gem.extensions = []
+    when 'universal-dotnet'
+      gem.platform = ENV['PLATFORM']
+      gem.files += FileList['lib/*.dll']
+      gem.extensions = []
     else
       gem.files += FileList['lib/gherkin/rb_lexer/*.rb']
       gem.files += FileList['ext/**/*.c']

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 1
 :minor: 0
 :build: 
-:patch: 29
+:patch: 30

data/lib/gherkin/cli/main.rb

@@ -17,11 +17,11 @@ module Gherkin
 
         cmd_name = args.shift
         die("Missing command") if cmd_name.nil?
-        cmd = Tools.const_get(cmd_name.capitalize.to_sym).new(args) rescue die("Unknown command #{cmd_name}")
         begin
+          cmd = Tools.const_get(cmd_name.capitalize.to_sym).new(args)
           cmd.run
         rescue => e
-          Trollop::die(e.message)
+          Trollop::die(e.message + "\nCommand: #{cmd_name}")
         end
       end
 

data/lib/gherkin/formatter/argument.rb

@@ -1,9 +1,9 @@
+require 'gherkin/native'
+
 module Gherkin
   module Formatter
     class Argument
-      require 'gherkin/java_impl'
-      java_impl('gherkin.jar')
-
+      native_impl('gherkin')
       attr_reader :byte_offset, :val
 
       def initialize(byte_offset, val)

data/lib/gherkin/formatter/pretty_formatter.rb

@@ -1,15 +1,14 @@
 # encoding: utf-8
-
 require 'gherkin/formatter/colors'
 require 'gherkin/formatter/monochrome_format'
 require 'gherkin/formatter/argument'
 require 'gherkin/formatter/escaping'
+require 'gherkin/native'
 
 module Gherkin
   module Formatter
     class PrettyFormatter
-      require 'gherkin/java_impl'
-      java_impl('gherkin.jar')
+      native_impl('gherkin')
 
       include Colors
       include Escaping

data/lib/gherkin/i18n.rb

@@ -1,12 +1,10 @@
 require 'yaml'
 require 'gherkin/rubify'
+require 'gherkin/native'
 
 module Gherkin
   class I18n
-    unless defined?(BYPASS_JAVA_IMPL)
-      require 'gherkin/java_impl'
-      java_impl('gherkin.jar')
-    end
+    native_impl('gherkin') unless defined?(BYPASS_NATIVE_IMPL)
 
     FEATURE_ELEMENT_KEYS = %w{feature background scenario scenario_outline examples}
     STEP_KEYWORD_KEYS    = %w{given when then and but}

data/lib/gherkin/i18n_lexer.rb

@@ -1,4 +1,5 @@
 require 'gherkin/i18n'
+require 'gherkin/native'
 
 module Gherkin
   I18nLexerNotFound = Class.new(LoadError)
@@ -6,8 +7,7 @@ module Gherkin
 
   # The main entry point to lexing Gherkin source.
   class I18nLexer
-    require 'gherkin/java_impl'
-    java_impl('gherkin.jar')
+    native_impl('gherkin')
 
     LANGUAGE_PATTERN = /language\s*:\s*(.*)/ #:nodoc:
     attr_reader :i18n_language

data/lib/gherkin/native.rb

@@ -0,0 +1,7 @@
+if defined?(RUBY_ENGINE) && RUBY_ENGINE == "ironruby"
+  require 'gherkin/native/ikvm'
+elsif defined?(JRUBY_VERSION)
+  require 'gherkin/native/java'
+else
+  require 'gherkin/native/null'
+end

data/lib/gherkin/native/ikvm.rb

@@ -0,0 +1,55 @@
+class Class
+
+  def implements(java_class_name)
+    m = java_class_name.split('.').inject(Object) do |mod, name|
+      mod = mod.const_get(name)
+    end
+    include m
+  end
+
+  # Causes a .NET class to be instantiated instead of the Ruby class when 
+  # running on IronRuby. This is used to test both pure .NET and pure Ruby classes 
+  # from the same Ruby based test suite. The .NET Class must have a package name
+  # that corresponds with the Ruby class.
+  def native_impl(lib)
+    begin
+      load_assembly(lib)
+    rescue LoadError => e
+      e.message << "\nTry this: SET MONO_PATH=#{File.expand_path(File.dirname(__FILE__) + '/../..')} (or export MONO_PATH=...)"
+      raise e
+    end
+
+    class << self
+      def ikvmify(arg)
+        if Array === arg
+          arg.map{|a| ikvmify(a)}
+        else
+          case(arg)
+          when Regexp
+            Object.const_get('java').const_get('util').const_get('regex').const_get('Pattern').compile(arg.source)
+          else
+            arg
+          end
+        end
+      end
+
+      def new(*args)
+        ikvm_class.new(*ikvmify(args))
+      end
+
+      def ===(object)
+        super || object.java_kind_of?(java_class)
+      end
+
+      def ikvm_class
+        names = self.name.split('::')
+        namespace = Object
+        names[0..-2].each do |module_name|
+          namespace = namespace.const_get(module_name.downcase)
+        end
+
+        namespace.const_get(names[-1])
+      end
+    end
+  end
+end

data/lib/gherkin/native/java.rb

@@ -0,0 +1,47 @@
+class Class
+
+  def implements(java_class_name)
+    # no-op
+  end
+
+  # Causes a Java class to be instantiated instead of the Ruby class when 
+  # running on JRuby. This is used to test both pure Java and pure Ruby classes 
+  # from the same Ruby based test suite. The Java Class must have a package name
+  # that corresponds with the Ruby class.
+  def native_impl(lib)
+    require "#{lib}.jar"
+
+    class << self
+      def javaify(arg)
+        if Array === arg
+          arg.map{|a| javaify(a)}
+        else
+          case(arg)
+          when Regexp
+            java.util.regex.Pattern.compile(arg.source)
+          else
+            arg
+          end
+        end
+      end
+
+      def new(*args)
+        java_class.new(*javaify(args))
+      end
+
+      def ===(object)
+        super || object.java_kind_of?(java_class)
+      end
+
+      def java_class
+        names = self.name.split('::')
+        package = Java
+        names[0..-2].each do |module_name|
+          package = package.__send__(module_name.downcase)
+        end
+
+        package.__send__(names[-1])
+      end
+    end
+  end
+end

data/lib/gherkin/native/null.rb

@@ -0,0 +1,9 @@
+class Class
+  def implements(java_class_name)
+    # no-op
+  end
+
+  def native_impl(lib)
+    # no-op
+  end
+end

data/lib/gherkin/parser/filter_listener.rb

@@ -1,12 +1,12 @@
 require 'gherkin/parser/event'
 require 'gherkin/parser/tag_expression'
+require 'gherkin/native'
 
 module Gherkin
   module Parser
     # This class filters events based on filter criteria.
     class FilterListener
-      require 'gherkin/java_impl'
-      java_impl('gherkin.jar')
+      native_impl('gherkin')
     
       # Creates a new instance that replays events to +listener+, filtered by +filters+,
       # an Array that can contain one of the following:

data/lib/gherkin/parser/parser.rb

@@ -1,3 +1,5 @@
+require 'gherkin/native'
+
 module Gherkin
   module Parser
     class ParseError < StandardError
@@ -7,8 +9,7 @@ module Gherkin
     end
 
     class Parser
-      require 'gherkin/java_impl'
-      java_impl('gherkin.jar')
+      native_impl('gherkin')
 
       # Initialize the parser. +machine_name+ refers to a state machine table.
       def initialize(listener, raise_on_error=true, machine_name='root')

data/lib/gherkin/parser/tag_expression.rb

@@ -1,8 +1,9 @@
+require 'gherkin/native'
+
 module Gherkin
   module Parser
     class TagExpression
-      require 'gherkin/java_impl'
-      java_impl('gherkin.jar')
+      native_impl('gherkin')
 
       attr_reader :limits
 

data/lib/gherkin/tools/stats_listener.rb

@@ -1,7 +1,11 @@
+require 'gherkin/native'
+
 # encoding: utf-8
 module Gherkin
   module Tools
     class StatsListener
+      implements 'gherkin.Listener'
+
       attr_reader :features, :scenarios, :steps
 
       def initialize

data/ragel/lexer.java.rl.erb

@@ -142,7 +142,7 @@ public class <%= @i18n.underscored_iso_code.upcase %> implements Lexer {
 
   %% write data noerror;
 
-  public void scan(CharSequence inputSequence)  {
+  public void scan(String inputSequence)  {
     String input = inputSequence.toString() + "\n%_FEATURE_END_%";
     byte[] data = null;
     try {

data/tasks/compile.rake

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/ragel_task'
-BYPASS_JAVA_IMPL = true
+BYPASS_NATIVE_IMPL = true
 require 'gherkin/i18n'
 
 CLEAN.include [

data/tasks/gems.rake

@@ -27,6 +27,12 @@ namespace :gems do
     mv "pkg/gherkin-#{GHERKIN_VERSION}-java.gem", 'release'
   end
 
+  desc 'Build IronRuby gem'
+  task :ironruby => [:jruby, 'ikvm:dll', 'ikvm:copy_ikvm_dlls'] do
+    sh "rake gemspec build PLATFORM=universal-dotnet"
+    mv "pkg/gherkin-#{GHERKIN_VERSION}-universal-dotnet.gem", 'release'
+  end
+
   task :release_dir do
     mkdir 'release' unless File.directory?('release')
   end
@@ -36,4 +42,4 @@ namespace :gems do
   end
 end
 
-task :gems => ['gems:clean_release_dir', 'gems:posix', 'gems:mswin32', 'gems:mingw32', 'gems:jruby']
+task :gems => ['gems:clean_release_dir', 'gems:posix', 'gems:mswin32', 'gems:mingw32', 'gems:jruby', 'gems:ironruby']

data/tasks/ikvm.rake

@@ -20,25 +20,23 @@
 #
 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
+  task :exe => 'lib/gherkin.jar' do
     mkdir_p 'release' unless File.directory?('release')
     sh("mono /usr/local/ikvm/bin/ikvmc.exe -target:exe lib/gherkin.jar -out:release/gherkin-#{GHERKIN_VERSION}.exe")
   end
 
-  file 'pkg/gherkin.dll' => 'lib/gherkin.jar' 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")
+    cp "release/gherkin-#{GHERKIN_VERSION}.dll", 'lib/gherkin.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.OpenJDK.Security,IKVM.Runtime}.dll'].each do |dll|
       cp dll, 'release'
+      cp dll, 'lib'
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 0
-    - 29
-  version: 1.0.29
+    - 30
+  version: 1.0.30
 platform: java
 authors: 
   - Mike Sassak
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 +02:00
+date: 2010-05-20 00:00:00 +02:00
 default_executable: gherkin
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -47,6 +47,20 @@ dependencies:
             version: 1.3.0
     type: :development
     version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: cucumber
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 7
+              - 2
+            version: 0.7.2
+    type: :development
+    version_requirements: *id003
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: 
@@ -94,7 +108,10 @@ files:
   - lib/gherkin/i18n.rb
   - lib/gherkin/i18n.yml
   - lib/gherkin/i18n_lexer.rb
-  - lib/gherkin/java_impl.rb
+  - lib/gherkin/native.rb
+  - lib/gherkin/native/ikvm.rb
+  - lib/gherkin/native/java.rb
+  - lib/gherkin/native/null.rb
   - lib/gherkin/parser/event.rb
   - lib/gherkin/parser/filter_listener.rb
   - lib/gherkin/parser/meta.txt

data/lib/gherkin/java_impl.rb

@@ -1,43 +0,0 @@
-class Class
-  # Causes a Java class to be instantiated instead of the Ruby class when 
-  # running on JRuby. This is used to test both pure Java and pure Ruby classes 
-  # from the same Ruby based test suite. The Java Class must have a package name
-  # that corresponds with the Ruby class.
-  def java_impl(jar)
-    if defined?(JRUBY_VERSION)
-      require jar
-      class << self
-        def javaify(arg)
-          if Array === arg
-            arg.map{|a| javaify(a)}
-          else
-            case(arg)
-            when Regexp
-              java.util.regex.Pattern.compile(arg.source)
-            else
-              arg
-            end
-          end
-        end
-
-        def new(*args)
-          java_class.new(*javaify(args))
-        end
-
-        def ===(object)
-          super || object.java_kind_of?(java_class)
-        end
-
-        def java_class
-          names = self.name.split('::')
-          package = Java
-          names[0..-2].each do |module_name|
-            package = package.__send__(module_name.downcase)
-          end
-
-          package.__send__(names[-1])
-        end
-      end
-    end
-  end
-end