async 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44eb7af07e00729f3e1ecc10e98cd7cda6d09a117a9d3f62e33a22d5fc7068b4
-  data.tar.gz: 115e88de10b11bb887b3a17c1c82f29d9ea1d082e13ac874e5311c37cfc7cdaf
+  metadata.gz: fbcd86e787f3949c50b5cc5f2aa05dd538bfc51bd6b56ee13f9a401e8becf567
+  data.tar.gz: e6e35d12fa6c08dd70e31de4ad8689506f80a6daa90a35af98cda331bf06e139
 SHA512:
-  metadata.gz: 7a48d12ecd04670b4d552772bf882c190230aa15cb1946f0558d46f3bf9b50d321d160128d2667db57b6531af26ca01a68457754c40b9aa91135bfb63d36e983
-  data.tar.gz: b56e6e3e0ccf58fd47f70f99209badf9c536430ffe3d8fac7f4f6694670c06d2e4861e61f87d4767822a01264b1b0ad5fede8ab23e8d35a9a4d5cdc8ba6cc537
+  metadata.gz: 668b4300208b250bd012ee41d3aa4612f22e3d7b6b22904396be2b52ea7eaef8ef5273b5996eaeebbfcfb3d072def93137614d58f1ef5a112ef75f17067c598b
+  data.tar.gz: 48dc3517c920260e26f3e1f2bd0835d857d32c5c253e634562a70f6f145a12d338e3e4f48adff206c0d23b0f4dde096522908970a49c29d07682aa95d2df3ec4

data/.travis.yml

@@ -7,7 +7,10 @@ addons:
     packages:
     - bind9
 
-before_script: sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
+before_script: 
+  - sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
+  - gem update --system
+  - gem install bundler
 
 matrix:
   include:

data/lib/async/condition.rb

@@ -57,29 +57,5 @@ module Async
 			
 			return nil
 		end
-		
-		# Signal to a given task that it should resume operations.
-		# @return [void]
-		def resume(value = nil, task: Task.current)
-			return if @waiting.empty?
-			
-			task.reactor << Signal.new(@waiting, value)
-			
-			@waiting = []
-			
-			return nil
-		end
-		
-		Signal = Struct.new(:waiting, :value) do
-			def alive?
-				true
-			end
-			
-			def resume
-				waiting.each do |fiber|
-					fiber.resume(value) if fiber.alive?
-				end
-			end
-		end
 	end
 end

data/lib/async/queue.rb

@@ -0,0 +1,46 @@
+# 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_relative 'notification'
+
+module Async
+	# A queue which allows items to be processed in order.
+	class Queue < Notification
+		def initialize
+			super
+			
+			@items = []
+		end
+		
+		def enqueue item
+			@items.push(item)
+			
+			self.signal unless self.empty?
+		end
+		
+		def dequeue
+			while @items.empty?
+				self.wait
+			end
+			
+			@items.shift
+		end
+	end
+end

data/lib/async/task.rb

@@ -65,7 +65,7 @@ module Async
 			@status = :initialized
 			@result = nil
 			
-			@condition = nil
+			@finished = nil
 			
 			@fiber = Fiber.new do |*args|
 				set!
@@ -99,7 +99,7 @@ module Async
 		
 		# Yield back to the reactor and allow other fibers to execute.
 		def yield
-			self.sleep(0)
+			reactor.yield
 		end
 		
 		# @attr fiber [Fiber] The fiber which is being used for the execution of this task.
@@ -134,8 +134,8 @@ module Async
 			raise RuntimeError.new("Cannot wait on own fiber") if Fiber.current.equal?(@fiber)
 			
 			if running?
-				@condition ||= Condition.new
-				@condition.wait
+				@finished ||= Condition.new
+				@finished.wait
 			else
 				Task.yield {@result}
 			end
@@ -186,8 +186,8 @@ module Async
 			consume
 			
 			# If this task was being used as a future, signal completion here:
-			if @condition
-				@condition.signal(@result)
+			if @finished
+				@finished.signal(@result)
 			end
 		end
 	

