ffi 1.9.8 → 1.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7f6c77b9d7ff90139dd58f53fd45f56a70cd1ab
-  data.tar.gz: 46d02e0786f9f5e27ffaf26c230073425ed8c6cc
+  metadata.gz: 274c28735a025a3c381ada6bb20c5d5a8c5b67f6
+  data.tar.gz: 4891b4ce3e3a37dd6b0ee17e7a35585eb4f113f6
 SHA512:
-  metadata.gz: 12179ec5d962f92acfeb926c628cb72b11ffb85021e62908b2ba216763ebb420fd578defe1e2a813259f5d8a19c95d8cb62c9d15323a563e3cd0b1345e3afe10
-  data.tar.gz: f2be958dc23f5b7f4df4ce47408515238d6fd105a716de51a73d812f712f162a31db0043c4ba83e67af9f0f71a5c92f27020cca39dfd98c2790acfa713524fec
+  metadata.gz: 43c61fec1452804a2559bdcceda307d524f7cf80ac126eeb7d5334acaafe64bea683098dff12005356c564a4e4f8b6b69ca3cbcf17b0bf77be16ce1675db1cd3
+  data.tar.gz: 8524c621239feca489074149a9183194f6a4fdc6b911afb73287f056e867d03fc00c5e14d6ae219e1d9b021138987751ff68f4dc39470ec98c498804e596cbd1

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rubygems/tasks'
 require 'rbconfig'
 require 'rake/clean'
+require File.expand_path("./lib/ffi/version")
 
 USE_RAKE_COMPILER = (RUBY_PLATFORM =~ /java/) ? false : true
 if USE_RAKE_COMPILER
@@ -13,11 +14,6 @@ require 'rbconfig'
 require 'rspec/core/rake_task'
 require 'rubygems/package_task'
 
-RSpec::Core::RakeTask.new(:spec => :compile) do |config|
-  config.rspec_opts = YAML.load_file 'spec/spec.opts'
-end
-
-
 LIBEXT = case RbConfig::CONFIG['host_os'].downcase
   when /darwin/
     "dylib"
@@ -81,38 +77,31 @@ end
 
 TEST_DEPS = [ LIBTEST ]
 if RUBY_PLATFORM == "java"
