cztop-reactor 0.7.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e017a75dd5e337e33e1340e765a2d9a25b4537c2d5ae9416c836e5f29f1f514
-  data.tar.gz: 015bb511a4955accc92c03f4f94887ca6b3ea7427d3840138053a85e14934661
+  metadata.gz: 1ad7473bbe7845c9a821e047efe656f695b97162f3412fd6beaf1c847c238c3e
+  data.tar.gz: 794025b550553a5b4ea94bd1960464b23ac0eb73502a26dd1914df340c51a61b
 SHA512:
-  metadata.gz: 3ed15bc7f31360a04d4a076af0dc711a2c6d3b42f4711af9eb131eca681d28d66e04e639b766fd95f5acac81a625c2f90e4465817f5b9ed8a5c8b5d18e0086a1
-  data.tar.gz: ff7d4d53270b16dc0af808f41052557b1810606d60ccac53d8fff99568fd53ca971da6066cefdd7c467b1a0db169cf64be06ed16b23ac3f1b6391b3e929bcece
+  metadata.gz: a6bdadd7d02f5627962b77d1d070afeb716a9d92f92fe80e7d32beffb40b617f951a76fbc4a8e96aebbb5ca71b846464b0af687cc31652baecd9bad5efc491f3
+  data.tar.gz: d04503ba29996ee6e8fffdcee28aa605bf65bdce210a5757944d6e5c10cfee2096b4b8d7f6b3ccdf8fb44fcb5f0cfc2fe255a8cf00a517c247f3d4cb83240e0e

data/History.md

@@ -1,3 +1,36 @@
+# Release History for cztop-reactor
+
+---
+
+## v1.0.0 [2022-04-27] Mahlon E. Smith <mahlon@martini.nu>
+
+- Bump cztop depdendency
+- Use rake-deveiate instead of hoe for rake management
+
+
+## v0.9.0 [2019-07-10] Michael Granger <ged@FaerieMUD.org>
+
+Improvements
+
+- Fix a bug in signal handling
+- Work around CZTop's mapping of EINTR in a poller_wait to an Interrupt
+
+
+## v0.8.0 [2019-05-22] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+- Fix several issues with socket monitoring.
+- Fix bug in signal-handler teardown
+- Super from the socket monitoring mixin
+
+Enhancements:
+
+- Add a #sockets_description method to the Reactor.
+- Turn on verbose on monitors if $VERBOSE is set
+- Super to monitor event handler methods if possible
+
+
 ## v0.7.0 [2018-07-23] Michael Granger <ged@FaerieMUD.org>
 
 Enhancements:

data/Manifest.txt

@@ -1,7 +1,6 @@
 .document
 .rdoc_options
 .simplecov
-ChangeLog
 History.md
 LICENSE.txt
 Manifest.txt

data/README.md

@@ -1,10 +1,10 @@
 # CZTop-Reactor
 
 home
-: http://deveiate.org/projects/CZTop-Reactor
+: https://hg.sr.ht/~ged/CZTop-Reactor
 
 code
-: http://bitbucket.org/ged/cztop-reactor
+: https://hg.sr.ht/~ged/CZTop-Reactor/browse
 
 github
 : https://github.com/ged/cztop-reactor
@@ -44,7 +44,7 @@ this writing includes:
 * Rubinius (HEAD)
 * JRuby 9000 (HEAD)
 
-I am also using it (and CZTop) under MRI 2.4.
+I am also using it (and CZTop) under MRI 2.6.
 
 
 ## Installation
@@ -69,7 +69,7 @@ distribute it as a gem for two reasons:
 ## Contributing
 
 You can check out the current development source with Mercurial via its
