beautiful-log 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d0e1f4c8c3aea739ef470352ed36b2fa1947e29
-  data.tar.gz: aecce600998bc5c3993caf1f77ec0a0965d0dad6
+  metadata.gz: 25927d2784ba9a2e0ee28f438335f220f6b40d9e
+  data.tar.gz: 4ff063f0c7bd22d53fc6618ccb1f37841e86fdb8
 SHA512:
-  metadata.gz: e95680e6562d10ef934b8be094c0eb63a53301e28ef00665fe0ff552ba36a13dbddc18641d678ddfdb9a259cc841b59fc347ebac30a38405b9f24c04e8ec2f6f
-  data.tar.gz: e0962d788b89a2e6c1efd2d8072781208444ca69a8ba86531a5e1574ec73b21a5262c6a841767350bb0b5ff21b879c7158f6b5c8e65fc1d28f66e842a4125209
+  metadata.gz: c0ff063a389fb17bb07be21cd192d80a1f516acdd6a83f95b993478b1b0305f866a99a10552eaf67a61931ff491e809e48645f221fb9996a1628d448bfc2554f
+  data.tar.gz: e0755aab97842b5d41b86929389518214c5aabe8b003e1b82a92a8534f2ce415b45a81e1b5ab3cd9b3bbd4ca188f31f656a2d417f076066a4436acd561230855

data/README.md

@@ -119,6 +119,7 @@ Below is a hash containing default values.
 ```ruby
 Beautiful::Log::Formatter.new(
   only_project_code: true,
+  shrink_bundle_path: true,
   backtrace_ignore_paths: [],
   highlighted_line_range: 3,
   highlighted_line_styles: :cyan,
@@ -126,6 +127,7 @@ Beautiful::Log::Formatter.new(
   error_file_path_styles: :red,
   severity_styles: { FATAL: [:red, :swap], ERROR: :red, WARN: :light_red },
   status_code_styles: { (1..3) => [:green, :bold], 'other' => [:red, :bold] },
+  occurence_line: :light_blue
 )
 ```
 

data/beautiful-log.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'beautiful/log/version'

data/lib/beautiful/log/formatter.rb

@@ -22,15 +22,18 @@ module Beautiful
       # rubocop: disable Metrics/AbcSize, Style/ParameterLists, Style/MethodLength
       def initialize(
         only_project_code: true,
+        shrink_bundle_path: true,
         backtrace_ignore_paths: [],
         highlighted_line_range: 3,
         highlighted_line_styles: :cyan,
         backtrace_styles: :light_red,
         error_file_path_styles: :red,
         status_code_styles: {},
-        severity_styles: {}
+        severity_styles: {},
+        occurence_line: :light_blue
       )
         @only_project_code = only_project_code
+        @shrink_bundle_path = shrink_bundle_path
         @ignore_paths = backtrace_ignore_paths.map do |path|
           Regexp.new "#{Rails.root}/#{path}"
         end << Regexp.new(bundle_path)
@@ -42,11 +45,12 @@ module Beautiful
         @error_file_path_styles = error_file_path_styles
         @status_code_styles = DEFAULT_STATUS_CODE_STYLES.merge(status_code_styles).with_indifferent_access
         @severity_styles = DEFAULT_SEVERITY_STYLES.merge(severity_styles).with_indifferent_access
+        @occurence_line = occurence_line
       end
 
       def call(severity, timestamp, _progname, message)
         problem_code = highlighted_code(message) if message.is_a?(Exception)
-        header = message_header(timestamp, severity)
+        header = message_header(timestamp, severity, caller)
         message = "#{header} -- : #{message_body(message, header.uncolorize.length + 6)}\n"
         message = "#{message}\n#{problem_code}" if problem_code.present?
         message = "\n#{message}\n" if %w(FATAL ERROR).include?(severity)
@@ -55,11 +59,19 @@ module Beautiful
 
       private
 
-      def message_header(timestamp, severity)
-        header = "[#{timestamp.strftime(datetime_format)}] (pida=#{$PROCESS_ID}) #{format('%5s', severity)}"
+      def message_header(timestamp, severity, backtrace)
+        header = "[#{timestamp.strftime(datetime_format)}] (pida=#{$PROCESS_ID}) #{file_line(backtrace)} #{format('%5s', severity)}"
         colored_header(severity, header)
       end
 
+      def file_line(backtrace_lines)
+        file_line = backtrace_lines.find do |line|
+          (only_project_code && project_code?(line)) && !ignore_path?(line)
+        end
+        file_line&.sub!(bundle_install_path, '') if @shrink_bundle_path
+        apply_styles(omit_project_path(file_line), @occurence_line) if file_line.present?
+      end
+
       def colored_header(severity, header)
         styles = severity_styles[severity.to_sym]
         return header if styles.blank?

data/lib/beautiful/log/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Beautiful
   module Log
-    VERSION = '0.1.6'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beautiful-log
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - nogahighland
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler