ffi 1.9.5-x86-mingw32 → 1.9.6-x86-mingw32

checksums.yaml

@@ -1,7 +1,15 @@
---- 
-SHA1: 
-  metadata.gz: 8388c8504e5777a39e69727d10ecf13670674e85
-  data.tar.gz: a3fbbcb12431244e647cb40f93b9366da87212ed
-SHA512: 
-  metadata.gz: 9b3ed3e25e37a153054936c60fcb63e700555477842c8be209c3ad6390151e1adb3ba97e6fb4c27b4644ba319160cccb332b1ea92957f103dbe3a394252420f2
-  data.tar.gz: 2415657adfd8815c3f478f40e8a531a6345a53b8b12487def0c8736f64bfe200aa20affd0a13500b767b37c517d177cbd12dce95c0cd5ef7cf54db8b4c6e8c06
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWU3ZWQwZWZhZTgxODViMjdiNTY0ZGI5MjI1NGMxNTg2NjQ1YWZhNg==
+  data.tar.gz: !binary |-
+    OThkY2E3MmM3YjY3NDgwYzdhNjRkODUyMmU0YjE1ZTNhMGVhOGRiOQ==
+SHA512:
+  metadata.gz: !binary |-
+    ZWVjMDdiMDRiOGY3MzQzMDM1ZGMwMjYyOTQ5MTM1Zjk5ZGNmZjg4ZGE5NTU5
+    ZTVlY2E0NDFiZjFhMjI5NDQwYjg4NGVhZjMzMjM0YWM5ZTIxNWVkOTBiMDRk
+    YmY1NDVlZjRlZTNkMTJlNTk1N2MzNjZiNDk2ZjUyMmNmMjdiOTQ=
+  data.tar.gz: !binary |-
+    OTY5ODkxMDNlNDdjYmI4Yjc4NDg5NTAxY2EzZWMxMTViZTE4Yjc5MjlkYjdh
+    ZjUxOTZhZWM2YmNkMDkwZDU0YzBhMDZjNTczMTM5ZGQzNzFjNDExOThiNTg0
+    MjY3NmMxYmU5ODM2ZTFhOGNmMTg0MDAwMzE3YjM0NTg0NTQ2OTg=

data/Rakefile

@@ -150,11 +150,6 @@ task 'spec:specdoc' => TEST_DEPS
 
 task :default => :specs
 
-task 'gem:win32' do
-  sh("rake cross native gem RUBY_CC_VERSION='1.8.7:1.9.3:2.0.0:2.1.3'") || raise("win32 build failed!")
-end
-
-
 namespace 'java' do
 
   java_gem_spec = Gem::Specification.new do |s|
@@ -190,11 +185,23 @@ if USE_RAKE_COMPILER
     ext.cross_platform = %w[i386-mingw32 x64-mingw32]                     # forces the Windows platform instead of the default one
   end
 
-  ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
+  task 'gem:win32' => ['gem:win32-x64', 'gem:win32-i386']
+
+  task 'gem:win32-x86' do
+    sh("rake cross native:i386-mingw32 gem RUBY_CC_VERSION='1.8.7:1.9.3:2.0.0:2.1.3'") || 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.3'") || raise("win32-x64 build failed!")
+  end
+
+  (ENV['RUBY_CC_VERSION'] || '1.8.7:1.9.3:2.0.0:2.1.3' ).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.3' ).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

data/ext/ffi_c/extconf.rb

@@ -9,8 +9,8 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
   $warnflags = ''
   $CFLAGS.gsub!(/[\s+]-ansi/, '')
   $CFLAGS.gsub!(/[\s+]-std=[^\s]+/, '')
