tracee 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fe043732447eea6e134cc2693613ee5b60a22fd
-  data.tar.gz: 7e5c83aa7f1ba6dfb44e363858ade287b8008d5a
+  metadata.gz: 629176c76e868df0ce4b840100b9495bbb5e82fe
+  data.tar.gz: c462f5a1364a3262ba0cea39cb6515388a766fb6
 SHA512:
-  metadata.gz: 0979b18c324e7713e82b1517631bd0ef2fe7dc9bf859b425422911ac22f9b24a36a8bc11e42c0fa22975dbe239c83429820b4b413f5ed1f84238a945be99f2c0
-  data.tar.gz: 41e0c19b0a631c8f113cfc1e9e0184f488294505c974e3d2bd5334eb7e6deafed7b107844263a2d646c2446c73a2237a6659ea0ed670d3a327443a4d83536ae7
+  metadata.gz: b1fca1d6f6a41f110ac635f929171c0cc37763b4f738ae90e0a39f0aa786a926c3beb8c7096566378f99e9725786d3b2756a9c2ff2d976b0e8175a058a7dd7f3
+  data.tar.gz: fc1573d63c6634b3ae3fee01c6b976ccf24209bfe4886965ea811a1f6aeb6f1ebab8b43a05c7c43fedc87d3e7411f44a5126ec0b65441a2fe1b8ee17e7ed781a

data/lib/tracee/ext/better_errors.rb

@@ -17,9 +17,9 @@ module Tracee
           
           frames = @error_page.backtrace_frames # original definition
           frames = frames.map(&:to_s).reject {|line| line =~ IGNORE_RE}
-          frames = Stack::BaseDecorator.(frames)
+          frames = Stack::BaseDecorator.(frames, paint_code_line: :greenish)
           frames.each do |frame|
-            if frame =~ /[-\w]+ \(\d+\.[\w\.]+\) /
+            if frame =~ /^[-\w]+ \(\d+\.[\w\.]+\) /
               logger.debug "  #{frame}"
             else
               logger.fatal "  #{frame}"

data/lib/tracee/preprocessors/colorize.rb

@@ -0,0 +1,48 @@
+module Tracee::Preprocessors
+  class Colorize < Base
+    COLOR_MAP = {
+      head: :white,
+      action: :yellow,
+      params: :yellowish,
+      redirect: :purple,
+      render: :greenish,
+      complete: :white,
+      raise: :red
+    }
+    
+    def initialize(color_map=COLOR_MAP)
+      @color_map = color_map
+      exception_classes = Exception.descendants
+      @exception_classes_re = Exception.descendants.map(&:name).join '|'
+    end
+  
+    def call(msg_level, datetime, progname, msg, caller_slice=[])
+      case msg
+      when %r{^Started (?<method>[A-Z]+) "(?<path>/[^"]*)" for (?<ip>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) at (?<time>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}(?: \+\d{4})?)}
+        m = $~
+        %{Started #{m[:method].send @color_map[:head]} "#{m[:path].send @color_map[:head]}" for #{m[:ip].send @color_map[:head]} at #{m[:time].send @color_map[:head]}}
+      when %r{^Processing by (?<class>[A-Z][\w:]+)#(?<method>\w+) as (?<format>[A-Z]+)$}
+        m = $~
+        %{Processing by #{m[:class].send @color_map[:action]}##{m[:method].send @color_map[:action]} as #{m[:format].send @color_map[:action]}}
+      when %r{^  Parameters: (.+)$}
+        m = $~
+        "  Parameters: #{m[1].send @color_map[:params]}"
+      when %r{^Redirected to (\S+)$}
+        m = $~
+        "Redirected to #{m[1].send @color_map[:redirect]}"
+      when %r{^  Rendered .+ \(\d+\.\dms\)$}
+        msg.send @color_map[:render]
+      when %r{^Completed (?<code>\d{3}) (?<codename>[A-Z][\w ]+) in (?<time>\d+ms) (?<times>.+)$}
+        m = $~
+        #"\e[4mCompleted #{m[:code].send @color_map[:complete]}\e[4m #{m[:codename].send @color_map[:complete]}\e[4m in #{m[:time].send @color_map[:complete]}\e[4mms #{m[:times]}\e[0m"
+        "Completed #{m[:code].send @color_map[:complete]} #{m[:codename].send @color_map[:complete]} in #{m[:time].send @color_map[:complete]} #{m[:times]}"
+      when %r{^(BetterErrors::RaisedException|#@exception_classes_re) (.+)}
+        m = $~
+        "#{m[1].send @color_map[:raise]} #{m[2]}"
+      else
+        msg
+      end
+    end
+
+  end
+end

data/lib/tracee/stack/base_decorator.rb

@@ -3,7 +3,7 @@ module Tracee
     module BaseDecorator
     
       # Make sure that Dir.pwd is the application root directory
-      def self.call(source)
+      def self.call(source, paint_code_line: nil)
         return source if source.empty? or source[0]["\n"] # already decorated
         
         result, current_line_steps = [], []
@@ -21,6 +21,7 @@ module Tracee
               current_line_steps.unshift "`#{method}#{" {#{step_details[:block_level]}}" if step_details[:block_level]}'"
             elsif step_details[:line].to_i > 0 and code_line = Tracee::Stack.readline(step_details[:path], step_details[:line].to_i)
               current_line_steps.unshift step
+              code_line = code_line.send paint_code_line if paint_code_line
               result << "#{current_line_steps * ' -> '}\n   >>   #{code_line}"
               current_line_steps = []
             else

data/lib/tracee/stack.rb

@@ -36,7 +36,7 @@ module Tracee
     
     def self.readline(file, line)
       if lines = readlines(file)
-        (lines[line.to_i - 1] || "<line #{line} is not found> ").chomp.green
+        (lines[line.to_i - 1] || "<line #{line} is not found> ").chomp
       end
     end
   

data/lib/tracee/version.rb

@@ -1,3 +1,3 @@
 module Tracee
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tracee
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Sergey Baev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,6 +107,7 @@ files:
 - lib/tracee/ext/exception.rb
 - lib/tracee/logger.rb
 - lib/tracee/preprocessors/base.rb
+- lib/tracee/preprocessors/colorize.rb
 - lib/tracee/preprocessors/formatter.rb
 - lib/tracee/preprocessors/quiet_assets.rb
 - lib/tracee/stack.rb