async-io 1.27.1 → 1.27.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7128e6848ad5bdee711dc7a8d1b2b13be4ced2b32cc18c3f067375a968ce59a
-  data.tar.gz: 3b2537d7467f536c65de6740042e59ae257dac49ebc07136167e239a47c2c356
+  metadata.gz: 484fda3385353976eaa6b5b52e3379264cb5a532369f9f036871c1525d6fad0d
+  data.tar.gz: 73a793c925d309ffdae29a364c656128e57192895fcad6d3f2c4673ffa7127ea
 SHA512:
-  metadata.gz: 80a3e758f2288cf0b01d9daad23914d2bf4b72a933d06483759bfdaf9fb38add65539dc4b4854a0bc0e1237baf72ab716f46c5e3401153e8bd6367f8c93b6379
-  data.tar.gz: 66221768e8c2b71f448868d769bdffe2faea1af137ebe7cbe1e223763bb92424633f02f6ada580eb0b6a4f3f5f777202b3342d0dc7509e585c41a3fcf7154e99
+  metadata.gz: 86979dff7abe788e7aa8f867bbeab23a1dab2afab8bf5bed71700be231b9d91799187cc7758d58f0127efacdc39727d125ff49c83e92f42e1c97284ddad8a86b
+  data.tar.gz: 85c753ce6ffbc31dfdde378794c6969a80539c5c64a60ff3d3345620b0d27c793c8f2b44ef6fab9f084ad2c0d617da673e300264a2ab3cf530c9be7f1de0abcd

data/.travis.yml

@@ -8,6 +8,7 @@ matrix:
     - rvm: 2.4
     - rvm: 2.5
     - rvm: 2.6
+    - rvm: 2.7
     - rvm: 2.6
       env: COVERAGE=PartialSummary,Coveralls
     - rvm: truffleruby

data/README.md

@@ -4,7 +4,7 @@ Async::IO provides builds on [async] and provides asynchronous wrappers for `IO`
 
 [async]: https://github.com/socketry/async
 
-[![Build Status](https://secure.travis-ci.org/socketry/async-io.svg)](http://travis-ci.org/socketry/async-io)
+[![Build Status](https://travis-ci.com/socketry/async-io.svg?branch=master)](https://travis-ci.com/socketry/async-io)
 [![Code Climate](https://codeclimate.com/github/socketry/async-io.svg)](https://codeclimate.com/github/socketry/async-io)
 [![Coverage Status](https://coveralls.io/repos/socketry/async-io/badge.svg)](https://coveralls.io/r/socketry/async-io)
 

data/async-io.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |spec|
 
 	spec.required_ruby_version = '~> 2.3'
 	
-	spec.add_development_dependency "async-container", "~> 0.10.0"
+	spec.add_development_dependency "async-container", "~> 0.15"
 	
-	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "covered"
+	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rake", "~> 10.0"
 	spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/async/io/peer.rb

@@ -0,0 +1,79 @@
+# 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 'socket'
+
+module Async
+	module IO
+		module Peer
+			include ::Socket::Constants
+			
+			# Is it likely that the socket is still connected?
+			# May return false positive, but won't return false negative.
+			def connected?
+				return false if @io.closed?
+				
+				# If we can wait for the socket to become readable, we know that the socket may still be open.
+				result = to_io.recv_nonblock(1, MSG_PEEK, exception: false)
+				
+				# Either there was some data available, or we can wait to see if there is data avaialble.
+				return !result.empty? || result == :wait_readable
+				
+			rescue Errno::ECONNRESET
+				# This might be thrown by recv_nonblock.
+				return false
+			end
+			
+			# Best effort to set *_NODELAY if it makes sense. Swallows errors where possible.
+			def sync=(value)
+				super
+				
+				case self.protocol
+				when 0, IPPROTO_TCP
+					self.setsockopt(IPPROTO_TCP, TCP_NODELAY, value ? 1 : 0)
+				else
+					Async.logger.warn(self) {"Unsure how to sync=#{value} for #{self.protocol}!"}
+				end
+			rescue Errno::EINVAL
+				# On Darwin, sometimes occurs when the connection is not yet fully formed. Empirically, TCP_NODELAY is enabled despite this result.
+			rescue Errno::EOPNOTSUPP
+				# Some platforms may simply not support the operation.
+				# Async.logger.warn(self) {"Unable to set sync=#{value}!"}
+			end
+			
+			def sync
+				case self.protocol
+				when IPPROTO_TCP
+					self.getsockopt(IPPROTO_TCP, TCP_NODELAY).bool
+				else
+					true
+				end && super
+			end
+			
+			def type
+				self.local_address.socktype
+			end
+			
+			def protocol
+				self.local_address.protocol
+			end
+		end
+	end
+end

data/lib/async/io/server.rb

@@ -0,0 +1,39 @@
+# 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/task'
+
+module Async
+	module IO
+		module Server
+			def accept_each(timeout: nil, task: Task.current)
+				task.annotate "accepting connections #{self.local_address.inspect} [fd=#{self.fileno}]"
+				
+				callback = lambda do |io, address|
+					yield io, address, task: task
+				end
+				
+				while true
+					self.accept(timeout: timeout, task: task, &callback)
+				end
+			end
+		end
+	end
+end

data/lib/async/io/socket.rb

@@ -21,64 +21,12 @@
 require 'socket'
 require 'async/task'
 
+require_relative 'peer'
+require_relative 'server'
 require_relative 'generic'
 
 module Async
 	module IO
-		module Peer
-			include ::Socket::Constants
-			
-			# Is it likely that the socket is still connected?
-			# May return false positive, but won't return false negative.
-			def connected?
-				return false if @io.closed?
-				
-				# If we can wait for the socket to become readable, we know that the socket may still be open.
-				result = to_io.recv_nonblock(1, MSG_PEEK, exception: false)
-				
-				# Either there was some data available, or we can wait to see if there is data avaialble.
-				return !result.empty? || result == :wait_readable
-				
-			rescue Errno::ECONNRESET
-				# This might be thrown by recv_nonblock.
-				return false
-			end
-			
-			# Best effort to set *_NODELAY if it makes sense. Swallows errors where possible.
-			def sync=(value)
-				super
-				
-				case self.protocol
-				when 0, IPPROTO_TCP
-					self.setsockopt(IPPROTO_TCP, TCP_NODELAY, value ? 1 : 0)
-				else
-					Async.logger.warn(self) {"Unsure how to sync=#{value} for #{self.protocol}!"}
-				end
-			rescue Errno::EINVAL
-				# On Darwin, sometimes occurs when the connection is not yet fully formed. Empirically, TCP_NODELAY is enabled despite this result.
-			rescue Errno::EOPNOTSUPP
-				# Some platforms may simply not support the operation.
-				# Async.logger.warn(self) {"Unable to set sync=#{value}!"}
-			end
-			
-			def sync
-				case self.protocol
-				when IPPROTO_TCP
-					self.getsockopt(IPPROTO_TCP, TCP_NODELAY).bool
-				else
-					true
-				end && super
-			end
-			
-			def type
-				self.local_address.socktype
-			end
-			
-			def protocol
-				self.local_address.protocol
-			end
-		end
-		
 		class BasicSocket < Generic
 			wraps ::BasicSocket, :setsockopt, :connect_address, :close_read, :close_write, :local_address, :remote_address, :do_not_reverse_lookup, :do_not_reverse_lookup=, :shutdown, :getsockopt, :getsockname, :getpeername, :getpeereid
 			
@@ -91,20 +39,6 @@ module Async
 			include Peer
 		end
 		
-		module Server
-			def accept_each(timeout: nil, task: Task.current)
-				task.annotate "accepting connections #{self.local_address.inspect} [fd=#{self.fileno}]"
-				
-				callback = lambda do |io, address|
-					yield io, address, task: task
-				end
-				
-				while true
-					self.accept(timeout: timeout, task: task, &callback)
-				end
-			end
-		end
-		
 		class Socket < BasicSocket
 			wraps ::Socket, :bind, :ipv6only!, :listen
 			

data/lib/async/io/stream.rb

@@ -21,6 +21,8 @@
 require_relative 'buffer'
 require_relative 'generic'
 
+require 'async/semaphore'
+
 module Async
 	module IO
 		class Stream
@@ -44,6 +46,7 @@ module Async
 				
 				@deferred = deferred
 				@pending = 0
+				@writing = Async::Semaphore.new(1)
 				
 				# We don't want Ruby to do any IO buffering.
 				@io.sync = sync
@@ -53,6 +56,7 @@ module Async
 				
 				@read_buffer = Buffer.new
 				@write_buffer = Buffer.new
+				@drain_buffer = Buffer.new
 				
 				# Used as destination buffer for underlying reads.
 				@input_buffer = Buffer.new
@@ -136,29 +140,8 @@ module Async
 				end
 			end
 			
-			# Writes `string` to the buffer. When the buffer is full or #sync is true the
-			# buffer is flushed to the underlying `io`.
-			# @param string the string to write to the buffer.
-			# @return the number of bytes appended to the buffer.
-			def write(string)
-				if @write_buffer.empty? and string.bytesize >= @block_size
-					@io.write(string)
-				else
-					@write_buffer << string
-					
-					if @write_buffer.bytesize >= @block_size
-						drain_write_buffer
-					end
-				end
-				
-				return string.bytesize
-			end
-			
-			# Writes `string` to the stream and returns self.
-			def <<(string)
-				write(string)
-				
-				return self
+			def gets(separator = $/, **options)
+				read_until(separator, **options)
 			end
 			
 			# Flushes buffered data to the stream.
@@ -176,8 +159,25 @@ module Async
 				end
 			end
 			
-			def gets(separator = $/, **options)
-				read_until(separator, **options)
+			# Writes `string` to the buffer. When the buffer is full or #sync is true the
+			# buffer is flushed to the underlying `io`.
+			# @param string the string to write to the buffer.
+			# @return the number of bytes appended to the buffer.
+			def write(string)
+				@write_buffer << string
+				
+				if @write_buffer.bytesize >= @block_size
+					flush
+				end
+				
+				return string.bytesize
+			end
+			
+			# Writes `string` to the stream and returns self.
+			def <<(string)
+				write(string)
+				
+				return self
 			end
 			
 			def puts(*arguments, separator: $/)
@@ -201,7 +201,7 @@ module Async
 			end
 			
 			def close_write
-				drain_write_buffer
+				drain_write_buffer unless @write_buffer.empty?
 			ensure
 				@io.close_write
 			end
@@ -242,17 +242,20 @@ module Async
 			private
 			
 			def drain_write_buffer
-				Async.logger.debug(self) do
-					if @pending > 0
-						"Draining #{@pending} writes (#{@write_buffer.bytesize} bytes)..."
-					else
-						"Draining immediate write (#{@write_buffer.bytesize} bytes)..."
+				@writing.acquire do
+					Async.logger.debug(self) do
+						if @pending > 0
+							"Draining #{@pending} writes (#{@write_buffer.bytesize} bytes)..."
+						else
+							"Draining immediate write (#{@write_buffer.bytesize} bytes)..."
+						end
 					end
+					
+					@write_buffer, @drain_buffer = @drain_buffer, @write_buffer
+					
+					@io.write(@drain_buffer)
+					@drain_buffer.clear
 				end
-				
-				# Async.logger.debug(self, name: "write") {@write_buffer.inspect}
-				@io.write(@write_buffer)
-				@write_buffer.clear
 			end
 			
 			# Fills the buffer from the underlying stream.

data/lib/async/io/unix_endpoint.rb

@@ -64,7 +64,7 @@ module Async
 			# @param options keyword arguments passed through to {UNIXEndpoint#initialize}
 			#
 			# @return [UNIXEndpoint]
-			def self.unix(path, type = ::Socket::SOCK_STREAM, **options)
+			def self.unix(path = "", type = ::Socket::SOCK_STREAM, **options)
 				UNIXEndpoint.new(path, type, **options)
 			end
 		end

data/lib/async/io/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module IO
-		VERSION = "1.27.1"
+		VERSION = "1.27.2"
 	end
 end

data/spec/async/io/endpoint_spec.rb

@@ -19,7 +19,10 @@
 # THE SOFTWARE.
 
 require 'async/io/endpoint'
+
 require 'async/io/tcp_socket'
+require 'async/io/socket_endpoint'
+require 'async/io/ssl_endpoint'
 
 RSpec.describe Async::IO::Endpoint do
 	include_context Async::RSpec::Reactor

data/spec/async/io/shared_endpoint/server_spec.rb

@@ -24,8 +24,7 @@ require 'async/rspec/ssl'
 require 'async/io/host_endpoint'
 require 'async/io/shared_endpoint'
 
-require 'async/container/forked'
-require 'async/container/threaded'
+require 'async/container'
 
 RSpec.shared_examples_for Async::IO::SharedEndpoint do |container_class|
 	include_context Async::RSpec::SSL::VerifiedContexts
@@ -44,23 +43,20 @@ RSpec.shared_examples_for Async::IO::SharedEndpoint do |container_class|
 	let(:container) {container_class.new}
 	
 	it "can use bound endpoint in container" do
-		container.run(count: 1) do
+		container.async do
 			bound_endpoint.accept do |peer|
 				peer.write "Hello World"
 				peer.close
 			end
 		end
 		
-		container.wait do
-			Async do
-				client_endpoint.connect do |peer|
-					expect(peer.read(11)).to eq "Hello World"
-				end
+		Async do
+			client_endpoint.connect do |peer|
+				expect(peer.read(11)).to eq "Hello World"
 			end
-			
-			container.stop(false)
 		end
 		
+		container.stop
 		bound_endpoint.close
 	end
 end

data/spec/async/io/ssl_server_spec.rb

@@ -125,7 +125,7 @@ RSpec.describe Async::IO::SSLServer do
 				end.to raise_exception(OpenSSL::SSL::SSLError, /handshake failure/)
 				
 				server_task.stop
-			end
+			end.wait
 		end
 	end
 end

data/spec/async/io/ssl_socket_spec.rb

@@ -87,7 +87,7 @@ RSpec.describe Async::IO::SSLSocket do
 					expect do
 						client_endpoint.connect
 					end.to raise_exception(OpenSSL::SSL::SSLError)
-				end
+				end.wait
 			end
 		end
 	end

data/spec/async/io/stream_spec.rb

@@ -46,6 +46,37 @@ RSpec.describe Async::IO::Stream do
 		
 		it_should_behave_like Async::IO
 		
+		describe '#drain_write_buffer' do
+			include_context Async::RSpec::Reactor
+			let(:output) {described_class.new(sockets.last)}
+			subject {described_class.new(sockets.first)}
+			
+			let(:buffer_size) {1024*6}
+			
+			it "can interleave calls to flush" do
+				tasks = 2.times.map do |i|
+					reactor.async do
+						buffer = i.to_s * buffer_size
+						128.times do
+							output.write(buffer)
+							output.flush
+						end
+					end
+				end
+				
+				reactor.async do
+					tasks.each(&:wait)
+					output.close
+				end
+				
+				Async::Task.current.sleep(1)
+				
+				while buffer = subject.read(buffer_size)
+					expect(buffer).to be == (buffer[0] * buffer_size)
+				end
+			end
+		end
+		
 		describe '#close_read' do
 			subject {described_class.new(sockets.last)}
 			

data/spec/async/io/udp_socket_spec.rb

@@ -49,6 +49,6 @@ RSpec.describe Async::IO::UDPSocket do
 			client.close
 			
 			expect(response).to be == data
-		end
+		end.wait
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.27.1
+  version: 1.27.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-06 00:00:00.000000000 Z
+date: 2020-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -44,16 +44,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: covered
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -148,8 +148,10 @@ files:
 - lib/async/io/generic.rb
 - lib/async/io/host_endpoint.rb
 - lib/async/io/notification.rb
+- lib/async/io/peer.rb
 - lib/async/io/protocol/generic.rb
 - lib/async/io/protocol/line.rb
+- lib/async/io/server.rb
 - lib/async/io/shared_endpoint.rb
 - lib/async/io/socket.rb
 - lib/async/io/socket_endpoint.rb
@@ -208,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Provides support for asynchonous TCP, UDP, UNIX and SSL sockets.