-  # solaris needs -c99 for <stdbool.h>
-  $CFLAGS << " -std=c99" if RbConfig::CONFIG['host_os'] =~ /solaris/
+  # solaris 10 needs -c99 for <stdbool.h>
+  $CFLAGS << " -std=c99" if RbConfig::CONFIG['host_os'] =~ /solaris(!?2\.11)/
   
   if ENV['RUBY_CC_VERSION'].nil? && (pkg_config("libffi") ||
      have_header("ffi.h") ||

data/lib/ffi.rb

@@ -7,6 +7,8 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
       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'
     else
       require 'ffi_c'
     end

data/lib/ffi/version.rb

@@ -1,4 +1,4 @@
 module FFI
-  VERSION = '1.9.5'
+  VERSION = '1.9.6'
 end
 

data/spec/ffi/async_callback_spec.rb

@@ -4,7 +4,6 @@
 #
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
-require 'ffi'
 
 describe "async callback" do
   module LibTest
@@ -21,8 +20,8 @@ describe "async callback" do
     called = false
     cb = Proc.new {|i| v = i; called = true }
     LibTest.testAsyncCallback(cb, 0x7fffffff) 
-    called.should be_true
-    v.should == 0x7fffffff
+    expect(called).to be true
+    expect(v).to eq(0x7fffffff)
   end
   
   it "called a second time" do
@@ -30,7 +29,7 @@ describe "async callback" do
     called = false
     cb = Proc.new {|i| v = i; called = true }
     LibTest.testAsyncCallback(cb, 0x7fffffff) 
-    called.should be_true
-    v.should == 0x7fffffff
+    expect(called).to be true
+    expect(v).to eq(0x7fffffff)
   end
 end

data/spec/ffi/bool_spec.rb

@@ -4,7 +4,6 @@
 #
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
-require 'ffi'
 
 describe "Function with primitive boolean arguments and return values" do
   module LibTest
@@ -15,17 +14,19 @@ describe "Function with primitive boolean arguments and return values" do
     attach_function :bool_return_val, [ :bool ], :bool
     attach_function :bool_reverse_val, [ :bool ], :bool
   end
+
   it "bools" do
-    LibTest.bool_return_true.should == true
-    LibTest.bool_return_false.should == false
+    expect(LibTest.bool_return_true).to be true
+    expect(LibTest.bool_return_false).to be false
 
-    LibTest.bool_return_val(true).should == true
-    LibTest.bool_return_val(false).should == false
+    expect(LibTest.bool_return_val(true)).to be true
+    expect(LibTest.bool_return_val(false)).to be false
 
-    LibTest.bool_reverse_val(true).should == false
-    LibTest.bool_reverse_val(false).should == true
+    expect(LibTest.bool_reverse_val(true)).to be false
+    expect(LibTest.bool_reverse_val(false)).to be true
   end
+
   it "raise error on invalid types" do
-    lambda { LibTest.bool_return_val(nil) }.should raise_error(::TypeError)
+    expect { LibTest.bool_return_val(nil) }.to raise_error(::TypeError)
   end
 end

data/spec/ffi/buffer_spec.rb

@@ -4,7 +4,6 @@
 #
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
-require 'ffi'
 
 describe "Buffer#total" do
   [1,2,3].each do |i|
@@ -12,14 +11,17 @@ describe "Buffer#total" do
       :uint => 4, :long => FFI::Type::LONG.size, :ulong => FFI::Type::ULONG.size, 
       :long_long => 8, :ulong_long => 8, :float => 4, :double => 8
     }.each_pair do |t, s|
+
       it "Buffer.alloc_in(#{t}, #{i}).total == #{i * s}" do
-        FFI::Buffer.alloc_in(t, i).total.should == i * s
+        expect(FFI::Buffer.alloc_in(t, i).total).to eq(i * s)
       end
+
       it "Buffer.alloc_out(#{t}, #{i}).total == #{i * s}" do
-        FFI::Buffer.alloc_out(t, i).total.should == i * s
+        expect(FFI::Buffer.alloc_out(t, i).total).to eq(i * s)
       end
+
       it "Buffer.alloc_inout(#{t}, #{i}).total == #{i * s}" do
-        FFI::Buffer.alloc_inout(t, i).total.should == i * s
+        expect(FFI::Buffer.alloc_inout(t, i).total).to eq(i * s)
       end
     end
   end
@@ -30,214 +32,239 @@ describe "Buffer#put_char" do
   (0..127).each do |i|
     (0..bufsize-1).each do |offset|
       it "put_char(#{offset}, #{i}).get_char(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_char(offset, i).get_char(offset).should == i
+        expect(FFI::Buffer.alloc_in(bufsize).put_char(offset, i).get_char(offset)).to eq(i)
       end
     end
   end
 end
+
 describe "Buffer#put_uchar" do
   bufsize = 4
   (0..255).each do |i|
     (0..bufsize-1).each do |offset|
       it "Buffer.put_uchar(#{offset}, #{i}).get_uchar(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_uchar(offset, i).get_uchar(offset).should == i
+        expect(FFI::Buffer.alloc_in(bufsize).put_uchar(offset, i).get_uchar(offset)).to eq(i)
       end
     end
   end 
 end
