ffi-rzmq-core 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 96d011bc8e933b61a4c64eaac4220eccc8adf85d
-  data.tar.gz: 31c4e376ca5400c5fb44af9331328e405d0fc2b1
+SHA256:
+  metadata.gz: dfb36c8fd3ba8ea7889a686282a1eea04fd42b6b418fb627a59136ebca5e9c60
+  data.tar.gz: 6351eccd6e2ca3e0c91a49e02672bbec65d4d33abd728e368a98abf3d975c9ca
 SHA512:
-  metadata.gz: 91f118d04d3507fa041c60599d5a0d2e25b02f1464ab3765b9bb94102df4118c99ef442f58b8d809596e98b6db3efa9d24a6052e9543eeaa817f831bf4fd8474
-  data.tar.gz: cfb7aaae1e8efd9776b6703e3750c605fbd6857f974e53afc24825828363698ee6f2d7f06786b43ae831bb750e0f72af0af7896ef92827897fba13890900f971
+  metadata.gz: 61f7bd2e38fe8025d8dd37e81e9872770c8ae367ec03305a5b155c4397503996f696af1f33987329ad2019041ddf17a4a1979df2cb0cb64e5c8bbb3852b8255c
+  data.tar.gz: 48c45585ef08d5a03cf76b3eb0e47cace36aacb686626bee1e2a55173b52c56ae858d5356736253d45b70b0702f69dd18e643dd5fb637e190121e78dbe652b1d

data/.travis.yml

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

data/History.txt

@@ -0,0 +1,8 @@
+== 1.0.7
+  * Provide a wrapper function for calling context termination. Zeromq 3.x
+    uses zmq_ctx_destroy to terminate a context. While this function exists
+    in Zeromq 4.x, it is deprecated. For 4.x, we prefer to use zmq_ctx_term.
+    When loading the library, we define a `terminate_context` method on the
+    module which defaults to using the 3.x function call. If the 4.x support
+    loads, then this method is overwritten to use the 4.x function call.
+    

data/lib/ffi-rzmq-core/libzmq.rb

@@ -44,12 +44,18 @@ module LibZMQ
     ffi_lib(ZMQ_LIB_PATHS + %w{libzmq})
 
   rescue LoadError
-    if ZMQ_LIB_PATHS.any? {|path|
-      File.file? File.join(path, "libzmq.#{FFI::Platform::LIBSUFFIX}")}
+    # Failed to load the zmq library
+
+    found_libs = ZMQ_LIB_PATHS.find_all {|path| File.file? path }
+    if found_libs.any?
       warn "Unable to load this gem. The libzmq library exists, but cannot be loaded."
-      warn "If this is Windows:"
-      warn "-  Check that you have MSVC runtime installed or statically linked"
-      warn "-  Check that your DLL is compiled for #{FFI::Platform::ADDRESS_SIZE} bit"
+      warn "libzmq library was found at:"
+      warn found_libs.inspect
+      if FFI::Platform::IS_WINDOWS
+        warn "On Windows:"
+        warn "-  Check that you have MSVC runtime installed or statically linked"
+        warn "-  Check that your DLL is compiled for #{FFI::Platform::ADDRESS_SIZE} bit"
+      end
     else
       warn "Unable to load this gem. The libzmq library (or DLL) could not be found."
       warn "If this is a Windows platform, make sure libzmq.dll is on the PATH."
@@ -123,4 +129,8 @@ module LibZMQ
   # Monitoring API
   attach_function :zmq_socket_monitor, [:pointer, :pointer, :int], :int, :blocking => true
 
+  # Wrapper function for context termination
+  def self.terminate_context(context)
+    zmq_ctx_destroy(context)
+  end
 end

data/lib/ffi-rzmq-core/libzmq4.rb

@@ -14,4 +14,9 @@ module LibZMQ
   # Will return -1 with errno set to ENOSUP otherwise
   attach_function :zmq_curve_keypair, [:pointer, :pointer], :int, :blocking => true
 
+  # Wrapper function for context termination
+  def self.terminate_context(context)
+    zmq_ctx_term(context)
+  end
+
 end

data/lib/ffi-rzmq-core/version.rb

@@ -1,3 +1,3 @@
 module LibZMQ
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/spec/libzmq_spec.rb

@@ -45,4 +45,27 @@ describe LibZMQ do
     expect(LibZMQ).to respond_to(:zmq_socket_monitor)
   end
 
+  if LibZMQ.version3?
+
+    describe '.terminate_context' do
+      it 'calls the 3.x zmq_ctx_destroy function' do
+        context_dbl = double('context')
+
+        expect(LibZMQ).to receive(:zmq_ctx_destroy).with(context_dbl)
+        LibZMQ.terminate_context(context_dbl)
+      end
+    end
+
+  elsif LibZMQ.version4?
+
+    describe '.terminate_context' do
+      it 'calls the 4.x zmq_ctx_destroy function' do
+        context_dbl = double('context')
+
+        expect(LibZMQ).to receive(:zmq_ctx_term).with(context_dbl)
+        LibZMQ.terminate_context(context_dbl)
+      end
+    end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-rzmq-core
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Chuck Remes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2019-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -64,6 +64,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
+- History.txt
 - LICENSE
 - README.md
 - Rakefile
@@ -102,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: This gem provides only the FFI wrapper for the ZeroMQ (0mq) networking library.