-{project page}[http://bitbucket.org/ged/cztop-reactor]. Or if you prefer Git,
+{project page}[https://hg.sr.ht/~ged/CZTop-Reactor]. Or if you prefer Git,
 via {its Github mirror}[https://github.com/ged/cztop-reactor].
 
 After checking out the source, run:
@@ -104,7 +104,7 @@ License](http://opensource.org/licenses/ISC):
 
 Everything else is distributed under the same license but is:
 
-Copyright (c) 2017, Michael Granger
+Copyright (c) 2017-2019, Michael Granger
 
 
 [POSA2]: http://www.cs.wustl.edu/~schmidt/POSA/POSA2/

data/Rakefile

@@ -1,3 +1,14 @@
+# -*- ruby -*-
+# frozen_string_literal: true
+
+require 'rake/deveiate'
+
+
+Rake::DevEiate.setup( 'cztop-reactor' )
+
+
+__END__
+
 #!/usr/bin/env rake
 
 begin
@@ -20,8 +31,8 @@ hoespec = Hoe.spec 'cztop-reactor' do |spec|
 	self.history_file = 'History.md'
 	self.extra_rdoc_files = FileList[ '*.rdoc', '*.md' ]
 	self.urls = {
-		home:   'http://deveiate.org/projects/cztop-reactor',
-		code:   'http://bitbucket.org/ged/cztop-reactor',
+		home:   'https://hg.sr.ht/~ged/CZTop-Reactor',
+		code:   'https://hg.sr.ht/~ged/CZTop-Reactor/browse',
 		docs:   'http://deveiate.org/code/cztop-reactor',
 		github: 'http://github.com/ged/cztop-reactor',
 	}
@@ -38,7 +49,7 @@ hoespec = Hoe.spec 'cztop-reactor' do |spec|
 	spec.dependency 'simplecov',               '~> 0.13', :developer
 	spec.dependency 'rdoc-generator-fivefish', '~> 0.3', :developer
 
-	spec.require_ruby_version( '>=2.2.4' )
+	spec.require_ruby_version( '>=2.4.0' )
 	spec.hg_sign_tags = true if spec.respond_to?( :hg_sign_tags= )
 	spec.check_history_on_release = true if spec.respond_to?( :check_history_on_release= )
 

data/lib/cztop/reactor/signal_handling.rb

@@ -64,7 +64,9 @@ module CZTop::Reactor::SignalHandling
 		return yield
 
 	ensure
+		self.log.debug "Going to reset signal traps..."
 		self.reset_signal_traps( *signals )
+		self.log.debug "Going to clean up signal handler..."
 		self.clean_up_signal_handling( reactor )
 	end
 
@@ -99,19 +101,25 @@ module CZTop::Reactor::SignalHandling
 
 	### Tear down the data structures for signal handling
 	def clean_up_signal_handling( reactor )
-		reactor.unregister( @self_pipe[:reader] )
-
-		@self_pipe[:writer].options.linger = 0
-		@self_pipe[:writer].close
-		@self_pipe[:reader].options.linger = 0
-		@self_pipe[:reader].close
+		if @self_pipe
+			self.log.info "Cleaning up signal handler self-pipe."
+			reactor.unregister( @self_pipe[:reader] )
+
+			@self_pipe[:writer].options.linger = 0
+			@self_pipe[:writer].close
+			@self_pipe[:reader].options.linger = 0
+			@self_pipe[:reader].close
+		else
+			self.log.info "No self-pipe; skipping signal-handler cleanup."
+		end
 
 		Thread.main[ SIGNAL_QUEUE_KEY ].clear
 	end
 
 
 	### Look for any signals that arrived and handle them.
-	def handle_queued_signals( _event )
+	def handle_queued_signals( event )
+		event.socket.wait
 		while sig = Thread.main[ SIGNAL_QUEUE_KEY ].shift
 			self.log.debug "  got a queued signal: %p" % [ sig ]
 			self.handle_signal( sig )

data/lib/cztop/reactor/socket_monitoring.rb

@@ -16,6 +16,7 @@ module CZTop::Reactor::SocketMonitoring
 
 	### Set up a monitor instance variable on object creation.
 	def initialize( * ) # :notnew:
+		super if defined?( super )
 		@monitor = nil
 	end
 
@@ -26,7 +27,7 @@ module CZTop::Reactor::SocketMonitoring
 
 	### Run the block with monitoring for the specified +socket+.
 	def with_socket_monitor( reactor, socket, *events )
-		mon = self.set_up_socket_monitor( reactor, socket )
+		mon = self.set_up_socket_monitor( reactor, socket, *events )
 
 		return yield
 	ensure
@@ -43,6 +44,7 @@ module CZTop::Reactor::SocketMonitoring
 	### Tear down the monitor.
 	def clean_up_socket_monitor( mon )
 		mon.terminate if mon
+		self.log.debug "Monitor is: %p" % [ mon ]
 	end
 
 
@@ -67,63 +69,109 @@ module CZTop::Reactor::SocketMonitoring
 	protected
 	#########
 
+
 	### Monitor event callback for socket connection events
 	def on_connected( fd, endpoint )
 		self.log.debug "Client socket on FD %d connected" % [ fd ]
+		super if defined?( super )
 	end
 
 
 	### Monitor event callback for socket connection-delayed events
 	def on_connect_delayed( fd, endpoint )
 		self.log.debug "Client socket on FD %d connection delayed" % [ fd ]
+		super if defined?( super )
 	end
 
 
 	### Monitor event callback for socket retry events
 	def on_connect_retried( fd, endpoint )
 		self.log.debug "Retrying connection for socket on FD %d" % [ fd ]
+		super if defined?( super )
+	end
+
+
+	### Monitor event callback for listening events
+	def on_listening( fd, endpoint )
+		self.log.debug "Socket on FD %d is now listening for connections" % [ fd ]
+		super if defined?( super )
+	end
+
+
+	### Monitor event callback for bind failure events
+	def on_bind_failed( fd, endpoint )
+		self.log.debug "Socket on FD %d could not be bound" % [ fd ]
+		super if defined?( super )
 	end
 
 
 	### Monitor event callback for socket accepted events
 	def on_accepted( fd, endpoint )
 		self.log.debug "Client socket on FD %d accepted" % [ fd ]
+		super if defined?( super )
 	end
 
 
-	### Monitor event callback for successful auth events.
-	def on_handshake_succeeded( fd, endpoint )
-		self.log.debug "Client socket on FD %d handshake succeeded" % [ fd ]
+	### Monitor event callback for socket accept failed events
+	def on_accept_failed( fd, endpoint )
+		self.log.debug "Client socket on FD %d accept failed" % [ fd ]
+		super if defined?( super )
 	end
 
 
-	### Monitor event callback for failed auth events.
-	def on_handshake_failed( fd, endpoint )
-		self.log.debug "Client socket on FD %d handshake failed" % [ fd ]
+	### Monitor event callback for socket closed events
+	def on_closed( fd, endpoint )
+		self.log.debug "Client socket on FD %d closed" % [ fd ]
+		super if defined?( super )
+	end
+
+
+	### Monitor event callback for socket close failed events
+	def on_close_failed( fd, endpoint )
+		self.log.debug "Close failed for socket on FD %d" % [ fd ]
+		super if defined?( super )
+	end
+
+
+	### Monitor event callback for socket disconnection events
+	def on_disconnected( fd, endpoint )
+		self.log.debug "Client socket on FD %d disconnected" % [ fd ]
+		super if defined?( super )
+	end
+
+
+	### Monitor event callback for monitor stopped events.
+	def on_monitor_stopped( fd, endpoint )
+		self.log.debug "Monitor for socket on FD %d stopped." % [ fd ]
+		super if defined?( super )
+	end
+
+
+	### Monitor event callback for successful auth events.
+	def on_handshake_succeeded( fd, endpoint )
+		self.log.debug "Client socket on FD %d handshake succeeded" % [ fd ]
+		super if defined?( super )
 	end
 
 
 	### Monitor event callback for failed handshake events.
 	def on_handshake_failed_no_detail( fd, endpoint )
 		self.log.debug "Client socket on FD %d handshake failed; no further details are known" % [ fd ]
+		super if defined?( super )
 	end
 
 
 	### Monitor event callback for failed handshake events.
 	def on_handshake_failed_protocol( fd, endpoint )
 		self.log.debug "Client socket on FD %d handshake failed: protocol error" % [ fd ]
+		super if defined?( super )
 	end
 
 
-	### Monitor event callback for socket closed events
-	def on_closed( fd, endpoint )
-		self.log.debug "Client socket on FD %d closed" % [ fd ]
-	end
-
-
-	### Monitor event callback for socket disconnection events
-	def on_disconnected( fd, endpoint )
-		self.log.debug "Client socket on FD %d disconnected" % [ fd ]
+	### Monitor event callback for failed auth events.
+	def on_handshake_failed_auth( fd, endpoint )
+		self.log.debug "Client socket on FD %d handshake failed: authentication failure" % [ fd ]
+		super if defined?( super )
 	end
 
 end # module CZTop::Reactor::SocketMonitoring

data/lib/cztop/reactor.rb

@@ -24,7 +24,7 @@ class CZTop::Reactor
 	include MonitorMixin
 
 	# The version of this library
-	VERSION = '0.7.0'
+	VERSION = '1.0.0'
 
 	# The maximum number of seconds to wait for events when there are no timers
 	# registered.
@@ -36,6 +36,14 @@ class CZTop::Reactor
 		write: CZTop::Poller::ZMQ::POLLOUT,
 	}.freeze
 
+	# Errors encountered during the poll that should retry instead of raising
+	POLLER_RETRY_ERRORS = [
+		Errno::EINTR::Errno, # CZTop maps this to Interrupt, but it can be *any*
+		                     # signal, not just SIGINT
+		Errno::EAGAIN::Errno,
+		Errno::ETIMEDOUT::Errno,
+	]
+
 
 	autoload :Event, 'cztop/reactor/event'
 
@@ -282,16 +290,18 @@ class CZTop::Reactor
 	### registered with the reactor for the `:read` event with the specified +callback+,
 	### then returned.
 	def register_monitor( socket, *events, &callback )
-		if !events.empty? && !events.last.is_a?( String )
+		if !events.empty? && events.last.respond_to?( :handle_monitor_event )
 			handler = events.pop
 			callback = handler.method( :handle_monitor_event )
 		end
 
+		events.map!( &:to_s )
 		events.push( 'ALL' ) if events.empty?
 
 		monitor = CZTop::Monitor.new( socket )
 		monitor.listen( *events )
 		monitor.start
+		monitor.verbose! if $VERBOSE
 
 		self.register( monitor.actor, :read, &callback )
 
@@ -327,15 +337,19 @@ class CZTop::Reactor
 
 		self.log.debug "Got event %p" % [ event ]
 		if event
-			# self.log.debug "Got event: %p" % [ event ]
-			handler = self.sockets[ event.socket ][ :handler ]
-			handler.call( event )
+			if event.socket
+				handler = self.sockets[ event.socket ][ :handler ]
+				handler.call( event )
+			else
+				self.log.warn "Got an event for an unregistered socket: racing to shut down?"
+			end
 		else
 			self.log.debug "Expired: firing timers."
 			self.timers.fire
 		end
 
-		self.log.debug "%d sockets after polling: %p" % [ self.sockets.length, self.sockets ]
+		# self.log.debug "%d sockets after polling: %s" %
+		# 	[ self.sockets.length, self.sockets_description ]
 	rescue Interrupt
 		raise unless ignore_interrupts
 		self.log.debug "Interrupted."
@@ -362,6 +376,21 @@ class CZTop::Reactor
 	end
 
 
+	### Return a description of the sockets registered with the reactor.
+	def sockets_description
+		return self.sockets.map do |sock, _|
+			case sock
+			when CZTop::Socket
+				"%s {%s}" % [ sock.class.name.sub(/.*::/, ''), sock.last_endpoint || 'not connected' ]
+			when CZTop::Actor
+				"Actor %#x" % [ sock.object_id * 2 ]
+			else
+				"??? %p ???" % [ sock.class ]
+			end
+		end.join( ', ' )
+	end
+
+
 	#########
 	protected
 	#########
@@ -372,7 +401,10 @@ class CZTop::Reactor
 	def wait( timeout=-1 )
 		rc = CZTop::Poller::ZMQ.poller_wait( @poller_ptr, @event_ptr, timeout )
 		if rc == -1
-			if CZMQ::FFI::Errors.errno != Errno::ETIMEDOUT::Errno
+			case CZMQ::FFI::Errors.errno
+			when *POLLER_RETRY_ERRORS
+				# Retry if the error means we should
+			else
 				CZTop::HasFFIDelegate.raise_zmq_err
 			end
 			return nil

data/spec/cztop/reactor/signal_handling_spec.rb

@@ -7,8 +7,8 @@ require 'cztop/reactor/signal_handling'
 
 describe CZTop::Reactor::SignalHandling do
 
-	it "can add a signal handler setup to a reactor for a block" do
-		including_class = Class.new do
+	let( :including_class ) do
+		class_instance = Class.new do
 
 			def initialize
 				@signals = []
@@ -21,9 +21,12 @@ describe CZTop::Reactor::SignalHandling do
 			end
 
 		end
+		class_instance.include( described_class )
+		return class_instance
+	end
 
-		including_class.include( described_class )
 
+	it "can add a signal handler setup to a reactor for a block" do
 		obj = including_class.new
 		reactor = CZTop::Reactor.new
 
@@ -38,10 +41,10 @@ describe CZTop::Reactor::SignalHandling do
 
 
 	it "raises if the including class doesn't provide a #handle_signal method" do
-		including_class = Class.new
-		including_class.include( described_class )
+		test_class = Class.new
+		test_class.include( described_class )
 
-		obj = including_class.new
+		obj = test_class.new
 		reactor = CZTop::Reactor.new
 
 		expect {
@@ -53,5 +56,23 @@ describe CZTop::Reactor::SignalHandling do
 		}.to raise_error( NotImplementedError, /unhandled signal USR1/i )
 	end
 
+
+	it "doesn't try to tear down signal handling if it didn't get set up" do
+		error_class = Class.new( StandardError )
+		allow( CZTop::Socket::PAIR ).to receive( :new ).
+			and_raise( error_class.new("something bad happened") )
+
+		obj = including_class.new
+		reactor = CZTop::Reactor.new
+
+		begin
+			obj.with_signal_handler( reactor, :USR1 ) do
+				fail "we shouldn't get here"
+			end
+		rescue error_class => err
+			expect( err.message ).to eq( "something bad happened" )
+		end
+	end
+
 end
 

data/spec/cztop/reactor/socket_monitoring_spec.rb

@@ -29,7 +29,7 @@ describe CZTop::Reactor::SocketMonitoring do
 		listener = CZTop::Socket::SERVER.new( '@tcp://127.0.0.1:*' )
 		socket = CZTop::Socket::CLIENT.new
 
-		obj.with_socket_monitor( reactor, socket, :CONNECTED ) do
+		obj.with_socket_monitor( reactor, socket ) do
 			socket.connect( listener.last_endpoint )
 			reactor.poll_once
 		end

data/spec/cztop/reactor_spec.rb

@@ -364,6 +364,16 @@ describe CZTop::Reactor do
 		end
 
 
+		it "ignores EINTR by default" do
+			expect( CZTop::Poller::ZMQ ).to receive( :poller_wait ).
+				and_return( -1 )
+			expect( CZMQ::FFI::Errors ).to receive( :errno ).
+				and_return( Errno::EINTR::Errno )
+
+			expect( reactor.poll_once ).to be_nil
+		end
+
+
 		it "has an option to propagate EGAIN/EWOULDBLOCK" do
 			expect( CZTop::Poller::ZMQ ).to receive( :poller_wait ).
 				and_raise( Errno::EAGAIN.new )

metadata

@@ -1,215 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: cztop-reactor
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Michael Granger
-autorequire: 
+- Mahlon E. Smith
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  btEP+7EplFuoiMfd
   -----END CERTIFICATE-----
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: loggability
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: cztop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: timers
+  name: loggability
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
-- !ruby/object:Gem::Dependency
-  name: hoe-mercurial
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
-  name: hoe-deveiate
+  name: rdoc-generator-fivefish
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
+        version: '0.4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: hoe-highline
+  name: timers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
+        version: '4.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake-deveiate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: rdoc-generator-fivefish
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.16'
-description: |-
-  This is an implementation of the Reactor pattern described in [Pattern-Oriented
-  Software Architecture (Volume 2)][POSA2]. It allows an asynchronous application
-  to be described as one or more "reactions" to events, in this case either I/O
-  conditions on a ZMQ socket or a timer expiring.
-
-  A simple example:
-
-      # Start a SERVER socket, and print out any messages sent to it
-      reactor = CZTop::Reactor.new
-      socket = CZTop::Socket::SERVER.new
-      socket.bind( 'tcp://0.0.0.0:8' )
-      reactor.register( socket, :read ) do |event|
-        if event.readable?
-          message = event.socket.receive
-          puts "Read: %p" % [ message.to_a ]
-        end
-      end
-      reactor.start_polling
+        version: '0.4'
+description: This is an implementation of the Reactor pattern described in Pattern-Oriented
+  Software Architecture (Volume 2). It allows an asynchronous application to be described
+  as one or more “reactions” to events, in this case either I/O conditions on a ZMQ
+  socket or a timer expiring.
 email:
-- ged@FaerieMUD.org
+- ged@faeriemud.org
+- mahlon@martini.nu
 executables: []
 extensions: []
-extra_rdoc_files:
-- History.md
-- LICENSE.txt
-- Manifest.txt
-- README.md
+extra_rdoc_files: []
 files:
 - ".document"
 - ".rdoc_options"
 - ".simplecov"
-- ChangeLog
 - History.md
 - LICENSE.txt
 - Manifest.txt
@@ -224,31 +148,33 @@ files:
 - spec/cztop/reactor/socket_monitoring_spec.rb
 - spec/cztop/reactor_spec.rb
 - spec/spec_helper.rb
-homepage: http://deveiate.org/projects/cztop-reactor
+homepage: https://hg.sr.ht/~ged/CZTop-Reactor
 licenses:
-- ISC
-metadata: {}
-post_install_message: 
-rdoc_options:
-- "--main"
-- README.md
+- BSD-3-Clause
+metadata:
+  homepage_uri: https://hg.sr.ht/~ged/CZTop-Reactor
+  documentation_uri: http://deveiate.org/code/cztop-reactor
+  changelog_uri: http://deveiate.org/code/cztop-reactor/History_md.html
+  source_uri: https://hg.sr.ht/~ged/CZTop-Reactor/browse
+  bug_tracker_uri: https://todo.sr.ht/~ged/CZTop-Reactor/browse
+post_install_message:
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.4
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
-summary: This is an implementation of the Reactor pattern described in [Pattern-Oriented
-  Software Architecture (Volume 2)][POSA2]
+summary: This is an implementation of the Reactor pattern described in Pattern-Oriented
+  Software Architecture (Volume 2).
 test_files: []

data/ChangeLog

@@ -1,223 +0,0 @@
-2018-07-23  Michael Granger  <ged@FaerieMUD.org>
-
-	* lib/cztop/reactor/socket_monitoring.rb:
-	Add socket monitoring methods for delayed and retried connections
-	[418d608db892] [tip]
-
-	* .hgtags:
-	Added tag v0.6.0 for changeset f97428feb0e2
-	[489876542fea]
-
-	* .hgsigs:
-	Added signature for changeset aea0b1dd1107
-	[f97428feb0e2] [v0.6.0]
-
-	* History.md, cztop-reactor.gemspec, lib/cztop/reactor.rb:
-	Bump the minor version, update history.
-	[aea0b1dd1107]
-
-	* lib/cztop/reactor/socket_monitoring.rb,
-	spec/cztop/reactor/socket_monitoring_spec.rb:
-	Fix unfinished socket monitor spec
-	[39358fbf9896]
-
-2018-07-21  Michael Granger  <ged@FaerieMUD.org>
-
-	* Manifest.txt, lib/cztop/reactor/socket_monitoring.rb,
-	spec/cztop/reactor/socket_monitoring_spec.rb:
-	Add a socket monitor mixin
-	[e65cdcbe5f89]
-
-2018-07-11  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgtags:
-	Added tag v0.5.0 for changeset c82d889b3d2e
-	[0338a8ab0f8b] [github/master]
-
-	* .hgsigs:
-	Added signature for changeset c6276b15f479
-	[c82d889b3d2e] [v0.5.0]
-
-	* History.md, Rakefile, cztop-reactor.gemspec, lib/cztop/reactor.rb:
-	Bump the minor version, cztop dep, and update History.
-	[c6276b15f479]
-
-	* cztop-reactor.gemspec, lib/cztop/reactor.rb,
-	spec/cztop/reactor_spec.rb:
-	Added methods to pause/resume all timers.
-	[67cfabefffd2]
-
-2018-06-27  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgtags:
-	Added tag v0.4.0 for changeset 36b814356934
-	[9e371cd81152]
-
-	* .hgsigs:
-	Added signature for changeset 4fa4ea9f2a91
-	[36b814356934] [v0.4.0]
-
-	* History.md, lib/cztop/reactor.rb:
-	Bump the minor version, update history.
-	[4fa4ea9f2a91]
-
-	* .ruby-version, lib/cztop/reactor.rb:
-	Make the reactor threadsafe
-	[c0beb742a2a2]
-
-2018-06-06  Michael Granger  <ged@FaerieMUD.org>
-
-	* Merged with 33bf1ec41017
-	[9ca502f040d3]
-
-2017-11-07  Michael Granger  <ged@FaerieMUD.org>
-
-	* .ruby-version:
-	Update to Ruby 2.4
-	[33bf1ec41017]
-
-2018-06-06  Michael Granger  <ged@FaerieMUD.org>
-
-	* lib/cztop/reactor/signal_handling.rb:
-	Fix docs and logging in signal handling mixin
-	[0adc6861a172]
-
-	* lib/cztop/reactor.rb:
-	Guard against events with no sockets
-	[749f5de1d5fe]
-
-	* certs/ged.pem:
-	Update my gem-signing cert
-	[26089589e937]
-
-2017-05-19  Michael Granger  <ged@FaerieMUD.org>
-
-	* Rakefile, cztop-reactor.gemspec:
-	Fix the rules for the gemspec.
-	[469956f9635b]
-
-2017-05-16  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgtags:
-	Added tag v0.3.0 for changeset 93726ed1d11c
-	[4a5ff1ab5370]
-
-	* .hgsigs:
-	Added signature for changeset b27d8748d922
-	[93726ed1d11c] [v0.3.0]
-
-	* History.md, lib/cztop/reactor.rb:
-	Bumped the minor version, updated history.
-	[b27d8748d922]
-
-2017-05-15  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgignore, Manifest.txt, lib/cztop/reactor/signal_handling.rb,
-	spec/cztop/reactor/signal_handling_spec.rb:
-	Add a mixin for signal handling.
-	[970a2eb110fb]
-
-2017-04-30  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgignore:
-	Ignore pkg directory
-	[1c8f915143cf]
-
-2017-04-29  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgtags:
-	Added tag v0.2.0 for changeset 05892f4b1e67
-	[188620133448]
-
-	* .hgsigs:
-	Added signature for changeset 94faa8741253
-	[05892f4b1e67] [v0.2.0]
-
-	* History.md, lib/cztop/reactor.rb:
-	Bump the minor version, update history.
-	[94faa8741253]
-
-	* lib/cztop/reactor.rb, spec/cztop/reactor_spec.rb:
-	Allow timers to be resumed after they're removed.
-	[2318715be614]
-
-2017-04-19  Michael Granger  <ged@FaerieMUD.org>
-
-	* Rakefile, cztop-reactor.gemspec:
-	Remove Rakefile guard against public release.
-	[bb56a75ae424]
-
-2017-04-12  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgtags:
-	Added tag v0.1.0 for changeset 436507f28e4d
-	[293cb9597072]
-
-	* .hgsigs:
-	Added signature for changeset 5f4e1c27760a
-	[436507f28e4d] [v0.1.0]
-
-	* History.md, lib/cztop/reactor.rb:
-	Set the minor version, update history file.
-	[5f4e1c27760a]
-
-2017-03-27  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hgsigs:
-	Added signature for changeset 8616ee222428
-	[10a0b983e907]
-
-	* .hgtags:
-	Added tag v0.1.0.pre20170323172345 for changeset 77db55f567df
-	[8616ee222428]
-
-	* cztop-reactor.gemspec, lib/cztop/reactor.rb,
-	spec/cztop/reactor_spec.rb:
-	Add options for ignoring interrupts and blocking errors
-	[77db55f567df] [v0.1.0.pre20170323172345]
-
-	* .gems:
-	Fix fivefish gem name in gemset
-	[27fcb613383f]
-
-2017-03-22  Michael Granger  <ged@FaerieMUD.org>
-
-	* .hoerc, cztop-reactor.gemspec, lib/cztop/reactor.rb,
-	spec/cztop/reactor_spec.rb:
-	Allow a handler object instead of a block.
-	[10904c471caa]
-
-2017-03-16  Michael Granger  <ged@FaerieMUD.org>
-
-	* Rakefile, cztop-reactor.gemspec:
-	Add missing dependency on timers.
-	[962f88d917bf]
-
-	* .hgignore:
-	Ignore built gems
-	[594168b03b71]
-
-	* README.md:
-	Fix link in the README
-	[0391133d132d]
-
-	* .hgignore:
-	Ignore generated docs directory
-	[ad4092564786]
-
-	* README.md:
-	Tabs -> spaces in the README
-	[41ec0ff65005]
-
-	* cztop-reactor.gemspec:
-	Add generated gemspec
-	[b3fcff597575]
-
-	* .document, .editorconfig, .gems, .hgignore, .hoerc, .pryrc,
-	.rdoc_options, .ruby-gemset, .ruby-version, .simplecov, Gemfile,
-	History.md, LICENSE.txt, Manifest.txt, README.md, Rakefile,
-	certs/ged.pem, lib/cztop/reactor.rb, lib/cztop/reactor/event.rb,
-	spec/cztop/reactor/event_spec.rb, spec/cztop/reactor_spec.rb,
-	spec/spec_helper.rb:
-	Initial commit.
-	[5e3f2358036b]