+
 describe "Buffer#put_short" do
   bufsize = 4
   [0, 1, 128, 32767].each do |i|
     (0..bufsize-2).each do |offset|
       it "put_short(#{offset}, #{i}).get_short(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_short(offset, i).get_short(offset).should == i
+        expect(FFI::Buffer.alloc_in(bufsize).put_short(offset, i).get_short(offset)).to eq(i)
       end
     end
   end
 end
+
 describe "Buffer#put_ushort" do
   bufsize = 4
   [ 0, 1, 128, 32767, 65535, 0xfee1, 0xdead, 0xbeef, 0xcafe ].each do |i|
     (0..bufsize-2).each do |offset|
       it "put_ushort(#{offset}, #{i}).get_ushort(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_ushort(offset, i).get_ushort(offset).should == i
+        expect(FFI::Buffer.alloc_in(bufsize).put_ushort(offset, i).get_ushort(offset)).to eq(i)
       end
     end
   end
 end
+
 describe "Buffer#put_int" do
   bufsize = 8
   [0, 1, 128, 32767, 0x7ffffff ].each do |i|
     (0..bufsize-4).each do |offset|
       it "put_int(#{offset}, #{i}).get_int(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_int(offset, i).get_int(offset).should == i
+        expect(FFI::Buffer.alloc_in(bufsize).put_int(offset, i).get_int(offset)).to eq(i)
       end
     end
   end
 end
+
 describe "Buffer#put_uint" do
   bufsize = 8
   [ 0, 1, 128, 32767, 65535, 0xfee1dead, 0xcafebabe, 0xffffffff ].each do |i|
     (0..bufsize-4).each do |offset|
       it "put_uint(#{offset}, #{i}).get_uint(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_uint(offset, i).get_uint(offset).should == i
+        expect(FFI::Buffer.alloc_in(bufsize).put_uint(offset, i).get_uint(offset)).to eq(i)
       end
     end
   end
 end
+
 describe "Buffer#put_long" do
   bufsize = 16
   [0, 1, 128, 32767, 0x7ffffff ].each do |i|
     (0..bufsize-FFI::Type::LONG.size).each do |offset|
       it "put_long(#{offset}, #{i}).get_long(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_long(offset, i).get_long(offset).should == i
+        expect(FFI::Buffer.alloc_in(bufsize).put_long(offset, i).get_long(offset)).to eq(i)
       end
     end
   end
 end
+
 describe "Buffer#put_ulong" do
   bufsize = 16
   [ 0, 1, 128, 32767, 65535, 0xfee1dead, 0xcafebabe, 0xffffffff ].each do |i|
     (0..bufsize-FFI::Type::LONG.size).each do |offset|
       it "put_ulong(#{offset}, #{i}).get_ulong(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_ulong(offset, i).get_ulong(offset).should == i
+        expect(FFI::Buffer.alloc_in(bufsize).put_ulong(offset, i).get_ulong(offset)).to eq(i)
       end
     end
   end
 end
+
 describe "Buffer#put_long_long" do
   bufsize = 16
   [0, 1, 128, 32767, 0x7ffffffffffffff ].each do |i|
     (0..bufsize-8).each do |offset|
       it "put_long_long(#{offset}, #{i}).get_long_long(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_long_long(offset, i).get_long_long(offset).should == i
+        expect(FFI::Buffer.alloc_in(bufsize).put_long_long(offset, i).get_long_long(offset)).to eq(i)
       end
     end
   end
 end
+
 describe "Buffer#put_ulong_long" do
   bufsize = 16
   [ 0, 1, 128, 32767, 65535, 0xdeadcafebabe, 0x7fffffffffffffff ].each do |i|
     (0..bufsize-8).each do |offset|
       it "put_ulong_long(#{offset}, #{i}).get_ulong_long(#{offset}) == #{i}" do
-        FFI::Buffer.alloc_in(bufsize).put_ulong_long(offset, i).get_ulong_long(offset).should == i
+        expect(FFI::Buffer.alloc_in(bufsize).put_ulong_long(offset, i).get_ulong_long(offset)).to eq(i)
       end
     end
   end
 end
+
 describe "Reading/Writing binary strings" do
   it "Buffer#put_bytes" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
     buf.put_bytes(0, str);
     s2 = buf.get_bytes(0, 11);
-    s2.should == str
+    expect(s2).to eq(str)
   end
