ffi 1.0.2 → 1.0.3

data/ext/ffi_c/extconf.rb

@@ -3,7 +3,7 @@ require 'mkmf'
 require 'rbconfig'
 dir_config("ffi_c")
 
-unless Config::CONFIG['host_os'] =~ /mswin32|mingw32/
+unless RbConfig::CONFIG['host_os'] =~ /mswin32|mingw32/
   if pkg_config("libffi") || find_header("ffi.h", "/usr/local/include")
 
     # We need at least ffi_call and ffi_prep_closure
@@ -25,16 +25,16 @@ $defs << "-DRUBY_1_9" if RUBY_VERSION >= "1.9.0"
 
 create_header
 
-$CFLAGS << " -mwin32 " if Config::CONFIG['host_os'] =~ /cygwin/
+$CFLAGS << " -mwin32 " if RbConfig::CONFIG['host_os'] =~ /cygwin/
 #$CFLAGS << " -Werror -Wunused -Wformat -Wimplicit -Wreturn-type "
 
 create_makefile("ffi_c")
 unless libffi_ok
   File.open("Makefile", "a") do |mf|
-    mf.puts "LIBFFI_HOST=--host=#{Config::CONFIG['host_alias']}" if Config::CONFIG.has_key?("host_alias")
-    if Config::CONFIG['host_os'].downcase =~ /darwin/
+    mf.puts "LIBFFI_HOST=--host=#{RbConfig::CONFIG['host_alias']}" if RbConfig::CONFIG.has_key?("host_alias")
+    if RbConfig::CONFIG['host_os'].downcase =~ /darwin/
       mf.puts "include ${srcdir}/libffi.darwin.mk"
-    elsif Config::CONFIG['host_os'].downcase =~ /bsd/
+    elsif RbConfig::CONFIG['host_os'].downcase =~ /bsd/
       mf.puts '.include "${srcdir}/libffi.bsd.mk"'
     else
       mf.puts "include ${srcdir}/libffi.mk"

data/spec/ffi/async_callback_spec.rb

@@ -10,7 +10,7 @@ describe "async callback" do
     attach_function :testAsyncCallback, [ AsyncIntCallback, :int ], :void, :blocking => true
   end
 
-  unless RUBY_VERSION =~ /1.8/
+#  unless RUBY_VERSION =~ /1.8/
     it ":int (0x7fffffff) argument" do
       v = 0xdeadbeef
       called = false
@@ -19,5 +19,5 @@ describe "async callback" do
       called.should be_true
       v.should == 0x7fffffff
     end
-  end
+#  end
 end

data/spec/ffi/function_spec.rb

@@ -1,3 +1,19 @@
+#
+# This file is part of ruby-ffi.
+#
+# This code is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License version 3 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# version 3 for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
 describe FFI::Function do
@@ -48,14 +64,12 @@ describe FFI::Function do
     foo.add(10, 10).should == 20    
   end
   it 'can wrap a blocking function' do
-    unless RUBY_VERSION =~ /1.8/
-      fp = FFI::Function.new(:void, [ :int ], @libtest.find_function('testBlocking'), :blocking => true)
-      time = Time.now
-      threads = []
-      threads << Thread.new { fp.call(2) }
-      threads << Thread.new(time) { (Time.now - time).should < 1 }
-      threads.each { |t| t.join }
-    end
+    fp = FFI::Function.new(:void, [ :int ], @libtest.find_function('testBlocking'), :blocking => true)
+    time = Time.now
+    threads = []
+    threads << Thread.new { fp.call(2) }
+    threads << Thread.new(time) { (Time.now - time).should < 1 }
+    threads.each { |t| t.join }
   end
   it 'autorelease flag is set to true by default' do
     fp = FFI::Function.new(:int, [:int, :int], @libtest.find_function('testAdd'))

data/spec/ffi/pointer_spec.rb

@@ -1,8 +1,25 @@
+#
+# This file is part of ruby-ffi.
+#
+# This code is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License version 3 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# version 3 for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+#
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 require 'delegate'
 require 'java' if RUBY_PLATFORM =~ /java/
 
