console 1.13.1 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8c8affd2da03cdb084d7ef8af7c666409d12606c4459da493bf01a96d6b7bf3
-  data.tar.gz: d0af1c352b7b89f91b57ea737a5069282177be325f1bae82db3cb8de2ee76f57
+  metadata.gz: 3a22bd139802242d9acc996a612905f05419887881056973d48545ad504502c5
+  data.tar.gz: 5c855c52b01e37118bfae82dfbfa59848283b3d008d705fa478d0e173f667a37
 SHA512:
-  metadata.gz: b9c453a4bfc44ac3b87c034e8854addb31d4a1c4d2cbdc9abf698f3dbf657ff99fa636d8e46dd0262e30cd195d1c3b12ba6d64c5e8b75668ec05d8b26952f494
-  data.tar.gz: 9ca8d1ade8c3b7fc3c4dd307a27e2e67f236526bd60619cb30cc7c70af179846050bd22d0e67d1e55f3019702052ffeb593c5eed1d1522c577e73cebc2e56795
+  metadata.gz: da5f8a41f1d6655a74b0c563b0fb52dfbff0c163afbce5ecfd58b706c39ec640e59ed1f4e509d740ca58ffbcfd412469d28b2c97e4ba9b49cafaee51f4230436
+  data.tar.gz: 9150e31d177ec0a71f1c235dd5dbf08592f04d12912afd755c657799c018a835eba0f6dfd5ee5e7337f90755c7d804ad8928e5d26e22ab19942eab3fe069e967

checksums.yaml.gz.sig