data/lib/async/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Async
-	VERSION = "1.4.1"
+	VERSION = "1.5.0"
 end

data/spec/async/logger_spec.rb

@@ -0,0 +1,47 @@
+# 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.
+
+RSpec.describe Async.logger do
+	let!(:debug) {$DEBUG}
+	after {$DEBUG = debug}
+	
+	let!(:verbose) {$VERBOSE}
+	after {$VERBOSE = verbose}
+	
+	it 'should set default log level' do
+		$DEBUG = false
+		$VERBOSE = false
+		
+		expect(Async.default_log_level).to be == Logger::WARN
+	end
+	
+	it 'should set default log level based on $DEBUG' do
+		$DEBUG = true
+		
+		expect(Async.default_log_level).to be == Logger::DEBUG
+	end
+	
+	it 'should set default log level based on $VERBOSE' do
+		$DEBUG = false
+		$VERBOSE = true
+		
+		expect(Async.default_log_level).to be == Logger::INFO
+	end
+end

data/spec/async/queue_spec.rb

@@ -0,0 +1,40 @@
+# 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/queue'
+
+require_relative 'condition_examples'
+
+RSpec.describe Async::Queue do
+	include_context Async::RSpec::Reactor
+	
+	it 'should process items in order' do
+		reactor.async do |task|
+			10.times do |i|
+				task.sleep(0.001)
+				subject.enqueue(i)
+			end
+		end
+		
+		10.times do |j|
+			expect(subject.dequeue).to be == j
+		end
+	end
+end

data/spec/async/reactor_spec.rb

@@ -96,6 +96,34 @@ RSpec.describe Async::Reactor do
 		end
 	end
 	
+	describe '#timeout' do
+		let(:duration) {1}
+		
+		it "stops immediately" do
+			start_time = Time.now
+			
+			described_class.run do |task|
+				condition = Async::Condition.new
+				
+				task.timeout(duration) do
+					task.async do
+						condition.wait
+					end
+					
+					condition.signal
+					
+					task.yield
+					
+					task.children.each(&:wait)
+				end
+			end
+			
+			duration = Time.now - start_time
+			
+			expect(duration).to be < 0.1
+		end
+	end
+	
 	describe '#to_s' do
 		it "shows stopped=" do
 			expect(subject.to_s).to include "stopped"

data/spec/async/wrapper_spec.rb

@@ -47,4 +47,17 @@ RSpec.describe Async::Wrapper do
 			output.close
 		end
 	end
+	
+	describe '#reactor=' do
+		include_context Async::RSpec::Reactor
+		
+		it 'can assign a wrapper to a reactor' do
+			input.reactor = reactor
+			
+			expect(input.reactor).to be == reactor
+			
+			input.close
+			output.close
+		end
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r
@@ -123,6 +123,7 @@ files:
 - lib/async/measure.rb
 - lib/async/node.rb
 - lib/async/notification.rb
+- lib/async/queue.rb
 - lib/async/reactor.rb
 - lib/async/task.rb
 - lib/async/version.rb
@@ -133,9 +134,11 @@ files:
 - papers/1987 ODell.pdf
 - spec/async/condition_examples.rb
 - spec/async/condition_spec.rb
+- spec/async/logger_spec.rb
 - spec/async/node_spec.rb
 - spec/async/notification_spec.rb
 - spec/async/performance_spec.rb
+- spec/async/queue_spec.rb
 - spec/async/reactor/nested_spec.rb
 - spec/async/reactor_spec.rb
 - spec/async/task_spec.rb
@@ -168,9 +171,11 @@ summary: Async is an asynchronous I/O framework based on nio4r.
 test_files:
 - spec/async/condition_examples.rb
 - spec/async/condition_spec.rb
+- spec/async/logger_spec.rb
 - spec/async/node_spec.rb
 - spec/async/notification_spec.rb
 - spec/async/performance_spec.rb
+- spec/async/queue_spec.rb
 - spec/async/reactor/nested_spec.rb
 - spec/async/reactor_spec.rb
 - spec/async/task_spec.rb