czmq-ffi-gen 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 169a0222735a985f3d160c632f4976f2646a35dec219f68e1fa1203aad71190a
-  data.tar.gz: 7123c785640b03258142a3843403d860a1fa9759306b5327a430952a200fc738
+  metadata.gz: 04e448a60ffba2ec6f7dbd771dbea9f79c6cb197de3eb8b92c7db0ef8d1d68bf
+  data.tar.gz: d549f1c0e1b7345654f4fd0455bd6b228c91f718478baeed42028dc2df76c191
 SHA512:
-  metadata.gz: 5d030dea047ce7ee74836c1fecacbaf7b9fea658279233fa8e9b45b82699e8ea4b7009068e89b79044d67c8968377f90e54bc1c66cb271dfbde60fc250b1b381
-  data.tar.gz: '0296af9112729a82198bec7bf89712f2b968fcfdf89f2053c293e319e01430d07b34f176dcab7a9ca6bc3533d68205f52d65305a8efd70940a5907b72fe6d714'
+  metadata.gz: 3dd9ea49ae737388e8f5a41143962cbf491b3c2999209b0d6efff0379f29a2c664ba14091ab8b6a44f3a68e928c12c33c94c48f30a3523188e1a81f59711f2bf
+  data.tar.gz: 680e72df5160b092fecd83125b3eab0e4272e2c20b83b9c27507e4116202c8eb7412266a163f733d59ef893920445dfa3693d04772c5a5d01b661f52005079ec

data/CHANGES.md

@@ -1,3 +1,9 @@
+1.2.0 (01/3/2025)
+-----
+* updated CZMQ low-level binding
+* find libczmq/libzmq in /usr/lib and respect LD_LIBRARY_PATH
+* add gem mutex_m as dependency to fix specs on Ruby 3.4
+
 1.1.2 (01/10/2024)
 -----
 * avoid warnings from FFI

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

@@ -269,6 +269,28 @@ module CZMQ
         result
       end
 
+      # Set the request username
+      #
+      # @param username [String, #to_s, nil]
+      # @return [void]
+      def set_username(username)
+        raise DestroyedError unless @ptr
+        self_p = @ptr
+        result = ::CZMQ::FFI.zhttp_request_set_username(self_p, username)
+        result
+      end
+
+      # Set the request password
+      #
+      # @param password [String, #to_s, nil]
+      # @return [void]
+      def set_password(password)
+        raise DestroyedError unless @ptr
+        self_p = @ptr
+        result = ::CZMQ::FFI.zhttp_request_set_password(self_p, password)
+        result
+      end
+
       # Match the path of the request.
       # Support wildcards with '%s' symbol inside the match string.
       # Matching wildcards until the next '/', '?' or '\0'.

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

@@ -124,6 +124,15 @@ module CZMQ
         __new ptr
       end
 
+      # Create a new zosc message from a string. This the same syntax as
+      # zosc_create but written as a single line string.
+      # @param oscstring [String, #to_s, nil]
+      # @return [CZMQ::Zosc]
+      def self.fromstring(oscstring)
+        ptr = ::CZMQ::FFI.zosc_fromstring(oscstring)
+        __new ptr
+      end
+
       # Create a new zosc message from the given format and arguments.
       # The format type tags are as follows:
       #   i - 32bit integer
@@ -307,6 +316,17 @@ module CZMQ
         result
       end
 
+      # Return a string describing the the OSC message. The returned string must be freed by the caller.
+      #
+      # @return [::FFI::AutoPointer]
+      def dump()
+        raise DestroyedError unless @ptr
+        self_p = @ptr
+        result = ::CZMQ::FFI.zosc_dump(self_p)
+        result = ::FFI::AutoPointer.new(result, LibC.method(:free))
+        result
+      end
+
       # Dump OSC message to stdout, for debugging and tracing.
       #
       # @return [void]

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

@@ -145,7 +145,7 @@ module CZMQ
 
       # Connects process stdin with a readable ('>', connect) zeromq socket. If
       # socket argument is NULL, zproc creates own managed pair of inproc
-      # sockets.  The writable one is then accessbile via zproc_stdin method.
+      # sockets.  The writable one is then accessible via zproc_stdin method.
       #
       # @param socket [::FFI::Pointer, #to_ptr]
       # @return [void]
@@ -158,7 +158,7 @@ module CZMQ
 
       # Connects process stdout with a writable ('@', bind) zeromq socket. If
       # socket argument is NULL, zproc creates own managed pair of inproc
-      # sockets.  The readable one is then accessbile via zproc_stdout method.
+      # sockets.  The readable one is then accessible via zproc_stdout method.
       #
       # @param socket [::FFI::Pointer, #to_ptr]
       # @return [void]
@@ -171,7 +171,7 @@ module CZMQ
 
       # Connects process stderr with a writable ('@', bind) zeromq socket. If
       # socket argument is NULL, zproc creates own managed pair of inproc
-      # sockets.  The readable one is then accessbile via zproc_stderr method.
+      # sockets.  The readable one is then accessible via zproc_stderr method.
       #
       # @param socket [::FFI::Pointer, #to_ptr]
       # @return [void]

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

@@ -21,12 +21,21 @@ module CZMQ
     end
 
     begin
