logz 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7398c68219adac50a2a7b95f4adb156b62447465ff8d9c01a02491d4c1cc940d
-  data.tar.gz: 6f88d5bb98b1b97280332194c85f2e25fbe9cdf393da4216822dd4c3de453a69
+  metadata.gz: ed6eb9e9414801bd5078be1d7d80e6d01f5668863b97695134b073fbe5afcd55
+  data.tar.gz: dbebdcb4a1e5d8553af622b9f5a744d0bc59bf494ee9a63c5202938ad88c8219
 SHA512:
-  metadata.gz: 6ad4d67f314dd164a3971b396d62fe793169a67152ff41282ab1f35f17dbf132b18edad676cd68a03db41c108ed017ca9062e5b6a4ff6d39c7d6628659cfd72d
-  data.tar.gz: 3ebfad24973360068c317b9178343fca0ee43213337ffbf2cf305ac29e11bf58fadeaec5cf9e959c61f332b7befe0e251cacec2e073e0bae99c295d27781b6e8
+  metadata.gz: 2cf7c34ee1c00846275f6fccf2b73b95c7454a046592f22b46061df4700be2669c8fc1a7e7637c74d46c9c2e3fffe17cc25080f8106673cff2f8a35731d8dc72
+  data.tar.gz: ec5ae14de2b64054b34a23aa4185a2217cbb4b9510b6183099dd7d31f972e64b40f6afcd9e0156d11823e2e4313b7e5a2442b95fef4f14a69339dfeaa9c8d45d

data/.gitignore

@@ -7,6 +7,7 @@
 /spec/reports/
 /tmp/
 /log/
+*.gem
 
 # rspec failure tracking
 .rspec_status

data/README.md

