async-rspec 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3740c7d6640f8341b9c748d5d992e3fe815fb404c0096077de47f42437d9464
-  data.tar.gz: a0e097113adadf7e7e5483cb2bf62184af9162d2f5320c9e38b95e7f94236142
+  metadata.gz: 4662aa08daa03184f72a9447f5c7d8567bd35f89692695f71febab03d4897297
+  data.tar.gz: d68401193d009f2fb6147e325628f65b76e53e2e921946464cfc1fe63985e9fa
 SHA512:
-  metadata.gz: 1512325a47c8ee2c63336b598b3767545a8a0e85709c7ad2f2ff81620634a3cca389e29867609127f9e9699d814a67fb5318f7e5cea7be551aa274483f240a80
-  data.tar.gz: fac2caaeaccc3b7206647f9a9456d106da12edd2745712d7b574ee35abee5b370abe6d8c46a92c164419c18666dcf69eb824631280b73a6b3c05c92cea796053
+  metadata.gz: 3ca947cc355d74542beec3b42de5e1c12dda183ff82cf119dc5537e6069842ede90995beafd2d597ecfd8e92cf4919237098ec187a50fd5ae5fa9bbdb59ccd7c
+  data.tar.gz: afd1957e91eab763e8ed16fe5a53820ebb88b6263d5bffcab789bce9d229be04e2e1e31f2346b751e99b8c8017ec668b3d8a5ad0ec5dee4287ce3c1d34050930

data/async-rspec.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "rspec", "~> 3.0"
 	
 	# Since we test the shared contexts, we need some bits of async:
-	spec.add_development_dependency "async"
+	spec.add_development_dependency "async", "~> 1.8"
 	spec.add_development_dependency "ruby-prof"
 	
 	spec.add_development_dependency "bundler", "~> 1.13"

data/lib/async/rspec/reactor.rb

@@ -19,24 +19,49 @@
 # THE SOFTWARE.
 
 require_relative 'leaks'
+
 require 'async/reactor'
+require 'async/debug/selector'
 
 module Async
 	module RSpec
 		module Reactor
-			def run_reactor(example, duration = nil)
+			def run_example(reactor, example, duration)
 				result = nil
 				
-				duration ||= example.metadata[:timeout] || 60
-				
-				Async::Reactor.run do |task|
-					task.timeout(duration) do
+				reactor.run do |task|
+					task.annotate(self.class)
+					
+					reactor = task.reactor
+					timer = nil
+					
+					if duration
+						timer = reactor.async do |task|
+							task.annotate("timer task duration=#{duration}")
+							task.sleep(duration)
+							
+							buffer = StringIO.new
+							reactor.print_hierarchy(buffer)
+							
+							reactor.stop
+							
+							raise TimeoutError, "run time exceeded duration #{duration}s:\r\n#{buffer.string}"
+						end
+					end
+					
+					task.async do |spec_task|
+						spec_task.annotate("example runner")
+						
 						result = example.run
 						
-						task.children.each(&:wait)
-					end
+						if result.is_a? Exception
+							reactor.stop
+						else
+							spec_task.children.each(&:wait)
+						end
+					end.wait
 					
-					task.reactor.stop if result.is_a? Exception
+					timer.stop if timer
 				end
 				
 				return result
@@ -46,12 +71,18 @@ module Async
 		RSpec.shared_context Reactor do
 			include Reactor
 			
-			let(:reactor) {Async::Task.current.reactor}
+			let(:reactor) {Async::Reactor.new(selector: Async::Debug::Selector.new)}
 			
 			include_context Async::RSpec::Leaks
 			
 			around(:each) do |example|
-				run_reactor(example)
+				duration = example.metadata.fetch(:timeout, 60)
+				
+				begin
+					run_example(reactor, example, duration)
+				ensure
+					reactor.close
+				end
 			end
 		end
 	end

data/lib/async/rspec/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module RSpec
-		VERSION = "1.4.0"
+		VERSION = "1.5.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-rspec
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -28,16 +28,16 @@ dependencies:
   name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement