console 1.9.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebadd29a9248f8a155c3bc22550a6433e53af806acae2112fe96a3924c92fb8d
-  data.tar.gz: fd23c8cb36efc9a36f688c2caa0383feb85fe7fdab2992d269239650faa8f92a
+  metadata.gz: 640269ce4b1afa8413ce60f657ab3c3ed01a036a32e554c8643aa599a0052422
+  data.tar.gz: b5fa60cc24de752c16af2160856fe0cfe3c038f24a409e9d3069d701afbfcb9b
 SHA512:
-  metadata.gz: 02b4cecf9844a7d6bb733da31953805d89590b5a43b68e7d6cc379bde7e2660e3064438385d40b147cde4c89b50b7f7f9f4cf3f58aa69e1498e0085f56015a86
-  data.tar.gz: 3bba83e7c801994f6fdb6a1a248fbac746a8a9987f786d30df73c91ba7d79032226d4f78d3eed9fb1a5d0eb9c339f89864c15fcceb823a2f877e81fe90c977f7
+  metadata.gz: 78b6e1c53280b26a315a422a418f36d228a583f095b41a406a33c67808ac2c299ab33399641880d5d3b7753d0ad88262fc536deac6ddd1ef6c8edf970b7d591e
+  data.tar.gz: d24238b81168471f70c4404badf944b24f01a92101b841513cb0ced7c6998b4a63efabb88bad49c042e72c174b1c56f2cd51cf385f7814d41d709cde040e1ab3

data/lib/console.rb

@@ -21,82 +21,22 @@
 # THE SOFTWARE.
 
 require_relative 'console/logger'
-require_relative 'console/resolver'
-require_relative 'console/terminal/logger'
 
 module Console
-	class << self
-		attr_accessor :logger
-		
-		# Set the default log level based on `$DEBUG` and `$VERBOSE`.
-		# You can also specify CONSOLE_LEVEL=debug or CONSOLE_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_LEVEL'] || env['CONSOLE_LOG_LEVEL'])
-				Logger::LEVELS[level.to_sym] || Logger.warn
-			elsif $DEBUG
-				Logger::DEBUG
-			elsif $VERBOSE.nil?
-				Logger::WARN
-			else
-				Logger::INFO
-			end
-		end
-		
-		# 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 Acorn and Banana to warn and Cat to
-		# debug. This overrides the default log level.
-		#
-		# @param logger [Logger] A logger instance to set the logging levels on.
-		# @param env [Hash] Environment to read levels from.
-		#
-		# @return [nil] if there were no custom logging levels specified in the environment.
-		# @return [Resolver] if there were custom logging levels, then the created resolver is returned.
-		def default_resolver(logger, env = ENV)
-			# find all CONSOLE_<LEVEL> variables from environment
-			levels = Logger::LEVELS
-			.map { |label, level| [level, env["CONSOLE_#{label.to_s.upcase}"]&.split(',')] }
-			.to_h
-			.compact
-
-			# if we have any levels, then create a class resolver, and each time a class is resolved, set the log level for
-			# that class to the specified level
-			if levels.any?
-				resolver = Resolver.new
-				levels.each do |level, names|
-					resolver.bind(names) do |klass|
-						logger.enable(klass, level)
-					end
-				end
-				return resolver
-			end
-		end
-		
-		# Controls verbose output using `$VERBOSE`.
-		def verbose?
-			!$VERBOSE.nil?
-		end
-		
-		def build(output, verbose: self.verbose?, level: self.default_log_level)
-			terminal = Terminal::Logger.new(output, verbose: verbose)
-			
-			logger = Logger.new(terminal, verbose: verbose, level: level)
-			
-			return logger
-		end
+	def self.logger
+		Logger.instance
 	end
 	
-	# Create the logger instance:
-	@logger = self.build($stderr)
-	@resolver = self.default_resolver(@logger)
+	def self.logger= instance
+		Logger.instance= instance
+	end
 	
 	def logger= logger
 		@logger = logger
 	end
 	
 	def logger
-		@logger || Console.logger
+		@logger || Logger.instance
 	end
 	
 	def self.extended(klass)

data/lib/console/logger.rb

@@ -21,8 +21,48 @@
 require_relative 'filter'
 require_relative 'progress'
 
+require_relative 'resolver'
+require_relative 'terminal/logger'
+
+require 'fiber/local'
+
 module Console
 	class Logger < Filter[debug: 0, info: 1, warn: 2, error: 3, fatal: 4]
+		extend Fiber::Local
+		
+		# Set the default log level based on `$DEBUG` and `$VERBOSE`.
+		# You can also specify CONSOLE_LEVEL=debug or CONSOLE_LEVEL=info in environment.
+		# https://mislav.net/2011/06/ruby-verbose-mode/ has more details about how it all fits together.
+		def self.default_log_level(env = ENV)
+			if level = (env['CONSOLE_LEVEL'] || env['CONSOLE_LOG_LEVEL'])
+				LEVELS[level.to_sym] || level.to_i
+			elsif $DEBUG
+				DEBUG
+			elsif $VERBOSE.nil?
+				WARN
+			else
+				INFO
+			end
+		end
+		
+		# Controls verbose output using `$VERBOSE`.
+		def self.verbose?(env = ENV)
+			!$VERBOSE.nil? || env['CONSOLE_VERBOSE']
+		end
+		
+		def self.default_logger(output, verbose: self.verbose?, level: self.default_log_level)
+			terminal = Terminal::Logger.new(output, verbose: verbose)
+			
+			logger = self.new(terminal, verbose: verbose, level: level)
+			resolver = Resolver.default_resolver(logger)
+			
+			return logger
+		end
+		
+		def self.local
+			self.default_logger($stderr)
+		end
+		
 		DEFAULT_LEVEL = 1
 		
 		def initialize(output, **options)

data/lib/console/resolver.rb

@@ -22,6 +22,36 @@ require_relative 'filter'
 
 module Console
 	class Resolver
+		# 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.
+		#
+		# @parameter logger [Logger] A logger instance to set the logging levels on.
+		# @parameter env [Hash] The environment to read levels from.
+		#
+		# @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:
+			levels = Logger::LEVELS
+				.map{|label, level| [level, env["CONSOLE_#{label.upcase}"]&.split(',')]}
+				.to_h
+				.compact
+			
+			# If we have any levels, then create a class resolver, and each time a class is resolved, set the log level for that class to the specified level:
+			if levels.any?
+				resolver = Resolver.new
+				
+				levels.each do |level, names|
+					resolver.bind(names) do |klass|
+						logger.enable(klass, level)
+					end
+				end
+				
+				return resolver
+			end
+		end
+		
 		def initialize
 			@names = {}
 			

data/lib/console/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: console
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2020-10-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: fiber-local
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bake
   requirement: !ruby/object:Gem::Requirement