gherkin 1.0.21-java → 1.0.22-java

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.22 (2010-04-28)
+
+=== Bugfixes
+* Make prebuilt binaries work on both Ruby 1.8.x and 1.9.x on Windows (#54 Luis Lavena, Aslak Hellesøy)
+
 == 1.0.21 (2010-04-27)
 
 === Bugfixes

data/Rakefile

@@ -22,7 +22,7 @@ begin
     gem.add_development_dependency "rspec", ">= 1.3.0"
     gem.add_development_dependency "cucumber", ">= 0.7.0.beta.1"
     gem.add_development_dependency "rake-compiler", ">= 0.7.0" unless defined?(JRUBY_VERSION)
-    
+
     gem.files -= FileList['ikvm/**/*']
     gem.files -= FileList['java/**/*']
     case ENV['PLATFORM']
@@ -32,7 +32,7 @@ begin
       gem.extensions = []
     when 'i386-mswin32', 'i386-mingw32'
       gem.platform = ENV['PLATFORM']
-      gem.files += FileList['lib/*.so']
+      gem.files += FileList['lib/*/*.so']
       gem.extensions = []
     else
       gem.files += FileList['lib/gherkin/rb_lexer/*.rb']

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 1
 :minor: 0
 :build: 
-:patch: 21
+:patch: 22

data/lib/gherkin/c_lexer.rb

@@ -1,8 +1,17 @@
+require 'rbconfig'
+
 module Gherkin
   module CLexer
     def self.[](i18n_underscored_iso_code)
-      require "gherkin_lexer_#{i18n_underscored_iso_code}"
-      const_get(i18n_underscored_iso_code.capitalize)
+      begin
+        prefix = Config::CONFIG['arch'] =~ /mswin|mingw/ ? "#{Config::CONFIG['MAJOR']}.#{Config::CONFIG['MINOR']}/" : ''
+        lib = "#{prefix}gherkin_lexer_#{i18n_underscored_iso_code}"
+        require lib
+        const_get(i18n_underscored_iso_code.capitalize)
+      rescue LoadError => e
+        e.message << %{\nCouldn't load #{lib}\nThe $LOAD_PATH was:\n#{$LOAD_PATH.join("\n")}}
+        raise e
+      end
     end
   end
 end

data/tasks/gems.rake

@@ -9,7 +9,12 @@ namespace :gems do
   [:mswin32, :mingw32].each do |win_compiler|
     desc "Build MRI/C precompiled #{win_compiler} gem"
     task win_compiler do
-      sh "rake cross compile RUBY_CC_VERSION=1.8.6"
+      # Bootstrap with:
+      #
+      #   rake-compiler cross-ruby VERSION=1.9.1-p243
+      #   rake-compiler cross-ruby VERSION=1.8.6-p114
+      #
+      sh "rake cross compile RUBY_CC_VERSION=1.8.6:1.9.1"
       sh "rake gemspec build PLATFORM=i386-#{win_compiler}"
       mv "pkg/gherkin-#{GHERKIN_VERSION}-x86-#{win_compiler}.gem", 'release'
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 0
-    - 21
-  version: 1.0.21
+    - 22
+  version: 1.0.22
 platform: java
 authors: 
   - Mike Sassak
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 -05:00
+date: 2010-04-28 00:00:00 -05:00
 default_executable: gherkin
 dependencies: 
   - !ruby/object:Gem::Dependency