async-io 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c21728ab9008e3a380403814866827866f69cfa5
-  data.tar.gz: 9459dcb16dc458acf1724865b12a53dccf548dc5
+SHA256:
+  metadata.gz: 152518b09c63b90c002c9e4fa832d075898c75e613cc0405e8b1df947f0c3bdd
+  data.tar.gz: 4ddb1b1b688bbc37bfc6beb705866706aba4f1e43efe53126b03e0f3f57c4733
 SHA512:
-  metadata.gz: 60deebccccfc2885880c6a226b8f7637ec1234894efc92cc125e04778555a65f69e4dac73547c0e11de360c575830258fb32093353109bd08fe6cc351d404b6d
-  data.tar.gz: 43de7fec9b8046f1b6fbb7be981671879d2f2ad7479d791a651b1aad82301edb834a64de0d7d66e4059f8111f2bc8b899970ff8f17c26da55e00806f04546fcb
+  metadata.gz: b057c8c881f386afa0151fa220a9b51660b2487d124e8c45dbc45c240c2c682e83fd16b8c92c69b311bc2ae0d3b638fec4218ceb7e76c417367fcbc0852ec9be
+  data.tar.gz: db8b25d2bbc5c069586ce61f17a030b9469d22b1173b618adf826dabdffe5251f3e4e387338adeb89fee93dafd303365e729cdf8cf3217401f9d306b10152e95

data/async-io.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "async", "~> 1.0"
 	spec.add_development_dependency "async-rspec", "~> 1.2"
 
-	spec.add_development_dependency "bundler", "~> 1.13"
+	spec.add_development_dependency "bundler", "~> 1.3"
 	spec.add_development_dependency "rake", "~> 10.0"
 	spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/async/io/endpoint.rb

@@ -34,12 +34,17 @@ module Async
 					self.send(uri.scheme, uri.host, uri.port, **options)
 				end
 				
+				# args: nodename, service, family, socktype, protocol, flags
 				def tcp(*args, **options)
-					AddressEndpoint.new(Address.tcp(*args), **options)
+					args[3] = ::Socket::SOCK_STREAM
+					
+					HostEndpoint.new(args, **options)
 				end
 				
 				def udp(*args, **options)
-					AddressEndpoint.new(Address.udp(*args), **options)
+					args[3] = ::Socket::SOCK_DGRAM
+					
+					HostEndpoint.new(args, **options)
 				end
 				
 				def unix(*args, **options)
@@ -47,7 +52,7 @@ module Async
 				end
 				
 				def ssl(*args, **options)
-					SecureEndpoint.new(Endpoint.tcp(*args, **options), **options)
+					SecureEndpoint.new(self.tcp(*args, **options), **options)
 				end
 				
 				# Generate a list of endpoints from an array.
@@ -76,32 +81,6 @@ module Async
 				super(specification, options)
 			end
 			
-			def address
-				specification.local_address
-			end
-			
-			def to_sockaddr
-				address.to_sockaddr
-			end
-			
-			# This is how addresses are internally converted, e.g. within `Socket#sendto`.
-			alias to_str to_sockaddr
-			
-			# SOCK_STREAM, SOCK_DGRAM, SOCK_RAW, etc.
-			def socket_type
-				address.socktype
-			end
-			
-			# PF_* eg PF_INET etc, normally identical to AF_* constants.
-			def socket_domain
-				address.afamily
-			end
-			
-			# IPPROTO_TCP, IPPROTO_UDP, IPPROTO_IPX, etc.
-			def socket_protocol
-				address.protocol
-			end
-			
 			def bind
 				yield specification
 			end
@@ -120,27 +99,50 @@ module Async
 			end
 		end
 		
-		# This class will open and close the socket automatically.
-		class AddressEndpoint < Endpoint
-			def address
-				specification
+		class HostEndpoint < Endpoint
+			def bind(&block)
+				task = Task.current
+				tasks = []
+				
+				task.annotate("binding to #{specification.inspect}")
+				
+				Addrinfo.foreach(*specification).each do |address|
+					tasks << task.async do
+						Socket.bind(address, **options, &block)
+					end
+				end
+				
+				tasks.each(&:wait)
 			end
 			
+			def connect(&block)
+				last_error = nil
+				
+				Addrinfo.foreach(*specification).each do |address|
+					begin
+						return Socket.connect(address, &block)
+					rescue
+						last_error = $!
+					end
+				end
+				
+				raise last_error
+			end
+		end
+		
+		# This class will open and close the socket automatically.
+		class AddressEndpoint < Endpoint
 			def bind(&block)
-				Socket.bind(address, **options, &block)
+				Socket.bind(specification, **options, &block)
 			end
 			
 			def connect(&block)
-				Socket.connect(address, &block)
+				Socket.connect(specification, &block)
 			end
 		end
 		
 		# This class doesn't exert ownership over the specified socket, wraps a native ::IO.
 		class SocketEndpoint < Endpoint
-			def address
-				specification.local_address
-			end
-			
 			def bind(&block)
 				yield Socket.new(specification)
 			end
@@ -151,10 +153,6 @@ module Async
 		end
 		
 		class SecureEndpoint < Endpoint
-			def address
-				specification.address
-			end
-			
 			def hostname
 				options[:hostname]
 			end

data/lib/async/io/generic.rb

@@ -93,7 +93,7 @@ module Async
 			
 			protected
 			
-			if RUBY_VERSION >= "2.3"
+			if RUBY_ENGINE == "ruby" and RUBY_VERSION >= "2.3"
 				def async_send(*args)
 					async do
 						@io.__send__(*args, exception: false)
@@ -114,7 +114,7 @@ module Async
 						end
 					end
 				end
-			elsif RUBY_VERSION >= "2.1"
+			elsif RUBY_ENGINE == "ruby" and RUBY_VERSION >= "2.1"
 				def async_send(*args)
 					async do
 						@io.__send__(*args)

data/lib/async/io/notification.rb

@@ -0,0 +1,57 @@
+# Copyright, 2018, 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_relative 'generic'
+
+module Async
+	module IO
+		# A cross-reactor/process notification pipe.
+		class Notification
+			def initialize
+				pipe = ::IO.pipe
+				
+				@input = pipe.first
+				@output = pipe.last
+				
+				@count = 0
+			end
+			
+			def close
+				@input.close
+				@output.close
+			end
+			
+			# Wait for signal to be called.
+			# @return [Object]
+			def wait
+				wrapper = Async::IO::Generic.new(@input)
+				wrapper.read(1)
+			ensure
+				wrapper.send(:close_monitor) if wrapper
+			end
+			
+			# Signal to a given task that it should resume operations.
+			# @return [void]
+			def signal
+				@output.write(".")
+			end
+		end
+	end
+end

data/lib/async/io/socket.rb

@@ -33,6 +33,10 @@ module Async
 			
 			wrap_blocking_method :sendmsg, :sendmsg_nonblock
 			wrap_blocking_method :send, :sendmsg_nonblock, invert: false
+			
+			def type
+				self.local_address.socktype
+			end
 		end
 		
 		module ServerSocket
@@ -42,8 +46,8 @@ module Async
 				wrapper = Socket.new(peer, self.reactor)
 				
 				if block_given?
-					task.async do
-						task.annotate "incoming connection #{address}"
+					task.async do |task|
+						task.annotate "incoming connection #{address.inspect}"
 						
 						begin
 							yield wrapper, address

data/lib/async/io/trap.rb

@@ -0,0 +1,64 @@
+# Copyright, 2018, 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_relative 'notification'
+
+module Async
+	module IO
+		# A cross-reactor/process notification pipe.
+		class Trap
+			def initialize(name)
+				@name = name
+				@notifications = []
+			end
+			
+			def install!
+				Signal.trap(@name, &self.method(:trigger))
+				
+				return self
+			end
+			
+			# Block the calling task until the signal occurs.
+			def trap
+				task = Task.current
+				task.annotate("waiting for signal #{@name}")
+				
+				notification = Notification.new
+				@notifications << notification
+				
+				while true
+					notification.wait
+					yield
+				end
+			ensure
+				if notification
+					notification.close
+					@notifications.delete(notification)
+				end
+			end
+			
+			# Signal all waiting tasks that the trap occurred.
+			# @return [void]
+			def trigger(signal_number = nil)
+				@notifications.each(&:signal)
+			end
+		end
+	end
+end

data/lib/async/io/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module IO
-		VERSION = "1.2.1"
+		VERSION = "1.3.0"
 	end
 end

data/spec/async/io/endpoint_spec.rb

@@ -18,28 +18,25 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'async/io/endpoint'
+# This seems to break rbx
+# require 'async/io/endpoint'
 
 RSpec.describe Async::IO::Endpoint do
 	include_context Async::RSpec::Reactor
 	
-	describe Async::IO::Endpoint.tcp('0.0.0.0', 1234) do
+	describe Async::IO::Endpoint.tcp('0.0.0.0', 5234, reuse_port: true) do
 		it "should be a tcp binding" do
