active_logger 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 329985023815903e40757931bee2d0fef32a2f0e9e703570306b58acc403db34
-  data.tar.gz: 30d2bc94716af0bbb5781fa8d43404154bd5e11cda6fc94b7d3564e0d0d17a0a
+  metadata.gz: 7e41d988455ce14566cfd4f5c3e0b6f8f56ba45e8a1f6da8d23a2e02f1665d0f
+  data.tar.gz: 0ac73b64c7762edb39bc8b7e6900815585bfb5153914f7150854afa01d157a23
 SHA512:
-  metadata.gz: bc955d714639abbec8d7452915e4b6b166a7b5768b37cc29f14a61404aac48fd06d6d066e9c6f601824c8092dab56daefe6bc0ea834e760a2dca75dd44f180e7
-  data.tar.gz: 36fac211a1ffc773b51614d53ff72dcf0d3c83b6adebc511b8694a77bfa9d3e7dd0c00c17e710d111881594da046a76f0bf06dd8ea1bbfaa6232a5a879689ad9
+  metadata.gz: dee86fdf0440c72c4d2adb9cc8e6a904541e9b1ad0956a509d9cb1bbc342a419305d4b84480f7e4058fe953e23ff2c660768bb990143cf4571f19ce8b4b71419
+  data.tar.gz: e105ab24cb5d3bed005d044fce0026ba4c54749030d55ffc8626ae1180f4aec8067e47b04fb6d696b6cf6b17206f0f292e216f4891808d4e9fb00f956c5c15e1

data/.rubocop.yml

@@ -6,9 +6,25 @@ require:
 AllCops:
   NewCops: enable
 
+# ************************
+# LAYOUT
+# ************************
+
 Layout/LineLength:
   Max: 130
 
+# ************************
+# METRICS
+# ************************
+
+# Configuration parameters: IgnoredMethods.
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+# Configuration parameters: IgnoredMethods.
+Metrics/PerceivedComplexity:
+  Enabled: false
+
 Metrics/BlockLength:
   Enabled: false
 
@@ -19,5 +35,8 @@ Metrics/MethodLength:
 Metrics/AbcSize:
   Max: 30
 
+# ************************
+# RSPEC
+# ************************
 RSpec/LeakyConstantDeclaration:
   Enabled: false

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-04-22 17:28:02 +0300 using RuboCop version 0.82.0.
+# on 2020-04-24 16:26:20 +0300 using RuboCop version 0.82.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_logger (0.4.0)
+    active_logger (0.5.0)
       activesupport (>= 5.0.0)
 
 GEM

data/README.md

@@ -27,6 +27,9 @@ Or install it yourself as:
 ```ruby
 logger = ActiveLogger.new :stdout
 logger.info 'test' # => test
+
+# with options
+logger = ActiveLogger.new :stdout, level: :debug, formatter: :json, progname: :project1
 ```
 
 There are 3 types:
@@ -35,6 +38,12 @@ There are 3 types:
 * `:stderr` : Messages will be written to STDERR
 * `:file` : Messages will be written to a file
 
+Available standard options:
+
+* `level` - log level (`DEBUG`, `INFO`, `WARN`, `ERROR`, `FATAL`)
+* `formatter` - format for logs: `:default`, `:json` or own custom formatter.
+* `progname` - program name.
+
 ### File example
 
 ```ruby

data/lib/active_logger.rb

@@ -7,7 +7,7 @@ module ActiveLogger # :nodoc:
   module_function
 
   def new(*args, &block)
-    ActiveLogger::Logger.new(*args, &block)
+    ActiveLogger::Logging.new(*args, &block)
   end
 end
 
@@ -23,4 +23,5 @@ require File.dirname(__FILE__) + '/active_logger/helpers/formatter'
 require File.dirname(__FILE__) + '/active_logger/helpers/appender'
 
 require File.dirname(__FILE__) + '/active_logger/tagged_logging'
+require File.dirname(__FILE__) + '/active_logger/logging'
 require File.dirname(__FILE__) + '/active_logger/logger'

data/lib/active_logger/formatters/base.rb

@@ -54,6 +54,10 @@ module ActiveLogger
       def pid
         $PID
       end
+
+      def default_progname
+        $PROGRAM_NAME
+      end
     end
   end
 end

data/lib/active_logger/formatters/default.rb

@@ -5,7 +5,7 @@ module ActiveLogger
   module Formatters
     class Default < Base # :nodoc:
       def call(severity, timestamp, progname, msg)
-        super(severity, timestamp, progname, "#{tags_text}#{msg}")
+        super(severity, timestamp, progname || default_progname, "#{tags_text}#{msg}")
       end
     end
   end

data/lib/active_logger/formatters/json.rb

@@ -7,7 +7,7 @@ module ActiveLogger
     class Json < Base # :nodoc:
       def call(severity, timestamp, progname, msg)
         {
-          progname: progname,
+          progname: progname || default_progname,
           severity: severity,
           timestamp: timestamp.utc.strftime(datetime_format),
           tags: current_tags,

data/lib/active_logger/helpers/appender.rb

@@ -5,6 +5,9 @@ module ActiveLogger #:nodoc:
     module Appender #:nodoc:
       extend ActiveSupport::Concern
 
+      class AppenderNotFound < StandardError; end
+      class FilenameNotSpecified < StandardError; end
+
       class_methods do
         def appender(type, options = {})
           appenders << loggable(type, options)
@@ -13,6 +16,31 @@ module ActiveLogger #:nodoc:
         def appenders
           @appenders ||= []
         end
+
+        def loggable(type, options = {})
+          parameters = []
+
+          case type
+          when :stdout, STDOUT
+            parameters << STDOUT
+          when :stderr, STDERR
+            parameters << STDERR
+          when String, Pathname
+            parameters = [type.to_s, options[:keep], options[:size]]
+          when :file
+            raise FilenameNotSpecified if options[:filename].nil?
+
+            parameters = [options[:filename], options[:keep], options[:size]]
+          else
+            raise AppenderNotFound
+          end
+
+          logger = ActiveLogger::Logger.new(*parameters)
+          logger.level = level
+          logger.formatter = formatter
+          logger.progname = progname
+          logger
+        end
       end
     end
   end

data/lib/active_logger/helpers/base.rb

@@ -6,9 +6,19 @@ module ActiveLogger #:nodoc:
       extend ActiveSupport::Concern
 
       class_methods do
+        def progname=(progname)
+          @progname = progname
+        end
+
+        def progname
+          @progname
+        end
+
         private
 
-        def reset!; end
+        def reset!
+          self.progname = nil
+        end
       end
     end
   end

data/lib/active_logger/logger.rb

@@ -1,60 +1,6 @@
 # frozen_string_literal: true
 
 module ActiveLogger
-  module Logger # :nodoc:
-    module_function
-
-    include ActiveLogger::Helpers::Base
-    include ActiveLogger::Helpers::Level
-    include ActiveLogger::Helpers::Formatter
-    include ActiveLogger::Helpers::Appender
-
-    class AppenderNotFound < StandardError; end
-    class FilenameNotSpecified < StandardError; end
-
-    def new(*args, &block)
-      # extract options
-      options = args.last.is_a?(Hash) ? args.pop : {}
-
-      reset!
-
-      self.formatter = options[:formatter] unless options[:formatter].nil?
-      self.level = options[:level] unless options[:level].nil?
-
-      if block_given?
-        block.arity.positive? ? block.call(self) : instance_eval(&block)
-      else
-        type = args.first
-        appender(type, options)
-      end
-
-      assign_appenders = appenders.drop(1)
-      loggers = assign_appenders.inject(appenders[0]) { |appender, acc| acc.extend(ActiveSupport::Logger.broadcast(appender)) }
-      TaggedLogging.new(loggers)
-    end
-
-    def loggable(type, options = {})
-      parameters = []
-
-      case type
-      when :stdout, STDOUT
-        parameters << STDOUT
-      when :stderr, STDERR
-        parameters << STDERR
-      when String, Pathname
-        parameters = [type.to_s, options[:keep], options[:size]]
-      when :file
-        raise FilenameNotSpecified if options[:filename].nil?
-
-        parameters = [options[:filename], options[:keep], options[:size]]
-      else
-        raise AppenderNotFound
-      end
-
-      logger = ActiveSupport::Logger.new(*parameters)
-      logger.level = level
-      logger.formatter = formatter
-      logger
-    end
+  class Logger < ActiveSupport::Logger # :nodoc:
   end
 end

data/lib/active_logger/logging.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module ActiveLogger
+  module Logging # :nodoc:
+    module_function
+
+    include ActiveLogger::Helpers::Base
+    include ActiveLogger::Helpers::Level
+    include ActiveLogger::Helpers::Formatter
+    include ActiveLogger::Helpers::Appender
+
+    def new(*args, &block)
+      # extract options
+      options = args.last.is_a?(Hash) ? args.pop : {}
+
+      reset!
+
+      self.formatter = options[:formatter] unless options[:formatter].nil?
+      self.level = options[:level] unless options[:level].nil?
+      self.progname = options[:progname] unless options[:progname].nil?
+
+      if block_given?
+        block.arity.positive? ? block.call(self) : instance_eval(&block)
+      else
+        type = args.first
+        appender(type, options)
+      end
+
+      assign_appenders = appenders.drop(1)
+      loggers = assign_appenders.inject(appenders[0]) { |appender, acc| acc.extend(ActiveSupport::Logger.broadcast(appender)) }
+      TaggedLogging.new(loggers)
+    end
+  end
+end

data/lib/active_logger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveLogger
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_logger
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Yury Snegirev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2020-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -54,6 +54,7 @@ files:
 - lib/active_logger/helpers/formatter.rb
 - lib/active_logger/helpers/level.rb
 - lib/active_logger/logger.rb
+- lib/active_logger/logging.rb
 - lib/active_logger/tagged_logging.rb
 - lib/active_logger/version.rb
 - log/.keep