ffi-rzmq 1.0.1 → 1.0.2

data/.travis.yml

@@ -2,18 +2,14 @@ before_install: sudo apt-get install libzmq3-dev
 script: bundle exec rspec
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - ruby-head
-  - jruby-18mode
   - jruby-19mode
   - jruby-head
-  - rbx-18mode
   - rbx-19mode
 
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: 1.9.2

data/AUTHORS.txt

@@ -23,3 +23,7 @@ Pawel Pacana, github: pawelpacana
 Brian Ford, github: brixen
 
 Nilson Santos F. Jr., github: nilsonfsj
+
+Simon Chiang , github: thinkerbot
+
+Harlow Ward, github: harlow

data/History.txt

@@ -1,3 +1,15 @@
+== 1.0.2 / 20130929
+	* Fix for issue #94. Now includes local_path when searching for a libzmq
+	  to load.
+	
+	* Fix for issue #92. Context and Socket finalizers now track the process'
+		PID to handle a special case when forking a process. Thanks to
+		thinkerbot for the issue and a fix. (Spec is disabled on JRuby since
+		it does not support fork().)
+		
+	* Fix a few RSpec deprecation warnings related to expectations on specific
+	  Exception types.
+	
 == 1.0.1 / 20130318
 	* Fix for issue #77 was not included in 1.0.0 release by mistake.
 	

data/README.rdoc

@@ -30,6 +30,9 @@ Check out the latest performance results:
 
   http://www.zeromq.org/bindings:ruby-ffi
 
+The short version is that the FFI bindings are a few microseconds slower
+than using a C extension.
+
 == FEATURES/PROBLEMS:
 
 This gem needs more tests. This gem has been battle tested by myself
@@ -131,14 +134,13 @@ time of installation.
 
   * ffi (>= 1.0.0)
 
-This is a requirement for MRI only. Both Rubinius and JRuby have FFI support built
+This is a requirement for MRI and Rubinius. JRuby has FFI support built
 in as a standard component. Do *not* run this gem under MRI with an old 'ffi' gem.
 It will crash randomly and you will be sad.
 
 
 == INSTALL:
 
-A full gem has been released to rubygems.org as of release 0.5.0.
 Make sure the ZeroMQ library is already installed on your system.
 
  % gem install ffi-rzmq # should grab the latest release

data/lib/ffi-rzmq/context.rb

@@ -149,15 +149,15 @@ module ZMQ
     private
 
     def define_finalizer
-      ObjectSpace.define_finalizer(self, self.class.close(@context))
+      ObjectSpace.define_finalizer(self, self.class.close(@context, Process.pid))
     end
 
     def remove_finalizer
       ObjectSpace.undefine_finalizer self
     end
 
-    def self.close context
-      Proc.new { LibZMQ.zmq_term context unless context.null? }
+    def self.close context, pid
+      Proc.new { LibZMQ.zmq_term context if !context.null? && Process.pid == pid }
     end
   end
 

data/lib/ffi-rzmq/libzmq.rb

@@ -10,17 +10,15 @@ module ZMQ
       # bias the library discovery to a path inside the gem first, then
       # to the usual system paths
       inside_gem = File.join(File.dirname(__FILE__), '..', '..', 'ext')
