ffi 1.12.2 → 1.13.0

data/lib/ffi/struct.rb

@@ -228,7 +228,11 @@ module FFI
 
       def callback(params, ret)
         mod = enclosing_module
-        FFI::CallbackInfo.new(find_type(ret, mod), params.map { |e| find_type(e, mod) })
+        ret_type = find_type(ret, mod)
+        if ret_type == Type::STRING
+          raise TypeError, ":string is not allowed as return type of callbacks"
+        end
+        FFI::CallbackInfo.new(ret_type, params.map { |e| find_type(e, mod) })
       end
 
       def packed(packed = 1)
@@ -244,7 +248,9 @@ module FFI
       def enclosing_module
         begin
           mod = self.name.split("::")[0..-2].inject(Object) { |obj, c| obj.const_get(c) }
-          (mod < FFI::Library || mod < FFI::Struct || mod.respond_to?(:find_type)) ? mod : nil
+          if mod.respond_to?(:find_type) && (mod.is_a?(FFI::Library) || mod < FFI::Struct)
+            mod
+          end
         rescue Exception
           nil
         end

data/lib/ffi/tools/types_generator.rb

@@ -47,6 +47,8 @@ module FFI
       typedefs = nil
       Tempfile.open 'ffi_types_generator' do |io|
         io.puts <<-C
+#include <stdint.h>
+#include <stddef.h>
 #include <sys/types.h>
 #if !(defined(WIN32))
 #include <sys/socket.h>

data/lib/ffi/version.rb

@@ -1,3 +1,3 @@
 module FFI
-  VERSION = '1.12.2'
+  VERSION = '1.13.0'
 end

data/samples/getlogin.rb

@@ -1,5 +1,5 @@
-require 'rubygems'
 require 'ffi'
+
 module Foo
   extend FFI::Library
   ffi_lib FFI::Library::LIBC

data/samples/getpid.rb

@@ -1,5 +1,5 @@
-require 'rubygems'
 require 'ffi'
+
 module Foo
   extend FFI::Library
   ffi_lib FFI::Library::LIBC

data/samples/gettimeofday.rb

@@ -1,16 +1,16 @@
-require 'rubygems'
 require 'ffi'
+require 'rbconfig'
+
 class Timeval < FFI::Struct
-  rb_maj, rb_min, rb_micro = RUBY_VERSION.split('.')
-  if rb_maj.to_i >= 1 && rb_min.to_i >= 9 || RUBY_PLATFORM =~ /java/
-    layout :tv_sec => :ulong, :tv_usec => :ulong
-  else
-    layout :tv_sec, :ulong, 0, :tv_usec, :ulong, 4
-  end
+  layout tv_sec: :ulong, tv_usec: :ulong
 end
 module LibC
   extend FFI::Library
-  ffi_lib FFI::Library::LIBC
+  if FFI::Platform.windows?
+    ffi_lib RbConfig::CONFIG["LIBRUBY_SO"]
+  else
+    ffi_lib FFI::Library::LIBC
+  end
   attach_function :gettimeofday, [ :pointer, :pointer ], :int
 end
 t = Timeval.new

data/samples/hello.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "sample_helper"))
+require 'ffi'
+
 module Foo
   extend FFI::Library
   ffi_lib FFI::Library::LIBC

data/samples/inotify.rb

@@ -1,5 +1,5 @@
-require 'rubygems'
 require 'ffi'
+
 module Inotify
   extend FFI::Library
   ffi_lib FFI::Library::LIBC

data/samples/pty.rb

@@ -1,6 +1,5 @@
 require 'ffi'
 
-
 module PTY
   private
   module LibC
@@ -41,7 +40,7 @@ module PTY
     #
     exec_cmd, exec_args = build_args(args)
     pid = LibC.forkpty(mfdp, name, nil, nil)
-    raise "forkpty failed: #{LibC.strerror(FFI.errno)}" if pid < 0    
+    raise "forkpty failed: #{LibC.strerror(FFI.errno)}" if pid < 0
     if pid == 0
       LibC.execvp(exec_cmd, exec_args)
       exit 1

data/samples/qsort.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'ffi'
 
 module LibC

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.13.0
 platform: ruby
 authors:
 - Wayne Meissner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-01 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -88,6 +88,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".appveyor.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".travis.yml"
@@ -608,12 +609,14 @@ files:
 - lib/ffi/platform/powerpc-aix/types.conf
 - lib/ffi/platform/powerpc-darwin/types.conf
 - lib/ffi/platform/powerpc-linux/types.conf
+- lib/ffi/platform/powerpc-openbsd/types.conf
 - lib/ffi/platform/powerpc64-linux/types.conf
 - lib/ffi/platform/s390-linux/types.conf
 - lib/ffi/platform/s390x-linux/types.conf
 - lib/ffi/platform/sparc-linux/types.conf
 - lib/ffi/platform/sparc-solaris/types.conf
 - lib/ffi/platform/sparc64-linux/types.conf
+- lib/ffi/platform/sparcv9-openbsd/types.conf
 - lib/ffi/platform/sparcv9-solaris/types.conf
 - lib/ffi/platform/x86_64-cygwin/types.conf
 - lib/ffi/platform/x86_64-darwin/types.conf
@@ -646,7 +649,6 @@ files:
 - samples/inotify.rb
 - samples/pty.rb
 - samples/qsort.rb
-- samples/sample_helper.rb
 homepage: https://github.com/ffi/ffi/wiki
 licenses:
 - BSD-3-Clause
@@ -667,7 +669,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/samples/sample_helper.rb

@@ -1,6 +0,0 @@
-require 'rubygems'
-require 'spec'
-
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib"), File.join(File.dirname(__FILE__), "..", "build", RUBY_VERSION) unless RUBY_PLATFORM =~ /java/
-require "ffi"
-