bbk-utils 1.0.1.147183 → 1.1.0.149110

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9e803d8681188bee3d02f0136ca8e23e879895bde7d7f36f954430c17ae375f
-  data.tar.gz: 917d6a58f8b48a3162c46504c9ea5a499b9c4444d8ed3e016e107f7d9e1a73a6
+  metadata.gz: b5a90e5fb2e9e12fcce7025e4db9358853b9b277c43660cb23d168dabd2957ed
+  data.tar.gz: 9133ac9e0fca489c65abe5b6702429fbb750537b1f092d5a6b0481caaf8c746c
 SHA512:
-  metadata.gz: 6ab6b068166a4bd68677644cac4f00a810f54e921353bdad6e7772aac947d55c9618c447c6277ff899b249122fb1de98bd2153147ada6a8ed3318e774cf33e8c
-  data.tar.gz: 12b7f0f487d56d9edd31183f7d428ed9a7bf5639c5e6496cabccb306e8d3cc764eca18c373513b4982323b2f9bf2ee0b51d379afc7b661cd16ab411a4ff53874
+  metadata.gz: 760c5aedb896030e63fde2ba5ad280f0e2ecc5ad19834c6e72fd7a6eb9551549b7750d085253a72999a49633f08862dc6eb5af9053615d70cf07fa9c41a381f7
+  data.tar.gz: f83185cf18a0658798b325ce78308d72e29585aea238340a90c33b9c56e654886d717b5bd1886617052f0fb4a5f646a2f176f1b177fafc2c4efba1c543b64cc3

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    bbk-utils (1.0.1.147183)
-      activesupport (>= 6.0)
+    bbk-utils (1.1.0.149110)
+      activesupport (>= 7.0)
       russian
 
 GEM
@@ -24,7 +24,7 @@ GEM
     byebug (11.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.4.4)
@@ -42,7 +42,7 @@ GEM
       path_expander (~> 1.0)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.8)
-    i18n (1.8.11)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     kwalify (0.7.2)

data/lib/bbk/utils/combined_logger.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+module BBK
+  module Utils
+    class CombinedLogger
+
+      include ::Logger::Severity
+
+      attr_reader :loggers, :progname, :level, :formatter
+
+      def self.new(*args, **kwargs)
+        ActiveSupport::TaggedLogging.new(super)
+      end
+
+      def initialize(progname, *loggers, formatter: LogFormatter.new, level: Logger::Severity::INFO)
+        @loggers = loggers
+        self.progname = progname
+        self.level = level
+        self.formatter = formatter
+      end
+
+      def progname=(name)
+        @progname = name
+        @loggers.each {|logger| logger.progname = name}
+      end
+  
+      def formatter=(formatter)
+        @formatter = formatter
+        @loggers.each {|logger| logger.formatter = formatter}
+      end
+  
+      def level=(level)
+        log_level = if  level.is_a?(Integer) || (Integer(level) rescue false)
+          level
+        else
+          self.class.const_get(level.to_s.upcase)
+        end
+        @level = log_level
+        @loggers.each {|logger| logger.level = log_level }
+      end
+
+      alias sev_threshold level
+      alias sev_threshold= level=    
+  
+      %i[debug info warn error fatal].each do |level|
+        define_method(level) do |*args, &block|
+          loggers.each {|logger| logger.send(level, *args, &block)}
+          nil
+        end
+
+        define_method("#{level}?") do
+          self.level <= self.class.const_get(level.upcase.to_sym)
+        end
+
+        define_method("#{level}!") do
+          self.level = self.class.const_get(level.upcase.to_sym)
+        end
+
+      end
+
+      def method_missing(name, *args, **kwargs, &block)
+        @loggers.each {|logger| logger.send(name, *args, **kwargs, &block)}
+        nil
+      end
+  
+      def clone
+        super.tap do |it| 
+          it.instance_variable_set(:@loggers, loggers.map(&:clone)) 
+        end 
+      end
+
+    end
+  end
+end

data/lib/bbk/utils/version.rb

@@ -3,7 +3,7 @@
 module BBK
   module Utils
 
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'.freeze
 
   end
 end

data/lib/bbk/utils.rb

@@ -5,6 +5,7 @@ require 'active_support/core_ext'
 require 'bbk/utils/config'
 require 'bbk/utils/crypt'
 require 'bbk/utils/logger'
+require 'bbk/utils/combined_logger'
 require 'bbk/utils/proxy_logger'
 require 'bbk/utils/version'
 require 'bbk/utils/xml'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbk-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.1.147183
+  version: 1.1.0.149110
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2023-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: russian
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +219,7 @@ files:
 - bin/console
 - bin/setup
 - lib/bbk/utils.rb
+- lib/bbk/utils/combined_logger.rb
 - lib/bbk/utils/config.rb
 - lib/bbk/utils/crypt.rb
 - lib/bbk/utils/env_helper.rb