async 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3722acb6246ee95cecd02b7d763cf695eabe3726510d2eda756ecfe3e809632e
-  data.tar.gz: da8e9cd294faf48293c39f7577ef6b807d3e46881fb99f248a7d3369bbc2d182
+  metadata.gz: b9530ec0131ea1a67aa243eabaaf6a20f2caa1588fe021c5efe4cec58f35c2b4
+  data.tar.gz: 51dc5db69d0793b9a1e5feea4de6478a5e63bbafedac307f6e1122c5d29be8bf
 SHA512:
-  metadata.gz: b69666de33bf4b97a4b72a9b9e6ecce98651dbc7fc6eab8c124946f979731fdb3b349d3143b6763a5cf2a41b2a2725d8186d3d2903603667dbd5ac973aea7686
-  data.tar.gz: 3e5a5211537c71bc368aeb7b1d7396693ad6f8908bdbf8e20a5a3baf395a0bb908eddbab2e05f3293667c3e25b2b75d08909df7dc6540d47522f411361ff9628
+  metadata.gz: 47b3ac832144d0c6555394368d3089f9577e4000fbb68b71972979d555a22d1028f34895ac7180cbe3a3314f6de7889d90ca6140c6ff27424f0f99e45d6ec085
+  data.tar.gz: abc2da19eb893c978826b07cb7ad13c2616b03fd7b559b39742698ae06bbf3558dbe4155db29f14d2bc2ac66812ad8e5bb35c25fe76a338f55ee905dd69c9396

data/lib/async/condition.rb

@@ -32,9 +32,16 @@ module Async
 		# Queue up the current fiber and wait on yielding the task.
 		# @return [Object]
 		def wait
-			@waiting << Fiber.current
+			fiber = Fiber.current
 			
+			@waiting << fiber
 			Task.yield
+			
+			# It would be nice if there was a better construct for this. We only need to invoke #delete if the task was not resumed normally. This can only occur with `raise` and `throw`. But there is no easy way to detect this.
+		# ensure when not return or ensure when raise, throw
+		rescue Exception
+			@waiting.delete(fiber)
+			raise
 		end
 		
 		# Is any fiber waiting on this notification?

data/lib/async/semaphore.rb

@@ -93,10 +93,17 @@ module Async
 		
 		# Wait until the semaphore becomes available.
 		def wait
+			fiber = Fiber.current
+			
 			while blocking?
-				@waiting << Fiber.current
+				@waiting << fiber
 				Task.yield
 			end
+		
+		# ensure when raise, throw
+		rescue Exception
+			@waiting.delete(fiber)
+			raise
 		end
 	end
 end

data/lib/async/version.rb

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

data/spec/async/condition_examples.rb

@@ -50,4 +50,37 @@ RSpec.shared_examples Async::Condition do
 		
 		subject.signal
 	end
+	
+	context "with timeout" do
+		before do
+			@state = nil
+		end
+		
+		let!(:task) do
+			reactor.async do |task|
+				task.with_timeout(0.1) do
+					begin
+						@state = :waiting
+						subject.wait
+						@state = :signalled
+					rescue Async::TimeoutError
+						@state = :timeout
+					end
+				end
+			end
+		end
+		
+		it 'can timeout while waiting' do
+			task.wait
+			
+			expect(@state).to be == :timeout
+		end
+		
+		it 'can signal while waiting' do
+			subject.signal
+			task.wait
+			
+			expect(@state).to be == :signalled
+		end
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r