ffi 0.5.3-java → 0.5.4-java

data/Rakefile

@@ -9,9 +9,9 @@ task :default => 'gem:repackage'
 
 PROJ.name = 'ffi'
 PROJ.authors = "JRuby Project"
-PROJ.email = "dev@ruby-ffi.kenai.com"
-PROJ.url = "http://kenai.com/projects/ruby-ffi"
-PROJ.version = "0.5.3"
+PROJ.email = "ruby-ffi@groups.google.com"
+PROJ.url = "http://wiki.github.com/ffi/ffi"
+PROJ.version = "0.5.4"
 PROJ.rubyforge.name = 'ffi'
 PROJ.svn.path = 'ffi'
 PROJ.summary = "A Ruby foreign function interface"

data/lib/ffi.rb

@@ -19,29 +19,24 @@ module FFI
 
   end
 
-  if JRUBY_VERSION < "1.6.0"
+  # Fix for RUBY-3527
+  if JRUBY_VERSION >= "1.2.0" && JRUBY_VERSION < "1.3.0"
     module Library
       def ffi_lib(*names)
-
-        ffi_libs = names.map do |name|
-          libnames = (name.is_a?(::Array) ? name : [ name ]).map { |n| [ n, FFI.map_library_name(n) ].uniq }.flatten
-          lib = nil
-          errors = {}
-
-          libnames.each do |libname|
+        ffi_libs = []
+        names.each do |name|
+          [ name, FFI.map_library_name(name) ].each do |libname|
             begin
               lib = FFI::DynamicLibrary.open(libname, FFI::DynamicLibrary::RTLD_LAZY | FFI::DynamicLibrary::RTLD_GLOBAL)
-              break if lib
+              if lib
+                ffi_libs << lib
+                break
+              end
             rescue LoadError => ex
-              errors[libname] = ex
             end
           end
-          
-          if lib.nil?
-            raise LoadError.new(errors.values.join('. '))
-          end
         end
-
+        raise LoadError, "Could not open any of [#{names.join(", ")}]" if ffi_libs.empty?
         @ffi_libs = ffi_libs
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ffi
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: java
 authors: 
 - JRuby Project
@@ -9,12 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-20 00:00:00 +10:00
+date: 2009-11-28 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
 description: ""
-email: dev@ruby-ffi.kenai.com
+email: ruby-ffi@groups.google.com
 executables: []
 
 extensions: []
@@ -41,7 +41,7 @@ files:
 - tasks/test.rake
 - tasks/zentest.rake
 has_rdoc: true
-homepage: http://kenai.com/projects/ruby-ffi
+homepage: http://wiki.github.com/ffi/ffi
 licenses: []
 
 post_install_message: 
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ffi
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A Ruby foreign function interface