console 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8f2a979a83f16c98de42a9ce7c76db88096c5a6baeb0a6739842e627d9c3ba4
-  data.tar.gz: 2e326f28c7a744ff783d009db13438d4333a02e63347fe03aedaab2edb1aee48
+  metadata.gz: 1caef24154ecf1f0cbe36ce8dfbbaceec31a1be279ce244105ff5e3868e04e28
+  data.tar.gz: 5c90b8b2f64ef76dccc1b7d37989ece807c2f636ef85e2d70344030884dab13e
 SHA512:
-  metadata.gz: 5e1df308579cd0c3da40dd8fdb970bfd41f0fd006acb9ca62e73dfdd47b62d28ce719f71eb853bea3400f0c1a1b2eec18be82a601652388ebcc8a8a32ac9f135
-  data.tar.gz: 5fd7718437f58ce2a8b41f91f9661b227a5b9b307046f057b837f63fbaf93642fa01b06c35cf720907d2b3d666b828bed3c01d6514f167f92142db18c56a3b9c
+  metadata.gz: 881fbf9a24669cf5287045c4a750c84f596fdb433047d4a1246503b060bd80441332d319eba0479b5a6ffc89e6eb6341e09c82fe8df4afc3a87537f63fb55733
+  data.tar.gz: e2cf4fcca144be6ebd9f5842a6fa44b077e7a603c0c29e23b80fd745ce83fedc9132e9e0dc3bdf72e52c80eb75dd8147b1bdf60d44b5fb0edd3c2c8c6fe85f72

data/.gitignore

@@ -7,6 +7,6 @@
 /spec/reports/
 /tmp/
 
-# rspec failure tracking
+Gemfile.lock
 .rspec_status
 .covered.db

data/lib/console.rb

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 require_relative 'console/logger'
+require_relative 'console/resolver'
 require_relative 'console/terminal/logger'
 
 module Console
@@ -32,6 +33,7 @@ module Console
 		
 		# Set the default log level based on `$DEBUG` and `$VERBOSE`.
 		# You can also specify CONSOLE_LOG_LEVEL=debug or CONSOLE_LOG_LEVEL=info in environment.
+		# https://mislav.net/2011/06/ruby-verbose-mode/ has more details about how it all fits together.
 		def default_log_level(env = ENV)
 			if level = env['CONSOLE_LOG_LEVEL']
 				LEVELS[level] || Logger.warn
@@ -52,6 +54,14 @@ module Console
 		verbose: !$VERBOSE.nil?,
 	)
 	
+	if names = ENV['CONSOLE_DEBUG']&.split(',')
+		@resolver ||= Resolver.new
+		
+		@resolver.bind(names) do |klass|
+			@logger.enable(klass, Logger::DEBUG)
+		end
+	end
+	
 	def logger= logger
 		@logger = logger
 	end

data/lib/console/filter.rb

@@ -29,15 +29,14 @@ module Console
 			
 			klass.instance_exec do
 				const_set(:LEVELS, levels)
+				const_set(:MINIMUM_LEVEL, levels.values.min)
 				const_set(:MAXIMUM_LEVEL, levels.values.max)
-			
+				
 				levels.each do |name, level|
 					const_set(name.to_s.upcase, level)
 					
 					define_method(name) do |subject = nil, *arguments, **options, &block|
-						enabled = @subjects[subject.class]
-						
-						if enabled == true or (enabled != false and level >= @level)
+						if self.enabled?(subject, level)
 							self.call(subject, *arguments, severity: name, **options, **@options, &block)
 						end
 					end
@@ -55,7 +54,7 @@ module Console
 			return klass
 		end
 		
-		def initialize(output, verbose: true, level: self.class::DEFAULT_LEVEL, **options)
+		def initialize(output, verbose: true, level: self.class::DEFAULT_LEVEL, enabled: nil, **options)
 			@output = output
 			@verbose = verbose
 			@level = level
@@ -64,6 +63,10 @@ module Console
 			
 			@options = options
 			
+			if enabled
+				enabled.each{|name| enable(name)}
+			end
+			
 			verbose!(verbose)
 		end
 		
@@ -104,16 +107,36 @@ module Console
 			@level = self.class::MAXIMUM_LEVEL
 		end
 		
-		def enabled?(subject)
-			@subjects[subject.class] == true
+		# You can enable and disable logging for classes. This function checks if logging for a given subject is enabled.
+		# @param subject [Object] the subject to check.
+		def enabled?(subject, level = self.class::MINIMUM_LEVEL)
+			if specific_level = @subjects[subject.class]
+				return level >= specific_level
+			end
+			
+			if level >= @level
+				return true
+			end
 		end
 		
-		def enable(subject)
-			@subjects[subject.class] = true
+		# Enable specific log level for the given class.
+		# @param name [String, Class] The class to enable.
+		def enable(subject, level = self.class::MINIMUM_LEVEL)
+			unless subject.is_a?(Class)
+				subject = subject.class
+			end
+			
+			@subjects[subject] = level
 		end
 		
+		# Disable specific logging for the specific class.
+		# @param name [String, Class] The class to disable.
 		def disable(subject)
-			@subjects[subject.class] = false
+			unless subject.is_a? Class
+				subject = subject.class
+			end
+			
+			@subjects.delete(subject)
 		end
 		
 		def call(*arguments, &block)

data/lib/console/resolver.rb

@@ -0,0 +1,61 @@
+# 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 'filter'
+
+module Console
+	class Resolver
+		def initialize
+			@names = {}
+			
+			@trace_point = TracePoint.new(:class, &self.method(:resolve))
+		end
+		
+		def bind(names, &block)
+			names.each do |name|
+				if klass = Object.const_get(name) rescue nil
+					yield klass
+				else
+					@names[name] = block
+				end
+			end
+			
+			if @names.any?
+				@trace_point.enable
+			else
+				@trace_point.disable
+			end
+		end
+		
+		def waiting?
+			@trace_point.enabled?
+		end
+		
+		def resolve(trace_point)
+			if block = @names.delete(trace_point.self.to_s)
+				block.call(trace_point.self)
+			end
+			
+			if @names.empty?
+				@trace_point.disable
+			end
+		end
+	end
+end

data/lib/console/terminal/logger.rb

@@ -118,7 +118,7 @@ module Console
 				prefix_style = @terminal[severity]
 				
 				if @verbose
-					suffix = " #{@terminal[:logger_suffix]}[pid=#{Process.pid}]#{@terminal.reset}"
+					suffix = " #{@terminal[:logger_suffix]}[pid=#{Process.pid}] [#{Time.now}]#{@terminal.reset}"
 				end
 				
 				output.puts "#{@terminal[:logger_prefix]}#{subject}#{@terminal.reset}#{suffix}", prefix: "#{prefix_style}#{prefix}:#{@terminal.reset} "

data/lib/console/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Console
-	VERSION = "1.3.2"
+	VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: covered
@@ -89,6 +89,7 @@ files:
 - lib/console/event/spawn.rb
 - lib/console/filter.rb
 - lib/console/logger.rb
+- lib/console/resolver.rb
 - lib/console/serialized/logger.rb
 - lib/console/split.rb
 - lib/console/terminal.rb
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Beautiful logging for Ruby.