ci_logger 0.1.3 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ed98779d07fdac9af3859e89ca4a2785b6a1df26270efad3ead2bfd473086db
-  data.tar.gz: c27d8ba865ba4f56a6f6e13f541a86397b025ebaecca3c4207a376ca1a356db6
+  metadata.gz: 4cf7f2dd60a91e9fa17277d37076bb7dbf25b9113b49c1bcf845d338121315bd
+  data.tar.gz: 2061f9ff81b43d5f884cfe069adbd098ad3677b9ea0c823d1e2499638ede8510
 SHA512:
-  metadata.gz: 5175af5e43ed981ae562b29c9419b8540a5c1fed6ed0135427e837cd9edb2f5d2a1564cde2beb94f76f58b4881f951aace952ccff50b285ab7b85491eec212c1
-  data.tar.gz: 709748c62dfa5ff7bd848b908a188346c476432befe487a3b4087e1d50fee4b070744a8cd6c5ea608fb79da24ee8575d3647b0123a65acecd5badba65be41b57
+  metadata.gz: 1dc04cf494366424732fba457af6b7b5afc4a7a385f83971464e31af238acac51ac73bac9b4261198aff04f3c6dc625c48bc20add75f2c76bea5380f3b94ae45
+  data.tar.gz: 13d36af5c45028117b6e8a6ce865b67146b9663d919371d29b3da3f36fcb24c7ce10027ae9eb24695baf65496e388097ccf0c70bdfe91e7239716325b72d87e1

data/lib/ci_logger/logger.rb

@@ -2,29 +2,58 @@ module CiLogger
   class Logger < ::Logger
     def initialize(original)
       @original = original
+      @original_level = @original.level
       @original.level = :debug
       self.level = :debug
     end
 
+    def sync
+      temporary_log.each do |l|
+        if @level <= l[:severity]
+          @original.add(l[:severity], l[:message], l[:progname])
+        end
+      end
+      temporary_log.clear
+    end
+
+    def sync_with_original_level
+      @original.level = @original_level
+      sync
+    ensure
+      @original.level = :debug
+    end
+
     def clear
       temporary_log.clear
     end
 
+    def formatter
+      @original.formatter
+    end
+
+    def formatter=(f)
+      @original.formatter = f
+    end
+
+    private
+
     def temporary_log
       @temporary_log ||= []
     end
 
     def add(severity, message = nil, progname = nil)
-      temporary_log << { severity: severity, message: message, progname: progname }
-    end
-
-    def sync
-      temporary_log.each do |l|
-        if @level <= l[:severity]
-          @original.add(l[:severity], l[:message], l[:progname])
+      if progname.nil?
+        progname = @progname
+      end
+      if message.nil?
+        if block_given?
+          message = yield
+        else
+          message = progname
+          progname = @progname
         end
       end
-      temporary_log.clear
+      temporary_log << { severity: severity, message: message, progname: progname }
     end
 
     def method_missing(symbol, *args, &block)

data/lib/ci_logger/railtie.rb

@@ -8,8 +8,8 @@ module CiLogger
         Rails.logger = CiLogger::Logger.new(Rails.logger)
 
         RSpec.configure do |config|
-          config.add_formatter 'progress'
-          config.add_formatter ::CiLogger::Formatter
+          config.add_formatter 'progress' if config.formatters.empty?
+          config.add_formatter ::CiLogger::RspecFormatter
           config.before do |example|
             Rails.logger.debug("start example at #{example.location}")
           end

data/lib/ci_logger/rspec_formatter.rb

@@ -0,0 +1,37 @@
+require "rspec/core"
+
+module CiLogger
+  class RspecFormatter
+    RSpec::Core::Formatters.register self, :example_passed, :example_pending, :example_failed
+
+    def initialize(_out)
+      @out = _out
+    end
+
+    def example_failed(notification)
+      if Rails.application.config.ci_logger.enabled
+        example = notification.example
+        Rails.logger.debug("finish example at #{example.location}")
+        Rails.logger.sync
+      else
+        Rails.logger.sync_with_original_level
+      end
+    end
+
+    def example_passed(_notification)
+      if Rails.application.config.ci_logger.enabled
+        Rails.logger.clear
+      else
+        Rails.logger.sync_with_original_level
+      end
+    end
+
+    def example_pending(_notification)
+      if Rails.application.config.ci_logger.enabled
+        Rails.logger.clear
+      else
+        Rails.logger.sync_with_original_level
+      end
+    end
+  end
+end

data/lib/ci_logger/version.rb

@@ -1,3 +1,3 @@
 module CiLogger
-  VERSION = '0.1.3'
+  VERSION = '0.2.3'
 end

data/lib/ci_logger.rb

@@ -1,33 +1,7 @@
 require "ci_logger/version"
 require "ci_logger/railtie"
 require "ci_logger/logger"
+require "ci_logger/rspec_formatter"
 
 module CiLogger
-  require "rspec/core"
-
-  class Formatter
-    RSpec::Core::Formatters.register self, :example_passed, :example_pending, :example_failed
-
-    def initialize(_out)
-      @out = _out
-    end
-
-    def example_failed(notification)
-      if Rails.application.config.ci_logger.enabled
-        example = notification.example
-        Rails.logger.debug("finish example at #{example.location}")
-        Rails.logger.sync
-      else
-        Rails.logger.clear
-      end
-    end
-
-    def example_passed(_notification)
-      Rails.logger.clear
-    end
-
-    def example_pending(_notification)
-      Rails.logger.clear
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.3
 platform: ruby
 authors:
 - willnet
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -65,6 +65,7 @@ files:
 - lib/ci_logger.rb
 - lib/ci_logger/logger.rb
 - lib/ci_logger/railtie.rb
+- lib/ci_logger/rspec_formatter.rb
 - lib/ci_logger/version.rb
 - lib/tasks/ci_logger_tasks.rake
 homepage: https://github.com/willnet/ci_logger
@@ -74,7 +75,7 @@ metadata:
   homepage_uri: https://github.com/willnet/ci_logger
   source_code_uri: https://github.com/willnet/ci_logger
   changelog_uri: https://github.com/willnet/ci_logger
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -90,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Faster logger for CI
 test_files: []