async-container 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ebb8de7090ed5a5d23691d8571baeb429b48a9f074732c236224e070beb494c
-  data.tar.gz: 3146ab6d57971fd5ac44649c866e9cdaade193d42281e1cdd6c2bfc4b95b134a
+  metadata.gz: c52199c3ce4eba08ef132232f2d812f38697dee26f4e58afd864dc35ecbe55d3
+  data.tar.gz: f1de4b8cf0d1343d5acbaa0d83219e4abd8a4c1b7a23730d1e235c4d7558b98f
 SHA512:
-  metadata.gz: 325838cec3b84c9d3f90f4d79dd7fb927275edbd547f9205bac7e31c8dd0e02aaf7c7030d82223f2c05a6b3ee2ef1e889b824640f8e81f8c9f307b40d751e12b
-  data.tar.gz: 7ffee495a8907695266b22696a8ecece4a2beb73b5ba392ad37332b1671bbb6ab6d063aec96ce4410524c2afef8dec0f66ea141a8bdcbcd64ee4cb24340fffe3
+  metadata.gz: 7faeea996aeaa8ef7ccecaca1d3c547dec8dc9bde59a7eb7ca27b4186378d6f7646ea5f78bba6b974464116f43ecacce1c80522467b7cff7a32c25d82bd5ee26
+  data.tar.gz: dd53e5af1f0b70a80354074de3d9554f8e6320b9362637fd8c6c8c15affcb3a1ac0c06a14ff4c04842fd9daae42b5bb1dd27cad1ecfb4e08cab1dc1c931975fc

data/async-container.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
 	spec.required_ruby_version = "~> 2.0"
 
 	spec.add_runtime_dependency "async", "~> 1.0"
+	spec.add_runtime_dependency "async-io", "~> 1.4"
+	
 	spec.add_development_dependency "async-rspec", "~> 1.1"
 	
 	spec.add_development_dependency "bundler", "~> 1.3"

data/lib/async/container/forked.rb

@@ -20,8 +20,9 @@
 
 require 'async/reactor'
 
+require 'async/io/notification'
+
 module Async
-	# TODO Move this into it's own gem, since it's really not required for async to work - it's only really for servers and this implementation is very basic.
 	# Manages a reactor within one or more threads.
 	module Container
 		class Forked
@@ -35,13 +36,26 @@ module Async
 						end
 					end
 				end
+				
+				@finished = false
 			end
 			
-			def stop
+			def wait
+				return if @finished
+				
 				@pids.each do |pid|
-					Process.kill(:INT, pid) rescue nil
 					Process.wait(pid)
 				end
+
+				@finished = true
+			end
+			
+			def stop(signal = :INT)
+				@pids.each do |pid|
+					Process.kill(signal, pid) rescue nil
+				end
+				
+				wait
 			end
 		end
 	end

data/lib/async/container/threaded.rb

@@ -21,6 +21,8 @@
 require 'async/reactor'
 require 'thread'
 
+require 'async/io/notification'
+
 module Async
 	module Container
 		# Manages a reactor within one or more threads.
@@ -41,11 +43,22 @@ module Async
 						end
 					end
 				end
+				
+				@finished = nil
+			end
+			
+			def wait
+				return if @finished
+				
+				@threads.each(&:join)
+					
+				@finished = true
 			end
 			
 			def stop
 				@reactors.each(&:stop)
-				@threads.each(&:join)
+				
+				wait
 			end
 		end
 	end

data/lib/async/container/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module Container
-		VERSION = "0.3.0"
+		VERSION = "0.4.0"
 	end
 end

data/spec/async/container_spec.rb

@@ -21,6 +21,8 @@
 require "async/container"
 
 RSpec.describe Async::Container do
+	include_context Async::RSpec::Reactor
+	
 	it "can run concurrently" do
 		count = 0
 		

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-container
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: async-io
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement