turbo_test 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cfabcac4630bd19d2529fa63dc7022e4c7dddf518afe98284a838c10ec0e0cf
-  data.tar.gz: 23941350f74476d097e5e4af2c65d877265c6a6b5b32911f68b6b8aae76230a8
+  metadata.gz: 7f598fcd0bc09d2a885b3d0440eabbfa54c2718fae7f39d9f8b853fa37503474
+  data.tar.gz: 348390cf74c0b7ba9c05d806eb2e84dd9571b3851cac2ae6dfd98898d2531a35
 SHA512:
-  metadata.gz: 5430e363ce617c8d0581a6c2cceed6477c63eed7234636ed031a97447ff9f512d53d269be17df4ff9e9a139493cd67d41da2f731a659f59838ddba98bd8396dd
-  data.tar.gz: 316141c95de82103149a2d57e532e08f252797e8f4953c2493020906b77cf8c252d20252dcfaccea1df1c9145407848611db0c358ab5baa430d867cf42d115d7
+  metadata.gz: 2afcc1b037df3aa41ba017861939fbfff7fe7ff9e861026f56aa3771504344e6b2de58b4eecccfa963e1bca9688e789d931c7a51c2949353526a99e6847017ad
+  data.tar.gz: 4b1270405702e4f9ccdd736c6bdbcfd75e61fa02bcc0080b1317cc1c21d42f2152cc8fc1cd8cee3e3013538f54dbf2f369f281239739788e7ee3bac88fac74ec

data/lib/turbo_test/command/run.rb

@@ -68,12 +68,7 @@ module TurboTest
 					[RSpec::Job, path]
 				end
 				
-				results = server.host(queue)
-				
-				server.workers
-				server.wait
-				
-				return results.read
+				return server.run(queue)
 			end
 		end
 	end

data/lib/turbo_test/server.rb

@@ -24,6 +24,9 @@ require 'async'
 require 'async/container'
 require 'async/io/unix_endpoint'
 require 'async/io/shared_endpoint'
+
+require 'async/io/threads'
+
 require 'msgpack'
 
 module TurboTest
@@ -49,14 +52,10 @@ module TurboTest
 	class Server
 		def initialize(configuration, endpoint = nil)
 			@configuration = configuration
-			@endpoint = endpoint || Async::IO::Endpoint.unix('turbo_test.ipc')
+			@endpoint = endpoint || Async::IO::Endpoint.unix("turbo_test-#{Process.pid}.ipc")
 			@wrapper = Wrapper.new
 			
 			@container = Async::Container.new
-			
-			@bound_endpoint = Sync do
-				Async::IO::SharedEndpoint.bound(@endpoint)
-			end
 		end
 		
 		def host(queue)
@@ -73,9 +72,13 @@ module TurboTest
 				}
 				
 				Async do |task|
+					bound_endpoint = Sync do
+						Async::IO::SharedEndpoint.bound(@endpoint)
+					end
+					
 					instance.ready!
 					
-					@bound_endpoint.accept do |peer|
+					bound_endpoint.accept do |peer|
 						# Console.logger.info(self) {"Incoming connection from #{peer}..."}
 						
 						packer = @wrapper.packer(peer)
@@ -123,8 +126,9 @@ module TurboTest
 							end
 						end
 					end
+					
+					bound_endpoint.close
 				end
-				
 			ensure
 				Console.logger.info("Writing results")
 				@wrapper.packer(output).write(statistics).flush
@@ -159,8 +163,9 @@ module TurboTest
 		def workers
 			@container.run(name: "#{self.class} Worker") do |instance|
 				Async do |task|
+					sleep(rand)
 					@endpoint.connect do |peer|
-						instance.ready!
+						threads = Async::IO::Threads.new
 						
 						packer = @wrapper.packer(peer)
 						unpacker = @wrapper.unpacker(peer)
@@ -168,6 +173,8 @@ module TurboTest
 						packer.write([:ready])
 						packer.flush
 						
+						instance.ready!
+						
 						unpacker.each do |message|
 							command, tail = message
 							
@@ -178,10 +185,14 @@ module TurboTest
 								klass, *arguments = *tail
 								
 								begin
-									result = klass.new(*arguments).call(packer: packer)
+									# We run this in a separate thread to keep it isolated from the worker loop:
+									result = threads.async do
+										klass.new(*arguments).call(packer: packer)
+									end.wait
+									
 									packer.write([:result, result])
 								rescue Exception => exception
-									packer.write([:error, exception, exception.backtrace])
+									packer.write([:error, exception.class, exception.backtrace])
 								end
 								
 								packer.write([:ready])
@@ -191,13 +202,27 @@ module TurboTest
 							end
 						end
 					end
+				rescue Errno::ECONNREFUSED
+					# Host is finished already.
 				end
 			end
 		end
 		
-		def wait
+		def run(queue)
+			# Start the host:
+			results = self.host(queue)
+			
+			# Wait until the host is ready:
+			@container.wait_until_ready
+			
+			# Start the workers:
+			self.workers
+			
+			# Wait for the container to finish:
 			@container.wait
-			@bound_endpoint.close
+			
+			# Read the results from the host:
+			return results.read
 		end
 	end
 end

data/lib/turbo_test/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module TurboTest
-	VERSION = "0.1.0"
+	VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbo_test
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-01 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-container
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Press the turbo button... for your tests.