-      lib_name = 'libczmq'
-      lib_dirs = ['/usr/local/lib', '/opt/local/lib', '/usr/lib64']
-      env_name = "#{lib_name.upcase}_PATH"
-      lib_dirs = [*ENV[env_name].split(':'), *lib_dirs] if ENV[env_name]
-      lib_paths = lib_dirs.map { |path| "#{path}/#{lib_name}.#{::FFI::Platform::LIBSUFFIX}" }
-      ffi_lib lib_paths + [lib_name]
+      lib_name      = 'libczmq'
+      major_version = '4'
+      lib_dirs      = ['/usr/local/lib', '/opt/local/lib', '/usr/lib64', '/usr/lib']
+      lib_dirs      = [*ENV['LD_LIBRARY_PATH'].split(':'), *lib_dirs] if ENV['LD_LIBRARY_PATH']
+      lib_dirs      = [*ENV["#{lib_name.upcase}_PATH"].split(':'), *lib_dirs] if ENV["#{lib_name.upcase}_PATH"]
+      lib_paths     = lib_dirs.map do |path|
+        [
+          "#{path}/#{lib_name}.#{::FFI::Platform::LIBSUFFIX}",
+          "#{path}/#{lib_name}.#{::FFI::Platform::LIBSUFFIX}.#{major_version}"
+        ]
+      end.flatten
+
+      lib_paths.concat [lib_name, "#{lib_name}.#{::FFI::Platform::LIBSUFFIX}.#{major_version}"]
+
+      ffi_lib lib_paths
       @available = true
     rescue LoadError
       warn ""
@@ -962,6 +971,8 @@ module CZMQ
       attach_function :zhttp_request_set_content, [:pointer, :pointer], :void, **opts
       attach_function :zhttp_request_set_content_const, [:pointer, :string], :void, **opts
       attach_function :zhttp_request_reset_content, [:pointer], :void, **opts
+      attach_function :zhttp_request_set_username, [:pointer, :string], :void, **opts
+      attach_function :zhttp_request_set_password, [:pointer, :string], :void, **opts
       attach_function :zhttp_request_match, [:pointer, :string, :string, :varargs], :bool, **opts
       attach_function :zhttp_request_test, [:bool], :void, **opts
 
@@ -989,6 +1000,7 @@ module CZMQ
       attach_function :zosc_new, [:string], :pointer, **opts
       attach_function :zosc_fromframe, [:pointer], :pointer, **opts
       attach_function :zosc_frommem, [:pointer, :size_t], :pointer, **opts
+      attach_function :zosc_fromstring, [:string], :pointer, **opts
       attach_function :zosc_create, [:string, :string, :varargs], :pointer, **opts
       attach_function :zosc_destroy, [:pointer], :void, **opts
       attach_function :zosc_size, [:pointer], :size_t, **opts
@@ -1001,6 +1013,7 @@ module CZMQ
       attach_function :zosc_pack, [:pointer], :pointer, **opts
       attach_function :zosc_packx, [:pointer], :pointer, **opts
       attach_function :zosc_unpack, [:pointer], :pointer, **opts
+      attach_function :zosc_dump, [:pointer], :pointer, **opts
       attach_function :zosc_print, [:pointer], :void, **opts
       attach_function :zosc_is, [:pointer], :bool, **opts
       attach_function :zosc_first, [:pointer, :pointer], :pointer, **opts

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

@@ -1,5 +1,5 @@
 module CZMQ
   module FFI
-    GEM_VERSION = "1.1.2"
+    GEM_VERSION = "1.2.0"
   end
 end

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

@@ -3,11 +3,21 @@
 module CZMQ::FFI::LibZMQ
   extend ::FFI::Library
 
-  lib_name = 'libzmq'
-  lib_dirs = ['/usr/local/lib', '/opt/local/lib', '/usr/lib64']
-  lib_dirs = [*ENV['LIBZMQ_PATH'].split(':'), *lib_dirs] if ENV['LIBZMQ_PATH']
-  lib_paths = lib_dirs.map { |path| "#{path}/#{lib_name}.#{::FFI::Platform::LIBSUFFIX}" }
-  ffi_lib lib_paths + [lib_name]
+  lib_name      = 'libzmq'
+  major_version = '5'
+  lib_dirs      = ['/usr/local/lib', '/opt/local/lib', '/usr/lib64', '/usr/lib']
+  lib_dirs      = [*ENV['LD_LIBRARY_PATH'].split(':'), *lib_dirs] if ENV['LD_LIBRARY_PATH']
+  lib_dirs      = [*ENV["#{lib_name.upcase}_PATH"].split(':'), *lib_dirs] if ENV["#{lib_name.upcase}_PATH"]
+  lib_paths     = lib_dirs.map do |path|
+    [
+      "#{path}/#{lib_name}.#{::FFI::Platform::LIBSUFFIX}",
+      "#{path}/#{lib_name}.#{::FFI::Platform::LIBSUFFIX}.#{major_version}"
+    ]
+  end.flatten
+
+  lib_paths.concat [lib_name, "#{lib_name}.#{::FFI::Platform::LIBSUFFIX}.#{major_version}"]
+
+  ffi_lib lib_paths
 
   opts = {
     blocking: true  # only necessary on MRI to deal with the GIL.

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: czmq-ffi-gen
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Patrik Wenger
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2025-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -66,7 +65,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 email:
 - paddor@gmail.com
 executables: []
@@ -131,7 +143,6 @@ metadata:
   source_code_uri: https://github.com/paddor/czmq-ffi-gen
   changelog_uri: https://github.com/paddor/czmq-ffi-gen/blob/master/CHANGES.md
   msys2_mingw_dependencies: czmq
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -146,8 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Generated low-level Ruby binding for CZMQ
 test_files: []