-module LibTest
+module PointerTestLib
+  extend FFI::Library
+  ffi_lib TestLibrary::PATH
   attach_function :ptr_ret_int32_t, [ :pointer, :int ], :int
   attach_function :ptr_from_address, [ FFI::Platform::ADDRESS_SIZE == 32 ? :uint : :ulong_long ], :pointer
   attach_function :ptr_set_pointer, [ :pointer, :int, :pointer ], :void
@@ -23,7 +40,7 @@ describe "Pointer" do
     magic = 0x12345678
     memory.put_int32(0, magic)
     tp = ToPtrTest.new(memory)
-    LibTest.ptr_ret_int32_t(tp, 0).should == magic
+    PointerTestLib.ptr_ret_int32_t(tp, 0).should == magic
   end
   class PointerDelegate < DelegateClass(FFI::Pointer)
     def initialize(ptr)
@@ -38,53 +55,40 @@ describe "Pointer" do
     magic = 0x12345678
     memory.put_int32(0, magic)
     ptr = PointerDelegate.new(memory)
-    LibTest.ptr_ret_int32_t(ptr, 0).should == magic
+    PointerTestLib.ptr_ret_int32_t(ptr, 0).should == magic
   end
   it "Fixnum cannot be used as a Pointer argument" do
-    lambda { LibTest.ptr_ret_int32(0, 0) }.should raise_error
+    lambda { PointerTestLib.ptr_ret_int32(0, 0) }.should raise_error
   end
   it "Bignum cannot be used as a Pointer argument" do
-    lambda { LibTest.ptr_ret_int32(0xfee1deadbeefcafebabe, 0) }.should raise_error
+    lambda { PointerTestLib.ptr_ret_int32(0xfee1deadbeefcafebabe, 0) }.should raise_error
   end
 
   describe "pointer type methods" do
 
-    describe "#read_pointer" do
+    it "#read_pointer" do
       memory = FFI::MemoryPointer.new :pointer
-      LibTest.ptr_set_pointer(memory, 0, LibTest.ptr_from_address(0xdeadbeef))
+      PointerTestLib.ptr_set_pointer(memory, 0, PointerTestLib.ptr_from_address(0xdeadbeef))
       memory.read_pointer.address.should == 0xdeadbeef
     end
 
-    describe "#write_pointer" do
+    it "#write_pointer" do
       memory = FFI::MemoryPointer.new :pointer
-      memory.write_pointer(LibTest.ptr_from_address(0xdeadbeef))
-      LibTest.ptr_ret_pointer(memory, 0).address.should == 0xdeadbeef
+      memory.write_pointer(PointerTestLib.ptr_from_address(0xdeadbeef))
+      PointerTestLib.ptr_ret_pointer(memory, 0).address.should == 0xdeadbeef
     end
 
-    describe "#read_array_of_pointer" do
+    it "#read_array_of_pointer" do
       values = [0x12345678, 0xfeedf00d, 0xdeadbeef]
       memory = FFI::MemoryPointer.new :pointer, values.size
       values.each_with_index do |address, j|
-        LibTest.ptr_set_pointer(memory, j * FFI.type_size(:pointer), LibTest.ptr_from_address(address))
+        PointerTestLib.ptr_set_pointer(memory, j * FFI.type_size(:pointer), PointerTestLib.ptr_from_address(address))
       end
       array = memory.read_array_of_pointer(values.size)
       values.each_with_index do |address, j|
         array[j].address.should == address
       end
     end
-
-    describe "#write_array_of_pointer" do
-      values = [0x12345678, 0xfeedf00d, 0xdeadbeef]
-      memory = FFI::MemoryPointer.new :pointer, values.size
-      memory.write_array_of_pointer(values.map { |address| LibTest.ptr_from_address(address) })
-      array = []
-      values.each_with_index do |address, j|
-        array << LibTest.ptr_ret_pointer(memory, j * FFI.type_size(:pointer))
-      end
-      values.each_with_index do |address, j|
-        array[j].address.should == address
-      end
-    end
     
   end
 
@@ -145,7 +149,7 @@ describe "AutoPointer" do
       # note that if we called
       # AutoPointerTestHelper.method(:release).to_proc inline, we'd
       # have a reference to the pointer and it would never get GC'd.
-      ap = AutoPointerSubclass.new(LibTest.ptr_from_address(magic))
+      ap = AutoPointerSubclass.new(PointerTestLib.ptr_from_address(magic))
     end
     AutoPointerTestHelper.gc_everything loop_count
   end
