async 1.13.1 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dc13bfa45d6862be04e8637de5659cbb2feca8a52239a2161863437686d89bf
-  data.tar.gz: 28d916223fa4402c0839d6652937b987bb14fe53f2fbb62d9313ee191b6bba95
+  metadata.gz: e95eca0cff51fba91c446924485001f6bd9d63978d92a15b583bbb8916b7c53b
+  data.tar.gz: 463002c552022842360fb031aee28c6286ed7af44761e3e8e55b60c40f1094bb
 SHA512:
-  metadata.gz: 371ee258edbe6128ca555b2a1e2b5551acdd3921161121343a7c6ce953c8bb9681c38c794b264037d82ee31e6986e5294ebf448920c6722df5edd6e331756b29
-  data.tar.gz: 22a1383658c19fc3e300f9ebe5760981a8ba16c7ff2a33bf5dc86a2864ad9c1fc876264137823e95c01440acc8f50a29dc65bf8daacc4bf012922fae2cf9fe23
+  metadata.gz: 8d2848633ef85c07e88321c1cc5f4eb890fc53eb66c973dcf182ab5b535fa211b3493d1a265500c83a359bcd673912ea9b77a076e0c818add4ad82b7d5b35a11
+  data.tar.gz: 9814c99bbdb06a4993aefd573cf77795d813ee0f129d93cd7df1cc29522cd4f2b11b212a4d9c91d45bdd9f78114ee21ca55dac0fa51438a877124e08e69dd382

data/lib/async/logger.rb

@@ -89,32 +89,39 @@ module Async
 		end
 		
 		def format(subject = nil, *arguments, &block)
+			buffer = StringIO.new
 			prefix = time_offset_prefix
 			indent = " " * prefix.size
 			
-			if block_given?
-				arguments << yield
-			end
-			
 			if subject
-				format_subject(prefix, subject)
+				format_subject(prefix, subject, output: buffer)
 			end
 			
 			arguments.each do |argument|
-				format_argument(indent, argument)
+				format_argument(indent, argument, output: buffer)
+			end
+			
+			if block_given?
+				if block.arity.zero?
+					format_argument(indent, yield, output: buffer)
+				else
+					yield(buffer, @terminal)
+				end
 			end
+			
+			@output.write buffer.string
 		end
 		
-		def format_argument(prefix, argument)
+		def format_argument(prefix, argument, output: @output)
 			if argument.is_a? Exception
-				format_exception(prefix, argument)
+				format_exception(prefix, argument, output: output)
 			else
-				format_value(prefix, argument)
+				format_value(prefix, argument, output: output)
 			end
 		end
 		
-		def format_exception(indent, exception, prefix = nil, pwd: Dir.pwd)
-			@output.puts "#{indent}|  #{prefix}#{@exception_title_style}#{exception.class}#{@reset_style}: #{exception}"
+		def format_exception(indent, exception, prefix = nil, pwd: Dir.pwd, output: @output)
+			output.puts "#{indent}|  #{prefix}#{@exception_title_style}#{exception.class}#{@reset_style}: #{exception}"
 			
 			exception.backtrace.each_with_index do |line, index|
 				path, offset, message = line.split(":")
@@ -122,22 +129,26 @@ module Async
 				# Make the path a bit more readable
 				path.gsub!(/^#{pwd}\//, "./")
 				
-				@output.puts "#{indent}|  #{index == 0 ? "→" : " "} #{@exception_line_style}#{path}:#{offset}#{@reset_style} #{message}"
+				output.puts "#{indent}|  #{index == 0 ? "→" : " "} #{@exception_line_style}#{path}:#{offset}#{@reset_style} #{message}"
 			end
 			
 			if exception.cause
-				@output.puts "#{indent}|"
+				output.puts "#{indent}|"
 				
-				format_exception(indent, exception.cause, "Caused by ", pwd: pwd)
+				format_exception(indent, exception.cause, "Caused by ", pwd: pwd, output: output)
 			end
 		end
 		
-		def format_subject(prefix, subject)
-			@output.puts "#{@prefix_style}#{prefix}: #{@subject_style}#{subject}#{@reset_style}"
+		def format_subject(prefix, subject, output: @output)
+			output.puts "#{@prefix_style}#{prefix}: #{@subject_style}#{subject}#{@reset_style}"
 		end
 		
-		def format_value(indent, value)
-			@output.puts "#{indent}: #{value}"
+		def format_value(indent, value, output: @output)
+			string = value.to_s
+			
+			string.each_line do |line|
+				output.puts "#{indent}: #{line}"
+			end
 		end
 		
 		def time_offset_prefix

data/lib/async/version.rb

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

data/spec/async/logger_spec.rb

@@ -36,6 +36,14 @@ RSpec.describe Async::Logger do
 			
 			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|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.14.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r
@@ -124,7 +124,6 @@ files:
 - lib/async/debug/monitor.rb
 - lib/async/debug/selector.rb
 - lib/async/logger.rb
-- lib/async/measure.rb
 - lib/async/node.rb
 - lib/async/notification.rb
 - lib/async/queue.rb

data/lib/async/measure.rb

@@ -1,37 +0,0 @@
-# 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 'benchmark'
-
-module Async
-	def self.measure(*args, threshold: 1.0, &block)
-		result = nil
-		
-		duration = Benchmark.realtime do
-			result = yield
-		end
-		
-		return result
-	ensure
-		if duration && duration > threshold
-			warn "#{args.join(' ')} took #{duration}s"
-		end
-	end
-end