+
   it "Buffer#put_bytes with index and length" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
     buf.put_bytes(0, str, 5, 6);
     s2 = buf.get_bytes(0, 6);
-    s2.should == str[5..-1]
+    expect(s2).to eq(str[5..-1])
   end
+
   it "Buffer#put_bytes with only index" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
     buf.put_bytes(0, str, 5);
     s2 = buf.get_bytes(0, 6);
-    s2.should == str[5..-1]
+    expect(s2).to eq(str[5..-1])
   end
+
   it "Buffer#put_bytes with index > str.length" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
-    lambda { buf.put_bytes(0, str, 12); }.should raise_error
+    expect { buf.put_bytes(0, str, 12); }.to raise_error
   end
+
   it "Buffer#put_bytes with length > str.length" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
-    lambda { buf.put_bytes(0, str, 0, 12); }.should raise_error
+    expect { buf.put_bytes(0, str, 0, 12); }.to raise_error
   end
-   it "Buffer#put_bytes with negative index" do
+
+  it "Buffer#put_bytes with negative index" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
-    lambda { buf.put_bytes(0, str, -1, 12); }.should raise_error
-   end
+    expect { buf.put_bytes(0, str, -1, 12); }.to raise_error
+  end
 
   it "Buffer#write_bytes" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
     buf.write_bytes(str)
     s2 = buf.get_bytes(0, 11)
-    s2.should == str
+    expect(s2).to eq(str)
   end
+
   it "Buffer#write_bytes with index and length" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
     buf.write_bytes(str, 5, 6)
     s2 = buf.get_bytes(0, 6)
-    s2.should == str[5..-1]
+    expect(s2).to eq(str[5..-1])
   end
+
   it "Buffer#write_bytes with only index" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
     buf.write_bytes(str, 5)
     s2 = buf.get_bytes(0, 6)
-    s2.should == str[5..-1]
+    expect(s2).to eq(str[5..-1])
   end
+
   it "Buffer#write_bytes with index > str.length" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
-    lambda { buf.write_bytes(str, 12) }.should raise_error
+    expect { buf.write_bytes(str, 12) }.to raise_error
   end
+
   it "Buffer#put_bytes with length > str.length" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
-    lambda { buf.put_bytes(0, str, 0, 12) }.should raise_error
+    expect { buf.put_bytes(0, str, 0, 12) }.to raise_error
   end
-   it "Buffer#write_bytes with negative index" do
+
+  it "Buffer#write_bytes with negative index" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
-    lambda { buf.write_bytes(str, -1, 12) }.should raise_error
+    expect { buf.write_bytes(str, -1, 12) }.to raise_error
   end
 end
+
 describe "Reading/Writing ascii strings" do
   it "Buffer#put_string with string containing zero byte" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
     buf.put_string(0, str);
     s2 = buf.get_bytes(0, 11);
-    s2.should == str
+    expect(s2).to eq(str)
   end
+
   it "Buffer#get_string with string containing zero byte" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
     buf.put_bytes(0, str);
     s2 = buf.get_string(0, 11);
-    s2.should == "hello"
+    expect(s2).to eq("hello")
   end
+
   it "Buffer#put_string without length should NUL terminate" do
     str = "hello"
     buf = FFI::Buffer.new 1024
     buf.put_string(0, str);
     s2 = buf.get_bytes(0, 6);
-    s2.should == "hello\0"
+    expect(s2).to eq("hello\0")
   end
 end
+
 describe "Buffer#put_pointer" do
   it "put_pointer(0, p).get_pointer(0) == p" do
     p = FFI::MemoryPointer.new :ulong_long
     p.put_uint(0, 0xdeadbeef)
     buf = FFI::Buffer.alloc_inout 8
     p2 = buf.put_pointer(0, p).get_pointer(0)
-    p2.should_not be_nil
-    p2.should == p
-    p2.get_uint(0).should == 0xdeadbeef
+    expect(p2).not_to be_nil
+    expect(p2).to eq(p)
+    expect(p2.get_uint(0)).to eq(0xdeadbeef)
   end
 end
+
 describe "Buffer#size" do
   it "should return size" do
     buf = FFI::Buffer.new 14
-    buf.size.should == 14
+    expect(buf.size).to eq(14)
   end
 end
 
@@ -247,6 +274,6 @@ describe "Buffer#initialize" do
     FFI::Buffer.new(:pointer) do |ptr|
       block_executed = true
     end
-    block_executed.should be_true
+    expect(block_executed).to be true
   end
 end