ffi 1.17.2-arm64-darwin → 1.17.3-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d6a30828daae75fb595fcdff5e46af863e8b769a2d36910ff99d278b23e1c7b
-  data.tar.gz: a1bda8cb55b85678881601311ea2c3525d9212c7f380aad69c8dbf3b4f8e0fe9
+  metadata.gz: fc6e3eb9231e3194654594e392b06730542b8e3bbc0e80e65b13c2ac5c5f938b
+  data.tar.gz: 7c3d235442d3a836e9013a7beea8027565a307080b08ca2c4a6b98246e7b31dc
 SHA512:
-  metadata.gz: 165730f75204571632dcc066f854b140710700bb55abd9d25aa1ec5f54ea54b7ea540e60ce7f30279a67f28de97e548bc3b8b4322aef418314111eaf08576b52
-  data.tar.gz: 4e9888493e6db60a3aaadeb1bc6c2b705595a72140bc59644419ae940f5e8c6f8a8fcdd261302d3f67b01300d46c64c2fad9620420ea252c2ffa2528fb434f75
+  metadata.gz: db6e79e726d8b71b0b73f2ee402af343439288b1917cb0bd88a33dba138d8af29613451ff29940fb5ddc11e3eff2617a086da31417d044df05f1d4aec5d45062
+  data.tar.gz: 669249e17e1eae7db92176d0860d3d09d68f47bc90c68f5b3325c4cd9276f32aad47d14571fb61d117a33e2cac07adde6034fb68a21b59e8af07dbadfceaa468

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+1.17.3 / 2025-12-29
+-------------------
+
+Fixed:
+* Opt-in for MFA requirement explicitly. #1159
+* Fix type signature for FFI::AutoPointer#initialize, FFI::StructByReference#native_type and FFI::Struct#auto_ptr . #1158
+* Fix function signature of function_call in FFI trampoline. #1154
+  It failed on `aarch64-mingw-ucrt`.
+* Add workaround for segmentation faults on `aarch64-mingw-ucrt`. #1154
+* Call super in `Library#freeze` . #1154
+* Deny duplication of AutoPointer per #dup and #clone . #1173
+  They led to double free before.
+
+Added:
+* Add binary gems for Ruby-4.0, now providing binary gems for Ruby-3.0 to 4.0.
+* Add msys2_mingw_dependencies for Windows Mingw for automatic installation of libffi. #1143
+* Mark callback dispatcher thread as fork safe for Puma. #1156
+* Add missing FFI::Platform module and LastError signatures. #1169
+
+Removed:
+* Drop fat binary gems for Ruby-2.7
+* Remove `FFI::TypesGenerator` from distributed gems. #1164
+* Remove libffi build dir after install, safing some install space. #1157
+
+
 1.17.2 / 2025-04-15
 -------------------
 

data/Gemfile

@@ -1,13 +1,15 @@
 source 'https://rubygems.org'
 
+gemspec
+
 group :development do
   gem 'benchmark' # necessary on ruby-3.5+
   gem 'bigdecimal' # necessary on ruby-3.3+
-  gem 'bundler', '>= 1.16', '< 3'
-  gem 'fiddle', platforms: %i[mri windows] # necessary on ruby-3.5+
+  gem 'bundler', '>= 1.16', '< 5.dev'
+  gem 'fiddle' # necessary on ruby-4.0+
   gem 'rake', '~> 13.0'
   gem 'rake-compiler', '~> 1.1'
-  gem 'rake-compiler-dock', '~> 1.9.0'
+  gem 'rake-compiler-dock', '~> 1.11.0'
   gem 'rspec', '~> 3.0'
 end
 
@@ -17,7 +19,8 @@ group :doc do
 end
 
 group :type_check do
-  if RUBY_VERSION >= "2.6" && %w[ ruby truffleruby ].include?(RUBY_ENGINE)
+  if RUBY_VERSION >= "3.0" && %w[ ruby truffleruby ].include?(RUBY_ENGINE)
     gem 'rbs', '~> 3.0'
