ffi 1.9.12-x86-mingw32 → 1.9.13-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e7f26deb92dfb11bacb683e61522e28f4c7185f
-  data.tar.gz: afe0a0b8762cce3f055d77763646b752fc923322
+  metadata.gz: 3a99f7cc0ee695104250f882d7cdbda9f0a96a99
+  data.tar.gz: 31bd2d4062179eecfbb2d0fe5cc8caa4f0a1ecd4
 SHA512:
-  metadata.gz: 079e3e16efd86c759e8fabe903535a811beea2925283aca24189d9b26c86a99bfef161078f4c4d7116df2326ea24301d20ecf776972efb021921d21b52547dc2
-  data.tar.gz: 6ef1828d0a3bd1d29e985dce9a0116ffe6936cb96c630178d70bffd088b1dbbd3b307470eb455512e3b19360e10555dd2dc6692e54b5d0fe12ff9d08dedb3d3b
+  metadata.gz: 21a921e2ddf9360182541d2a450443bb5e5ead2ac6ffe1f13f034f2f8ae0c1e4ca088b1eb14a9e59bb8525fc1302d2245c303b62064e95a9d4a148c59fe1e364
+  data.tar.gz: a5289e8ec9928212214cbd7e29eb33229e555ad8ada55169539940e70cd6cfc7d99b4fefa8843ae2a3eea85ec02815692f45dd25ca518860bb71eac3db33e94b

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