async 1.19.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bbe9b738c758dc531ae3a13f10a4a5bdcfdadaf29e3dc51bc11e2daca28781d
-  data.tar.gz: 31872ca49209a1038eb02ec0497bf968c68c84122c81f3bafd3b87773c653f1d
+  metadata.gz: db5bf4667851a5b5c7f18895a970d61429aaa4a3d09b67f1b27114f60c1b3be0
+  data.tar.gz: 5e01edfda229d537e214c5addc67460d533eb2096580f2055642f160c2f4c116
 SHA512:
-  metadata.gz: 2caef4acc794a33d79a7f74a7bf98642d5b882e406a31cca62a7714fa4933123ff9565c769fe2aaf88e71f1ae34499cff847402fa07194c85dd70f61fa19b594
-  data.tar.gz: 93a95a79cd6db4646108863121b60406f82e2ab4142ebba4108ac0cc7b23eec271d5a1cf4f1c9c7d3939ae17e3aba402f6f729a7bc3d56770fae49dac430ebe3
+  metadata.gz: 3353bb22a9f9669db6e417d575c953bb7c4384109459b437de5539c6ff0869957f02720bfbb878a6682678015a7d54ea7e67e2caf4c805d59c5fb57e470185be
+  data.tar.gz: bb6f76024fc98843c9ed1d08e834b9bfa0230deca26f4aa07b87eb8faf761922bab6a89f080b5dbae77b389b45ec8929bbcc0695cd4515058752b4250bd9b76c

data/lib/async/task.rb

@@ -134,13 +134,20 @@ module Async
 		# Stop the task and all of its children.
 		# @return [void]
 		def stop
-			@children&.each(&:stop)
-			
-			if self.current?
-				raise Stop, "Stopping current fiber!"
-			elsif @fiber.alive?
-				@fiber.resume(Stop.new)
+			if self.stopping?
+				# If we are already stopping this task... don't try to stop it again.
+				return true
+			elsif self.running?
+				@status = :stopping
+				
+				if self.current?
+					raise Stop, "Stopping current fiber!"
+				elsif @fiber.alive?
+					@fiber.resume(Stop.new)
+				end
 			end
+		ensure
+			@children&.each(&:stop)
 		end
 	
 		# Lookup the {Task} for the current fiber. Raise `RuntimeError` if none is available.
@@ -176,10 +183,18 @@ module Async
 			@status == :failed
 		end
 		
+		def stopping?
+			@status == :stopping
+		end
+		
 		def stopped?
 			@status == :stopped
 		end
 		
+		def complete?
+			@status == :complete
+		end
+		
 		private
 		
 		# This is a very tricky aspect of tasks to get right. I've modelled it after `Thread` but it's slightly different in that the exception can propagate back up through the reactor. If the user writes code which raises an exception, that exception should always be visible, i.e. cause a failure. If it's not visible, such code fails silently and can be very difficult to debug.

data/lib/async/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Async
-	VERSION = "1.19.0"
+	VERSION = "1.20.0"
 end

data/spec/async/task_spec.rb

@@ -148,6 +148,26 @@ RSpec.describe Async::Task do
 			expect(task).to be_stopped
 		end
 		
+		it "can stop nested tasks with exception handling" do
+			task = reactor.async do |task|
+				child = task.async do |subtask|
+					subtask.sleep(1)
+				end
+				
+				begin
+					child.wait
+				ensure
+					child.stop
+				end
+			end
+			
+			subtask = task.children.first
+			task.stop
+			
+			expect(task.status).to be :stopped
+			expect(subtask.status).to be :stopped
+		end
+		
 		it "can stop current task" do
 			state = nil
 			

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.20.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-17 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r