async 2.11.0 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43ab9833acc38ebf7eff4ef5e37401c5d9aff7f668eb71e77547666c1ddee9b8
-  data.tar.gz: f18b2eec51ff8bb163b91e6ed5583a8bbbbc0a985ff35738ae0c79aa37913687
+  metadata.gz: 1eef4bf800b6d52c0f273289186f9886975237ecdf9885f599617691283ca2e5
+  data.tar.gz: 14a7e20dc72c178b89a93233a73fd49f182f7aec7926804b9b8bf37e8ceb9f36
 SHA512:
-  metadata.gz: f07fafe843aea1930627b51f1dd4ba3c0a698f960282381a09c6955a79aeb5ab774d0f89b9680a4cf9bd84fa15c8a50fe9b2bce8bce0c5e6f0e655cbfe39988e
-  data.tar.gz: b4ec7cfe3d51ed349f72993b862a01738341a0603833df75188dd8a43d714e1b1ede85f97bcbaebe17027a4cd1992d1cb617d41d4773b04da447080701e94a71
+  metadata.gz: 30176358a5c9efc3df3e525e0ba941f5771bb7619bef28e1b6229a547ad3a24cb5475483a257704c3eea2d9214dcca2e17932994e0859a1c5d4dfc6401b24d48
+  data.tar.gz: 8b7353cf2ef0884c78a919775b84280d3234c7868c6c3b95aa00ae560a5825a07bd9533eda1afcc9776d1c94b7cc116e549e24144e4bab7c9bb3f086782a7456

data/lib/async/scheduler.rb

@@ -11,7 +11,6 @@ require_relative 'task'
 require 'io/event'
 
 require 'console'
-require 'timers'
 require 'resolv'
 
 module Async
@@ -40,7 +39,7 @@ module Async
 			@busy_time = 0.0
 			@idle_time = 0.0
 			
-			@timers = ::Timers::Group.new
+			@timers = ::IO::Event::Timers.new
 		end
 		
 		# Compute the scheduler load according to the busy and idle times that are updated by the run loop.
@@ -165,7 +164,7 @@ module Async
 				@blocked -= 1
 			end
 		ensure
-			timer&.cancel
+			timer&.cancel!
 		end
 		
 		# @asynchronous May be called from any thread.
@@ -225,7 +224,7 @@ module Async
 			
 			return @selector.io_wait(fiber, io, events)
 		ensure
-			timer&.cancel
+			timer&.cancel!
 		end
 		
 		if ::IO::Event::Support.buffer?
@@ -240,7 +239,7 @@ module Async
 				
 				@selector.io_read(fiber, io, buffer, length, offset)
 			ensure
-				timer&.cancel
+				timer&.cancel!
 			end
 			
 			if RUBY_ENGINE != "ruby" || RUBY_VERSION >= "3.3.1"
@@ -255,7 +254,7 @@ module Async
 					
 					@selector.io_write(fiber, io, buffer, length, offset)
 				ensure
-					timer&.cancel
+					timer&.cancel!
 				end
 			end
 		end
@@ -347,6 +346,7 @@ module Async
 			Kernel::raise ClosedError if @selector.nil?
 			
 			initial_task = self.async(...) if block_given?
+			interrupt = nil
 			
 			begin
 				# In theory, we could use Exception here to be a little bit safer, but we've only shown the case for SignalException to be a problem, so let's not over-engineer this.
@@ -359,14 +359,17 @@ module Async
 						break unless self.run_once
 					end
 				end
-			rescue Interrupt
+			rescue Interrupt => interrupt
 				Thread.handle_interrupt(::SignalException => :never) do
 					self.stop
 				end
 				
 				retry
 			end
-				
+			
+			# If the event loop was interrupted, and we finished exiting normally (due to the interrupt), we need to re-raise the interrupt so that the caller can handle it too.
+			Kernel.raise interrupt if interrupt
+			
 			return initial_task
 		ensure
 			Console.debug(self) {"Exiting run-loop because #{$! ? $! : 'finished'}."}
@@ -416,7 +419,7 @@ module Async
 			
 			yield timer
 		ensure
-			timer.cancel if timer
+			timer&.cancel!
 		end
 		
 		def timeout_after(duration, exception, message, &block)

data/lib/async/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2017-2024, by Samuel Williams.
 
 module Async
-	VERSION = "2.11.0"
+	VERSION = "2.12.1"
 end

data/readme.md

@@ -1,7 +1,6 @@
 # ![Async](logo.svg)
 
-Async is a composable asynchronous I/O framework for Ruby based on [io-event](https://github.com/socketry/io-event) and
-[timers](https://github.com/socketry/timers).
+Async is a composable asynchronous I/O framework for Ruby based on [io-event](https://github.com/socketry/io-event).
 
 > "Lately I've been looking into `async`, as one of my projects –
 > [tus-ruby-server](https://github.com/janko/tus-ruby-server) – would really benefit from non-blocking I/O. It's really

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -62,7 +62,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-05-04 00:00:00.000000000 Z
+date: 2024-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console
@@ -104,34 +104,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
-- !ruby/object:Gem::Dependency
-  name: timers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 1.6.5
 description:
 email:
 executables: []
@@ -186,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A concurrency framework for Ruby.