ffi 0.5.0-java → 0.5.3-java

data/Rakefile

@@ -11,7 +11,7 @@ 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.0"
+PROJ.version = "0.5.3"
 PROJ.rubyforge.name = 'ffi'
 PROJ.svn.path = 'ffi'
 PROJ.summary = "A Ruby foreign function interface"

data/lib/ffi.rb

@@ -19,24 +19,29 @@ module FFI
 
   end
 
-  # Fix for RUBY-3527
-  if JRUBY_VERSION >= "1.2.0" && JRUBY_VERSION < "1.3.0"
+  if JRUBY_VERSION < "1.6.0"
     module Library
       def ffi_lib(*names)
-        ffi_libs = []
-        names.each do |name|
-          [ name, FFI.map_library_name(name) ].each do |libname|
+
+        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|
             begin
               lib = FFI::DynamicLibrary.open(libname, FFI::DynamicLibrary::RTLD_LAZY | FFI::DynamicLibrary::RTLD_GLOBAL)
-              if lib
-                ffi_libs << lib
-                break
-              end
+              break if lib
             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.0
+  version: 0.5.3
 platform: java
 authors: 
 - JRuby Project
@@ -9,19 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-06 00:00:00 +02:00
+date: 2009-11-20 00:00:00 +10:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.1
-    version: 
+dependencies: []
+
 description: ""
 email: dev@ruby-ffi.kenai.com
 executables: []
@@ -74,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ffi
-rubygems_version: 1.3.5
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: A Ruby foreign function interface