-      if FFI::Platform::IS_WINDOWS
-        local_path=ENV['PATH'].split(';')
-      else
-        local_path=ENV['PATH'].split(':')
-      end
-      ZMQ_LIB_PATHS = [
-        inside_gem, '/usr/local/lib', '/opt/local/lib', '/usr/local/homebrew/lib', '/usr/lib64'
+      local_path = FFI::Platform::IS_WINDOWS ? ENV['PATH'].split(';') : ENV['PATH'].split(':')
+
+      # Search for libzmq in the following order...
+      ZMQ_LIB_PATHS = [inside_gem] + local_path + [
+        '/usr/local/lib', '/opt/local/lib', '/usr/local/homebrew/lib', '/usr/lib64'
       ].map{|path| "#{path}/libzmq.#{FFI::Platform::LIBSUFFIX}"}
       ffi_lib(ZMQ_LIB_PATHS + %w{libzmq})
     rescue LoadError
-      if ZMQ_LIB_PATHS.push(*local_path).any? {|path|
+      if ZMQ_LIB_PATHS.any? {|path|
         File.file? File.join(path, "libzmq.#{FFI::Platform::LIBSUFFIX}")}
         warn "Unable to load this gem. The libzmq library exists, but cannot be loaded."
         warn "If this is Windows:"

data/lib/ffi-rzmq/socket.rb

@@ -629,16 +629,16 @@ module ZMQ
       # module; they *must* be in the class definition directly
 
       def define_finalizer
-        ObjectSpace.define_finalizer(self, self.class.close(@socket))
+        ObjectSpace.define_finalizer(self, self.class.close(@socket, Process.pid))
       end
 
       def remove_finalizer
         ObjectSpace.undefine_finalizer self
       end
 
-      def self.close socket
+      def self.close socket, pid
         Proc.new do
-          LibZMQ.zmq_close(socket) if socket && !socket.null?
+          LibZMQ.zmq_close(socket) if socket && !socket.nil? && Process.pid == pid
         end
       end
     end # class Socket for version2
@@ -745,15 +745,15 @@ module ZMQ
       # module; they *must* be in the class definition directly
 
       def define_finalizer
-        ObjectSpace.define_finalizer(self, self.class.close(@socket))
+        ObjectSpace.define_finalizer(self, self.class.close(@socket, Process.pid))
       end
 
       def remove_finalizer
         ObjectSpace.undefine_finalizer self
       end
 
-      def self.close socket
-        Proc.new { LibZMQ.zmq_close socket }
+      def self.close socket, pid
+        Proc.new { LibZMQ.zmq_close socket if Process.pid == pid }
       end
     end # Socket for version3
   end # LibZMQ.version3?

data/lib/ffi-rzmq/version.rb

@@ -1,3 +1,3 @@
 module ZMQ
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/context_spec.rb

@@ -99,7 +99,7 @@ module ZMQ
     context "when allocating a socket" do
       it "should return nil when allocation fails" do
         ctx = Context.new
-        LibZMQ.stub!(:zmq_socket => nil)
+        LibZMQ.stub(:zmq_socket => nil)
         ctx.socket(ZMQ::REQ).should be_nil
       end
     end # context socket

data/spec/poll_spec.rb

@@ -16,10 +16,10 @@ module ZMQ
 
     context "#register" do
 
-      let(:pollable) { mock('pollable') }
+      let(:pollable) { double('pollable') }
       let(:poller) { Poller.new }
       let(:socket) { FFI::MemoryPointer.new(4) }
-      let(:io) { stub(:posix_fileno => fd) }
+      let(:io) { double(:posix_fileno => fd) }
       let(:fd) { 1 }
 
       it "returns false when given a nil pollable" do
@@ -53,10 +53,10 @@ module ZMQ
 
     context "#deregister" do
 
-      let(:pollable) { mock('pollable') }
+      let(:pollable) { double('pollable') }
       let(:poller) { Poller.new }
       let(:socket) { FFI::MemoryPointer.new(4) }
-      let(:io) { stub(:posix_fileno => fd) }
+      let(:io) { double(:posix_fileno => fd) }
       let(:fd) { 1 }
 
       it "returns true when deregistered pollable from event" do

data/spec/socket_spec.rb

@@ -26,14 +26,14 @@ module ZMQ
         lambda do
           s = Socket.new(@ctx.pointer, ZMQ::REQ)
           s.close
-        end.should_not raise_exception(ZMQ::ContextError)
+        end.should_not raise_exception
       end
 
       it "works with a Context instance as the context_ptr" do
         lambda do
           s = Socket.new(@ctx, ZMQ::SUB)
           s.close
-        end.should_not raise_exception(ZMQ::ContextError)
+        end.should_not raise_exception
       end
 
 
@@ -47,8 +47,8 @@ module ZMQ
       end # each socket_type
 
       it "should set the :socket accessor to the raw socket allocated by libzmq" do
-        socket = mock('socket')
-        socket.stub!(:null? => false)
+        socket = double('socket')
+        socket.stub(:null? => false)
         LibZMQ.should_receive(:zmq_socket).and_return(socket)
 
         sock = Socket.new(@ctx.pointer, ZMQ::REQ)
@@ -60,6 +60,15 @@ module ZMQ
         sock = Socket.new(@ctx.pointer, ZMQ::REQ)
         sock.close
       end
+
+      unless jruby?
+        it "should track pid in finalizer so subsequent fork will not segfault" do
+          sock = Socket.new(@ctx.pointer, ZMQ::REQ)
+          pid = fork { }
+          Process.wait(pid)
+          sock.close
+        end
+      end
     end # context initializing
 
 

data/spec/spec_helper.rb

@@ -22,6 +22,10 @@ def version3?
   ZMQ::LibZMQ.version3?
 end
 
+def jruby?
+  RUBY_PLATFORM =~ /java/
+end
+
 
 def connect_to_inproc(socket, endpoint)
   begin
@@ -30,16 +34,6 @@ def connect_to_inproc(socket, endpoint)
 end
 
 module APIHelper
-  def stub_libzmq
-    @err_str_mock = mock("error string")
-
-    LibZMQ.stub!(
-    :zmq_init => 0,
-    :zmq_errno => 0,
-    :zmq_sterror => @err_str_mock
-    )
-  end
-
   def poller_setup
     @helper_poller ||= ZMQ::Poller.new
   end

metadata

@@ -1,252 +1,173 @@
 --- !ruby/object:Gem::Specification
 name: ffi-rzmq
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
+  prerelease:
 platform: ruby
 authors:
 - Chuck Remes
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   name: ffi
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
   name: rspec
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   name: rake
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'This gem wraps the ZeroMQ networking library using the ruby FFI (foreign
-
-  function interface). It''s a pure ruby wrapper so this gem can be loaded
-
-  and run by any ruby runtime that supports FFI. That''s all of the major ones -
-
-  MRI, Rubinius and JRuby.'
+  prerelease: false
+description: |-
+  This gem wraps the ZeroMQ networking library using the ruby FFI (foreign
+  function interface). It's a pure ruby wrapper so this gem can be loaded
+  and run by any ruby runtime that supports FFI. That's all of the major ones -
+  MRI, Rubinius and JRuby.
 email:
 - git@chuckremes.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- !binary |-
-  LmJuc2lnbm9yZQ==
-- !binary |-
-  LmdpdGlnbm9yZQ==
-- !binary |-
-  LnRyYXZpcy55bWw=
-- !binary |-
-  QVVUSE9SUy50eHQ=
-- !binary |-
-  R2VtZmlsZQ==
-- !binary |-
-  SGlzdG9yeS50eHQ=
-- !binary |-
-  UkVBRE1FLnJkb2M=
-- !binary |-
-  UmFrZWZpbGU=
-- !binary |-
-  ZXhhbXBsZXMvUkVBRE1FLnJkb2M=
-- !binary |-
-  ZXhhbXBsZXMvdjJhcGkvbGF0ZW5jeV9tZWFzdXJlbWVudC5yYg==
-- !binary |-
-  ZXhhbXBsZXMvdjJhcGkvbG9jYWxfbGF0LnJi
-- !binary |-
-  ZXhhbXBsZXMvdjJhcGkvbG9jYWxfbGF0X3BvbGwucmI=
-- !binary |-
-  ZXhhbXBsZXMvdjJhcGkvbG9jYWxfdGhyb3VnaHB1dC5yYg==
-- !binary |-
-  ZXhhbXBsZXMvdjJhcGkvcHViLnJi
-- !binary |-
-  ZXhhbXBsZXMvdjJhcGkvcHVibGlzaF9zdWJzY3JpYmUucmI=
-- !binary |-
-  ZXhhbXBsZXMvdjJhcGkvcmVtb3RlX2xhdC5yYg==
-- !binary |-
-  ZXhhbXBsZXMvdjJhcGkvcmVtb3RlX3Rocm91Z2hwdXQucmI=
-- !binary |-
-  ZXhhbXBsZXMvdjJhcGkvcmVxcmVwX3BvbGwucmI=
-- !binary |-
-  ZXhhbXBsZXMvdjJhcGkvcmVxdWVzdF9yZXNwb25zZS5yYg==
-- !binary |-
-  ZXhhbXBsZXMvdjJhcGkvc3ViLnJi
-- !binary |-
-  ZXhhbXBsZXMvdjJhcGkvdGhyb3VnaHB1dF9tZWFzdXJlbWVudC5yYg==
-- !binary |-
-  ZXhhbXBsZXMvdjJhcGkveHJlcXhyZXBfcG9sbC5yYg==
-- !binary |-
-  ZXhhbXBsZXMvdjNhcGkvbGF0ZW5jeV9tZWFzdXJlbWVudC5yYg==
-- !binary |-
-  ZXhhbXBsZXMvdjNhcGkvbG9jYWxfbGF0LnJi
-- !binary |-
-  ZXhhbXBsZXMvdjNhcGkvbG9jYWxfbGF0X3BvbGwucmI=
-- !binary |-
-  ZXhhbXBsZXMvdjNhcGkvbG9jYWxfdGhyb3VnaHB1dC5yYg==
-- !binary |-
-  ZXhhbXBsZXMvdjNhcGkvcHViLnJi
-- !binary |-
-  ZXhhbXBsZXMvdjNhcGkvcHVibGlzaF9zdWJzY3JpYmUucmI=
-- !binary |-
-  ZXhhbXBsZXMvdjNhcGkvcmVtb3RlX2xhdC5yYg==
-- !binary |-
-  ZXhhbXBsZXMvdjNhcGkvcmVtb3RlX3Rocm91Z2hwdXQucmI=
-- !binary |-
-  ZXhhbXBsZXMvdjNhcGkvcmVxcmVwX3BvbGwucmI=
-- !binary |-
-  ZXhhbXBsZXMvdjNhcGkvcmVxdWVzdF9yZXNwb25zZS5yYg==
-- !binary |-
-  ZXhhbXBsZXMvdjNhcGkvc3ViLnJi
-- !binary |-
-  ZXhhbXBsZXMvdjNhcGkvdGhyb3VnaHB1dF9tZWFzdXJlbWVudC5yYg==
-- !binary |-
-  ZXhhbXBsZXMvdjNhcGkveHJlcXhyZXBfcG9sbC5yYg==
-- !binary |-
-  ZXh0L1JFQURNRQ==
-- !binary |-
-  ZmZpLXJ6bXEuZ2Vtc3BlYw==
-- !binary |-
-  bGliL2ZmaS1yem1xLnJi
-- !binary |-
-  bGliL2ZmaS1yem1xL2NvbnN0YW50cy5yYg==
-- !binary |-
-  bGliL2ZmaS1yem1xL2NvbnRleHQucmI=
-- !binary |-
-  bGliL2ZmaS1yem1xL2RldmljZS5yYg==
-- !binary |-
-  bGliL2ZmaS1yem1xL2V4Y2VwdGlvbnMucmI=
-- !binary |-
-  bGliL2ZmaS1yem1xL2xpYmMucmI=
-- !binary |-
-  bGliL2ZmaS1yem1xL2xpYnptcS5yYg==
-- !binary |-
-  bGliL2ZmaS1yem1xL21lc3NhZ2UucmI=
-- !binary |-
-  bGliL2ZmaS1yem1xL3BvbGwucmI=
-- !binary |-
-  bGliL2ZmaS1yem1xL3BvbGxfaXRlbS5yYg==
-- !binary |-
-  bGliL2ZmaS1yem1xL3BvbGxfaXRlbXMucmI=
-- !binary |-
-  bGliL2ZmaS1yem1xL3NvY2tldC5yYg==
-- !binary |-
-  bGliL2ZmaS1yem1xL3V0aWwucmI=
-- !binary |-
-  bGliL2ZmaS1yem1xL3ZlcnNpb24ucmI=
-- !binary |-
-  bGliL2lvX2V4dGVuc2lvbnMucmI=
-- !binary |-
-  c3BlYy9jb250ZXh0X3NwZWMucmI=
-- !binary |-
-  c3BlYy9kZXZpY2Vfc3BlYy5yYg==
-- !binary |-
-  c3BlYy9tZXNzYWdlX3NwZWMucmI=
-- !binary |-
-  c3BlYy9tdWx0aXBhcnRfc3BlYy5yYg==
-- !binary |-
-  c3BlYy9ub25ibG9ja2luZ19yZWN2X3NwZWMucmI=
-- !binary |-
-  c3BlYy9wb2xsX3NwZWMucmI=
-- !binary |-
-  c3BlYy9wdXNocHVsbF9zcGVjLnJi
-- !binary |-
-  c3BlYy9yZXFyZXBfc3BlYy5yYg==
-- !binary |-
-  c3BlYy9zb2NrZXRfc3BlYy5yYg==
-- !binary |-
-  c3BlYy9zcGVjX2hlbHBlci5yYg==
-- !binary |-
-  c3BlYy9zdXBwb3J0L3Rlc3QuY3J0
-- !binary |-
-  c3BlYy9zdXBwb3J0L3Rlc3Qua2V5
+- .bnsignore
+- .gitignore
+- .travis.yml
+- AUTHORS.txt
+- Gemfile
+- History.txt
+- README.rdoc
+- Rakefile
+- examples/README.rdoc
+- examples/v2api/latency_measurement.rb
+- examples/v2api/local_lat.rb
+- examples/v2api/local_lat_poll.rb
+- examples/v2api/local_throughput.rb
+- examples/v2api/pub.rb
+- examples/v2api/publish_subscribe.rb
+- examples/v2api/remote_lat.rb
+- examples/v2api/remote_throughput.rb
+- examples/v2api/reqrep_poll.rb
+- examples/v2api/request_response.rb
+- examples/v2api/sub.rb
+- examples/v2api/throughput_measurement.rb
+- examples/v2api/xreqxrep_poll.rb
+- examples/v3api/latency_measurement.rb
+- examples/v3api/local_lat.rb
+- examples/v3api/local_lat_poll.rb
+- examples/v3api/local_throughput.rb
+- examples/v3api/pub.rb
+- examples/v3api/publish_subscribe.rb
+- examples/v3api/remote_lat.rb
+- examples/v3api/remote_throughput.rb
+- examples/v3api/reqrep_poll.rb
+- examples/v3api/request_response.rb
+- examples/v3api/sub.rb
+- examples/v3api/throughput_measurement.rb
+- examples/v3api/xreqxrep_poll.rb
+- ext/README
+- ffi-rzmq.gemspec
+- lib/ffi-rzmq.rb
+- lib/ffi-rzmq/constants.rb
+- lib/ffi-rzmq/context.rb
+- lib/ffi-rzmq/device.rb
+- lib/ffi-rzmq/exceptions.rb
+- lib/ffi-rzmq/libc.rb
+- lib/ffi-rzmq/libzmq.rb
+- lib/ffi-rzmq/message.rb
+- lib/ffi-rzmq/poll.rb
+- lib/ffi-rzmq/poll_item.rb
+- lib/ffi-rzmq/poll_items.rb
+- lib/ffi-rzmq/socket.rb
+- lib/ffi-rzmq/util.rb
+- lib/ffi-rzmq/version.rb
+- lib/io_extensions.rb
+- spec/context_spec.rb
+- spec/device_spec.rb
+- spec/message_spec.rb
+- spec/multipart_spec.rb
+- spec/nonblocking_recv_spec.rb
+- spec/poll_spec.rb
+- spec/pushpull_spec.rb
+- spec/reqrep_spec.rb
+- spec/socket_spec.rb
+- spec/spec_helper.rb
+- spec/support/test.crt
+- spec/support/test.key
 homepage: http://github.com/chuckremes/ffi-rzmq
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ffi-rzmq
-rubygems_version: 1.8.25
-signing_key: 
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
-summary: This gem wraps the ZeroMQ (0mq) networking library using Ruby FFI (foreign
-  function interface).
+summary: This gem wraps the ZeroMQ (0mq) networking library using Ruby FFI (foreign function interface).
 test_files:
-- !binary |-
-  c3BlYy9jb250ZXh0X3NwZWMucmI=
-- !binary |-
-  c3BlYy9kZXZpY2Vfc3BlYy5yYg==
-- !binary |-
-  c3BlYy9tZXNzYWdlX3NwZWMucmI=
-- !binary |-
-  c3BlYy9tdWx0aXBhcnRfc3BlYy5yYg==
-- !binary |-
-  c3BlYy9ub25ibG9ja2luZ19yZWN2X3NwZWMucmI=
-- !binary |-
-  c3BlYy9wb2xsX3NwZWMucmI=
-- !binary |-
-  c3BlYy9wdXNocHVsbF9zcGVjLnJi
-- !binary |-
-  c3BlYy9yZXFyZXBfc3BlYy5yYg==
-- !binary |-
-  c3BlYy9zb2NrZXRfc3BlYy5yYg==
-- !binary |-
-  c3BlYy9zcGVjX2hlbHBlci5yYg==
-- !binary |-
-  c3BlYy9zdXBwb3J0L3Rlc3QuY3J0
-- !binary |-
-  c3BlYy9zdXBwb3J0L3Rlc3Qua2V5
+- spec/context_spec.rb
+- spec/device_spec.rb
+- spec/message_spec.rb
+- spec/multipart_spec.rb
+- spec/nonblocking_recv_spec.rb
+- spec/poll_spec.rb
+- spec/pushpull_spec.rb
+- spec/reqrep_spec.rb
+- spec/socket_spec.rb
+- spec/spec_helper.rb
+- spec/support/test.crt
+- spec/support/test.key