@@ -0,0 +1,2 @@
+��C �^�������ى/E�}ܛi�n��\N�
b
+��ub|ǣK��d�]�y,����P�@�vrkY�����,^b����0ԁ(aN�.I曉��0�J�D'oe�c�,d��3� ��*c�߇��@���������w27���s ��Y(��ǵz��5E��=:\|�?��2p�ON8���2*���S.>�ԣ	���؎�5���O�OW0�k-ܤ5���x�."�O'���ml9��.

data/lib/console/buffer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/capture.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/clock.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2021, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/compatible/logger.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+# Copyright, 2021, 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 'logger'
+
+module Console
+	module Compatible
+		class Logger < ::Logger
+			class LogDevice
+				def initialize(subject, output)
+					@subject = subject
+					@output = output
+				end
+				
+				def write(message)
+					@output.call(@subject, message)
+				end
+				
+				def call(*arguments, **options)
+					@output.call(*arguments, **options)
+				end
+				
+				def reopen
+				end
+				
+				def close
+				end
+			end
+
+			def initialize(subject, output)
+				super(nil)
+				
+				@progname = subject
+				@logdev = LogDevice.new(@subject, output)
+			end
+			
+			def add(severity, message = nil, progname = nil)
+				severity ||= UNKNOWN
+
+				if @logdev.nil? or severity < level
+					return true
+				end
+
+				if progname.nil?
+					progname = @progname
+				end
+
+				if message.nil?
+					if block_given?
+						message = yield
+					else
+						message = progname
+						progname = @progname
+					end
+				end
+
+				@logdev.call(
+					progname, message,
+					severity: format_severity(severity)
+				)
+
+				return true
+			end
+		end
+	end
+end

data/lib/console/event/failure.rb

@@ -1,4 +1,5 @@
-# frozen_string_literals: true
+# frozen_string_literal: true
+
 #
 # Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 

data/lib/console/event/generic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -27,8 +29,8 @@ module Console
 			def to_h
 			end
 			
-			def as_json
-				to_h
+			def to_json(*arguments)
+				JSON.generate([self.class, to_h], *arguments)
 			end
 			
 			def format(buffer, terminal)

data/lib/console/event/measure.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/event/metric.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/event/progress.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/event/spawn.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -26,13 +28,14 @@ module Console
 			def self.for(*arguments, **options)
 				# Extract out the command environment:
 				if arguments.first.is_a?(Hash)
-					self.new(*arguments, **options)
+					environment = arguments.shift
+					self.new(environment, arguments, options)
 				else
-					self.new(nil, arguments, **options)
+					self.new(nil, arguments, options)
 				end
 			end
 			
-			def initialize(environment, *arguments, **options)
+			def initialize(environment, arguments, options)
 				@environment = environment
 				@arguments = arguments
 				@options = options
@@ -53,7 +56,11 @@ module Console
 			end
 			
 			def to_h
-				{environment: @environment, arguments: @arguments, options: @options}
+				Hash.new.tap do |hash|
+					hash[:environment] = @environment if @environment&.any?
+					hash[:arguments] = @arguments if @arguments&.any?
+					hash[:options] = @options if @options&.any?
+				end
 			end
 			
 			def format(output, terminal, verbose)

data/lib/console/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/measure.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/output/default.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2021, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/output/json.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2021, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/output/sensitive.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2021, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/output/text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2021, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/output/xterm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2021, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/output.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2021, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/progress.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/resolver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -22,7 +24,7 @@ require_relative 'filter'
 
 module Console
 	class Resolver
-		# You can change the log level for different classes using CONSOLE_<LEVEL> env vars.
+		# You can change the log level for different classes using CONSOLE_$LEVEL env vars.
 		#
 		# e.g. `CONSOLE_WARN=Acorn,Banana CONSOLE_DEBUG=Cat` will set the log level for the classes Acorn and Banana to `warn` and Cat to `debug`. This overrides the default log level.
 		#
@@ -34,7 +36,7 @@ module Console
 		# @returns [Nil] If there were no custom logging levels specified in the environment.
 		# @returns [Resolver] If there were custom logging levels, then the created resolver is returned.
 		def self.default_resolver(logger, env = ENV)
-			# Find all CONSOLE_<LEVEL> variables from environment:
+			# Find all CONSOLE_$LEVEL variables from environment:
 			levels = logger.class::LEVELS
 				.map{|label, level| [level, env["CONSOLE_#{label.upcase}"]&.split(',')]}
 				.to_h

data/lib/console/serialized/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -59,26 +61,59 @@ module Console
 					record[:subject] = subject
 				end
 				
-				if arguments.any?
-					record[:arguments] = arguments
-				end
-				
-				if options.any?
-					record[:options] = options
-				end
+				message = arguments
 				
 				if block_given?
 					if block.arity.zero?
-						record[:message] = yield
+						message << yield
 					else
 						buffer = StringIO.new
 						yield buffer
-						record[:message] = buffer.string
+						message << buffer.string
 					end
 				end
 				
+				if message.size == 1
+					record[:message] = message.first
+				elsif message.any?
+					record[:message] = message
+				end
+				
+				if exception = find_exception(message)
+					record[:error] = {
+						kind: exception.class,
+						message: exception.message,
+						stack: format_stack(exception)
+					}
+				end
+				
+				record.update(options)
+				
 				@io.puts(self.dump(record))
 			end
+			
+			private
+			
+			def find_exception(message)
+				message.find{|part| part.is_a?(Exception)}
+			end
+			
+			def format_stack(exception)
+				buffer = StringIO.new
+				format_backtrace(exception, buffer)
+				return buffer.string
+			end
+			
+			def format_backtrace(exception, buffer)
+				buffer.puts exception.backtrace
+				
+				if exception = exception.cause
+					buffer.puts
+					buffer.puts "Caused by: #{exception.class} #{exception.message}"
+
+					format_backtrace(exception, buffer)
+				end
+			end
 		end
 	end
 end

data/lib/console/split.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 # Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 

data/lib/console/terminal/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/terminal/text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/terminal/xterm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/terminal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

data/lib/console/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -19,5 +21,5 @@
 # THE SOFTWARE.
 
 module Console
-	VERSION = "1.13.1"
+	VERSION = "1.15.1"
 end

data/lib/console.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #
 # Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 

metadata

@@ -1,14 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: console
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.15.1
 platform: ruby
 authors:
 - Samuel Williams
+- Robert Schulze
+- Bryan Powell
+- Michael Adams
+- Cyril Roelandt
+- Cédric Boutillier
+- Olle Jonsson
 autorequire:
 bindir: bin
-cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEhDCCAuygAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MTUwMwYDVQQDDCxzYW11
+  ZWwud2lsbGlhbXMvREM9b3Jpb250cmFuc2Zlci9EQz1jby9EQz1uejAeFw0yMTA4
+  MTYwNjMzNDRaFw0yMjA4MTYwNjMzNDRaMDcxNTAzBgNVBAMMLHNhbXVlbC53aWxs
+  aWFtcy9EQz1vcmlvbnRyYW5zZmVyL0RDPWNvL0RDPW56MIIBojANBgkqhkiG9w0B
+  AQEFAAOCAY8AMIIBigKCAYEAyXLSS/cw+fXJ5e7hi+U/TeChPWeYdwJojDsFY1xr
+  xvtqbTTL8gbLHz5LW3QD2nfwCv3qTlw0qI3Ie7a9VMJMbSvgVEGEfQirqIgJXWMj
+  eNMDgKsMJtC7u/43abRKx7TCURW3iWyR19NRngsJJmaR51yGGGm2Kfsr+JtKKLtL
+  L188Wm3f13KAx7QJU8qyuBnj1/gWem076hzdA7xi1DbrZrch9GCRz62xymJlrJHn
+  9iZEZ7AxrS7vokhMlzSr/XMUihx/8aFKtk+tMLClqxZSmBWIErWdicCGTULXCBNb
+  E/mljo4zEVKhlTWpJklMIhr55ZRrSarKFuW7en0+tpJrfsYiAmXMJNi4XAYJH7uL
+  rgJuJwSaa/dMz+VmUoo7VKtSfCoOI+6v5/z0sK3oT6sG6ZwyI47DBq2XqNC6tnAj
+  w+XmCywiTQrFzMMAvcA7rPI4F0nU1rZId51rOvvfxaONp+wgTi4P8owZLw0/j0m4
+  8C20DYi6EYx4AHDXiLpElWh3AgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8E
+  BAMCBLAwHQYDVR0OBBYEFB6ZaeWKxQjGTI+pmz7cKRmMIywwMC4GA1UdEQQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEB
+  CwUAA4IBgQBVoM+pu3dpdUhZM1w051iw5GfiqclAr1Psypf16Tiod/ho//4oAu6T
+  9fj3DPX/acWV9P/FScvqo4Qgv6g4VWO5ZU7z2JmPoTXZtYMunRAmQPFL/gSUc6aK
+  vszMHIyhtyzRc6DnfW2AiVOjMBjaYv8xXZc9bduniRVPrLR4J7ozmGLh4o4uJp7w
+  x9KCFaR8Lvn/r0oJWJOqb/DMAYI83YeN2Dlt3jpwrsmsONrtC5S3gOUle5afSGos
+  bYt5ocnEpKSomR9ZtnCGljds/aeO1Xgpn2r9HHcjwnH346iNrnHmMlC7BtHUFPDg
+  Ts92S47PTOXzwPBDsrFiq3VLbRjHSwf8rpqybQBH9MfzxGGxTaETQYOd6b4e4Ag6
+  y92abGna0bmIEb4+Tx9rQ10Uijh1POzvr/VTH4bbIPy9FbKrRsIQ24qDbNJRtOpE
+  RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
+  HiLJ8VOFx6w=
+  -----END CERTIFICATE-----
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fiber-local
@@ -105,6 +139,7 @@ files:
 - lib/console/buffer.rb
 - lib/console/capture.rb
 - lib/console/clock.rb
+- lib/console/compatible/logger.rb
 - lib/console/event.rb
 - lib/console/event/failure.rb
 - lib/console/event/generic.rb
@@ -149,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Beautiful logging for Ruby.