@@ -125,7 +125,7 @@ end
 
 Set up custom formatter for all logs:
 ```
-logger.each do |l|
+logz.each do |l|
   l.formatter = proc do |severity, datetime, progname, msg|
     "[#{datetime}] [#{severity}] #{msg}\n"
   end

data/lib/logz/logger_wrapper.rb

@@ -0,0 +1,60 @@
+module Logz
+  class LoggerWrapper
+    attr_accessor :logger
+
+    def initialize(logger)
+      @logger = Logger.new(logger)
+      reset
+    end
+
+    def reset
+      @tags = []
+      @color = nil
+    end
+
+    def color(color_name)
+      @color = color_name
+      self
+    end
+
+    # user_id: 1
+    def tagged(tags)
+      if tags.is_a?(Hash)
+        @tags << tags.map { |k, v| "[#{k&.upcase}=#{v}]" }.join(" ")
+      elsif tags.is_a?(Array)
+        @tags << tags.map { |v| "[#{v&.upcase}]" }.join(" ")
+      else
+        @tags << "[#{tags.to_s&.upcase}]"
+      end
+
+      self
+    end
+
+    def has_level?(level)
+      Logz.config.levels.include?(level)
+    end
+
+    alias_method :tag, :tagged
+
+    def method_missing(m, *args, &block)
+      if has_level?(m)
+        logger.send(m, to_output(args.first))
+        reset
+      elsif logger.respond_to?(m)
+        logger.send(m, *args)
+      elsif Rainbow::X11ColorNames::NAMES.include?(m)
+        @color = m.to_sym
+        self
+      else
+        super
+      end
+    end
+
+    private
+
+    def to_output(msg)
+      output = @tags.empty? ? msg : "#{@tags.join(" ")} #{msg}"
+      output = @color ? Rainbow(output).color(@color.to_sym) : output
+    end
+  end
+end

data/lib/logz/multi_logger.rb

@@ -3,46 +3,32 @@ module Logz
     include Enumerable
     attr_accessor :folder, :loggers
 
-    def initialize(folder = nil)
-      @folder = set_folder(folder)
+    def initialize(folder = Logz.config.folder, loggers: [])
       @loggers = {}
-
-      FileUtils.mkdir_p(@folder)  unless File.directory?(@folder)
-
-      add(Logz.configuration.default)
-      Logz.configuration.loggers.each { |logger_name| add(logger_name) }  if Logz.configuration.loggers.any?
+      @folder = set_and_create_folder(folder)
+      Logz.config.loggers.dup.push(*loggers).each { |name| add(name) }
     end
 
-    def add(name, path = '', to_stdout: nil, to_file: nil)
-      to_stdout = Logz.configuration.output_to_stdout  if to_stdout == nil
-      to_file   = Logz.configuration.output_to_file    if to_file == nil
-
-      if !name || name.blank?
-        return false
-      elsif name == STDOUT || name == 'stdout'
-        name = 'stdout'
-        to_stdout = true
-        to_file = false
-      end
-
+    def add(name, path = "", to_stdout: Logz.config.output_to_stdout, to_file: Logz.config.output_to_file)
       if name.is_a?(Array)
-        name.each { |n| add(n, path, to_stdout: to_stdout, to_file: to_file) }
+        name.each { |log| add(log, path, to_stdout: to_stdout, to_file: to_file) }
+      elsif name == STDOUT || name.to_s == "stdout"
+        @loggers[:stdout] = LoggerWrapper.new(STDOUT)
       else
-        log_path      = set_log_path(path, name)
-        output_stream = set_output_stream(log_path, to_stdout, to_file)
-
-        @loggers[name.to_sym] = Logger.new(output_stream)
+        output_stream = set_output_stream(name, path, to_stdout, to_file)
+        @loggers[name.to_sym] = LoggerWrapper.new(output_stream)
       end
     end
 
-    def <<(name, path = '')
-      add(name, path)
+    def <<(name, path = "", to_stdout: nil, to_file: nil)
+      add(name, path, to_stdout: to_stdout, to_file: to_file)
     end
 
     def remove(name)
       @loggers[name.to_sym].close
       @loggers.delete(name.to_sym)
     end
+
     alias_method :delete, :remove
 
     def each
@@ -60,7 +46,7 @@ module Logz
     end
 
     def default_logger
-      loggers[Logz.configuration.default&.to_sym]
+      loggers[:stdout]
     end
 
     def method_missing(m, *args, &block)
@@ -68,48 +54,54 @@ module Logz
         if args.empty?
           loggers[m]
         else
-          puts "Invalid method for logger '#{m}': #{args.join(', ')}"
+          puts "Invalid method for logger '#{m}': #{args.join(", ")}"
         end
+      elsif default_logger.has_level?(m)
+        default_logger.logger.send(m, *args, &block)
       elsif default_logger.respond_to?(m)
-        default_logger.send(m, *args)
+        default_logger.send(m, *args, &block)
       else
-        puts "Logger '#{m}' not found. Current loggers: #{loggers.keys.join(', ')}"
+        puts "Logger '#{m}' not found. Current loggers: #{loggers.keys.join(", ")}"
       end
     end
 
     private
 
-    def set_folder(folder)
-      folder ||= Logz.configuration.folder
+    def set_and_create_folder(folder)
+      set_folder(folder).tap do |f|
+        FileUtils.mkdir_p(f) unless File.directory?(f)
+      end
+    end
 
-      if !folder || folder.empty? || folder == '.' || folder == './'
+    def set_folder(folder)
+      if !folder || folder.empty? || folder == "." || folder == "./"
         Dir.pwd
-      elsif folder.start_with?('/')
+      elsif folder.start_with?("/")
         folder
       else
         File.join(Dir.pwd, folder)
       end
     end
 
-    def set_log_path(path, name)
-      file_extension = Logz.configuration.extension.to_s.strip.empty? ? '' : ".#{Logz.configuration.extension}"
-      log_folder_path = path.start_with?('/') ? path : File.join(folder, path)
-      log_file_path = "/#{Logz.configuration.prefix}#{name}#{Logz.configuration.suffix}#{file_extension}"
-
-      File.join(log_folder_path, log_file_path)
-    end
+    def set_output_stream(name, path, to_stdout, to_file)
+      if to_file
+        log_path = set_log_path(name, path)
+        log_file = File.open(log_path, "a+")
 
-    def set_output_stream(log_path, to_stdout, to_file)
-      if to_stdout && to_file
-        MultiIO.new(STDOUT, File.open(log_path, 'a+'))
+        to_stdout ? MultiIO.new(STDOUT, log_file) : log_file
       elsif to_stdout
         STDOUT
-      elsif to_file
-        File.open(log_path, 'a+')
       else
-        '/dev/null'
+        "/dev/null"
       end
     end
 
+    def set_log_path(name, path)
+      file_extension = Logz.config.extension.to_s.strip.empty? ? "" : ".#{Logz.config.extension}"
+      log_folder_path = path.start_with?("/") ? path : File.join(folder, path)
+      log_file_path = "/#{Logz.config.prefix}#{name}#{Logz.config.suffix}#{file_extension}"
+
+      File.join(log_folder_path, log_file_path)
+    end
   end
 end

data/lib/logz/version.rb

@@ -1,3 +1,3 @@
 module Logz
-  VERSION = "1.2.1"
+  VERSION = "1.4.0"
 end

data/lib/logz.rb

@@ -1,36 +1,39 @@
-require 'logger'
-require 'logz/version'
-require 'logz/multi_io'
-require 'logz/multi_logger'
+require "logger"
+require "fileutils"
+require "logz/version"
+require "logz/multi_io"
+require "logz/multi_logger"
+require "logz/logger_wrapper"
+require "rainbow"
 
 module Logz
-  class Configuration
+  class Config
     attr_accessor :folder, :output_to_stdout, :output_to_file,
-                  :default, :suffix, :prefix, :loggers, :extension
+                  :suffix, :prefix, :loggers, :extension, :levels
 
     def initialize
       @output_to_stdout = true
       @output_to_file = true
-      @default = 'stdout'
-      @folder = 'log'
-      @extension = 'log'
-      @loggers = []
-      @suffix = ''
-      @prefix = ''
+      @folder = "log"
+      @extension = "log"
+      @loggers = [:stdout]
+      @suffix = ""
+      @prefix = ""
+      @levels = %i(debug info warn error fatal unknown)
     end
   end
 
   class << self
-    attr_accessor :configuration
+    attr_accessor :config
   end
 
   def self.new(*params)
     configure
     MultiLogger.new(*params)
   end
-  
+
   def self.configure
-    self.configuration ||= Configuration.new
-    yield(configuration)  if block_given?
+    self.config ||= Config.new
+    yield(config) if block_given?
   end
-end
+end

data/logz.gemspec

@@ -3,24 +3,26 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "logz/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "logz"
-  spec.version       = Logz::VERSION
-  spec.authors       = ["Ivan Tumanov"]
-  spec.email         = ["vizakenjack@gmail.com"]
-  spec.licenses      = ['MIT']
-  spec.summary       = %q{Simple and lightweight logger tool}
-  spec.description   = %q{Output to STDOUT and log file at the same time. Support for multiple log files.}
-  spec.homepage      = "https://github.com/vizakenjack/logz"
+  spec.name = "logz"
+  spec.version = Logz::VERSION
+  spec.authors = ["Ivan Tumanov"]
+  spec.email = ["vizakenjack@gmail.com"]
+  spec.licenses = ["MIT"]
+  spec.summary = %q{Simple and lightweight logger tool}
+  spec.description = %q{Output to STDOUT and log file at the same time. Support for multiple log files.}
+  spec.homepage = "https://github.com/v1z4/logz"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "rainbow", "~> 3.0"
+
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: logz
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Ivan Tumanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-21 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -68,12 +82,12 @@ files:
 - README.md
 - Rakefile
 - lib/logz.rb
+- lib/logz/logger_wrapper.rb
 - lib/logz/multi_io.rb
 - lib/logz/multi_logger.rb
 - lib/logz/version.rb
-- logz-1.1.0.gem
 - logz.gemspec
-homepage: https://github.com/vizakenjack/logz
+homepage: https://github.com/v1z4/logz
 licenses:
 - MIT
 metadata: {}
@@ -92,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Simple and lightweight logger tool