cztop 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3d86b355a30b1827c5f043d9f0702ba1fac41ced1a5d6d0ebb64afe4b6ee4a9
-  data.tar.gz: 2693a71698843f37da1a4cd6a48a116fed64017794771fbd29bcb00b5c345ebf
+  metadata.gz: 5d76545700369dac81459715b642249b0b12460a7307e15454800a373feeea0f
+  data.tar.gz: 978a64afa33b8d8ca3f38a1e9f6fc115cee1ba64da8ad6b56eb705392007543f
 SHA512:
-  metadata.gz: aebc2e503f04d592b82c77689976dd5cd7e4364628063af332072bc199f1e24215302accfc3026359bf06ff69b579033a88b3fdfc86cbfc00845a779cce34bfa
-  data.tar.gz: 235999ed78bbfcf4ae575c9cdd01cdc73d0cb8e937426f0a3542265d046806250312bfd8cb3e167a8879a4961f835f995332753b841c445083cee85a30524efd
+  metadata.gz: e7bc28d173c43d80379a0e41bc041f8b942aecd3378c3fbe29995c1b9d2d03657ea11c43bbaf4f3781f1ab0f9778e089c4dd76db9ec27419281550d20dd890e1
+  data.tar.gz: 89c5d43a8aab9e10250257592b91f6c8362be08cd5ae66d4b4a5db408f5b58d2c1fd0408e8529c66f0392d169bb6b8e82ca6e6278f88574427e36d00b4e492e2

data/CHANGES.md

@@ -1,3 +1,12 @@
+1.2.3 (1/7/2024)
+-----
+* no changes, just re-release to update README on https://www.rubydoc.info/gems/cztop
+
+1.2.2 (1/7/2024)
+-----
+* restore compatibility with Ruby 3.0+
+* fix latency issue
+
 1.2.1 (1/7/2024)
 -----
 * fix changelog URI

data/README.md

@@ -18,26 +18,33 @@ See [this example](https://github.com/paddor/cztop/blob/master/examples/async.rb
 ```ruby
 #! /usr/bin/env ruby
 
-require 'cztop'
+require 'bundler/inline'
+
+gemfile do
+  source 'https://rubygems.org'
+  gem 'cztop', path: '../../'
+  gem 'async'
+end
+
+ENDPOINT = 'inproc://req_rep_example'
+# ENDPOINT = 'ipc:///tmp/req_rep_example0'
+# ENDPOINT = 'tcp://localhost:5556'
 
 Async do |task|
-  task.async do |t|
-    socket = CZTop::Socket::REP.new("inproc://req_rep_example")
-    socket.options.rcvtimeo = 50 # ms
+  rep_task = task.async do |t|
+    socket = CZTop::Socket::REP.new ENDPOINT
 
     loop do
       msg = socket.receive
       puts "<<< #{msg.to_a.inspect}"
       socket << msg.to_a.map(&:upcase)
-    rescue IO::TimeoutError
-      break
     end
-
+  ensure
     puts "REP done."
   end
 
   task.async do
-    socket = CZTop::Socket::REQ.new("inproc://req_rep_example")
+    socket = CZTop::Socket::REQ.new ENDPOINT
 
     10.times do |i|
       socket << "foobar ##{i}"
@@ -46,6 +53,7 @@ Async do |task|
     end
 
     puts "REQ done."
+    rep_task.stop
   end
 end
 ```
@@ -85,6 +93,8 @@ Executed in  401.51 millis    fish           external
 
 ```
 
+A slightly more complex version (more sockets) is [here](https://github.com/paddor/cztop/blob/master/examples/massive_async.rb).
+
 ## Overview
 
 ### Features
@@ -117,8 +127,6 @@ At least:
 
 * Ruby 3.0, 3.1, 3.2, 3.3
 
-Using CZTop with Async will require Ruby 3.2 because of the use of `IO::TimeoutError`, which was introduced in Ruby 3.2.
-
 ## Installation
 
 To use this gem, add this line to your application's Gemfile:

data/cztop.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'CZMQ binding based on the generated low-level FFI bindings of CZMQ'
   spec.homepage      = "https://rubygems.org/gems/cztop"
   spec.license       = "ISC"
-  spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
   spec.metadata["homepage_uri"]    = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/paddor/cztop"
@@ -32,8 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-given", "~> 3.8.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "yard"
-
-  if RUBY_VERSION >= '3.1'
-    spec.add_development_dependency "async", ">= 2.0.1"
-  end
+  spec.add_development_dependency "async"
 end

data/lib/cztop/has_ffi_delegate.rb

@@ -52,16 +52,18 @@ module CZTop::HasFFIDelegate
   #   SystemCallError subclass, if errno is known)
   def raise_zmq_err(msg = CZMQ::FFI::Errors.strerror,
                     errno: CZMQ::FFI::Errors.errno)
-
     case errno
-    when Errno::EINVAL::Errno       then raise ArgumentError, msg, caller
-    when Errno::EINTR::Errno        then raise Interrupt, msg, caller
-    when Errno::EHOSTUNREACH::Errno then raise SocketError, msg, caller
-
-    # If the errno is known, the corresponding Errno::* exception is
-    # automatically constructed. Otherwise, it'll be a plain SystemCallError.
-    # In any case, #errno will return the corresponding errno.
-    else raise SystemCallError.new(msg, errno), msg, caller
+    when Errno::EINVAL::Errno
+      fail ArgumentError, msg, caller
+    when Errno::EINTR::Errno
+      fail Interrupt, msg, caller
+    when Errno::EHOSTUNREACH::Errno
+      fail SocketError, msg, caller
+    else
+      # If the errno is known, the corresponding Errno::* exception is
+      # automatically constructed. Otherwise, it'll be a plain SystemCallError.
+      # In any case, #errno will return the corresponding errno.
+      fail SystemCallError.new(msg, errno), msg, caller
     end
   end
 

data/lib/cztop/send_receive_methods.rb

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
+unless defined? IO::TimeoutError
+  # Support Ruby < 3.2
+  class IO::TimeoutError < IOError
+  end
+end
+
 module CZTop
   # These are methods that can be used on a {Socket} as well as an {Actor},
   # but actually just pass through to methods of {Message} (which take
@@ -52,6 +58,7 @@ module CZTop
         timeout_at = now + timeout
 
         while true
+          # p wait_readable: self, timeout: timeout
           @fd_io.wait_readable(timeout)
           break if readable? # NOTE: ZMQ FD can't be trusted
           raise ::IO::TimeoutError if now >= timeout_at
@@ -60,8 +67,10 @@ module CZTop
           sleep JIFFY
         end
       else
-        until readable?
+        while true
+          # p wait_readable: self
           @fd_io.wait_readable
+          break if readable? # NOTE: ZMQ FD can't be trusted
 
           # HACK for edge case: avoid hogging CPU if FD for socket type doesn't block and just insists
           sleep JIFFY
@@ -85,6 +94,7 @@ module CZTop
         timeout_at = now + timeout
 
         while true
+          # p wait_writable: self, timeout: timeout
           @fd_io.wait_writable(timeout)
           break if writable? # NOTE: ZMQ FD can't be trusted
           raise ::IO::TimeoutError if now >= timeout_at
@@ -93,8 +103,10 @@ module CZTop
           sleep JIFFY
         end
       else
-        until writable?
+        while true
+          # p wait_writable: self
           @fd_io.wait_writable
+          break if writable? # NOTE: ZMQ FD can't be trusted
 
           # HACK for edge case: avoid hogging CPU if FD for socket type doesn't block and just insists
           sleep JIFFY

data/lib/cztop/version.rb

@@ -2,6 +2,6 @@
 
 module CZTop
 
-  VERSION = '1.2.1'
+  VERSION = '1.2.3'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cztop
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - Patrik Wenger
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
 description: CZMQ binding based on the generated low-level FFI bindings of CZMQ
 email:
 - paddor@gmail.com
@@ -201,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="