@@ -162,7 +166,7 @@ describe "AutoPointer" do
     AutoPointerTestHelper.should_receive(:release).at_least(loop_count-wiggle_room).times
     AutoPointerTestHelper.reset
     loop_count.times do
-      ap = FFI::AutoPointer.new(LibTest.ptr_from_address(magic),
+      ap = FFI::AutoPointer.new(PointerTestLib.ptr_from_address(magic),
                                 AutoPointerTestHelper.finalizer)
     end
     AutoPointerTestHelper.gc_everything loop_count
@@ -172,7 +176,7 @@ describe "AutoPointer" do
     AutoPointerTestHelper.should_receive(:release).at_least(loop_count-wiggle_room).times
     AutoPointerTestHelper.reset
     loop_count.times do
-      ap = FFI::AutoPointer.new(LibTest.ptr_from_address(magic),
+      ap = FFI::AutoPointer.new(PointerTestLib.ptr_from_address(magic),
                                 AutoPointerTestHelper.method(:release))
     end
     AutoPointerTestHelper.gc_everything loop_count
@@ -200,7 +204,7 @@ describe "AutoPointer#new" do
     lambda { FFI::AutoPointer.new(FFI::MemoryPointer.new(:int))}.should raise_error(::TypeError)
   end
   it "AutoPointer argument raises TypeError" do
-    lambda { AutoPointerSubclass.new(AutoPointerSubclass.new(LibTest.ptr_from_address(0))) }.should raise_error(::TypeError)
+    lambda { AutoPointerSubclass.new(AutoPointerSubclass.new(PointerTestLib.ptr_from_address(0))) }.should raise_error(::TypeError)
   end
   it "Buffer argument raises TypeError" do
     lambda { FFI::AutoPointer.new(FFI::Buffer.new(:int))}.should raise_error(::TypeError)

data/spec/ffi/spec_helper.rb

@@ -1,6 +1,20 @@
+#
+# This file is part of ruby-ffi.
+#
+# This code is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License version 3 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# version 3 for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+#
 require 'rubygems'
 require 'rbconfig'
-require 'spec'
 
 if RUBY_PLATFORM =~/java/
   libdir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib"))
@@ -9,7 +23,7 @@ else
   $:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib"),
     File.join(File.dirname(__FILE__), "..", "..", "build", "#{Config::CONFIG['host_cpu''arch']}", "ffi_c", RUBY_VERSION)
 end
-puts "loadpath=#{$:.join(':')}"
+# puts "loadpath=#{$:.join(':')}"
 require "ffi"
 
 module TestLibrary

data/spec/ffi/string_spec.rb

@@ -1,3 +1,19 @@
+#
+# This file is part of ruby-ffi.
+#
+# This code is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License version 3 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# version 3 for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 describe "String tests" do
   include FFI
@@ -10,14 +26,14 @@ describe "String tests" do
     attach_function :string_null, [ ], :string
   end
   it "MemoryPointer#get_string returns a tainted string" do
-    mp = MemoryPointer.new 1024
+    mp = FFI::MemoryPointer.new 1024
     mp.put_string(0, "test\0")
     str = mp.get_string(0)
     str.tainted?.should == true
   end
   it "String returned by a method is tainted" do
-    mp = MemoryPointer.new :pointer
-    sp = MemoryPointer.new 1024
+    mp = FFI::MemoryPointer.new :pointer
+    sp = FFI::MemoryPointer.new 1024
     sp.put_string(0, "test")
     mp.put_pointer(0, sp)
     str = StrLibTest.ptr_ret_pointer(mp, 0)
@@ -45,9 +61,9 @@ describe "String tests" do
   end
   it "reads an array of strings until encountering a NULL pointer" do
     strings = ["foo", "bar", "baz", "testing", "ffi"]
-    ptrary = MemoryPointer.new(:pointer, 6)
+    ptrary = FFI::MemoryPointer.new(:pointer, 6)
     ary = strings.inject([]) do |a, str|
-      f = MemoryPointer.new(1024)
+      f = FFI::MemoryPointer.new(1024)
       f.put_string(0, str)
       a << f
     end
@@ -57,9 +73,9 @@ describe "String tests" do
   end
   it "reads an array of strings of the size specified, substituting nil when a pointer is NULL" do
     strings = ["foo", "bar", "baz", "testing", "ffi"]
-    ptrary = MemoryPointer.new(:pointer, 6)
+    ptrary = FFI::MemoryPointer.new(:pointer, 6)
     ary = strings.inject([]) do |a, str|
-      f = MemoryPointer.new(1024)
+      f = FFI::MemoryPointer.new(1024)
       f.put_string(0, str)
       a << f
     end
@@ -69,9 +85,9 @@ describe "String tests" do
   end
   it "reads an array of strings, taking a memory offset parameter" do
     strings = ["foo", "bar", "baz", "testing", "ffi"]
-    ptrary = MemoryPointer.new(:pointer, 5)
+    ptrary = FFI::MemoryPointer.new(:pointer, 5)
     ary = strings.inject([]) do |a, str|
-      f = MemoryPointer.new(1024)
+      f = FFI::MemoryPointer.new(1024)
       f.put_string(0, str)
       a << f
     end
@@ -80,9 +96,9 @@ describe "String tests" do
   end
   it "raises an IndexError when trying to read an array of strings out of bounds" do
     strings = ["foo", "bar", "baz", "testing", "ffi"]
-    ptrary = MemoryPointer.new(:pointer, 5)
+    ptrary = FFI::MemoryPointer.new(:pointer, 5)
     ary = strings.inject([]) do |a, str|
-      f = MemoryPointer.new(1024)
+      f = FFI::MemoryPointer.new(1024)
       f.put_string(0, str)
       a << f
     end
@@ -91,9 +107,9 @@ describe "String tests" do
   end
   it "raises an IndexError when trying to read an array of strings using a negative offset" do
     strings = ["foo", "bar", "baz", "testing", "ffi"]
-    ptrary = MemoryPointer.new(:pointer, 5)
+    ptrary = FFI::MemoryPointer.new(:pointer, 5)
     ary = strings.inject([]) do |a, str|
-      f = MemoryPointer.new(1024)
+      f = FFI::MemoryPointer.new(1024)
       f.put_string(0, str)
       a << f
     end

data/spec/ffi/struct_initialize_spec.rb

@@ -1,3 +1,18 @@
+#
+# This file is part of ruby-ffi.
+#
+# This code is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License version 3 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# version 3 for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+#
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
 describe FFI::Struct, ' with an initialize function' do
@@ -20,7 +35,7 @@ describe FFI::ManagedStruct, ' with an initialize function' do
       layout :string, :string
       attr_accessor :magic
       def initialize
-        super MemoryPointer.new(:pointer).put_int(0, 0x1234).get_pointer(0)
+        super FFI::MemoryPointer.new(:pointer).put_int(0, 0x1234).get_pointer(0)
         self.magic = 42
       end
       def self.release;end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ffi
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Wayne Meissner
@@ -14,39 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 +10:00
+date: 2010-12-28 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bones
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 4
-        - 7
-        version: 3.4.7
-  type: :development
-  version_requirements: *id002
+        version: 0.8.7
+    version: 
 description: |-
   Ruby-FFI is a ruby extension for programmatically loading dynamic
   libraries, binding functions within them, and calling those functions
@@ -62,7 +37,6 @@ extensions:
 extra_rdoc_files: 
 - History.txt
 - README.rdoc
-- lib/ffi_c.bundle
 files: 
 - History.txt
 - LICENSE
@@ -102,6 +76,8 @@ files:
 - ext/ffi_c/StructByValue.c
 - ext/ffi_c/StructByValue.h
 - ext/ffi_c/StructLayout.c
+- ext/ffi_c/Thread.c
+- ext/ffi_c/Thread.h
 - ext/ffi_c/Type.c
 - ext/ffi_c/Type.h
 - ext/ffi_c/Types.c
@@ -391,7 +367,6 @@ files:
 - lib/ffi/types.rb
 - lib/ffi/union.rb
 - lib/ffi/variadic.rb
-- lib/ffi_c.bundle
 - spec/ffi/async_callback_spec.rb
 - spec/ffi/bool_spec.rb
 - spec/ffi/buffer_spec.rb
@@ -447,27 +422,21 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 2
-      version: 1.9.2
+      version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: ffi
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby-FFI is a ruby extension for programmatically loading dynamic libraries, binding functions within them, and calling those functions from Ruby code