async 1.15.5 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9054b68547d0e94b18941009bd5027671653e5b13c9e02ef5cecc02660d03b64
-  data.tar.gz: 9c2ef872af0bcb90a0bcbfcb757fb4eb1c5a416c52d93176fab13ade58894b2a
+  metadata.gz: d32f66a08662551d096e73d45b968db7ba3c1faac364dd30a6727e6b987fc060
+  data.tar.gz: daaecb80e3223b8fbd31798c6d45f8c7a03ec45544fceea966ffd1cdc075264a
 SHA512:
-  metadata.gz: 0f4b0338a5cda22e46ffff913033d76092225dbec527d35985c477c6bdfa46fda4f38ccb36257994ae675088091abbdc2c1d6bc73a951ecea5d743dfc7c5f007
-  data.tar.gz: f81dc50f4e9933aacf9132e59651238e5bd40889fdd022551fff024731129d1ea5c5cc07fae03a12594705e941353e5ddb18baec36ad17d40b646fae2e8cfa5e
+  metadata.gz: 138843f67fa5d3d700a64d034d8ca70b826f26d48392e2f7bfd404bc77d6045ee7c492f823fb33263a1896a03988e57f9d6d0ba78c6ce7ab48ba48ee29a9460a
+  data.tar.gz: 3040bffa50775ca7fa3fde5dd1a6d6c4cde77ffcfd079fddc5118310ff9cf0057842b1525b8c9c0ec1b07192af56baf20e6298efaa359b2bb2c0e55bed948e5a

data/async.gemspec

@@ -19,11 +19,12 @@ 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.required_ruby_version = ">= 2.2.7"
-
+	
 	spec.add_runtime_dependency "nio4r", "~> 2.3"
 	spec.add_runtime_dependency "timers", "~> 4.1"
+	spec.add_runtime_dependency "event", "~> 1.1"
 	
 	spec.add_development_dependency "async-rspec", "~> 1.1"
 	

data/lib/async/logger.rb

@@ -18,191 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'terminal'
-
-# Downstream gems often use `Logger:::LEVEL` constants, so we pull this in so they are available. That being said, the code should be fixed.
-require 'logger'
+require 'event/console'
 
 module Async
