async-container 0.16.3 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7adf1896a47b233182c937ab7b2af7dc5c096580ebba30fad4c6153f1af26c0
-  data.tar.gz: f84bdd5f8bdc921449c814788a093342e7508cb1b449b42cfc3994069c2d350a
+  metadata.gz: a5d86c65b350b653e621c4f36e8005fc85ba7c6a97569784dc2d5170d1310a27
+  data.tar.gz: 708b959103791bb424fae6c8f32e8a213dc04986c4e33e498069ebcd08b12473
 SHA512:
-  metadata.gz: 2fd17ac64451b53a6ce97c057c2cc150b2e17a7540252770fa2e0ab9a3652ed27acbe1250a218e9ec6f14ef95471d0004855870572da666f77d1b9d7776b15e8
-  data.tar.gz: a9503f7eb323e982812103fb313e1dff3edbc558479240a97b451f3458b34e9f85415a2e1db505573cfa6f4241a354fcfd5f8d767dab14af15f1602a77de48a0
+  metadata.gz: 5b216348b1514841d813e1455565b41e108a9c284e2b26e2629d8a8cf26acf7c5952bc0e63a2a84ab2c144b6a4c462cbdb1e1b54255ed1ecdbc4107a92d0e66b
+  data.tar.gz: f0afa2fcb3cd7ee73dd67cc92d0b004bc7b467cef2b7f4753ddbd296316d6364e81f7edd22987887957e14fe5bb0971370263e84731b7ebb181a109e635ea5e1

data/lib/async/container/group.rb

@@ -81,13 +81,12 @@ module Async
 			end
 			
 			def stop(timeout = 1)
-				# Handle legacy `graceful = true` argument:
+				# Use a default timeout if not specified:
+				timeout = 1 if timeout == true
+				
 				if timeout
 					start_time = Async::Clock.now
 					
-					# Use a default timeout if not specified:
-					timeout = 1 if timeout == true
-					
 					self.interrupt
 					
 					while self.any?
@@ -103,14 +102,6 @@ module Async
 					end
 				end
 				
-				# Timeout can also be `graceful = false`:
-				if timeout
-					self.interrupt
-					self.sleep(timeout)
-				end
-				
-				self.wait_for_children(duration)
-				
 				# Terminate all children:
 				self.terminate
 				

data/lib/async/container/notify/console.rb

@@ -38,7 +38,7 @@ module Async
 				end
 				
 				def send(level: :debug, **message)
-					@logger.send(level, self) {message[:status]}
+					@logger.send(level, self) {message}
 				end
 				
 				def ready!(**message)

data/lib/async/container/notify/server.rb

@@ -98,7 +98,7 @@ module Async
 					
 					def receive
 						while true
-							data, address, flags, *controls = @bound.recvmsg(MAXIMUM_MESSAGE_SIZE)
+							data, _address, _flags, *_controls = @bound.recvmsg(MAXIMUM_MESSAGE_SIZE)
 							
 							message = Server.load(data)
 							

data/lib/async/container/thread.rb

@@ -116,7 +116,7 @@ module Async
 			end
 			
 			def name= value
-				@thread.name = name
+				@thread.name = value
 			end
 			
 			def name

data/lib/async/container/version.rb

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

data/spec/async/container/controller_spec.rb

@@ -33,18 +33,18 @@ RSpec.describe Async::Container::Controller do
 				container.spawn(key: "test") do |instance|
 					instance.ready!
 					
-					sleep(0.2)
+					sleep(0.2 * QUANTUM)
 					
 					@output.write(".")
 					@output.flush
 					
-					sleep(0.4)
+					sleep(0.4 * QUANTUM)
 				end
 				
 				container.spawn do |instance|
 					instance.ready!
 					
-					sleep(0.3)
+					sleep(0.3 * QUANTUM)
 					
 					@output.write(",")
 					@output.flush
@@ -101,6 +101,5 @@ RSpec.describe Async::Container::Controller do
 				subject.run
 			end.to raise_exception(Async::Container::InitializationError)
 		end
-		
 	end
 end

data/spec/async/container/dots.rb

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative '../../../lib/async/container/controller'
+require_relative '../../../lib/async/container/forked'
+
+Console.logger.debug!
+
+class Dots < Async::Container::Controller
+	def setup(container)
+		container.run(name: "dots", count: 1, restart: true) do |instance|
+			instance.ready!
+			
+			sleep 1
+			
+			$stdout.write "."
+			$stdout.flush
+			
+			sleep
+		rescue Async::Container::Interrupt
+			$stdout.write("I")
+		rescue Async::Container::Terminate
+			$stdout.write("T")
+		end
+	end
+end
+
+controller = Dots.new
+
+begin
+	controller.run
+ensure
+	$stderr.puts $!
+end

data/spec/async/container/forked_spec.rb

@@ -45,7 +45,7 @@ RSpec.describe Async::Container::Forked, if: Async::Container.fork? do
 		
 		3.times do
 			trigger.last.puts "die"
-			child_pid = pids.first.gets
+			_child_pid = pids.first.gets
 		end
 		
 		thread.kill

data/spec/async/container/notify/pipe_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe Async::Container::Notify::Pipe do
 		# Wait for the state to be updated by the child process:
 		container.sleep
 		
-		child, state = container.state.first
+		_child, state = container.state.first
 		expect(state).to be == {status: "Initializing..."}
 		
 		container.wait

data/spec/async/container/shared_examples.rb

@@ -51,11 +51,11 @@ RSpec.shared_examples_for Async::Container do
 	describe '#sleep' do
 		it "can sleep for a short time" do
 			subject.spawn do
-				sleep(0.2)
+				sleep(0.2 * QUANTUM)
 				raise "Boom"
 			end
 			
-			subject.sleep(0.1)
+			subject.sleep(0.1 * QUANTUM)
 			expect(subject.statistics).to have_attributes(failures: 0)
 			
 			subject.wait

data/spec/async/container/signal_spec.rb

@@ -0,0 +1,66 @@
+# 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

data/spec/spec_helper.rb

@@ -5,10 +5,16 @@ require 'covered/rspec'
 # Shared rspec helpers:
 require "async/rspec"
 
+if RUBY_PLATFORM =~ /darwin/i
+	QUANTUM = 2.0
+else
+	QUANTUM = 1.0
+end
+
 RSpec.configure do |config|
 	# Enable flags like --only-failures and --next-failure
 	config.example_status_persistence_file_path = ".rspec_status"
-
+	
 	config.expect_with :rspec do |c|
 		c.syntax = :expect
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-container
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: process-group
@@ -173,12 +173,14 @@ files:
 - lib/async/container/threaded.rb
 - lib/async/container/version.rb
 - spec/async/container/controller_spec.rb
+- spec/async/container/dots.rb
 - spec/async/container/forked_spec.rb
 - spec/async/container/hybrid_spec.rb
 - spec/async/container/notify/notify.rb
 - 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
@@ -207,12 +209,14 @@ specification_version: 4
 summary: Async is an asynchronous I/O framework based on nio4r.
 test_files:
 - spec/async/container/controller_spec.rb
+- spec/async/container/dots.rb
 - spec/async/container/forked_spec.rb
 - spec/async/container/hybrid_spec.rb
 - spec/async/container/notify/notify.rb
 - 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