async-container 0.16.4 → 0.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5d86c65b350b653e621c4f36e8005fc85ba7c6a97569784dc2d5170d1310a27
-  data.tar.gz: 708b959103791bb424fae6c8f32e8a213dc04986c4e33e498069ebcd08b12473
+  metadata.gz: 366f5bcb56207cad5c7989c0384d2017d86603a19336fca1228ca7d0dc4684cc
+  data.tar.gz: 6f8e3410a31b4ffeb091256e49a0c553714ce974a401efa0e03dc8832da751a1
 SHA512:
-  metadata.gz: 5b216348b1514841d813e1455565b41e108a9c284e2b26e2629d8a8cf26acf7c5952bc0e63a2a84ab2c144b6a4c462cbdb1e1b54255ed1ecdbc4107a92d0e66b
-  data.tar.gz: f0afa2fcb3cd7ee73dd67cc92d0b004bc7b467cef2b7f4753ddbd296316d6364e81f7edd22987887957e14fe5bb0971370263e84731b7ebb181a109e635ea5e1
+  metadata.gz: cadf260da393227a17a340e16a12f81b9baa96f144be7d106397521d5259bf9963ed135fbabbc270d7df54501b72b99e47959cc3462ee870e0cbb2bcf9886509
+  data.tar.gz: 1a488679a02e575fcbb8c1a6e6ffa220b1b83cb0a84025c431ba461a4c70f840d26b3e65b9f95df634bd925b79557cb11b76c7c2582eeaca4bc996bf6a04f9c1

data/.github/workflows/development.yml

@@ -11,10 +11,10 @@ jobs:
           - macos
         
         ruby:
-          - 2.4
           - 2.5
           - 2.6
           - 2.7
+          - jruby
         
         include:
           - os: 'ubuntu'
@@ -25,7 +25,7 @@ jobs:
     
     steps:
     - uses: actions/checkout@v1
-    - uses: actions/setup-ruby@v1
+    - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{matrix.ruby}}
     - name: Install dependencies

data/async-container.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
 	spec.add_development_dependency "covered"
 	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.6"
-	spec.add_development_dependency "rake"
+	spec.add_development_dependency "bake-bundler"
 end

data/lib/async/container/controller.rb

@@ -55,7 +55,9 @@ module Async
 				
 				@signals = {}
 				
-				trap(SIGHUP, &self.method(:restart))
+				trap(SIGHUP) do
+					self.restart
+				end
 			end
 			
 			def state_string
@@ -138,6 +140,7 @@ module Async
 				old_container = @container
 				@container = container
 				
+				Async.logger.debug(self, "Stopping old container...")
 				old_container&.stop
 				@notify&.ready!
 			rescue

data/lib/async/container/group.rb

@@ -69,12 +69,14 @@ module Async
 			end
 			
 			def interrupt
+				Async.logger.debug(self, "Sending interrupt to #{@running.size} running processes...")
 				@running.each_value do |fiber|
 					fiber.resume(Interrupt)
 				end
 			end
 			
 			def terminate
+				Async.logger.debug(self, "Sending terminate to #{@running.size} running processes...")
 				@running.each_value do |fiber|
 					fiber.resume(Terminate)
 				end

data/lib/async/container/hybrid.rb

@@ -33,12 +33,21 @@ module Async
 				threads = (count / forks).ceil
 				
 				forks.times do
-					self.spawn(**options) do
-						container = Threaded::Container.new
+					self.spawn(**options) do |instance|
+						container = Threaded.new
 						
 						container.run(count: threads, **options, &block)
 						
+						container.wait_until_ready
+						instance.ready!
+						
 						container.wait
+					rescue Async::Container::Terminate
+						# Stop it immediately:
+						container.stop(false)
+					ensure
+						# Stop it gracefully (also code path for Interrupt):
+						container.stop
 					end
 				end
 				

data/lib/async/container/thread.rb

@@ -21,6 +21,7 @@
 # THE SOFTWARE.
 
 require_relative 'channel'
+require_relative 'error'
 require_relative 'notify/pipe'
 
 require 'async/logger'

data/lib/async/container/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module Container
-		VERSION = "0.16.4"
+		VERSION = "0.16.5"
 	end
 end

data/spec/async/container/controller_spec.rb

@@ -102,4 +102,47 @@ RSpec.describe Async::Container::Controller do
 			end.to raise_exception(Async::Container::InitializationError)
 		end
 	end
