rubcat 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7195ee684462e7b33de2befa92e6d2d71ae35401
-  data.tar.gz: 23df5d73c0338b5b473e00fbd72b071b64cf7260
+  metadata.gz: bb580474c09c7997b57faf5a48f3b448aaec89b7
+  data.tar.gz: 903799ea6617203a66ed4721da9fd4d507b742cb
 SHA512:
-  metadata.gz: 1b2f57ee39e302ffe3585b45a06620e9d519f4e95bc44b11c1dd18d4438ea2cedcfc9bbdc1ca0823e512ce59b230bc1c82070b8a665bb7ea1e04357dbae5682e
-  data.tar.gz: 2f84898aee725b718a32b55340eb2f64265404628a9b9cbbd92d2463f2153d49739c26199c8f19d4a7b64a87cd6b2672c8151f5f35cbb4fe592943680d064de1
+  metadata.gz: ca66ce662bc0fcdab90ba9bbec4052a4e93eb507821be5d7be8471f85c86d1c80aafa75aaf1e2711871da1682b6b9971b90ded2d39034ca57208e7c2a4b2be5b
+  data.tar.gz: 74187438056f98a0c88f06decd83a5002bd6db21526882e18db5fe927c7b3c6f579f07ff512b9efb168a66fa7f16b5ff78e4e1ef27efc68be926390c556d9eeb

data/exe/rubcat

@@ -18,7 +18,7 @@ opt.on('-l {V,D,I,W,E,F}', '--level={V,D,I,W,E,F}', 'Minimul level to display')
   if %w{V D I W E F}.include? v
     OPTS[:min_level] = v.to_sym
   else
-    raise OptionParser::ParseError, "Invalid choice: 'A' (choose from 'V', 'D', 'I', 'W', 'E', 'F')"
+    raise OptionParser::ParseError, "Invalid choice: #{v} (choose from 'V', 'D', 'I', 'W', 'E', 'F')"
   end
 }
 opt.on('-s DEVICE_SERIAL', '--serial=DEVICE_SERIAL') { |v| flags << " -s #{v}" }
@@ -42,6 +42,7 @@ begin
           pl.echo line
         rescue => e
           puts line
+          puts e if ENV["DEBUG"]
         end
       end
     rescue Errno::EIO

data/lib/rubcat/pretty_logcat.rb

@@ -3,6 +3,7 @@ require 'io/console'
 module Rubcat
   class PrettyLogcat
     attr_reader :opt, :last_tag
+    LOG_LEVELS = [:V, :D, :I, :W, :E, :F]
 
     def initialize(options)
       @opt = {
@@ -15,7 +16,7 @@ module Rubcat
     def parse_message(message)
       m = message.match(/^([VDIWEFS])\/(.*)\((\s*[0-9]+)\):\s(.*)$/)
       {
-        type: m[1],
+        type: m[1].to_sym,
         tag: m[2].strip,
         pid: m[3],
         message: m[4]
@@ -24,13 +25,13 @@ module Rubcat
 
     def colorize_type(type)
       case type
-      when "V"
+      when :V
         " #{type} ".bold.bg_gray.black
-      when "D"
+      when :D
         " #{type} ".bold.bg_blue
-      when "I"
+      when :I
         " #{type} ".bold.bg_green
-      when "W"
+      when :W
         " #{type} ".bold.bg_brown
       else
         " #{type} ".bold.bg_red
@@ -39,31 +40,59 @@ module Rubcat
 
     KNOWN_TAGS = %w{dalvikvm art dex2oat}
 
-    def format_tag(tag)
-      unless tag == @last_tag
-        @last_tag = tag
-        puts if @opt[:split_tags]
-        if KNOWN_TAGS.include? tag
-          tag.trim_and_rjust(@opt[:tag_length]).bold.black.bg_gray
+    def format_tag(type, tag)
+      if type == :normal
+        unless tag == @last_tag
+          @last_tag = tag
+          puts if @opt[:split_tags]
+          if KNOWN_TAGS.include? tag
+            tag.trim_and_rjust(@opt[:tag_length]).bold.black.bg_gray
+          elsif tag == "ActivityManager"
+            tag.trim_and_rjust(@opt[:tag_length]).bold
+          else
+            tag.trim_and_rjust(@opt[:tag_length]).randomize_color.bold
+          end
         else
-          tag.trim_and_rjust(@opt[:tag_length]).randomize_color.bold
+          " " * @opt[:tag_length]
         end
-      else
-        " " * @opt[:tag_length]
+      elsif type == :activity_kill
+        tag.trim_and_rjust(@opt[:tag_length]).bold.bg_red
+      elsif type == :activity_start
+        tag.trim_and_rjust(@opt[:tag_length]).bold.bg_green
       end
     end
 
+
     def wrap_message(mes, type)
       mes.scan(/.{1,#{IO.console.winsize[1] - @opt[:tag_length] - 5}}/).join("\n#{' ' * @opt[:tag_length]} #{type} ")
     end
 
-    def prettify(mes)
+    def pretty_print(mes)
+      return if (LOG_LEVELS.find_index @opt[:min_level]) > (LOG_LEVELS.find_index mes[:type])
+
       type = colorize_type mes[:type]
-      "#{format_tag mes[:tag]} #{type} #{wrap_message mes[:message], type}"
+
+      if mes[:tag] == "ActivityManager"
+        if mes[:message] =~ /^Killing/
+          m = mes[:message].match(/^Killing ([0-9]+):([^\s\/]+)/)
+          puts
+          puts "#{format_tag :activity_kill, "Killing process"} #{wrap_message(m[2] + " (pid " + m[1], "")})"
+          puts
+        elsif mes[:message] =~ /^Start proc/
+          m = mes[:message].match(/^Start proc (.*)$/)
+          puts
+          puts "#{format_tag :activity_start, "Start process"} #{wrap_message(m[1], "")}"
+          puts
+        else
+          puts "#{format_tag :normal, mes[:tag]} #{type} #{wrap_message mes[:message], type}"
+        end
+      else
+        puts "#{format_tag :normal, mes[:tag]} #{type} #{wrap_message mes[:message], type}"
+      end
     end
 
     def echo(mes)
-      puts prettify parse_message mes
+      pretty_print parse_message mes
     end
   end
 end

data/lib/rubcat/version.rb

@@ -1,3 +1,3 @@
 module Rubcat
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubcat
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - polamjag