ffi 1.9.12-x64-mingw32 → 1.9.13-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3763b8d3765c5cf32f3a495e61390da702864c89
-  data.tar.gz: 02df6497f630a1eb4b48b6fead05c3a2abf67282
+  metadata.gz: e2b17f5b40e60f2fd8c48d4456ed03ae5bb185d0
+  data.tar.gz: 4279ca220d55a076c1140ac9e0e76b9b9062d06b
 SHA512:
-  metadata.gz: dc56794eae34134d0263ffee21154bb884564e334baf6143e5847e5416b433bd3e37efbc0b08b25e4ccffd3568b1a89b3124a9a8986d37ff00e3ada6558cdd95
-  data.tar.gz: 48abf913371b8428ee630aef623daca19d8aaf79944e739bb959fff65278ac26df07edab70333a5bfb1a1b9196c579e626a5c779d75c1477aaae4fbeb85f88cf
+  metadata.gz: 8e22f412c90c089fa06706c8a996e277d75a3bf61f84f57beeca81793ffc253ec1bb3bed5206f310118e26944093202b86415f788ec957b0b6ab3f106442f5dd
+  data.tar.gz: 2aa3cb5131810bd29cc8786d87aa37120eea39d07adda31576b4f85bd60af5ac22f41c40ac7fe8409800cb9107cdf64bfeb7363129903675456f5dbc7aa18657

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: x64-mingw32
 authors:
 - Wayne Meissner