-  desc "Run all specs"
-  task :specs, [:options] => TEST_DEPS do |t, args|
-    sh %{#{Gem.ruby} -w -S rspec #{args.options || Dir["spec/ffi/*_spec.rb"].join(" ")} -fs --color}
-  end
-  desc "Run rubinius specs"
-  task :rbxspecs => TEST_DEPS do
-    sh %{#{Gem.ruby} -w -S rspec #{Dir["spec/ffi/rbx/*_spec.rb"].join(" ")} -fs --color}
+  RSpec::Core::RakeTask.new(:spec) do |config|
+    config.rspec_opts = YAML.load_file 'spec/spec.opts'
   end
 else
-  TEST_DEPS.unshift :compile
-  desc "Run all specs"
-  task :specs, [:options] => TEST_DEPS do |t, args|
-    ENV["MRI_FFI"] = "1"
-    sh %{#{Gem.ruby} -w -Ilib -I#{BUILD_EXT_DIR} -S rspec #{args.options || Dir["spec/ffi/*_spec.rb"].join(" ")} -fs --color}
-  end
-  desc "Run rubinius specs"
-  task :rbxspecs => TEST_DEPS do
-    ENV["MRI_FFI"] = "1"
-    sh %{#{Gem.ruby} -w -Ilib -I#{BUILD_EXT_DIR} -S rspec #{Dir["spec/ffi/rbx/*_spec.rb"].join(" ")} -fs --color}
+  RSpec::Core::RakeTask.new(:spec => :compile) do |config|
+    config.rspec_opts = YAML.load_file 'spec/spec.opts'
   end
+
+  TEST_DEPS.unshift :compile
 end
 
 desc "Build all packages"
 task :package => 'gem:package'
 
-CLOBBER.include 'build'
-CLOBBER.include FileList['lib/**/ffi_c.so']
-CLOBBER.include FileList["lib/**/ffi_c.#{RbConfig::CONFIG['DLEXT']}"]
 CLOBBER.include 'lib/ffi/types.conf'
-CLOBBER.include 'conftest.dSYM'
 CLOBBER.include 'pkg'
-CLOBBER.include 'spec/ffi/fixtures/libtest.dylib'
+
+CLEAN.include 'build'
+CLEAN.include 'conftest.dSYM'
+CLEAN.include 'spec/ffi/fixtures/libtest.dylib'
+CLEAN.include FileList["pkg/ffi-#{FFI::VERSION}-*-mingw32"]
+CLEAN.include FileList["pkg/ffi-#{FFI::VERSION}-java"]
+CLEAN.include FileList['lib/1.*']
+CLEAN.include FileList['lib/2.*']
+CLEAN.include 'bin'
 
 task :distclean => :clobber
 
@@ -185,27 +174,23 @@ if USE_RAKE_COMPILER
     ext.cross_platform = %w[i386-mingw32 x64-mingw32]                     # forces the Windows platform instead of the default one
   end
 
-  task 'gem:win32' => ['gem:win32-x64', 'gem:win32-i386']
-
-  task 'gem:win32-i386' do
-    sh("rake cross native:i386-mingw32 gem RUBY_CC_VERSION='1.8.7:1.9.3:2.0.0:2.1.5:2.2.1'") || raise("win32-i386 build failed!")
-  end
-
-  task 'gem:win32-x64' do
-    sh("rake cross native:x64-mingw32 gem RUBY_CC_VERSION='2.0.0:2.1.5:2.2.1'") || raise("win32-x64 build failed!")
-  end
+  ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.3:2.0.0:2.1.5:2.2.1'
 
-  (ENV['RUBY_CC_VERSION'] || '1.8.7:1.9.3:2.0.0:2.1.5:2.2.1' ).to_s.split(':').each do |ruby_version|
+  ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
     task "copy:ffi_c:i386-mingw32:#{ruby_version}" do |t|
       sh "i686-w64-mingw32-strip -S #{BUILD_DIR}/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
     end
-  end
 
-  (ENV['RUBY_CC_VERSION'] || '2.0.0:2.1.5:2.2.1' ).to_s.split(':').each do |ruby_version|
     task "copy:ffi_c:x64-mingw32:#{ruby_version}" do |t|
       sh "x86_64-w64-mingw32-strip -S #{BUILD_DIR}/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
     end
   end
+
+  desc "build a windows gem without all the ceremony."
+  task "gem:windows" do
+    require "rake_compiler_dock"
+    RakeCompilerDock.sh "bundle && rake cross native gem MAKE='nice make -j`nproc`'"
+  end
 end
 
 Gem::Tasks.new do |t|

data/ext/ffi_c/MemoryPointer.c

@@ -75,7 +75,7 @@ memptr_allocate(VALUE klass)
  * @param [Numeric] count number of cells in memory
  * @param [Boolean] clear set memory to all-zero if +true+
  * @return [self]
- * A new instance of FFI::MeoryPointer.
+ * A new instance of FFI::MemoryPointer.
  */
 static VALUE
 memptr_initialize(int argc, VALUE* argv, VALUE self)

data/ext/ffi_c/MethodHandle.c

@@ -132,12 +132,6 @@ rbffi_MethodHandle_CodeAddress(MethodHandle* handle)
 #ifndef CUSTOM_TRAMPOLINE
 static void attached_method_invoke(ffi_cif* cif, void* retval, METHOD_PARAMS parameters, void* user_data);
 
-static ffi_type* methodHandleParamTypes[] = {
-    &ffi_type_sint,
-    &ffi_type_pointer,
-    &ffi_type_ulong,
-};
-
 static ffi_cif mh_cif;
 
 static bool
@@ -339,7 +333,12 @@ void
 rbffi_MethodHandle_Init(VALUE module)
 {
 #ifndef CUSTOM_TRAMPOLINE
-    ffi_status ffiStatus;
+    ffi_status ffiStatus;	
+    ffi_type* methodHandleParamTypes[] = {
+        &ffi_type_sint,
+        &ffi_type_pointer,
+        &ffi_type_ulong,
+    };
 #endif
 
     defaultClosurePool = rbffi_ClosurePool_New((int) trampoline_size(), prep_trampoline, NULL);

data/ext/ffi_c/StructLayout.c

@@ -510,8 +510,8 @@ struct_layout_initialize(VALUE self, VALUE fields, VALUE size, VALUE align)
 static VALUE
 struct_layout_union_bang(VALUE self) 
 {
-    static const ffi_type *alignment_types[] = { &ffi_type_sint8, &ffi_type_sint16, &ffi_type_sint32, &ffi_type_sint64,
-                                                 &ffi_type_float, &ffi_type_double, &ffi_type_longdouble, NULL };
+    const ffi_type *alignment_types[] = { &ffi_type_sint8, &ffi_type_sint16, &ffi_type_sint32, &ffi_type_sint64,
+                                          &ffi_type_float, &ffi_type_double, &ffi_type_longdouble, NULL };
     StructLayout* layout;
     ffi_type *t = NULL;
     int count, i;

data/ext/ffi_c/extconf.rb

@@ -33,10 +33,11 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
   $defs << "-DHAVE_EXTCONF_H" if $defs.empty? # needed so create_header works
   $defs << "-DUSE_INTERNAL_LIBFFI" unless libffi_ok
   $defs << "-DRUBY_1_9" if RUBY_VERSION >= "1.9.0"
+  $defs << "-DFFI_BUILDING" if RbConfig::CONFIG['host_os'] =~ /mswin/ # for compatibility with newer libffi
 
   create_header
   
-  $LOCAL_LIBS << " ./libffi/.libs/libffi_convenience.lib" if RbConfig::CONFIG['host_os'] =~ /mswin/
+  $LOCAL_LIBS << " ./libffi/.libs/libffi_convenience.lib" if !libffi_ok && RbConfig::CONFIG['host_os'] =~ /mswin/
 
   create_makefile("ffi_c")
   unless libffi_ok

data/ffi.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.8.7'
   s.add_development_dependency 'rake', '~> 10.1'
   s.add_development_dependency 'rake-compiler', '~> 0.9'
+  s.add_development_dependency 'rake-compiler-dock', '~> 0.3.1'
   s.add_development_dependency 'rspec', '~> 2.14.1'
   s.add_development_dependency 'rubygems-tasks', "~> 0.2.4"
 end

data/lib/ffi.rb

@@ -1,19 +1,7 @@
 if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
   Object.send(:remove_const, :FFI) if defined?(::FFI)
   begin
-    if RUBY_VERSION =~ /1\.8/
-      require '1.8/ffi_c'
-    elsif RUBY_VERSION =~ /1\.9/
-      require '1.9/ffi_c'
-    elsif RUBY_VERSION =~ /2\.0/
-      require '2.0/ffi_c'
-    elsif RUBY_VERSION =~ /2\.1/
-      require '2.1/ffi_c'
-    elsif RUBY_VERSION =~ /2\.2/
-      require '2.2/ffi_c'
-    else
-      require 'ffi_c'
-    end
+    require RUBY_VERSION.split('.')[0, 2].join('.') + '/ffi_c'
   rescue Exception
     require 'ffi_c'
   end

data/lib/ffi/autopointer.rb

@@ -161,9 +161,9 @@ module FFI
     # CallableReleaser is a {Releaser} used when an {AutoPointer} is defined with a
     # Proc or a Method.
     class CallableReleaser < Releaser
+      # Release +ptr+ by using Proc or Method defined at +ptr+ {AutoPointer#initialize initialization}.
       # @param [Pointer] ptr
       # @return [nil]
-      # Release +ptr+ by using Proc or Method defined at +ptr+ {AutoPointer#initialize initialization}.
       def release(ptr)
         @proc.call(ptr)
       end
@@ -183,8 +183,8 @@ module FFI
     #
     # Override {DataConverter#from_native}.
     # @overload self.from_native(ptr, ctx)
-    # @param [Pointer] ptr 
-    # @param ctx not used. Please set +nil+.
+    #   @param [Pointer] ptr
+    #   @param ctx not used. Please set +nil+.
     # @return [AutoPointer]
     def self.from_native(val, ctx)
       self.new(val)

data/lib/ffi/enum.rb

@@ -85,6 +85,7 @@ module FFI
     include DataConverter
 
     attr_reader :tag
+    attr_reader :native_type
 
     # @overload initialize(info, tag=nil)
     #   @param [nil, Enumerable] info
@@ -94,7 +95,7 @@ module FFI
     #   @param [nil, Enumerable] info symbols and values for new Enum
     #   @param [nil, Symbol] tag name of new Enum
     def initialize(*args)
-      @native_type = args.shift if args.first.kind_of?(FFI::Type)
+      @native_type = args.first.kind_of?(FFI::Type) ? args.shift : Type::INT
       info, @tag = *args
       @kv_map = Hash.new
       unless info.nil?
@@ -149,12 +150,6 @@ module FFI
     alias to_h symbol_map
     alias to_hash symbol_map
 
-    # Get native type of Enum
-    # @return [Type]
-    def native_type
-      @native_type || Type::INT
-    end
-
     # @param [Symbol, Integer, #to_int] val
     # @param ctx unused
     # @return [Integer] value of a enum symbol

data/lib/ffi/library.rb

@@ -292,24 +292,26 @@ module FFI
     end
 
     # @overload attach_variable(mname, cname, type)
-    #  @example
-    #   module Bar
-    #     extend FFI::Library
-    #     ffi_lib 'my_lib'
-    #     attach_variable :c_myvar, :myvar, :long
-    #   end
-    #   # now callable via Bar.c_myvar
+    #   @param [#to_s] mname name of ruby method to attach as
+    #   @param [#to_s] cname name of C variable to attach
+    #   @param [DataConverter, Struct, Symbol, Type] type C variable's type
+    #   @example
+    #     module Bar
+    #       extend FFI::Library
+    #       ffi_lib 'my_lib'
+    #       attach_variable :c_myvar, :myvar, :long
+    #     end
+    #     # now callable via Bar.c_myvar
     # @overload attach_variable(cname, type)
-    #  @example
-    #   module Bar
-    #     extend FFI::Library
-    #     ffi_lib 'my_lib'
-    #     attach_variable :myvar, :long
-    #   end
-    #   # now callable via Bar.myvar
-    # @param [#to_s] mname name of ruby method to attach as
-    # @param [#to_s] cname name of C variable to attach
-    # @param [DataConverter, Struct, Symbol, Type] type C varaible's type
+    #   @param [#to_s] mname name of ruby method to attach as
+    #   @param [DataConverter, Struct, Symbol, Type] type C variable's type
+    #   @example
+    #     module Bar
+    #       extend FFI::Library
+    #       ffi_lib 'my_lib'
+    #       attach_variable :myvar, :long
+    #     end
+    #     # now callable via Bar.myvar
     # @return [DynamicLibrary::Symbol]
     # @raise {FFI::NotFoundError} if +cname+ cannot be found in libraries
     #
@@ -360,10 +362,12 @@ module FFI
 
 
     # @overload callback(name, params, ret)
+    #   @param name callback name to add to type map
+    #   @param [Array] params array of parameters' types
+    #   @param [DataConverter, Struct, Symbol, Type] ret callback return type
     # @overload callback(params, ret)
-    # @param name callback name to add to type map
-    # @param [Array] params array of parameters' types
-    # @param [DataConverter, Struct, Symbol, Type] ret callback return type
+    #   @param [Array] params array of parameters' types
+    #   @param [DataConverter, Struct, Symbol, Type] ret callback return type
     # @return [FFI::CallbackInfo]
     def callback(*args)
       raise ArgumentError, "wrong number of arguments" if args.length < 2 || args.length > 3
@@ -388,10 +392,6 @@ module FFI
       cb
     end
 
-    # @param [DataConverter, Symbol, Type] old
-    # @param  add
-    # @param [] info
-    # @return [FFI::Enum, FFI::Type]
     # Register or get an already registered type definition.
     #
     # To register a new type definition, +old+ should be a {FFI::Type}. +add+
@@ -404,6 +404,11 @@ module FFI
     # * in others cases, +info+ is used to create a named enum.
     #
     # If +old+ is a key for type map, #typedef get +old+ type definition.
+    #
+    # @param [DataConverter, Symbol, Type] old
+    # @param [Symbol] add
+    # @param [Symbol] info
+    # @return [FFI::Enum, FFI::Type]
     def typedef(old, add, info=nil)
       @ffi_typedefs = Hash.new unless defined?(@ffi_typedefs)
 

data/lib/ffi/platform.rb

@@ -79,7 +79,7 @@ module FFI
     def self.is_os(os)
       OS == os
     end
-    
+
     NAME = "#{ARCH}-#{OS}"
     IS_GNU = defined?(GNU_LIBC)
     IS_LINUX = is_os("linux")
@@ -87,12 +87,12 @@ module FFI
     IS_FREEBSD = is_os("freebsd")
     IS_NETBSD = is_os("netbsd")
     IS_OPENBSD = is_os("openbsd")
+    IS_SOLARIS = is_os("solaris")
     IS_WINDOWS = is_os("windows")
     IS_BSD = IS_MAC || IS_FREEBSD || IS_NETBSD || IS_OPENBSD
     CONF_DIR = File.join(File.dirname(__FILE__), 'platform', NAME)
-    public
 
-    
+    public
 
     LIBPREFIX = case OS
     when /windows/
@@ -143,6 +143,12 @@ module FFI
       IS_MAC
     end
 
+    # Test if current OS is Solaris (Sun OS)
+    # @return [Boolean]
+    def self.solaris?
+      IS_SOLARIS
+    end
+
     # Test if current OS is a unix OS
     # @return [Boolean]
     def self.unix?

data/lib/ffi/struct.rb

@@ -341,7 +341,7 @@ module FFI
       # @raise if Ruby 1.8
       # Add hash +spec+ to +builder+.
       def hash_layout(builder, spec)
-        raise "Ruby version not supported" if RUBY_VERSION =~ /1.8.*/
+        raise "Ruby version not supported" if RUBY_VERSION =~ /1\.8\.*/
         spec[0].each do |name, type|
           builder.add name, find_field_type(type), nil
         end

data/lib/ffi/struct_layout_builder.rb

@@ -30,12 +30,12 @@
 #
 
 module FFI
-  
+
   # Build a {StructLayout struct layout}.
   class StructLayoutBuilder
     attr_reader :size
     attr_reader :alignment
-    
+
     def initialize
       @size = 0
       @alignment = 1
@@ -45,42 +45,47 @@ module FFI
       @fields = Array.new
     end
 
-    # @param [Numeric] size
     # Set size attribute with +size+ only if +size+ is greater than attribute value.
+    # @param [Numeric] size
     def size=(size)
       @size = size if size > @size
     end
 
-    # @param [Numeric] alignment
-    # Set alignment attribute with +alignment+ only if it is greater than attribute value.
+    # Set alignment attribute with +align+ only if it is greater than attribute value.
+    # @param [Numeric] align
     def alignment=(align)
       @alignment = align if align > @alignment
       @min_alignment = align
     end
 
-    # @param [Boolean] is_union
-    # @return [is_union]
     # Set union attribute.
     # Set to +true+ to build a {Union} instead of a {Struct}.
+    # @param [Boolean] is_union
+    # @return [is_union]
     def union=(is_union)
       @union = is_union
     end
 
-    # @return [Boolean]
     # Building a {Union} or a {Struct} ?
+    #
+    # @return [Boolean]
+    #
     def union?
       @union
     end
 
     # Set packed attribute
-    # @overload packed=(packed)
-    #  @param [Fixnum] packed
-    #  @return [packed]
-    #  Set alignment and packed attributes to +packed+.
-    # @overload packed=(packed)
-    #  @param packed
-    #  @return [0,1]
-    #  Set packed attribute.
+    # @overload packed=(packed) Set alignment and packed attributes to
+    #   +packed+.
+    #
+    #   @param [Fixnum] packed
+    #
+    #   @return [packed]
+    # @overload packed=(packed) Set packed attribute.
+    #   @param packed
+    #
+    #   @return [0,1]
+    #
     def packed=(packed)
       if packed.is_a?(Fixnum)
         @alignment = packed
@@ -139,7 +144,7 @@ module FFI
     def add_field(name, type, offset = nil)
       add(name, type, offset)
     end
-    
+
     # @param (see #add)
     # @return (see #add)
     # Add a struct as a field to the builder.
@@ -162,14 +167,14 @@ module FFI
     def build
       # Add tail padding if the struct is not packed
       size = @packed ? @size : align(@size, @alignment)
-      
+
       layout = StructLayout.new(@fields, size, @alignment)
       layout.__union! if @union
       layout
     end
 
     private
-    
+
     # @param [Numeric] offset
     # @param [Numeric] align
     # @return [Numeric]

data/lib/ffi/types.rb

@@ -155,7 +155,7 @@ module FFI
     native_type Type::POINTER
 
     # @param [Pointer] val
-    # @param [] ctx
+    # @param ctx
     # @return [Array(String, Pointer)]
     # Returns a [ String, Pointer ] tuple so the C memory for the string can be freed
     def self.from_native(val, ctx)

data/lib/ffi/version.rb

@@ -1,4 +1,4 @@
 module FFI
-  VERSION = '1.9.8'
+  VERSION = '1.9.9'
 end
 

data/spec/ffi/managed_struct_spec.rb

@@ -38,7 +38,8 @@ describe "Managed Struct" do
     expect(ClassWithSelfRef.new(ManagedStructTestLib.ptr_from_address(0x12345678)).class).to eq(ClassWithSelfRef)
   end
 
-  it "should release memory properly" do
+  # see #427
+  it "should release memory properly", :broken => true do
     class PleaseReleaseMe < FFI::ManagedStruct
       layout :i, :int
       @@count = 0

data/spec/ffi/pointer_spec.rb

@@ -170,7 +170,8 @@ describe "AutoPointer" do
     def self.release(ptr); end
   end
 
-  it "cleanup via default release method" do
+  # see #427
+  it "cleanup via default release method", :broken => true do
     expect(AutoPointerSubclass).to receive(:release).at_least(loop_count-wiggle_room).times
     AutoPointerTestHelper.reset
     loop_count.times do
@@ -182,7 +183,8 @@ describe "AutoPointer" do
     AutoPointerTestHelper.gc_everything loop_count
   end
 
-  it "cleanup when passed a proc" do
+  # see #427
+  it "cleanup when passed a proc", :broken => true do
     #  NOTE: passing a proc is touchy, because it's so easy to create a memory leak.
     #
     #  specifically, if we made an inline call to
@@ -200,7 +202,8 @@ describe "AutoPointer" do
     AutoPointerTestHelper.gc_everything loop_count
   end
 
-  it "cleanup when passed a method" do
+  # see #427
+  it "cleanup when passed a method", :broken => true do
     expect(AutoPointerTestHelper).to receive(:release).at_least(loop_count-wiggle_room).times
     AutoPointerTestHelper.reset
     loop_count.times do

data/spec/ffi/rbx/attach_function_spec.rb

@@ -25,7 +25,7 @@ describe FFI::Library, "#attach_function" do
   
   it "correctly populates a struct for gettimeofday" do
     t = Timeval.new
-    time = LibC.gettimeofday(t.pointer, nil)
+    LibC.gettimeofday(t.pointer, nil)
     expect(t[:tv_sec]).to be_kind_of(Numeric)
     expect(t[:tv_usec]).to be_kind_of(Numeric)
   end

data/spec/ffi/spec_helper.rb

@@ -7,6 +7,10 @@ require 'rbconfig'
 require 'fileutils'
 require 'ffi'
 
+RSpec.configure do |c|
+  c.filter_run_excluding :broken => true
+end
+
 CPU = case RbConfig::CONFIG['host_cpu'].downcase
   when /i[3456]86/
     # Darwin always reports i686, even when running in 64bit mode
@@ -53,13 +57,7 @@ def compile_library(path, lib)
 
   dir = File.expand_path(path, File.dirname(__FILE__))
   lib = "#{dir}/#{lib}"
-  if !File.exists?(lib)
-    ldshared  = RbConfig::CONFIG["LDSHARED"] || "clang -dynamic -bundle"
-    libs      = RbConfig::CONFIG["LIBS"]
-    dldflags  = RbConfig::CONFIG["DLDFLAGS"] || "-Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress"
-
-    puts Dir.pwd, dir, File.dirname(__FILE__)
-
+  if !File.exist?(lib)
     output = nil
     FileUtils.cd(dir) do
       output = system(*%{#{system('which gmake >/dev/null') && 'gmake' || 'make'} CPU=#{CPU} OS=#{OS} }.tap{|x| puts x.inspect})

data/spec/ffi/struct_spec.rb

@@ -7,6 +7,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
 describe "Struct aligns fields correctly" do
   it "char, followed by an int" do
+    pending("not supported in 1.8") if RUBY_VERSION =~ /1.8.*/
     class CIStruct < FFI::Struct
       layout :c => :char, :i => :int
     end
@@ -14,6 +15,7 @@ describe "Struct aligns fields correctly" do
   end
 
   it "short, followed by an int" do
+    pending("not supported in 1.8") if RUBY_VERSION =~ /1.8.*/
     class SIStruct < FFI::Struct
       layout :s => :short, :i => :int
     end
@@ -21,6 +23,7 @@ describe "Struct aligns fields correctly" do
   end
 
   it "int, followed by an int" do
+    pending("not supported in 1.8") if RUBY_VERSION =~ /1.8.*/
     class IIStruct < FFI::Struct
       layout :i1 => :int, :i => :int
     end
@@ -28,6 +31,7 @@ describe "Struct aligns fields correctly" do
   end
 
   it "long long, followed by an int" do
+    pending("not supported in 1.8") if RUBY_VERSION =~ /1.8.*/
     class LLIStruct < FFI::Struct
       layout :l => :long_long, :i => :int
     end
@@ -102,7 +106,7 @@ describe "Struct tests" do
     smp = FFI::MemoryPointer.new :pointer
     s = PointerMember.new smp
     expect { s[:pointer] = s }.not_to raise_error Exception
-    expect { foo = s[:pointer] }.not_to raise_error Exception
+    expect { s[:pointer].nil? }.not_to raise_error Exception
   end
 
   it "Struct#[:pointer]=nil" do

data/spec/spec.opts

@@ -1,3 +1,4 @@
 --color
+-w
 --format
 documentation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.9.8
+  version: 1.9.9
 platform: ruby
 authors:
 - Wayne Meissner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement