async-io 1.18.2 → 1.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6af60edd4c664064f17db04a1146cbd88656068c1c0c95618674c6b5ce8c6943
-  data.tar.gz: fcf301863fabc8a477bddb0854e6e25d0c4d1ba5c783322eb4d4a392c228e435
+  metadata.gz: 316ad4a29714cbc95c2b264ba6346f7bb4dfbebdd1cb87bdfdcaef30f86e309d
+  data.tar.gz: 10f97c613207b25398889aacfe0e4898d7399d977f215bfea4f88d87320825aa
 SHA512:
-  metadata.gz: 95d4bca4d11cea4cdb29c7dbc904fae62c83a3232f6ce1d73631884bf326217c7735fe9c762092c26c1b3288226f82ab0ec4f222bd41f2863fb73282a5168769
-  data.tar.gz: ce9921bf2cbcefb702e3af88eb61e6797726baa09f2d855f806525c153a67264abb2af53eccc9a884dc47a81af09e27ac4f6a2ccb9e92ac32d0f55244c185e9b
+  metadata.gz: 33529f95bf9d54e4249cfa8b2f7588fc8985f336500c975e75d61a767123a164ff4369da1c34d5d0f8946ddcbbd806cd3d62b8d01021f36bbe17d48252249002
+  data.tar.gz: b6f84aed9ab41abef7abc0ea2a5ce0033625bfeb2fb2f6c0a5e473ec0cdf8e730730fdf6d95157a8e63c55118e471eb980a9da147a753c61a834b364ab378b01

data/.travis.yml

@@ -8,6 +8,8 @@ matrix:
     - rvm: 2.4
     - rvm: 2.5
     - rvm: 2.6
+    - rvm: 2.6
+      env: COVERAGE=PartialSummary,Coveralls
     - rvm: truffleruby
     - rvm: jruby-head
       env: JRUBY_OPTS="--debug -X+O"

data/Gemfile

@@ -6,18 +6,12 @@ gemspec
 group :development do
 	gem 'pry'
 	gem 'guard-rspec'
-	gem 'guard-yard'
-	
-	gem 'yard'
 end
 
 group :test do
 	gem 'benchmark-ips'
 	gem 'ruby-prof', platforms: :mri
 	
-	gem 'simplecov'
-	gem 'coveralls', require: false
-	
 	gem 'async-container'
 
 	gem 'http'

data/README.md

@@ -32,7 +32,7 @@ Basic echo server (from `spec/async/io/echo_spec.rb`):
 require 'async/io'
 
 def echo_server(endpoint)
-	Async::Reactor.run do |task|
+	Async do |task|
 		# This is a synchronous block within the current task:
 		endpoint.accept do |client|
 			# This is an asynchronous block within the current reactor:
@@ -47,7 +47,7 @@ def echo_server(endpoint)
 end
 
 def echo_client(endpoint, data)
-	Async::Reactor.run do |task|
+	Async do |task|
 		endpoint.connect do |peer|
 			result = peer.write(data)
 			
@@ -58,7 +58,7 @@ def echo_client(endpoint, data)
 	end
 end
 
-Async::Reactor.run do
+Async do
 	endpoint = Async::IO::Endpoint.tcp('0.0.0.0', 9000)
 	
 	server = echo_server(endpoint)

data/async-io.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 	spec.required_ruby_version = '~> 2.3'
 
 	spec.add_development_dependency "bundler"
+	spec.add_development_dependency "covered"
 	spec.add_development_dependency "rake", "~> 10.0"
 	spec.add_development_dependency "rspec", "~> 3.0"
 end

data/examples/chat/client.rb

@@ -2,7 +2,8 @@
 
 $LOAD_PATH << File.expand_path("../../lib", __dir__)
 
-require 'async/reactor'
+require 'async'
+require 'async/notification'
 require 'async/io/stream'
 require 'async/io/host_endpoint'
 require 'async/io/protocol/line'
@@ -18,23 +19,39 @@ input = Async::IO::Protocol::Line.new(
 	)
 )
 
-Async::Reactor.run do |task|
+Async do |task|
 	socket = endpoint.connect
 	stream = Async::IO::Stream.new(socket)
 	user = User.new(stream)
 	
-	connection = task.async do
+	# This is used to track whether either reading from stdin failed or reading from network failed.
+	finished = Async::Notification.new
+	
+	# Read lines from stdin and write to network.
+	terminal = task.async do
+		while line = input.read_line
+			user.write_lines line
+		end
+	rescue EOFError
+		# It's okay, we are disconnecting, because stdin has closed.
+	ensure
+		finished.signal
+	end
+	
+	# Read lines from network and write to stdout.
+	network = task.async do
 		while line = user.read_line
 			puts line
 		end
+	ensure
+		finished.signal
 	end
 	
-	while line = input.read_line
-		user.write_lines line
-	end
-rescue EOFError
-	# It's okay, we are disconnecting, because stdin has closed.
+	# Wait for any of the above processes to finish:
+	finished.wait
 ensure
-	connection.stop
-	user.close
+	# Stop all the nested tasks if we are exiting:
+	network.stop if network
+	terminal.stop if terminal
+	user.close if user
 end

data/examples/chat/server.rb

@@ -4,7 +4,7 @@ $LOAD_PATH << File.expand_path("../../lib", __dir__)
 
 require 'set'
 
-require 'async/reactor'
+require 'async'
 require 'async/io/host_endpoint'
 require 'async/io/protocol/line'
 
