async 2.10.2 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ced20437db1c26026bbe526bc5c69c4ef467bf89fa7784eac27e5a4a0ad3d3a
-  data.tar.gz: 34724c6fcc75517b86a8875482f744cc7cfe83bce1fe87fdde28cf2851b46b0f
+  metadata.gz: 1eef4bf800b6d52c0f273289186f9886975237ecdf9885f599617691283ca2e5
+  data.tar.gz: 14a7e20dc72c178b89a93233a73fd49f182f7aec7926804b9b8bf37e8ceb9f36
 SHA512:
-  metadata.gz: 35919d63868bf8c0524807e448415224438c25bc8b87824bfec34d613f8febd9459c4367df5c9a3275cf5dc59e78769c7ba420e2492c3d172f2ec6e2015ee6a6
-  data.tar.gz: f707fb4cca45592ac4d0ba4f2e41a25f80c22db5a452e0710a106095ca2d30a32753e652a0a46a1ebbd2bc1b0a3ee37917927efdff4ea2405c3fc0ec1b31ba24
+  metadata.gz: 30176358a5c9efc3df3e525e0ba941f5771bb7619bef28e1b6229a547ad3a24cb5475483a257704c3eea2d9214dcca2e17932994e0859a1c5d4dfc6401b24d48
+  data.tar.gz: 8b7353cf2ef0884c78a919775b84280d3234c7868c6c3b95aa00ae560a5825a07bd9533eda1afcc9776d1c94b7cc116e549e24144e4bab7c9bb3f086782a7456

data/lib/async/barrier.md

@@ -9,7 +9,7 @@ require 'async/barrier'
 
 barrier = Async::Barrier.new
 Sync do
-	Console.logger.info("Barrier Example: sleep sort.")
+	Console.info("Barrier Example: sleep sort.")
 	
 	# Generate an array of 10 numbers:
 	numbers = 10.times.map{rand(10)}
@@ -26,7 +26,7 @@ Sync do
 	# Wait for all the numbers to be sorted:
 	barrier.wait
 	
-	Console.logger.info("Sorted", sorted)
+	Console.info("Sorted", sorted)
 ensure
 	# Ensure all the tasks are stopped when we exit:
 	barrier.stop

data/lib/async/condition.md

@@ -9,14 +9,14 @@ Sync do
 	condition = Async::Condition.new
 	
 	Async do
-		Console.logger.info "Waiting for condition..."
+		Console.info "Waiting for condition..."
 		value = condition.wait
-		Console.logger.info "Condition was signalled: #{value}"
+		Console.info "Condition was signalled: #{value}"
 	end
 	
 	Async do |task|
 		task.sleep(1)
-		Console.logger.info "Signalling condition..."
+		Console.info "Signalling condition..."
 		condition.signal("Hello World")
 	end
 end

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,17 +359,20 @@ 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.logger.debug(self) {"Exiting run-loop because #{$! ? $! : 'finished'}."}
+			Console.debug(self) {"Exiting run-loop because #{$! ? $! : 'finished'}."}
 		end
 		
 		# Start an asynchronous task within the specified reactor. The task will be
@@ -395,7 +398,7 @@ module Async
 			# - Avoid scheduler overhead if no blocking operation is performed.
 			task.run(*arguments)
 			
-			# Console.logger.debug "Initial execution of task #{fiber} complete (#{result} -> #{fiber.alive?})..."
+			# Console.debug "Initial execution of task #{fiber} complete (#{result} -> #{fiber.alive?})..."
 			return task
 		end
 		
@@ -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/semaphore.md

@@ -17,9 +17,9 @@ Sync do
 	# Search for the terms:
 	terms.each do |term|
 		semaphore.async do |task|
-			Console.logger.info("Searching for #{term}...")
+			Console.info("Searching for #{term}...")
 			response = Net::HTTP.get(URI "https://www.google.com/search?q=#{term}")
-			Console.logger.info("Got response #{response.size} bytes.")
+			Console.info("Got response #{response.size} bytes.")
 		end
 	end
 end

data/lib/async/task.rb

@@ -8,6 +8,7 @@
 # Copyright, 2023, by Math Ieu.
 
 require 'fiber'
+require 'console/event/failure'
 
 require_relative 'node'
 require_relative 'condition'
@@ -335,15 +336,15 @@ module Async
 					raise exception
 				elsif @finished.nil?
 					# If no one has called wait, we log this as a warning:
-					Console.logger.warn(self, "Task may have ended with unhandled exception.", exception)
+					Console::Event::Failure.for(exception).emit(self, "Task may have ended with unhandled exception.", severity: :warn)
 				else
-					Console.logger.debug(self, exception)
+					Console::Event::Failure.for(exception).emit(self, severity: :debug)
 				end
 			end
 		end
 		
 		def stopped!
-			# Console.logger.info(self, status:) {"Task #{self} was stopped with #{@children&.size.inspect} children!"}
+			# Console.info(self, status:) {"Task #{self} was stopped with #{@children&.size.inspect} children!"}
 			@status = :stopped
 			
 			stopped = false
@@ -374,7 +375,7 @@ module Async
 				
 				begin
 					completed!(yield)
-					# Console.logger.debug(self) {"Task was completed with #{@children.size} children!"}
+					# Console.debug(self) {"Task was completed with #{@children.size} children!"}
 				rescue Stop
 					stopped!
 				rescue StandardError => error
@@ -382,7 +383,7 @@ module Async
 				rescue Exception => exception
 					failed!(exception, true)
 				ensure
-					# Console.logger.info(self) {"Task ensure $! = #{$!} with #{@children&.size.inspect} children!"}
+					# Console.info(self) {"Task ensure $! = #{$!} with #{@children&.size.inspect} children!"}
 					finish!
 				end
 			end

data/lib/async/version.rb

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

data/lib/async/waiter.md

@@ -38,7 +38,7 @@ Sync do
 	# Stop all tasks which we don't care about:
 	barrier.stop
 	
-	Console.logger.info("Smallest", numbers)
+	Console.info("Smallest", numbers)
 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.10.2
+  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-04-15 00:00:00.000000000 Z
+date: 2024-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console
@@ -70,14 +70,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.25'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.25.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.25'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.25.2
 - !ruby/object:Gem::Dependency
   name: fiber-annotation
   requirement: !ruby/object:Gem::Requirement
@@ -98,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: []
@@ -180,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.