-	class Logger
-		class Buffer < StringIO
-			def initialize(prefix = nil)
-				@prefix = prefix
-				
-				super()
-			end
-			
-			def puts(*args, prefix: @prefix)
-				args.each do |arg|
-					self.write(prefix) if prefix
-					
-					super(arg)
-				end
-			end
-		end
-		
-		LEVELS = {debug: 0, info: 1, warn: 2, error: 3, fatal: 4}
-		
-		LEVELS.each do |name, level|
-			const_set(name.to_s.upcase, level)
-			
-			define_method(name) do |subject = nil, *arguments, &block|
-				enabled = @subjects[subject.class]
-				
-				if enabled == true or (enabled != false and level >= @level)
-					self.format(subject, *arguments, &block)
-				end
-			end
-			
-			define_method("#{name}!") do
-				@level = level
-			end
-		end
-		
-		def initialize(output, level: 1)
-			@output = output
-			@level = level
-			@start = Time.now
-			
-			@terminal = Terminal.new(output)
-			@reset_style = @terminal.reset
-			@prefix_style = @terminal.color(Terminal::Colors::CYAN)
-			@subject_style = @terminal.color(nil, nil, Terminal::Attributes::BOLD)
-			@exception_title_style = @terminal.color(Terminal::Colors::RED, nil, Terminal::Attributes::BOLD)
-			@exception_details_style = @terminal.color(Terminal::Colors::YELLOW)
-			@exception_line_style = @terminal.color(Terminal::Colors::RED)
-			
-			@subjects = {}
-		end
-		
-		attr :level
-		
-		def level= value
-			if value.is_a? Symbol
-				@level = LEVELS[value]
-			else
-				@level = value
-			end
-		end
-		
-		def enabled?(subject)
-			@subjects[subject.class] == true
-		end
-		
-		def enable(subject)
-			@subjects[subject.class] = true
-		end
-		
-		def disable(subject)
-			@subjects[subject.class] = false
-		end
-		
-		def log(level, *arguments, &block)
-			unless level.is_a? Symbol
-				level = LEVELS[level]
-			end
-			
-			self.send(level, *arguments, &block)
-		end
-		
-		def format(subject = nil, *arguments, &block)
-			prefix = time_offset_prefix
-			indent = " " * prefix.size
-			
-			buffer = Buffer.new("#{indent}| ")
-			
-			if subject
-				format_subject(prefix, subject, output: buffer)
-			end
-			
-			arguments.each do |argument|
-				format_argument(argument, output: buffer)
-			end
-			
-			if block_given?
-				if block.arity.zero?
-					format_argument(yield, output: buffer)
-				else
-					yield(buffer, @terminal)
-				end
-			end
-			
-			@output.write buffer.string
-		end
-		
-		def format_argument(argument, output: @output)
-			if argument.is_a? Exception
-				format_exception(argument, output: output)
-			else
-				format_value(argument, output: output)
-			end
-		end
-		
-		def format_exception(exception, prefix = nil, pwd: Dir.pwd, output: @output)
-			lines = exception.message.lines.map(&:chomp)
-			
-			output.puts " #{prefix}#{@exception_title_style}#{exception.class}#{@reset_style}: #{lines.shift}"
-			
-			lines.each do |line|
-				output.puts "   #{@exception_details_style}" + line + @reset_style
-			end
-			
-			exception.backtrace.each_with_index do |line, index|
-				path, offset, message = line.split(":")
-				
-				# Make the path a bit more readable
-				path.gsub!(/^#{pwd}\//, "./")
-				
-				output.puts " #{index == 0 ? "→" : " "} #{@exception_line_style}#{path}:#{offset}#{@reset_style} #{message}"
-			end
-			
-			if exception.cause
-				format_exception(exception.cause, "Caused by ", pwd: pwd, output: output)
-			end
-		end
-		
-		def format_subject(prefix, subject, output: @output)
-			output.puts "#{@subject_style}#{subject}#{@reset_style}", prefix: "#{@prefix_style}#{prefix}: "
-		end
-		
-		def format_value(value, output: @output)
-			string = value.to_s
-			
-			string.each_line do |line|
-				output.puts "#{line}"
-			end
-		end
-		
-		def time_offset_prefix
-			offset = Time.now - @start
-			minutes = (offset/60).floor
-			seconds = (offset - (minutes*60))
-			
-			if minutes > 0
-				"#{minutes}m#{seconds.floor}s"
-			else
-				"#{seconds.round(2)}s"
-			end.rjust(6)
-		end
-	end
-	
-	# The Async Logger class.
-	class << self
-		# @attr logger [Logger] the global logger instance used by `Async`.
-		attr :logger
-	
-		# Set the default log level based on `$DEBUG` and `$VERBOSE`.
-		def default_log_level
-			if $DEBUG
-				Logger::DEBUG
-			elsif $VERBOSE
-				Logger::INFO
-			else
-				Logger::WARN
-			end
-		end
-	end
-
-	# Create the logger instance.
-	@logger = Logger.new($stderr, level: self.default_log_level)
+	extend Event::Console
 end

data/lib/async/queue.rb

@@ -51,7 +51,7 @@ module Async
 			super()
 			
 			@limit = limit
-			@full = Async::Condition.new
+			@full = Async::Queue.new
 		end
 		
 		attr :limit
@@ -63,7 +63,7 @@ module Async
 		
 		def enqueue item
 			if limited?
-				@full.wait
+				@full.dequeue
 			end
 			
 			super
@@ -72,7 +72,7 @@ module Async
 		def dequeue
 			item = super
 			
-			@full.signal unless @full.empty?
+			@full.enqueue(nil) unless @full.empty?
 			
 			return item
 		end

data/lib/async/reactor.rb

@@ -193,7 +193,8 @@ module Async
 			
 			return initial_task
 		ensure
-			Async.logger.debug(self) {"Exiting run-loop because #{$! ? $!.inspect : 'finished'}."}
+			Async.logger.debug(self) {"Exiting run-loop because #{$! ? $! : 'finished'}."}
+			
 			@stopped = true
 		end
 	

data/lib/async/version.rb

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

data/spec/async/queue_spec.rb

@@ -53,4 +53,25 @@ RSpec.describe Async::LimitedQueue do
 		subject.enqueue(10)
 		expect(subject).to be_limited
 	end
+
+	it 'should resume waiting tasks in order' do
+		total_resumed = 0
+		total_dequeued = 0
+		Async do |producer|
+			10.times do
+				producer.async do
+					subject.enqueue('foo')
+					total_resumed += 1
+				end
+			end
+		end
+		Async do |consumer|
+			10.times do
+				subject.dequeue
+				total_dequeued += 1
+
+				expect(total_resumed).to be == total_dequeued
+			end
+		end
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async
 version: !ruby/object:Gem::Version
-  version: 1.15.5
+  version: 1.16.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-03 00:00:00.000000000 Z
+date: 2019-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: event
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +158,6 @@ files:
 - lib/async/reactor.rb
 - lib/async/semaphore.rb
 - lib/async/task.rb
-- lib/async/terminal.rb
 - lib/async/version.rb
 - lib/async/wrapper.rb
 - logo.png
@@ -154,7 +167,6 @@ files:
 - spec/async/clock_spec.rb
 - 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
@@ -193,7 +205,6 @@ test_files:
 - spec/async/clock_spec.rb
 - 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

data/lib/async/terminal.rb

@@ -1,99 +0,0 @@
-# Copyright, 2019, 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.
-
-module Async
-	# Styled terminal output. **Internal Use Only**
-	class Terminal
-		module Attributes
-			NORMAL = 0
-			BOLD = 1
-			FAINT = 2
-			ITALIC = 3
-			UNDERLINE = 4
-			BLINK = 5
-			REVERSE = 7
-			HIDDEN = 8
-		end
-		
-		module Colors
-			BLACK = 0
-			RED = 1
-			GREEN = 2
-			YELLOW = 3
-			BLUE = 4
-			MAGENTA = 5
-			CYAN = 6
-			WHITE = 7
-			DEFAULT = 9
-		end
-		
-		def initialize(output)
-			@output = output
-		end
-		
-		def tty?
-			@output.isatty
-		end
-		
-		def color(foreground, background = nil, attributes = nil)
-			return nil unless tty?
-			
-			buffer = String.new
-			
-			buffer << "\e["
-			first = true
-			
-			if attributes
-				buffer << (attributes).to_s
-				first = false
-			end
-			
-			if foreground
-				if !first
-					buffer << ";" 
-				else
-					first = false
-				end
-				
-				buffer << (30 + foreground).to_s
-			end
-			
-			if background
-				if !first
-					buffer << ";" 
-				else
-					first = false
-				end
-				
-				buffer << (40 + background).to_s
-			end
-			
-			buffer << 'm'
-			
-			return buffer
-		end
-		
-		def reset
-			return nil unless tty?
-			
-			return "\e[0m"
-		end
-	end
-end

data/spec/async/logger_spec.rb

@@ -1,101 +0,0 @@
-# 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(:output) {StringIO.new}
-	subject{described_class.new(output)}
-	
-	let(:message) {"Hello World"}
-	
-	context "default log level" do
-		it "logs info" do
-			subject.info(message)
-			
-			expect(output.string).to include message
-		end
-		
-		it "doesn't log debug" do
-			subject.debug(message)
-			
-			expect(output.string).to_not include message
-		end
-		
-		it "can log to buffer" do
-			subject.info do |buffer|
-				buffer << message
-			end
-			
-			expect(output.string).to include message
-		end
-	end
-	
-	described_class::LEVELS.each do |name, level|
-		it "can log #{name} messages" do
-			subject.level = level
-			subject.log(name, message)
-			
-			expect(output.string).to include message
-		end
-	end
-	
-	describe '#enable' do
-		let(:object) {Async::Node.new}
-		
-		it "can enable specific subjects" do
-			subject.warn!
-			
-			subject.enable(object)
-			expect(subject).to be_enabled(object)
-			
-			subject.debug(object, message)
-			expect(output.string).to include message
-		end
-	end
-end
-
-RSpec.describe Async.logger do
-	describe 'default_log_level' 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 == Async::Logger::WARN
-		end
-		
-		it 'should set default log level based on $DEBUG' do
-			$DEBUG = true
-			
-			expect(Async.default_log_level).to be == Async::Logger::DEBUG
-		end
-		
-		it 'should set default log level based on $VERBOSE' do
-			$DEBUG = false
-			$VERBOSE = true
-			
-			expect(Async.default_log_level).to be == Async::Logger::INFO
-		end
-	end
-end