async-io 1.15.5 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c298cffb1e3e465beb847df243d77b8ac8404e1cfa2c05b912098b7a9ec6c50
-  data.tar.gz: 92836def7a7c3bec166d7adaeb48ad4491a9d19377eb0dbcefdec8389d9ed184
+  metadata.gz: 11d4123b62b4c9d36348dffe2ce2e450924d491db1b3bd4f4ded739140637300
+  data.tar.gz: f707c236c48b1169dc1d26fe9101782c7c11ab26c9c05a6e5cd19bfa784183ca
 SHA512:
-  metadata.gz: 63a23d633e7d5edb50942ca68131d1066e0c9f51e36c2cd5acca185f1bf12135d7a1491cbcaa1c656249dbda488ac75ce382e878a501383bfefcb70c24bdeea6
-  data.tar.gz: 6d90e23f6c212c48d66d6af5d661a22215bd563a280c42923e8fa1221521db89b494810ba0153065a0e11eb1aea2e561a3640f075ec012f3d6a8294ae8f723f3
+  metadata.gz: c8f33cc994bf02d7ece78d249bf85418c9f5de2c079f49053cb4f7534e5d04b12f40a468fc7ef095c0cbacd04c1fe37291726b20c07f2f34c52453ac9b8ce4cb
+  data.tar.gz: 65424003ca8e5904e4984af6bf558f8e7378e873f6f1ec018aea0669187786ef3d348c4c546a5ecb8e80edc526eb41eb5ac09242f714263fec1badacad3d9cf9

data/async-io.gemspec

@@ -14,7 +14,6 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}).map{|f| File.basename(f)}
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ["lib"]
-	spec.has_rdoc      = "yard"
 
 	spec.add_dependency "async", "~> 1.3"
 	spec.add_development_dependency "async-rspec", "~> 1.10"

data/lib/async/io/socket.rb

@@ -123,7 +123,7 @@ module Async
 			# @param local_address [Addrinfo] The local address to bind to before connecting.
 			# @option protcol [Integer] The socket protocol to use.
 			def self.connect(remote_address, local_address = nil, reuse_port: false, task: Task.current, **options)
-				# Async.logger.debug(self) {"Connecting to #{remote_address.inspect}"}
+				Async.logger.debug(self) {"Connecting to #{remote_address.inspect}"}
 				
 				task.annotate "connecting to #{remote_address.inspect}"
 				
@@ -140,7 +140,7 @@ module Async
 				begin
 					wrapper.connect(remote_address.to_sockaddr)
 					task.annotate "connected to #{remote_address.inspect}"
-				rescue
+				rescue Exception
 					wrapper.close
 					raise
 				end

data/lib/async/io/stream.rb

@@ -79,10 +79,12 @@ module Async
 				return consume_read_buffer(size)
 			end
 			
+			alias readpartial read_partial
+			
 			# Efficiently read data from the stream until encountering pattern.
 			# @param pattern [String] The pattern to match.
 			# @return [String] The contents of the stream up until the pattern, which is consumed but not returned.
-			def read_until(pattern, offset = 0)
+			def read_until(pattern, offset = 0, chomp: true)
 				until index = @read_buffer.index(pattern, offset)
 					offset = @read_buffer.size
 					
@@ -90,7 +92,7 @@ module Async
 				end
 				
 				@read_buffer.freeze
-				matched = @read_buffer.byteslice(0, index)
+				matched = @read_buffer.byteslice(0, index+(chomp ? 0 : pattern.bytesize))
 				@read_buffer = @read_buffer.byteslice(index+pattern.bytesize, @read_buffer.bytesize)
 				
 				return matched
@@ -120,14 +122,14 @@ module Async
 				
 				return string.bytesize
 			end
-
+			
 			# Writes `string` to the stream and returns self.
 			def <<(string)
 				write(string)
 				
 				return self
 			end
-
+			
 			# Flushes buffered data to the stream.
 			def flush
 				unless @write_buffer.empty?
@@ -135,13 +137,11 @@ module Async
 					@write_buffer.clear
 				end
 			end
-
-			def gets(separator = $/)
-				flush
-				
-				read_until(separator)
+			
+			def gets(separator = $/, **options)
+				read_until(separator, **options)
 			end
-
+			
 			def puts(*args, separator: $/)
 				args.each do |arg|
 					@write_buffer << arg << separator
@@ -171,7 +171,7 @@ module Async
 					@io.close
 				end
 			end
-
+			
 			# Returns true if the stream is at file which means there is no more data to be read.
 			def eof?
 				fill_read_buffer if !@eof && @read_buffer.empty?
@@ -203,7 +203,7 @@ module Async
 					return false
 				end
 			end
-
+			
 			# Consumes at most `size` bytes from the buffer.
 			# @param size [Integer|nil] The amount of data to consume. If nil, consume entire buffer.
 			def consume_read_buffer(size = nil)

data/lib/async/io/tcp_socket.rb

@@ -28,6 +28,32 @@ module Async
 		class TCPSocket < IPSocket
 			wraps ::TCPSocket
 			
+			class StreamWrapper
+				def initialize(io)
+					@io = io
+				end
+				
+				def sync= value
+					@io.sync = value
+				end
+				
+				def close
+					@io.close
+				end
+				
+				def read(*args)
+					@io.sysread(*args)
+				end
+				
+				def write(*args)
+					@io.syswrite(*args)
+				end
+				
+				def flush
+					@io.flush
+				end
+			end
+			
 			def initialize(remote_host, remote_port = nil, local_host = nil, local_port = nil)
 				if remote_host.is_a? ::TCPSocket
 					super(remote_host)
@@ -38,6 +64,7 @@ module Async
 					# We do this unusual dance to avoid leaking an "open" socket instance.
 					socket = Socket.connect(remote_address, local_address)
 					fd = socket.fcntl(Fcntl::F_DUPFD)
+					Async.logger.debug(self) {"Connected to #{remote_address.inspect}: #{fd}"}
 					socket.close
 					
 					super(::TCPSocket.for_fd(fd))
@@ -46,7 +73,7 @@ module Async
 					# super(::TCPSocket.new(remote_host, remote_port, local_host, local_port))
 				end
 				
-				@buffer = Stream.new(self)
+				@buffer = Stream.new(StreamWrapper.new(self))
 			end
 			
 			class << self
@@ -58,6 +85,16 @@ module Async
 			attr :buffer
 			
 			def_delegators :@buffer, :gets, :puts, :flush
+			
+			def write(*)
+				@buffer.flush
+				
+				super
+			end
+			
+			def read(size)
+				@buffer.read_partial(size)
+			end
 		end
 		
 		# Asynchronous TCP server wrappper.

data/lib/async/io/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module IO
-		VERSION = "1.15.5"
+		VERSION = "1.16.0"
 	end
 end

data/spec/async/io/socket_spec.rb

@@ -39,6 +39,16 @@ RSpec.describe Async::IO::Socket do
 				Async::IO::Socket.connect(address)
 			end.to raise_error(Errno::ECONNREFUSED)
 		end
+		
+		it "should close the socket when interrupted by a timeout" do
+			wrapper = double()
+			expect(Async::IO::Socket).to receive(:build).and_return(wrapper)
+			expect(wrapper).to receive(:connect).and_raise Async::TimeoutError
+			expect(wrapper).to receive(:close)
+			expect do
+				Async::IO::Socket.connect(address)
+			end.to raise_error(Async::TimeoutError)
+		end
 	end
 	
 	describe '#bind' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.15.5
+  version: 1.16.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2018-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Provides support for asynchonous TCP, UDP, UNIX and SSL sockets.