+    gem 'steep', '~> 1.6'
   end
 end

data/README.md

@@ -33,6 +33,7 @@ MyLib.puts 'Hello, World using libc!'
 
 For less minimalistic and more examples you may look at:
 
+* The [documentation](https://www.rubydoc.info/gems/ffi)
 * the `samples/` folder
 * the examples on the [wiki](https://github.com/ffi/ffi/wiki)
 * the projects using FFI listed on the wiki: https://github.com/ffi/ffi/wiki/projects-using-ffi

data/Rakefile

@@ -97,6 +97,7 @@ Bundler::GemHelper.instance.cross_platforms = %w[
   arm-linux-musl
   aarch64-linux-gnu
   aarch64-linux-musl
+  aarch64-mingw-ucrt
   x86_64-darwin
   arm64-darwin
 ]
@@ -111,6 +112,8 @@ if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
     ext.cross_platform = Bundler::GemHelper.instance.cross_platforms
     ext.cross_compiling do |spec|
       spec.files.reject! { |path| File.fnmatch?('ext/*', path) }
+      # Binary gems don't need libffi header+lib files
+      spec.metadata.delete("msys2_mingw_dependencies")
     end
     # Enable debug info for 'rake compile' but not for 'gem install'
     ext.config_options << "--enable-debug"
@@ -126,7 +129,7 @@ end
 namespace "gem" do
   task 'prepare' do
     require 'rake_compiler_dock'
-    sh "bundle package --all"
+    sh "bundle package"
   end
 
   Bundler::GemHelper.instance.cross_platforms.each do |plat|
@@ -137,8 +140,8 @@ namespace "gem" do
     task plat => ['prepare', 'build'] do
       RakeCompilerDock.sh <<-EOT, platform: plat
         sudo apt-get update && sudo apt-get install -y libltdl-dev &&
-        bundle --local &&
-        rake native:#{plat} pkg/#{gem_spec.full_name}-#{plat}.gem MAKE='nice make -j`nproc`' RUBY_CC_VERSION=#{RakeCompilerDock.ruby_cc_version("~>2.5", "~>3.0")}
+        bundle install --local &&
+        rake native:#{plat} pkg/#{gem_spec.full_name}-#{plat}.gem MAKE='nice make -j`nproc`' RUBY_CC_VERSION=#{RakeCompilerDock.ruby_cc_version("~>4.0", "~>3.0")}
       EOT
     end
   end
@@ -180,7 +183,7 @@ logfile = File.join(File.dirname(__FILE__), 'types_log')
 
 task types_conf do |task|
   require 'fileutils'
-  require_relative "lib/ffi/tools/types_generator"
+  require_relative "rakelib/types_generator"
   options = {}
   FileUtils.mkdir_p(File.dirname(task.name), mode: 0755 )
   File.open(task.name, File::CREAT|File::TRUNC|File::RDWR, 0644) do |f|

data/Steepfile

@@ -0,0 +1,8 @@
+target :lib do
+  signature "sig"
+
+  check "lib"
+
+  # ignore whole of lib, to just validate RBS in sig
+  ignore "lib"
+end

data/ffi.gemspec

@@ -15,9 +15,10 @@ Gem::Specification.new do |s|
     s.metadata['wiki_uri'] = 'https://github.com/ffi/ffi/wiki'
     s.metadata['source_code_uri'] = 'https://github.com/ffi/ffi/'
     s.metadata['mailing_list_uri'] = 'http://groups.google.com/group/ruby-ffi'
+    s.metadata['rubygems_mfa_required'] = 'true'
   end
   s.files = `git ls-files -z`.split("\x0").reject do |f|
-    f =~ /^(\.|bench|gen|libtest|nbproject|spec)/
+    f =~ /^(\.|bench|gen|libtest|nbproject|spec|rakelib)/
   end
 
   # Add libffi git files
@@ -35,8 +36,6 @@ Gem::Specification.new do |s|
   s.license = 'BSD-3-Clause'
   s.require_paths << 'ext/ffi_c'
   s.required_ruby_version = '>= 2.5'
-  s.add_development_dependency 'rake', '~> 13.0'
-  s.add_development_dependency 'rake-compiler', '~> 1.1'
-  s.add_development_dependency 'rake-compiler-dock', '~> 1.0'
-  s.add_development_dependency 'rspec', '~> 2.14.1'
+
+  s.metadata['msys2_mingw_dependencies'] = 'libffi'
 end

data/lib/ffi/autopointer.rb

@@ -89,6 +89,12 @@ module FFI
       self
     end
 
+    def dup
+      raise RuntimeError, "cannot duplicate FFI::AutoPointer"
+    end
+
+    alias clone dup
+
     # @return [nil]
     # Free the pointer.
     def free

data/lib/ffi/compat.rb

@@ -40,4 +40,15 @@ module FFI
       obj.freeze
     end
   end
+
+  if defined?(Ractor.shareable_proc)
+    # This is for FFI internal use only.
+    def self.shareable_proc(**kwargs, &block)
+      Ractor.shareable_proc(**kwargs, &block)
+    end
+  else
+    def self.shareable_proc(**_kwargs, &block)
+      block
+    end
+  end
 end

data/lib/ffi/function.rb

@@ -51,6 +51,29 @@ module FFI
       end
     end
 
+    if RUBY_PLATFORM == 'aarch64-mingw-ucrt'
+      # Use a workaround for https://github.com/libffi/libffi/issues/905
+      def attach(mod, name)
+        this = self
+        body = proc do |*args, &block|
+          this.call(*args, &block)
+        end
+
+        mod.define_method(name, body)
+        mod.define_singleton_method(name, body)
+
+        # Store function Proc's for re-definition as Ractor-shareable in Library#freeze
+        funcs = mod.instance_variable_get("@ffi_function_procs")
+        unless funcs
+          funcs = {}
+          mod.instance_variable_set("@ffi_function_procs", funcs)
+        end
+        funcs[name] = self
+
+        self
+      end
+    end
+
     # Stash the Function in a module variable so it can be inspected by attached_functions.
     # On CRuby it also ensures that it does not get garbage collected.
     module RegisterAttach

data/lib/ffi/library.rb

@@ -287,7 +287,7 @@ module FFI
       if type.is_a?(Class) && type < FFI::Struct
         # If it is a global struct, just attach directly to the pointer
         s = s = type.new(address) # Assigning twice to suppress unused variable warning
-        self.module_eval <<-code, __FILE__, __LINE__
+        self.module_eval(<<-code, __FILE__, __LINE__)
           @ffi_gsvars = {} unless defined?(@ffi_gsvars)
           @ffi_gsvars[#{mname.inspect}] = s
           def self.#{mname}
@@ -302,7 +302,7 @@ module FFI
         #
         # Attach to this module as mname/mname=
         #
-        self.module_eval <<-code, __FILE__, __LINE__
+        self.module_eval(<<-code, __FILE__, __LINE__)
           @ffi_gvars = {} unless defined?(@ffi_gvars)
           @ffi_gvars[#{mname.inspect}] = s
           def self.#{mname}
@@ -564,12 +564,28 @@ module FFI
     # Freeze all definitions of the module
     #
     # This freezes the module's definitions, so that it can be used in a Ractor.
-    # No further methods or variables can be attached and no further enums or typedefs can be created in this module afterwards.
+    # No further functions or variables can be attached and no further enums or typedefs can be created in this module afterwards.
     def freeze
+      # @ffi_function_procs is only used on aarch64-mingw-ucrt
+      instance_variable_get("@ffi_function_procs")&.each do |name, func|
+        # Redefine attached functions as Ractor-shareable.
+        # The function Proc can't be shareable from the beginning, since it references enums and typedefs.
+        this = FFI.make_shareable(func)
+        body = FFI.shareable_proc(self: nil) do |*args, &block|
+          this.call(*args, &block)
+        end
+        undef_method(name)
+        singleton_class.undef_method(name)
+
+        define_method(name, body)
+        define_singleton_method(name, body)
+      end
+
       instance_variables.each do |name|
         var = instance_variable_get(name)
         FFI.make_shareable(var)
       end
+      super
       nil
     end
   end

data/lib/ffi/struct_by_reference.rb

@@ -44,7 +44,7 @@ module FFI
     end
 
     # Always get {FFI::Type}::POINTER.
-    def native_type
+    def native_type(_type = nil)
       FFI::Type::POINTER
     end
 

data/lib/ffi/version.rb

@@ -1,3 +1,3 @@
 module FFI
-  VERSION = '1.17.2'
+  VERSION = '1.17.3'
 end

data/samples/hello_ractor.rb

@@ -1,5 +1,13 @@
+# See the ffi wiki for how to use FFI with Ractors:
+# https://github.com/ffi/ffi/wiki/Ractors
+
 require 'ffi'
 
+class Ractor
+  # compat with Ruby-3.4 and older
+  alias value take unless method_defined? :value
+end
+
 module Foo
   extend FFI::Library
   ffi_lib FFI::Library::LIBC
@@ -8,4 +16,4 @@ module Foo
 end
 Ractor.new do
   Foo.cputs("Hello, World via libc puts using FFI in a Ractor")
-end.take
+end.value

data/samples/qsort_ractor.rb

@@ -1,5 +1,13 @@
+# See the ffi wiki for how to use FFI with Ractors:
+# https://github.com/ffi/ffi/wiki/Ractors
+
 require 'ffi'
 
+class Ractor
+  # compat with Ruby-3.4 and older
+  alias value take unless method_defined? :value
+end
+
 module LibC
   extend FFI::Library
   ffi_lib FFI::Library::LIBC
@@ -23,6 +31,6 @@ res = Ractor.new(p) do |p|
     i1 < i2 ? -1 : i1 > i2 ? 1 : 0
   end
   puts "After qsort #{p.get_array_of_int32(0, 3).join(', ')}"
-end.take
+end.value
 
 puts "After ractor termination #{p.get_array_of_int32(0, 3).join(', ')}"

data/sig/ffi/auto_pointer.rbs

@@ -12,7 +12,7 @@ module FFI
       def release: (Pointer ptr) -> void
     end
 
-    def initialize: (Pointer pointer, Method | ^(self) -> void | Releaser::_Proc[self] callable) -> self
+    def initialize: (Pointer pointer, Method | ^(instance) -> void | Releaser::_Proc[instance] callable) -> self
                   | (Pointer pointer) -> self # where class < `def self.release: (instance pointer) -> void`
 
     extend DataConverter[Pointer, instance, nil]

data/sig/ffi/errno.rbs

@@ -0,0 +1,8 @@
+module FFI
+  module LastError
+    def self?.error: () -> Integer
+    def self?.error=: (Integer) -> Integer
+    def self?.winapi_error: () -> Integer?
+    def self?.winapi_error=: (Integer? error) -> void
+  end
+end

data/sig/ffi/platform.rbs

@@ -0,0 +1,49 @@
+module FFI
+  class PlatformError < LoadError
+  end
+
+  module Platform
+    OS: String
+
+    OSVERSION: Integer
+
+    CPU: String
+
+    ARCH: String
+
+    IS_GNU: bool
+    IS_LINUX: bool
+    IS_MAC: bool
+    IS_FREEBSD: bool
+    IS_NETBSD: bool
+    IS_OPENBSD: bool
+    IS_DRAGONFLYBSD: bool
+    IS_SOLARIS: bool
+    IS_WINDOWS: bool
+    IS_BSD: bool
+
+    NAME: String
+
+    CONF_DIR: String
+
+    LIBPREFIX: String
+
+    LIBSUFFIX: String
+
+    LIBC: String
+
+    LITTLE_ENDIAN: Integer
+
+    BIG_ENDIAN: Integer
+
+    def self.bsd?: () -> bool
+    def self.windows?: () -> bool
+    def self.mac?: () -> bool
+    def self.solaris?: () -> bool
+    def self.unix?: () -> bool
+
+    private
+
+    def self.is_os: (String os) -> bool
+  end
+end

data/sig/ffi/struct.rbs

@@ -4,7 +4,7 @@ module FFI
 
     type ptr = Type::Mapped[
       StructByReference[Struct[AbstractMemory, untyped], AbstractMemory],
-      AbstractMemory, instance, untyped
+      AbstractMemory, Struct[AbstractMemory, untyped], untyped
     ]
     def self.ptr: (?untyped flags) -> ptr # https://github.com/ffi/ffi/issues/1073
     alias self.by_ref self.ptr
@@ -22,7 +22,7 @@ module FFI
 
     def self.auto_ptr: () -> Type::Mapped[
         ManagedStructConverter[ManagedStruct[AutoPointer, untyped], AutoPointer],
-        Pointer, instance, untyped
+        Pointer, ManagedStruct[AutoPointer, untyped], untyped
       ]
     def self.layout: (*layout | Integer) -> StructLayout
               | (Hash[Symbol, layout]) -> StructLayout

data/sig/ffi/struct_by_reference.rbs

@@ -5,7 +5,7 @@ module FFI
 
     def initialize: (S struct_class) -> void
     def from_native: (P value, untyped ctx) -> S
-    def native_type: () -> Type::Builtin
+    def native_type: (?ffi_auto_type? type) -> Type
     def to_native: (S? value, untyped ctx) -> P
   end
 end

data/sig/ffi.rbs

@@ -14,9 +14,12 @@ module FFI
   CURRENT_PROCESS: current_process
   USE_THIS_PROCESS_AS_LIBRARY: current_process
 
+  class NotFoundError < LoadError
+  end
+
   private def self.custom_typedefs: () -> type_map
   def self.errno: () -> Integer
-  def self.errno=: (Integer) -> nil
+  def self.errno=: (Integer) -> Integer
   def self.find_type: (ffi_auto_type name, ?type_map? type_map) -> Type
   def self.make_shareable: [T] (T obj) -> T
   def self.map_library_name: (_ToS lib) -> String

metadata

@@ -1,70 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.17.2
+  version: 1.17.3
 platform: arm64-darwin
 authors:
 - Wayne Meissner
 bindir: bin
 cert_chain: []
-date: 2025-04-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler-dock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.14.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.14.1
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies: []
 description: Ruby FFI library
 email: wmeissner@gmail.com
 executables: []
@@ -78,15 +22,14 @@ files:
 - LICENSE.SPECS
 - README.md
 - Rakefile
+- Steepfile
 - ffi.gemspec
-- lib/2.5/ffi_c.bundle
-- lib/2.6/ffi_c.bundle
-- lib/2.7/ffi_c.bundle
 - lib/3.0/ffi_c.bundle
 - lib/3.1/ffi_c.bundle
 - lib/3.2/ffi_c.bundle
 - lib/3.3/ffi_c.bundle
 - lib/3.4/ffi_c.bundle
+- lib/4.0/ffi_c.bundle
 - lib/ffi.rb
 - lib/ffi/abstract_memory.rb
 - lib/ffi/autopointer.rb
@@ -172,12 +115,10 @@ files:
 - lib/ffi/tools/generator.rb
 - lib/ffi/tools/generator_task.rb
 - lib/ffi/tools/struct_generator.rb
-- lib/ffi/tools/types_generator.rb
 - lib/ffi/types.rb
 - lib/ffi/union.rb
 - lib/ffi/variadic.rb
 - lib/ffi/version.rb
-- rakelib/ffi_gem_helper.rb
 - samples/getlogin.rb
 - samples/getpid.rb
 - samples/gettimeofday.rb
@@ -194,9 +135,11 @@ files:
 - sig/ffi/data_converter.rbs
 - sig/ffi/dynamic_library.rbs
 - sig/ffi/enum.rbs
+- sig/ffi/errno.rbs
 - sig/ffi/function.rbs
 - sig/ffi/library.rbs
 - sig/ffi/native_type.rbs
+- sig/ffi/platform.rbs
 - sig/ffi/pointer.rbs
 - sig/ffi/struct.rbs
 - sig/ffi/struct_by_reference.rbs
@@ -214,6 +157,7 @@ metadata:
   wiki_uri: https://github.com/ffi/ffi/wiki
   source_code_uri: https://github.com/ffi/ffi/
   mailing_list_uri: http://groups.google.com/group/ruby-ffi
+  rubygems_mfa_required: 'true'
 rdoc_options:
 - "--exclude=ext/ffi_c/.*\\.o$"
 - "--exclude=ffi_c\\.(bundle|so)$"
@@ -223,17 +167,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.5.dev
+      version: 4.1.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Ruby FFI
 test_files: []

data/lib/ffi/tools/types_generator.rb

@@ -1,137 +0,0 @@
-require 'tempfile'
-
-module FFI
-
-  # @private
-  class TypesGenerator
-
-    ##
-    # Maps different C types to the C type representations we use
-
-    TYPE_MAP = {
-               "char" => :char,
-        "signed char" => :char,
-      "__signed char" => :char,
-      "unsigned char" => :uchar,
-
-               "short"     => :short,
-        "signed short"     => :short,
-        "signed short int" => :short,
-      "unsigned short"     => :ushort,
-      "unsigned short int" => :ushort,
-
-               "int" => :int,
-        "signed int" => :int,
-      "unsigned int" => :uint,
-
-               "long" => :long,
-               "long int" => :long,
-        "signed long" => :long,
-        "signed long int" => :long,
-      "unsigned long" => :ulong,
-      "unsigned long int" => :ulong,
-      "long unsigned int" => :ulong,
-
-               "long long"     => :long_long,
-               "long long int" => :long_long,
-        "signed long long"     => :long_long,
-        "signed long long int" => :long_long,
-      "unsigned long long"     => :ulong_long,
-      "unsigned long long int" => :ulong_long,
-
-      "char *" => :string,
-      "void *" => :pointer,
-    }
-
-    def self.generate(options = {})
-      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>
-#include <netinet/in.h>
-#include <sys/resource.h>
-#endif
-        C
-
-        io.close
-        cc = ENV['CC'] || 'gcc'
-        cmd = "#{cc} -E -x c #{options[:cppflags]} -D_DARWIN_USE_64_BIT_INODE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -c"
-        if options[:input]
-          typedefs = File.read(options[:input])
-        elsif options[:remote]
-          typedefs = `ssh #{options[:remote]} #{cmd} - < #{io.path}`
-        else
-          typedefs = `#{cmd} #{io.path}`
-        end
-      end
-
-      code = []
-
-      typedefs.each_line do |type|
-        # We only care about single line typedef
-        next unless type =~ /typedef/
-        # Ignore unions or structs
-        next if type =~ /union|struct/
-
-        # strip off the starting typedef and ending ;
-        type.gsub!(/^(.*typedef\s*)/, "")
-        type.gsub!(/\s*;\s*$/, "")
-
-        parts = type.split(/\s+/)
-        def_type   = parts.join(" ")
-
-        # GCC does mapping with __attribute__ stuf, also see
-        # http://hal.cs.berkeley.edu/cil/cil016.html section 16.2.7.  Problem
-        # with this is that the __attribute__ stuff can either occur before or
-        # after the new type that is defined...
-        if type =~ /__attribute__/
-          if parts.last =~ /__QI__|__HI__|__SI__|__DI__|__word__/
-
-            # In this case, the new type is BEFORE __attribute__ we need to
-            # find the final_type as the type before the part that starts with
-            # __attribute__
-            final_type = ""
-            parts.each do |p|
-              break if p =~ /__attribute__/
-              final_type = p
-            end
-          else
-            final_type = parts.pop
-          end
-
-          def_type = case type
-                     when /__QI__/   then "char"
-                     when /__HI__/   then "short"
-                     when /__SI__/   then "int"
-                     when /__DI__/   then "long long"
-                     when /__word__/ then "long"
-                     else                 "int"
-                     end
-
-          def_type = "unsigned #{def_type}" if type =~ /unsigned/
-        else
-          final_type = parts.pop
-          def_type   = parts.join(" ")
-        end
-
-        if type = TYPE_MAP[def_type]
-          code << "rbx.platform.typedef.#{final_type} = #{type}"
-          TYPE_MAP[final_type] = TYPE_MAP[def_type]
-        else
-          # Fallback to an ordinary pointer if we don't know the type
-          if def_type =~ /\*/
-            code << "rbx.platform.typedef.#{final_type} = pointer"
-            TYPE_MAP[final_type] = :pointer
-          end
-        end
-      end
-
-      code.sort.join("\n")
-    end
-  end
-end
-

data/rakelib/ffi_gem_helper.rb

@@ -1,65 +0,0 @@
-require 'bundler'
-require 'bundler/gem_helper'
-
-class FfiGemHelper < Bundler::GemHelper
-  attr_accessor :cross_platforms
-
-  def install
-    super
-
-    task "release:guard_clean" => ["release:update_history"]
-
-    task "release:update_history" do
-      update_history
-    end
-
-    task "release:rubygem_push" => ["gem:native", "gem:java"]
-  end
-
-  def hfile
-    "CHANGELOG.md"
-  end
-
-  def headline
-    '([^\w]*)(\d+\.\d+\.\d+(?:\.\w+)?)([^\w]+)([2Y][0Y][0-9Y][0-9Y]-[0-1M][0-9M]-[0-3D][0-9D])([^\w]*|$)'
-  end
-
-  def reldate
-    Time.now.strftime("%Y-%m-%d")
-  end
-
-  def update_history
-    hin = File.read(hfile)
-    hout = hin.sub(/#{headline}/) do
-      raise "#{hfile} isn't up-to-date for version #{version}" unless $2==version.to_s
-      $1 + $2 + $3 + reldate + $5
-    end
-    if hout != hin
-      Bundler.ui.confirm "Updating #{hfile} for release."
-      File.write(hfile, hout)
-      Rake::FileUtilsExt.sh "git", "commit", hfile, "-m", "Update release date in #{hfile}"
-    end
-  end
-
-  def tag_version
-    Bundler.ui.confirm "Tag release with annotation:"
-    m = File.read(hfile).match(/(?<annotation>#{headline}.*?)#{headline}/m) || raise("Unable to find release notes in #{hfile}")
-    Bundler.ui.info(m[:annotation].gsub(/^/, "    "))
-    IO.popen(["git", "tag", "--file=-", version_tag], "w") do |fd|
-      fd.write m[:annotation]
-    end
-    yield if block_given?
-  rescue
-    Bundler.ui.error "Untagging #{version_tag} due to error."
-    sh_with_code "git tag -d #{version_tag}"
-    raise
-  end
-
-  def rubygem_push(path)
-    cross_platforms.each do |ruby_platform|
-      super(path.gsub(/\.gem\z/, "-#{ruby_platform}.gem"))
-    end
-    super(path.gsub(/\.gem\z/, "-java.gem"))
-    super(path)
-  end
-end