czmq-ffi-gen 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40d4556bb0a5a5c7ba0aafa6d6bc34ec4eb4487f
-  data.tar.gz: b58af5fa24fce796084d8657c5fab6ebb1532f3f
+  metadata.gz: cc384e8c7226d8c4ac3fff21ed42d85c7ae4bc8a
+  data.tar.gz: 6e01c0d2750f9e0182687abd20c7653500694447
 SHA512:
-  metadata.gz: 2035e8506a6f87e614c2cf97ccf8df9e84ae7645d6df8e1c750130889cc6ff2ee082df24dbb5e635493b3252e09a313a765010e33f6832f7612b02f861ed1b70
-  data.tar.gz: bde5b181e74601897dd2f200c745ce23ce57a1fecda7d31b3c524772de8cca3c87cb34ddb62966781cf4fb175c9ab812fc01d93f6bd2c2b26406164cc1608c13
+  metadata.gz: c9d1c8a296b36d67b4e6569e45cb1372f57a60d49a9f8c46be14cdb8182755f3c11ebcbdb67c5d36248c82feab53cab6e633d38a2924144a288261d2bb12f65d
+  data.tar.gz: 09a8772b377504f00d0a6f2a7f9553ccef076e5dbbb02dd94c07591a10547e6f40b1d9221aebe06be86fe04177488f8b37fba8085bd5df65ef1accad93e87ff9

data/CHANGES.md

@@ -1,3 +1,10 @@
+0.8.1 (03/29/2016)
+-----
+* provide CZMQ::FFI::ZMQ_VERSION
+* rename CZMQ::FFI::LIBRARY_VERSION to CZMQ::FFI::CZMQ_VERSION
+* new module CZMQ::FFI::LibZMQ which is the sole place to interact directly
+  with the ZMQ library
+
 0.8.0 (03/27/2016)
 -----
 * upgrade CZMQ low-level binding to

data/lib/czmq-ffi-gen/errors.rb

@@ -1,26 +1,12 @@
 # This is only used to be able to read get the last ZMQ error.
 module CZMQ::FFI::Errors
-  extend ::FFI::Library
-
-  lib_name = 'libzmq'
-  lib_paths = ['/usr/local/lib', '/opt/local/lib', '/usr/lib64']
-    .map { |path| "#{path}/#{lib_name}.#{::FFI::Platform::LIBSUFFIX}" }
-  ffi_lib lib_paths + [lib_name]
-
-  opts = {
-    blocking: true  # only necessary on MRI to deal with the GIL.
-  }
-
-  attach_function :zmq_strerror, [:int], :string, **opts
-  attach_function :zmq_errno, [], :int, **opts
-
   # @return [String] error code of the last (ZMQ) error
   def self.errno
-    zmq_errno
+    CZMQ::FFI::LibZMQ.zmq_errno
   end
 
   # @return [String] the string representation of the last (ZMQ) error
   def self.strerror
-    zmq_strerror(zmq_errno)
+    CZMQ::FFI::LibZMQ.zmq_strerror(zmq_errno)
   end
 end

data/lib/czmq-ffi-gen/gem_version.rb

@@ -1,5 +1,5 @@
 module CZMQ
   module FFI
-    GEM_VERSION = "0.8.0"
+    GEM_VERSION = "0.8.1"
   end
 end

data/lib/czmq-ffi-gen/libzmq.rb

@@ -0,0 +1,18 @@
+# Bare minimum to get some things directly from the ZMQ library itself
+# (without the CZMQ wrapper).
+module CZMQ::FFI::LibZMQ
+  extend ::FFI::Library
+
+  lib_name = 'libzmq'
+  lib_paths = ['/usr/local/lib', '/opt/local/lib', '/usr/lib64']
+    .map { |path| "#{path}/#{lib_name}.#{::FFI::Platform::LIBSUFFIX}" }
+  ffi_lib lib_paths + [lib_name]
+
+  opts = {
+    blocking: true  # only necessary on MRI to deal with the GIL.
+  }
+
+  attach_function :zmq_strerror, [:int], :string, **opts
+  attach_function :zmq_errno, [], :int, **opts
+  attach_function :zmq_version, [:pointer, :pointer, :pointer], :void, **opts
+end

data/lib/czmq-ffi-gen/versions.rb

@@ -0,0 +1,19 @@
+require_relative "gem_version"
+require_relative "libzmq"
+
+module CZMQ
+  module FFI
+    # CZMQ library version
+    CZMQ_VERSION = VERSION
+
+    # @deprecated Use {CZMQ_VERSION} instead.
+    LIBRARY_VERSION = CZMQ_VERSION
+
+    # ZMQ library version
+    ZMQ_VERSION = begin
+      version = Array.new(3) { ::FFI::MemoryPointer.new(:int) }
+      LibZMQ.zmq_version(*version)
+      version.map { |n| n.get_int(0) }.join(".")
+    end
+  end
+end

data/lib/czmq-ffi-gen.rb

@@ -1,6 +1,5 @@
 require_relative "czmq-ffi-gen/czmq/ffi"
-require_relative "czmq-ffi-gen/gem_version"
-require_relative "czmq-ffi-gen/library_version"
+require_relative "czmq-ffi-gen/versions"
 require_relative "czmq-ffi-gen/errors"
 require_relative "czmq-ffi-gen/signals"
 require_relative "czmq-ffi-gen/legacy"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: czmq-ffi-gen
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Patrik Wenger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -123,8 +123,9 @@ files:
 - lib/czmq-ffi-gen/errors.rb
 - lib/czmq-ffi-gen/gem_version.rb
 - lib/czmq-ffi-gen/legacy.rb
-- lib/czmq-ffi-gen/library_version.rb
+- lib/czmq-ffi-gen/libzmq.rb
 - lib/czmq-ffi-gen/signals.rb
+- lib/czmq-ffi-gen/versions.rb
 homepage: https://github.com/paddor/czmq-ffi-gen
 licenses:
 - ISC

data/lib/czmq-ffi-gen/library_version.rb

@@ -1,5 +0,0 @@
-module CZMQ
-  module FFI
-    LIBRARY_VERSION = VERSION
-  end
-end