droid-monitor 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34230c0938cda61bde69a9d30b74292a67e63051
-  data.tar.gz: 0fd0a4f442c7aa73ba216a94dc00ca8d07760608
+  metadata.gz: 8da129e7df0339c17b106e4984189b08eeac7118
+  data.tar.gz: 556a5486aef855935005c630a33176637d834e8a
 SHA512:
-  metadata.gz: 34cf7b7ce4def6e4529705ee6a033a950475bd91b97a25b1a01eecf3fa4d08edd96d715880bebb8b597d62b98e15d54b7b1771ba5bd4ac9c3738af41ca22a662
-  data.tar.gz: 26bf6b03014f754bf9106ebb406483cc8981c27d588dc2e04d84d8bb78a4041fd3c98382cbf37d23c320efb790a40214aa0b9b4d08eda67d94f73fccfd6fa71f
+  metadata.gz: 05f31540dfd8f923355e5259429b5c646b0411f030fdaf2929d4d2dd8822507021da9348437e7e2dd92ff5109a9afe12e1bcd916d3a2cb289ba78947912b0e55
+  data.tar.gz: 51f67ab1107e9c892d9dffcb3f8114e782bc2d651dff4640369f32d7efdc24eedabcea64d0cd5c8351d824d9c2aa2bff7c58438bf90fad185f0ca6dfed549973

data/lib/droid/monitor.rb

@@ -32,11 +32,15 @@ module Droid
       end
 
       def dump_tcp_rec
-        run_adb("#{adb_shell} cat proc/uid_stat/#{get_pid}/tcp_rcv").to_i
+        pid = get_pid
+        return "0" if pid == -1
+        run_adb("#{adb_shell} cat proc/uid_stat/#{pid}/tcp_rcv").to_i
       end
 
       def dump_tcp_snd
-        run_adb("#{adb_shell} cat proc/uid_stat/#{get_pid}/tcp_snd").to_i
+        pid = get_pid
+        return "0" if pid == -1
+        run_adb("#{adb_shell} cat proc/uid_stat/#{pid}/tcp_snd").to_i
       end
 
       def dump_gfxinfo
@@ -61,7 +65,9 @@ module Droid
 
       # @return [String] line of packages regarding pid and so on
       def get_pid
-        run_adb("#{adb_shell} dumpsys package #{@package}").scan(/userId=[0-9]+/).uniq.first.delete("userId=")
+        dump = run_adb("#{adb_shell} dumpsys package #{@package}")
+        return -1 if dump.nil?
+        dump.scan(/userId=[0-9]+/).uniq.first.delete("userId=")
       end
 
       def run_adb(cmd)

data/lib/droid/monitor/cpu.rb

@@ -21,7 +21,10 @@ module Droid
       end
 
       def dump_cpu_usage(dump_data)
-        dump = dump_data.scan(/^.*#{self.package}.*$/).map(&:strip).first.split(/\s/).reject(&:empty?)
+        scanned_dump = dump_data.scan(/^.*#{self.package}.*$/).map(&:strip).first
+        return [] if scanned_dump.nil?
+
+        dump = scanned_dump.split(/\s/).reject(&:empty?)
         fail 'no package' if /^Load:$/ =~ dump[0]
         dump
       rescue StandardError => e

data/lib/droid/monitor/gfxinfo.rb

@@ -21,9 +21,14 @@ module Droid
       end
 
       def dump_gfxinfo_usage(dump_data)
-        dump1 = dump_data.scan(/^.*views,.*kB of display lists,.*frames rendered.*$/).map(&:strip)
-                  .first.split(/\s/).reject(&:empty?)
-        dump2 = dump_data.scan(/^.*bytes,.*MB.*$/).map(&:strip).first.split(/\s/).reject(&:empty?)
+        scanned_dump1 = dump_data.scan(/^.*views,.*kB of display lists,.*frames rendered.*$/).map(&:strip).first
+        scanned_dump2 = dump_data.scan(/^.*bytes,.*MB.*$/).map(&:strip).first
+
+        return [] if scanned_dump1.nil? || scanned_dump2.nil?
+
+        dump1 = scanned_dump1.split(/\s/).reject(&:empty?)
+        dump2 = scanned_dump2.split(/\s/).reject(&:empty?)
+
         dump1 + dump2
       rescue StandardError => e
         puts e

data/lib/droid/monitor/memory.rb

@@ -27,7 +27,11 @@ module Droid
 
       def dump_memory_usage(dump_data)
         fail "no process" if dump_data == "No process found for: #{@package}"
-        dump_data.scan(/^.*Uptime.*Realtime.*$/).map(&:strip).first.split(/\s/).reject(&:empty?)
+
+        scanned_dump = dump_data.scan(/^.*Uptime.*Realtime.*$/).map(&:strip).first
+
+        return [] if scanned_dump.nil?
+        scanned_dump.split(/\s/).reject(&:empty?)
       rescue StandardError => e
         puts e
         []
@@ -35,7 +39,10 @@ module Droid
 
       def dump_memory_details_usage(dump_data)
         fail "no process" if dump_data == "No process found for: #{@package}"
-        dump_data.scan(/^.*TOTAL.*$/).map(&:strip).first.split(/\s/).reject(&:empty?)
+        scanned_dump = dump_data.scan(/^.*TOTAL.*$/).map(&:strip).first
+
+        return [] if scanned_dump.nil?
+        scanned_dump.split(/\s/).reject(&:empty?)
       rescue StandardError => e
         puts e
         []

data/lib/droid/monitor/version.rb

@@ -1,5 +1,5 @@
 module Droid
   module Monitor
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droid-monitor
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Kazuaki MATSUO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faml