ffi 1.9.12 → 1.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5384dc1ad83cc154814d1caf19bf73add2073e9
-  data.tar.gz: 2d0411d05b20266f3a0232182e3fdc94e4ffce7f
+  metadata.gz: ae37e4a0786d5656ea80701b2a6752adabc12b98
+  data.tar.gz: 6b6fcd4779ce7669cfdac62426e794204fe3c4a1
 SHA512:
-  metadata.gz: 0cecdb13ca1dc33e06911810ce16b7b6085ff60985e1eab84eb9f4eb6c73fa1185937bcab477e5930ecc4165d0391523f8ca8bcf8a7d3f30eb7254047bb5e52e
-  data.tar.gz: 9244b575f403ac117fb3a9c869e21bd1f1e0abd0be26f5593799d00cadd9f5fb36c4379b0000872e2e7c03d662f1c76012d0744b153be51f08c9237e6f277f5a
+  metadata.gz: 75d63a7a600c78b6ca7c050c72af5ce2dabe5f95ddaf459cf0f49800d85b5501db7180ef66e581f139276c99cf8a7d96a714282a0ae69f0ada37a4cb9c7ea27e
+  data.tar.gz: 58d41a1f3a1b6ddd769fa1edccb8e063f94675caeb3e93fa8f3a7b66fb6eba8cc400c142bd30873ed4b88e39a8253d31aba138151d56d6cdb120c67c080b10d0

data/lib/ffi/library.rb

@@ -122,20 +122,21 @@ module FFI
                 end
               end
 
-              # TODO better library lookup logic
-              unless libname.to_s.start_with?("/")
-                path = ['/usr/lib/','/usr/local/lib/'].find do |pth|
-                  File.exist?(pth + libname)
-                end
-                if path
-                  libname = path + libname
-                  retry
-                end
-              end
-
               if ldscript
                 retry
               else
+                # TODO better library lookup logic
+                libname = libname.to_s
+                unless libname.start_with?("/")
+                  path = ['/usr/lib/','/usr/local/lib/'].find do |pth|
+                    File.exist?(pth + libname)
+                  end
+                  if path
+                    libname = path + libname
+                    retry
+                  end
+                end
+
                 libr = (orig == libname ? orig : "#{orig} #{libname}")
                 errors[libr] = ex
               end

data/lib/ffi/version.rb

@@ -1,4 +1,4 @@
 module FFI
-  VERSION = '1.9.12'
+  VERSION = '1.9.13'
 end
 

data/spec/ffi/library_spec.rb

@@ -96,6 +96,16 @@ describe "Library" do
       }.not_to raise_error
     end
 
+    it "loads library using symbol" do
+      expect {
+        expect(Module.new do |m|
+          m.extend FFI::Library
+          ffi_lib :c
+          attach_function :getpid, [ ], :uint
+        end.getpid).to eq(Process.pid)
+      }.not_to raise_error
+    end
+
     it "attach_function :getpid from [ 'c', 'libc.so.6'] " do
       expect {
         expect(Module.new do |m|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.9.12
+  version: 1.9.13
 platform: ruby
 authors:
 - Wayne Meissner
@@ -570,7 +570,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby FFI