@@ -61,7 +61,7 @@ class Server
 	end
 	
 	def run(endpoint)
-		Async::Reactor.run do |task|
+		Async do |task|
 			endpoint.accept do |peer|
 				stream = Async::IO::Stream.new(peer)
 				user = User.new(stream)

data/examples/millions/client.rb

@@ -21,7 +21,7 @@ puts "Total number of connections: #{CONCURRENCY * TASKS * REPEATS}!"
 
 begin
 	container = Async::Container::Forked.new(concurrency: CONCURRENCY) do
-		Async::Reactor.run do |task|
+		Async do |task|
 			connections = []
 			
 			TASKS.times do

data/examples/millions/server.rb

@@ -14,7 +14,7 @@ class Server
 	end
 	
 	def run(endpoint)
-		Async::Reactor.run do |task|
+		Async do |task|
 			task.async do |subtask|
 				while true
 					subtask.sleep 10

data/lib/async/io/stream.rb

@@ -85,8 +85,11 @@ module Async
 			# @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, chomp: true)
+				# We don't want to split on the pattern, so we subtract the size of the pattern.
+				split_offset = pattern.bytesize - 1
+				
 				until index = @read_buffer.index(pattern, offset)
-					offset = @read_buffer.size
+					offset = [0, @read_buffer.size - split_offset].max
 					
 					return unless fill_read_buffer
 				end

data/lib/async/io/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module IO
-		VERSION = "1.18.2"
+		VERSION = "1.18.3"
 	end
 end

data/spec/async/io/c10k_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe "echo client/server" do
 	let(:server_address) {Async::IO::Address.tcp('0.0.0.0', 10102)}
 	
 	def echo_server(server_address)
-		Async::Reactor.run do |task|
+		Async do |task|
 			connection_count = 0
 			
 			connections_complete = task.async do
@@ -66,7 +66,7 @@ RSpec.describe "echo client/server" do
 	end
 	
 	def echo_client(server_address, data, responses)
-		Async::Reactor.run do |task|
+		Async do |task|
 			begin
 				Async::IO::Socket.connect(server_address) do |peer|
 					result = peer.write(data)
@@ -104,7 +104,7 @@ RSpec.describe "echo client/server" do
 	
 	it "should send/receive 10,000 messages" do
 		fork_server do
-			Async::Reactor.run do |task|
+			Async do |task|
 				responses = []
 				
 				tasks = repeats.times.collect do |i|

data/spec/async/io/echo_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe "echo client/server" do
 	let(:server_address) {Async::IO::Address.tcp('0.0.0.0', 9002)}
 	
 	def echo_server(server_address)
-		Async::Reactor.run do |task|
+		Async do |task|
 			# This is a synchronous block within the current task:
 			Async::IO::Socket.accept(server_address) do |client|
 				# This is an asynchronous block within the current reactor:
@@ -41,7 +41,7 @@ RSpec.describe "echo client/server" do
 	end
 	
 	def echo_client(server_address, data, responses)
-		Async::Reactor.run do |task|
+		Async do |task|
 			Async::IO::Socket.connect(server_address) do |peer|
 				result = peer.write(data)
 				

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

@@ -36,7 +36,7 @@ RSpec.shared_examples_for Async::IO::SharedEndpoint do |container_class|
 	let(:client_endpoint) {Async::IO::SSLEndpoint.new(endpoint, ssl_context: client_context)}
 	
 	let!(:bound_endpoint) do
-		Async::Reactor.run do
+		Async do
 			Async::IO::SharedEndpoint.bound(server_endpoint)
 		end.wait
 	end
@@ -49,7 +49,7 @@ RSpec.shared_examples_for Async::IO::SharedEndpoint do |container_class|
 			end
 		end
 		
-		Async::Reactor.run do
+		Async do
 			client_endpoint.connect do |peer|
 				expect(peer.read(11)).to eq "Hello World"
 			end

data/spec/async/io/stream_spec.rb

@@ -82,6 +82,19 @@ RSpec.describe Async::IO::Stream do
 			expect(stream.read_until("\n")).to be_nil
 		end
 		
+		context "with 1-byte block size" do
+			let!(:stream) {Async::IO::Stream.new(buffer, block_size: 1)}
+			
+			it "can read a line with a multi-byte pattern" do
+				io.write("hello\r\nworld\r\n")
+				io.seek(0)
+				
+				expect(stream.read_until("\r\n")).to be == 'hello'
+				expect(stream.read_until("\r\n")).to be == 'world'
+				expect(stream.read_until("\r\n")).to be_nil
+			end
+		end
+		
 		context "with large content" do
 			it "allocates expected amount of bytes" do
 				expect do

data/spec/spec_helper.rb

@@ -1,23 +1,5 @@
 
-if ENV['COVERAGE'] || ENV['TRAVIS']
-	begin
-		require 'simplecov'
-		
-		SimpleCov.start do
-			add_filter "/spec/"
-		end
-		
-		if ENV['TRAVIS']
-			require 'coveralls'
-			Coveralls.wear!
-		end
-	rescue LoadError
-		warn "Could not load simplecov: #{$!}"
-	end
-end
-
-require "bundler/setup"
-require "async/io"
+require 'covered/rspec'
 
 if RUBY_ENGINE == "truffleruby"
 	warn "Workarounds for TruffleRuby enabled..."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.18.2
+  version: 1.18.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: covered
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Provides support for asynchonous TCP, UDP, UNIX and SSL sockets.