droid-monitor 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57e8e14b629c3491612d6694bd1303b147258e49
-  data.tar.gz: 57491e27df2bfb6883c7834fadf76de937fc52cb
+  metadata.gz: 41e69af4a588755f113bab4a8ae6c47b7a1ac9af
+  data.tar.gz: 5bfcb635d2bea2cea39836680d9fc4c580ab7b9d
 SHA512:
-  metadata.gz: 9835127db21a61910610a3f98c5b2fd85c0458e823fcb860887c345d7b03e2b8429ac6e76fe5c3b5b18a4392d975be5e109741b4fa50014c6582b283650cf09c
-  data.tar.gz: a9cd88bb4b1b1df4c7c0b56d58c5d45cf6dbb43852213efe453f6d4b6c285a7e73828bbfaf505f949ff386b7823bbd7299f1fd2fa4cda4520f26100a755b8d29
+  metadata.gz: b219d4e597b2745bd6acf0906d1f9c5b04fb6145c9d0f04df6474d36ccd29a65d7c50c9358aacdafb49b4daec1f6e737bd7030c9a6200433f60b47b7e08f79cd
+  data.tar.gz: f77de209557b9251b7f5b79904f21904f6e565f63a285da43ebaf1eac8815f8d923a1ca5d9fac77c0fb81c85ef49867f27765e50137eea796422c450070097d5

data/README.md

@@ -28,6 +28,8 @@ The `sample` use clockwork to run ruby script in particular terms.
 ### CPU
 
 ```ruby
+require "droid/monitor/cpu"
+
 # initialize
 @cpu = Droid::Monitor::Cpu.new( { package: "com.android.chrome" } )
 
@@ -52,6 +54,8 @@ graph_opts = { title: "Example", header1: "this graph is just sample"}
 ### Memory
 
 ```ruby
+require "droid/monitor/memory"
+
 # initialize
 # You can specify target devices with providing device serial which is provided via adb devices.
 @memory = Droid::Monitor::Cpu.new( { package: "com.android.chrome", device_serial: "device_serials"} )
@@ -76,6 +80,8 @@ graph_opts = { title: "Example", header1: "this graph is just sample"}
 ### Net
 
 ```ruby
+require "droid/monitor/net"
+
 # initialize
 @net = Droid::Monitor::Net.new( { package: "com.android.chrome" } )
 

data/lib/droid/monitor.rb

@@ -1,13 +1,15 @@
 require_relative "monitor/version"
 
+require "Open3"
+
 module Droid
   module Monitor
     class Adb
       attr_accessor :package, :device_serial, :api_level
 
-      def initialize( opts = {})
-        fail 'opts must be a hash' unless opts.is_a? Hash
-        fail 'Package name is required.' unless opts[:package]
+      def initialize(opts = {})
+        fail "opts must be a hash" unless opts.is_a? Hash
+        fail "Package name is required." unless opts[:package]
         @package = opts[:package]
         @device_serial = opts[:device_serial] || ""
         @api_level = device_sdk_version
@@ -16,30 +18,25 @@ module Droid
       # @return [Integer] message from adb command
       # e.g: 17
       def device_sdk_version
-        `#{adb_shell} getprop ro.build.version.sdk`.chomp.to_i
+        run_adb("#{adb_shell} getprop ro.build.version.sdk").to_i
       end
 
       # @return [String] message from adb command
       def dump_cpuinfo
-        `#{adb_shell} dumpsys cpuinfo`.chomp
+        run_adb("#{adb_shell} dumpsys cpuinfo")
       end
 
       # @return [String] message from adb command
       def dump_meminfo
-        `#{adb_shell} dumpsys meminfo #{@package}`.chomp
-      end
-
-      # @return [String] line of packages regarding pid and so on
-      def get_pid
-        `#{adb_shell} dumpsys package #{@package} | grep userId=`.chomp.scan(/userId=[0-9]+/).uniq.first.delete("userId=")
+        run_adb("#{adb_shell} dumpsys meminfo #{@package}")
       end
 
       def dump_tcp_rcv
-        `#{adb_shell} cat proc/uid_stat/#{get_pid}/tcp_rcv`
+        run_adb("#{adb_shell} cat proc/uid_stat/#{get_pid}/tcp_rcv").to_i
       end
 
       def dump_tcp_snd
-        `#{adb_shell} cat proc/uid_stat/#{get_pid}/tcp_snd`
+        run_adb("#{adb_shell} cat proc/uid_stat/#{get_pid}/tcp_snd").to_i
       end
 
       private
@@ -57,6 +54,17 @@ module Droid
       def adb_shell
         "#{adb} #{device_serial_option} shell"
       end
+
+      # @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=")
+      end
+
+      def run_adb(cmd)
+        out_s, out_e, status = Open3.capture3(cmd)
+        puts "error: device not found which serial is #{@device_serial}" if out_e.include?("error: device not found")
+        out_s.chomp unless out_s.nil? || out_s.empty?
+      end
     end # class Adb
   end # module Monitor
 end # module Droid

data/lib/droid/monitor/cpu.rb

@@ -43,7 +43,7 @@ module Droid
       end
 
       def transfer_total_cpu_to_hash(dump_cpu_array)
-        if dump_cpu_array.length == 0
+        if dump_cpu_array.length <= 1
           {
             total_cpu: '0%',
             process: 'no package process',

data/lib/droid/monitor/net.rb

@@ -17,11 +17,19 @@ module Droid
         @tcp_snd = []
       end
 
-      def clear_tcps
+      def clear_tcps_rec
         @tcp_rec = []
+      end
+
+      def clear_tcps_snd
         @tcp_snd = []
       end
 
+      def clear_tcps
+        clear_tcps_rec
+        clear_tcps_snd
+      end
+
       def dump_tcp_rcv_usage(dump_data)
         [dump_data.to_i]
       end

data/lib/droid/monitor/version.rb

@@ -1,5 +1,5 @@
 module Droid
   module Monitor
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/test/cpu_test.rb

@@ -106,4 +106,4 @@ class CpuTest < Test::Unit::TestCase
     assert_equal(@cpu.export_as_google_api_format(@cpu.cpu_usage), expected_json)
   end
 
-end
+end

data/test/net_test.rb

@@ -10,7 +10,7 @@ TCP_RCV = "174934"
 
 TCP_SND = "374934"
 
-class MemoryTest < Test::Unit::TestCase
+class NetTest < Test::Unit::TestCase
 
   def setup
     @net = Droid::Monitor::Net.new( { package: "com.android.chrome" } )

metadata

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