ffi 0.3.1-java → 0.3.2-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.3.1"
+PROJ.version = "0.3.2"
 PROJ.rubyforge.name = 'ffi'
 PROJ.svn.path = 'ffi'
 PROJ.summary = "A Ruby foreign function interface"

data/lib/ffi.rb

@@ -18,4 +18,27 @@ module FFI
     end unless method_defined?(:write_array_of_pointer)
 
   end
-end
+
+  # Fix for RUBY-3527
+  if JRUBY_VERSION >= "1.2.0" && JRUBY_VERSION < "1.3.0"
+    module Library
+      def ffi_lib(*names)
+        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)
+              if lib
+                ffi_libs << lib
+                break
+              end
+            rescue LoadError => ex
+            end
+          end
+        end
+        raise LoadError, "Could not open any of [#{names.join(", ")}]" if ffi_libs.empty?
+        @ffi_libs = ffi_libs
+      end
+    end
+  end
+end

metadata

@@ -1,36 +1,31 @@
 --- !ruby/object:Gem::Specification 
-name: ffi
-version: !ruby/object:Gem::Version 
-  version: 0.3.1
-platform: java
-authors: 
-- JRuby Project
-autorequire: 
-bindir: bin
-cert_chain: []
-
-date: 2009-03-24 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.4.2
-    version: 
-description: ""
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - '>='
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 email: dev@ruby-ffi.kenai.com
-executables: []
-
-extensions: []
+cert_chain: []
 
+summary: A Ruby foreign function interface
+post_install_message: 
 extra_rdoc_files: 
 - README.txt
 - History.txt
+homepage: http://kenai.com/projects/ruby-ffi
+signing_key: 
+name: ffi
+rdoc_options: 
+- --main
+- README.txt
+autorequire: 
+rubyforge_project: ffi
+executables: []
+
+description: ""
+specification_version: 2
+default_executable: 
 files: 
 - History.txt
 - LICENSE
@@ -49,32 +44,37 @@ files:
 - tasks/spec.rake
 - tasks/svn.rake
 - tasks/test.rake
-has_rdoc: false
-homepage: http://kenai.com/projects/ruby-ffi
-post_install_message: 
-rdoc_options: 
-- --main
-- README.txt
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-requirements: []
+extensions: []
 
-rubyforge_project: ffi
 rubygems_version: 1.3.1
-signing_key: 
-specification_version: 2
-summary: A Ruby foreign function interface
+requirements: []
+
+authors: 
+- JRuby Project
+date: 2009-03-24 14:00:00 +00:00
+platform: java
 test_files: []
 
+version: !ruby/object:Gem::Version 
+  version: 0.3.2
+require_paths: 
+- lib
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - '>='
+      - !ruby/object:Gem::Version 
+        version: 2.4.2
+    version: 
+  type: :development
+  version_requirement: 
+  name: bones
+bindir: bin
+has_rdoc: false