-			expect(subject.socket_type).to be == ::Socket::SOCK_STREAM
-		end
-		
-		it "should generate valid address" do
-			expect(subject.address).to be == Async::IO::Address.tcp('0.0.0.0', 1234)
+			subject.bind do |server|
+				expect(server.local_address.socktype).to be == ::Socket::SOCK_STREAM
+			end
 		end
 	end
 	
 	describe Async::IO::SocketEndpoint.new(TCPServer.new('0.0.0.0', 1234)) do
-		it "should be a tcp binding" do
-			expect(subject.socket_type).to be == ::Socket::SOCK_STREAM
-		end
-		
-		it "should generate valid address" do
-			expect(subject.address).to be == Async::IO::Address.tcp('0.0.0.0', 1234)
+		it "should bind to given socket" do
+			subject.bind do |server|
+				expect(server.io).to be == subject.specification
+			end
 		end
 	end
 end

data/spec/async/io/notification_spec.rb

@@ -0,0 +1,44 @@
+# Copyright, 2017, 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/io/notification'
+
+RSpec.describe Async::IO::Notification do
+	include_context Async::RSpec::Reactor
+	
+	it "should wait for notification" do
+		waiting_task = reactor.async do
+			subject.wait
+		end
+		
+		expect(waiting_task.status).to be :running
+		
+		signalling_task = reactor.async do
+			subject.signal
+		end
+		
+		signalling_task.wait
+		waiting_task.wait
+		
+		expect(waiting_task.status).to be :complete
+		
+		subject.close
+	end
+end

data/spec/async/io/ssl_socket_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe Async::Reactor do
 	include_context Async::RSpec::SSL::VerifiedContexts
 	
 	# Shared port for localhost network tests.
-	let(:endpoint) {Async::IO::Endpoint.tcp("localhost", 6779, reuse_port: true)}
+	let(:endpoint) {Async::IO::Endpoint.tcp("127.0.0.1", 6779, reuse_port: true)}
 	let(:server_endpoint) {Async::IO::SecureEndpoint.new(endpoint, ssl_context: server_context)}
 	let(:client_endpoint) {Async::IO::SecureEndpoint.new(endpoint, ssl_context: client_context)}
 	

data/spec/async/io/trap_spec.rb

@@ -0,0 +1,44 @@
+# Copyright, 2017, 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/io/trap'
+
+RSpec.describe Async::IO::Trap do
+	include_context Async::RSpec::Reactor
+	
+	subject {described_class.new(:USR1)}
+	
+	it "should wait for signal" do
+		trapped = false
+		
+		waiting_task = reactor.async do
+			subject.trap do
+				trapped = true
+				break
+			end
+		end
+		
+		subject.trigger
+		
+		waiting_task.wait
+		
+		expect(trapped).to be_truthy
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -98,11 +98,13 @@ files:
 - lib/async/io/binary_string.rb
 - lib/async/io/endpoint.rb
 - lib/async/io/generic.rb
+- lib/async/io/notification.rb
 - lib/async/io/protocol/line.rb
 - lib/async/io/socket.rb
 - lib/async/io/ssl_socket.rb
 - lib/async/io/stream.rb
 - lib/async/io/tcp_socket.rb
+- lib/async/io/trap.rb
 - lib/async/io/udp_socket.rb
 - lib/async/io/unix_socket.rb
 - lib/async/io/version.rb
@@ -111,11 +113,13 @@ files:
 - spec/async/io/echo_spec.rb
 - spec/async/io/endpoint_spec.rb
 - spec/async/io/generic_spec.rb
+- spec/async/io/notification_spec.rb
 - spec/async/io/protocol/line_spec.rb
 - spec/async/io/socket_spec.rb
 - spec/async/io/ssl_socket_spec.rb
 - spec/async/io/stream_spec.rb
 - spec/async/io/tcp_socket_spec.rb
+- spec/async/io/trap_spec.rb
 - spec/async/io/udp_socket_spec.rb
 - spec/async/io/unix_socket_spec.rb
 - spec/async/io/wrap/tcp_spec.rb
@@ -139,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Provides support for asynchonous TCP, UDP, UNIX and SSL sockets.
@@ -148,11 +152,13 @@ test_files:
 - spec/async/io/echo_spec.rb
 - spec/async/io/endpoint_spec.rb
 - spec/async/io/generic_spec.rb
+- spec/async/io/notification_spec.rb
 - spec/async/io/protocol/line_spec.rb
 - spec/async/io/socket_spec.rb
 - spec/async/io/ssl_socket_spec.rb
 - spec/async/io/stream_spec.rb
 - spec/async/io/tcp_socket_spec.rb
+- spec/async/io/trap_spec.rb
 - spec/async/io/udp_socket_spec.rb
 - spec/async/io/unix_socket_spec.rb
 - spec/async/io/wrap/tcp_spec.rb