+	
+	context 'with signals' do
+		let(:controller_path) {File.expand_path("dots.rb", __dir__)}
+		
+		let(:pipe) {IO.pipe}
+		let(:input) {pipe.first}
+		let(:output) {pipe.last}
+		
+		let(:pid) {Process.spawn("bundle", "exec", controller_path, out: output)}
+		
+		before do
+			pid
+			output.close
+		end
+		
+		after do
+			Process.kill(:KILL, pid)
+		end
+		
+		it "restarts children when receiving SIGHUP" do
+			expect(input.read(1)).to be == '.'
+			
+			Process.kill(:HUP, pid)
+			
+			expect(input.read(2)).to be == 'I.'
+		end
+		
+		it "exits gracefully when receiving SIGINT" do
+			expect(input.read(1)).to be == '.'
+			
+			Process.kill(:INT, pid)
+			
+			expect(input.read).to be == 'I'
+		end
+		
+		it "exits gracefully when receiving SIGTERM" do
+			expect(input.read(1)).to be == '.'
+			
+			Process.kill(:TERM, pid)
+			
+			expect(input.read).to be == 'T'
+		end
+	end
 end

data/spec/async/container/dots.rb

@@ -2,9 +2,8 @@
 # frozen_string_literal: true
 
 require_relative '../../../lib/async/container/controller'
-require_relative '../../../lib/async/container/forked'
 
-Console.logger.debug!
+# Console.logger.debug!
 
 class Dots < Async::Container::Controller
 	def setup(container)
@@ -27,8 +26,4 @@ end
 
 controller = Dots.new
 
-begin
-	controller.run
-ensure
-	$stderr.puts $!
-end
+controller.run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-container
 version: !ruby/object:Gem::Version
-  version: 0.16.4
+  version: 0.16.5
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2020-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: process-group
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bake-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -134,12 +134,10 @@ files:
 - ".github/workflows/development.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - ".yardopts"
 - Gemfile
 - Guardfile
 - README.md
-- Rakefile
 - async-container.gemspec
 - examples/async.rb
 - examples/channel.rb
@@ -180,7 +178,6 @@ files:
 - spec/async/container/notify/pipe_spec.rb
 - spec/async/container/notify_spec.rb
 - spec/async/container/shared_examples.rb
-- spec/async/container/signal_spec.rb
 - spec/async/container/threaded_spec.rb
 - spec/async/container_spec.rb
 - spec/spec_helper.rb
@@ -216,7 +213,6 @@ test_files:
 - spec/async/container/notify/pipe_spec.rb
 - spec/async/container/notify_spec.rb
 - spec/async/container/shared_examples.rb
-- spec/async/container/signal_spec.rb
 - spec/async/container/threaded_spec.rb
 - spec/async/container_spec.rb
 - spec/spec_helper.rb

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-dist: xenial
-cache: bundler
-
-matrix:
-  include:
-    - rvm: 2.4
-    - rvm: 2.5
-    - rvm: 2.6
-    # - rvm: 2.6
-    #   os: osx
-    - rvm: 2.6
-      env: COVERAGE=BriefSummary,Coveralls
-    - rvm: 2.7
-    - rvm: truffleruby
-    - rvm: jruby-head
-      env: JRUBY_OPTS="--debug -X+O"
-    - rvm: ruby-head
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head

data/Rakefile

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:test)
-
-task :default => :test

data/spec/async/container/signal_spec.rb

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require "async/container/controller"
-
-RSpec.describe Async::Container::Controller do
-	let(:controller_path) {File.expand_path("dots.rb", __dir__)}
-	
-	let(:pipe) {IO.pipe}
-	let(:input) {pipe.first}
-	let(:output) {pipe.last}
-	
-	let(:pid) {Process.spawn(controller_path, out: output)}
-	
-	before do
-		pid
-		output.close
-	end
-	
-	after do
-		Process.kill(:KILL, pid)
-	end
-	
-	it "restarts children when receiving SIGHUP" do
-		expect(input.read(1)).to be == '.'
-		
-		Process.kill(:HUP, pid)
-		
-		expect(input.read(2)).to be == 'I.'
-	end
-	
-	it "exits gracefully when receiving SIGINT" do
-		expect(input.read(1)).to be == '.'
-		
-		Process.kill(:INT, pid)
-		
-		expect(input.read).to be == 'I'
-	end
-	
-	it "exits gracefully when receiving SIGTERM" do
-		expect(input.read(1)).to be == '.'
-		
-		Process.kill(:TERM, pid)
-		
-		expect(input.read).to be == 'T'
-	end
-end