async-rspec 1.16.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99cc9f67cfd8ad26555a5805dc8aa76b58876272ea0aecd18c07434ee8304c18
-  data.tar.gz: de573e462396eb1ccd28a45f7bd345bd2ecd0e8e6ea814ec300775b51d16280d
+  metadata.gz: 34164069084058e87dd043f816b73f6c480d4998d105581213d7eb1e89ce3084
+  data.tar.gz: 46f3d8e14a447fbee85151cb6a3272e361fa287bbabed35805b5b79114916993
 SHA512:
-  metadata.gz: ef693569b536cbba80c35d7805de22cd2cda1046f125cb3516c432b6548587042269cc802989fb79d94aa032c96eb45c589fd275f1c891462fb71337affdcdf5
-  data.tar.gz: fc6a89c0a9cecc214e140fb9a3b0887f6304f8612aeb1b6e771babda377d993fa56e6f2ef223fd02800123f24fd64005ceea500f0420df1fc29d7da039152d2a
+  metadata.gz: c8168f6c7a6846b4aa836417e005575bb4a5fa125a050145aefa4a31039d1909339d73b0227df97858a745dbde447d6fa72f00914dba6a3c511ef5eb4dce9a48
+  data.tar.gz: bdf7b373ce4fcbb11c149a4f3be47a318f508fc02ff57d5775ac01a3874310646b31af49bf5e0bf7a97752b4e0a0878890d3cada5a582b975325b41152412996

data/lib/async/rspec/reactor.rb

@@ -20,8 +20,10 @@
 
 require_relative 'leaks'
 
+require 'kernel/sync'
 require 'kernel/async'
 require 'async/reactor'
+require 'async/task'
 
 module Async
 	module RSpec
@@ -32,13 +34,12 @@ module Async
 			
 			def run_in_reactor(reactor, duration = nil)
 				result = nil
-				
 				timer_task = nil
 				
 				if duration
 					timer_task = reactor.async do |task|
 						# Wait for the timeout, at any point this task might be cancelled if the user code completes:
-						task.annotate("timer task duration=#{duration}")
+						task.annotate("Timer task duration=#{duration}.")
 						task.sleep(duration)
 						
 						# The timeout expired, so generate an error:
@@ -46,30 +47,28 @@ module Async
 						reactor.print_hierarchy(buffer)
 						
 						# Raise an error so it is logged:
-						raise TimeoutError, "run time exceeded duration #{duration}s:\r\n#{buffer.string}"
+						raise TimeoutError, "Run time exceeded duration #{duration}s:\n#{buffer.string}"
 					end
 				end
 				
-				reactor.run do |task|
-					task.annotate(self.class)
+				spec_task = reactor.async do |spec_task|
+					spec_task.annotate("running example")
 					
-					spec_task = task.async do |spec_task|
-						spec_task.annotate("running example")
-						
-						result = yield
-						
-						timer_task&.stop
-						
-						raise Async::Stop
-					end
+					result = yield(spec_task)
 					
-					begin
-						timer_task&.wait
-						spec_task.wait
-					ensure
-						spec_task.stop
-					end
-				end.wait
+					# We are finished, so stop the timer task if it was started:
+					timer_task&.stop
+					
+					# Now stop the entire reactor:
+					raise Async::Stop
+				end
+				
+				begin
+					timer_task&.wait
+					spec_task.wait
+				ensure
+					spec_task.stop
+				end
 				
 				return result
 			end
@@ -77,7 +76,7 @@ module Async
 		
 		::RSpec.shared_context Reactor do
 			include Reactor
-			let(:reactor) {Async::Reactor.new}
+			let(:reactor) {@reactor}
 			
 			include_context Async::RSpec::Leaks
 			
@@ -85,11 +84,17 @@ module Async
 				duration = example.metadata.fetch(:timeout, 10)
 				
 				begin
-					run_in_reactor(reactor, duration) do
-						example.run
+					Sync do |task|
+						@reactor = task.reactor
+						
+						task.annotate(self.class)
+						
+						run_in_reactor(@reactor, duration) do
+							example.run
+						end
+					ensure
+						@reactor = nil
 					end
-				ensure
-					reactor.close
 				end
 			end
 		end

data/lib/async/rspec/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module RSpec
-		VERSION = "1.16.0"
+		VERSION = "1.16.1"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-rspec
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.16.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2021-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -56,16 +56,16 @@ dependencies:
   name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: async-io
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Helpers for writing specs against the async gem.