droid-monitor 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2aa95a30515885e5d6e843bc5ef5e80369000180
-  data.tar.gz: 75c889ae70cac3d21401222ec717fd8a2f067d9d
+SHA256:
+  metadata.gz: '019f451202097810f6434f9f093815f4b4796c592c1e2abd917bf96d64d3265b'
+  data.tar.gz: 77a5c9a451a42fd2ff660cd2d2848ec686408a05a0bae99f1eda1db1c639cf09
 SHA512:
-  metadata.gz: d33fb3c81370760dd92aeee6afb9cd1e73d2c3aa9f2ecab56a84c6fac2d7c2a6765ba739ec01d6ccffed89be5004874c3b0aa151f50c7ff0cbe64d5d0e25c318
-  data.tar.gz: 1f0d5cba2c6cdaac3df70a8d522fcf6b0bcab41a7a8acfce770bad314c94a9fa525123c1375d052ef161e9eb061f289abd287ebf53eb6655274ea35187a0771f
+  metadata.gz: d3faf985803dc5babcd3c40578972b4e539e57e4fb618ca731d7ff18e3a0e3c4cc49a653bceef415fee69f820a6dae1ffa8c7e38131ccdd271a3ecf35d00b481
+  data.tar.gz: fb8a76c3264134608f41ce4c41a591e2617419f76016aa40fc87481c9ccfa4b285508d2f63ffffec65fd0e9c4740e7bc1a34b87b48f826bd9bd7a784198556f6

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+sample/Gemfile.lock
 /_yardoc/
 /coverage/
 /pkg/

data/.rubocop.yml

@@ -0,0 +1,16 @@
+AllCops:
+  TargetRubyVersion: 2.3
+Metrics/LineLength:
+  Enabled: false
+Metrics/AbcSize:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Style/Documentation:
+  Enabled: false
+Style/CommentedKeyword:
+  Enabled: false
+Naming/HeredocDelimiterNaming:
+  Enabled: false

data/.travis.yml

@@ -1,16 +1,21 @@
+sudo: false
+#cache: bundler
 language: ruby
 rvm:
-  - 2.1.4
-  - 2.2.0
-  - 2.3.0
-
-sudo: false
-cache: bundler
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
 
-before_install: gem update --remote bundler
+env:
+  - ANDROID_HOME='~' # dummy
 
-install:
-  - bundle install --retry=3
+before_install:
+  - gem update --system
+  - gem update bundler
+  - mkdir ~/platform-tools
+  - touch ~/platform-tools/adb
 
 script:
+  - bundle exec rubocop
   - ruby test/run_test.rb

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in droid-monitor.gemspec

data/README.md

@@ -4,6 +4,8 @@ Monitoring Android cpu or memory usage and create their simple graph with Google
 
 [![Gem Version](https://badge.fury.io/rb/droid-monitor.svg)](http://badge.fury.io/rb/droid-monitor)
 
+Read also: https://developer.android.com/training/testing/performance
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/Rakefile

@@ -1,2 +1,11 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
 
+require 'bundler/gem_tasks'
+require 'rubocop/rake_task'
+
+desc('Execute RuboCop static code analysis')
+RuboCop::RakeTask.new(:rubocop) do |t|
+  t.patterns = %w[lib test sample]
+  t.options = %w[-D]
+  t.fail_on_error = true
+end

data/droid-monitor.gemspec

@@ -1,27 +1,29 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'droid/monitor/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "droid-monitor"
+  spec.name          = 'droid-monitor'
   spec.version       = Droid::Monitor::VERSION
-  spec.authors       = ["Kazuaki MATSUO"]
-  spec.email         = ["fly.49.89.over@gmail.com"]
-  spec.summary       = %q{Monitoring Android cpu or memory usage and create their simple graph with Google API.}
-  spec.description   = %q{Monitoring connected Android devices via adb command. And you can create simple http graph wth Google API.}
-  spec.homepage      = "https://github.com/KazuCocoa/droid-monitor"
-  spec.license       = "MIT"
+  spec.authors       = ['Kazuaki MATSUO']
+  spec.email         = ['fly.49.89.over@gmail.com']
+  spec.summary       = 'Monitoring Android cpu or memory usage and create their simple graph with Google API.'
+  spec.description   = 'Monitoring connected Android devices via adb command. And you can create simple http graph wth Google API.'
+  spec.homepage      = 'https://github.com/KazuCocoa/droid-monitor'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.1.0"
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.3'
 
-  spec.add_dependency "faml"
-  spec.add_dependency "haml" # for using faml to tilt
-  spec.add_dependency "tilt"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "test-unit"
+  spec.add_dependency 'faml', '~> 0.8'
+  spec.add_dependency 'haml', '~> 5.0' # for using faml to tilt
+  spec.add_dependency 'tilt', '~> 2.0'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rubocop', '0.61.0'
+  spec.add_development_dependency 'test-unit'
 end

data/lib/droid/monitor.rb

@@ -1,8 +1,10 @@
-require_relative "monitor/version"
-require_relative "monitor/common/timer"
-require_relative "monitor/executor/executor"
+# frozen_string_literal: true
 
-require "Open3"
+require_relative 'monitor/version'
+require_relative 'monitor/common/timer'
+require_relative 'monitor/executor/executor'
+
+require 'open3'
 
 module Droid
   module Monitor
@@ -10,10 +12,11 @@ module Droid
       attr_accessor :package, :device_serial, :api_level
 
       def initialize(opts = {})
-        raise "opts must be a hash" unless opts.is_a? Hash
-        raise "Package name is required." unless opts[:package]
+        raise 'opts must be a hash' unless opts.is_a? Hash
+        raise 'Package name is required.' unless opts[:package]
+
         @package = opts[:package]
-        @device_serial = opts[:device_serial] || ""
+        @device_serial = opts[:device_serial] || ''
         @api_level = device_sdk_version
         @debug = opts[:debug]
       end
@@ -46,15 +49,17 @@ module Droid
       end
 
       def dump_tcp_rec
-        pid = get_pid
+        pid = user_pid
         return 0 if pid == -1
+
         puts "pid is #{pid}" if @debug
         run_adb("#{adb_shell} cat proc/uid_stat/#{pid}/tcp_rcv").to_i
       end
 
       def dump_tcp_snd
-        pid = get_pid
+        pid = user_pid
         return 0 if pid == -1
+
         puts "pid is #{pid}" if @debug
         run_adb("#{adb_shell} cat proc/uid_stat/#{pid}/tcp_snd").to_i
       end
@@ -66,12 +71,14 @@ module Droid
       private
 
       def adb
-        raise "ANDROID_HOME is not set" unless ENV["ANDROID_HOME"]
-        "#{ENV["ANDROID_HOME"]}/platform-tools/adb"
+        raise 'ANDROID_HOME is not set' unless ENV['ANDROID_HOME']
+
+        "#{ENV['ANDROID_HOME']}/platform-tools/adb"
       end
 
       def device_serial_option
-        return "" unless @device_serial && @device_serial != ""
+        return '' unless @device_serial && @device_serial != ''
+
         "-s \"#{@device_serial}\""
       end
 
@@ -80,19 +87,19 @@ module Droid
       end
 
       # @return [String] line of packages regarding pid and so on
-      def get_pid
+      def user_pid
         dump = run_adb("#{adb_shell} dumpsys package #{@package}")
         return -1 if dump.nil?
 
         userid = dump.scan(/userId=[0-9]+/)
         return -1 if userid.empty?
 
-        userid.uniq.first.delete("userId=")
+        userid.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, 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

data/lib/droid/monitor/common/commons.rb

@@ -1,2 +1,4 @@
-require_relative "utils"
-require_relative "timer"
+# frozen_string_literal: true
+
+require_relative 'utils'
+require_relative 'timer'

data/lib/droid/monitor/common/timer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Droid
   module Monitor
     module Timer

data/lib/droid/monitor/common/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Droid
   module Monitor
     module Utils

data/lib/droid/monitor/cpu.rb

@@ -1,8 +1,10 @@
-require_relative "../monitor"
-require_relative "common/commons"
-require_relative "report/google_api_template"
+# frozen_string_literal: true
 
-require "json"
+require_relative '../monitor'
+require_relative 'common/commons'
+require_relative 'report/google_api_template'
+
+require 'json'
 
 module Droid
   module Monitor
@@ -21,11 +23,12 @@ module Droid
       end
 
       def dump_cpu_usage(dump_data)
-        scanned_dump = dump_data.scan(/^.*#{self.package}.*$/).map(&:strip).first
+        scanned_dump = dump_data.scan(/^.*#{package}.*$/).map(&:strip).first
         return [] if scanned_dump.nil?
 
         dump = scanned_dump.split(/\s/).reject(&:empty?)
-        fail 'no package' if /^Load:$/ =~ dump[0]
+        raise 'no package' if /^Load:$/ =~ dump[0]
+
         dump
       rescue StandardError => e
         puts e
@@ -36,9 +39,7 @@ module Droid
         return [] if dump_data.nil?
 
         dump = dump_data.split(/\s/).reject(&:empty?)
-        fail 'no package' if /^Load:$/ =~ dump[0]
-
-        puts dump
+        raise 'no package' if /^Load:$/ =~ dump[0]
 
         dump
       rescue StandardError => e
@@ -48,27 +49,27 @@ module Droid
 
       # called directory
       def store_dumped_cpu_usage
-        self.store_cpu_usage(self.dump_cpu_usage(self.dump_cpuinfo))
+        store_cpu_usage(dump_cpu_usage(dump_cpuinfo))
       end
 
       def store_dumped_cpu_usage_with_top
-        self.store_cpu_usage_with_top(self.dump_cpu_usage_with_top(self.dump_cpuinfo_with_top))
+        store_cpu_usage_with_top(dump_cpu_usage_with_top(dump_cpuinfo_with_top))
       end
 
       def save_cpu_usage_as_google_api(file_path)
-        self.save(export_as_google_api_format(@cpu_usage), file_path)
+        save(export_as_google_api_format(@cpu_usage), file_path)
       end
 
       def save_cpu_usage_as_google_api_with_top(file_path)
-        self.save(export_as_google_api_format_with_top(@cpu_usage), file_path)
+        save(export_as_google_api_format_with_top(@cpu_usage), file_path)
       end
 
       def store_cpu_usage(dumped_cpu)
-        @cpu_usage.push self.merge_current_time(transfer_total_cpu_to_hash(dumped_cpu))
+        @cpu_usage.push merge_current_time(transfer_total_cpu_to_hash(dumped_cpu))
       end
 
       def store_cpu_usage_with_top(dumped_cpu)
-        @cpu_usage.push self.merge_current_time(transfer_total_cpu_with_top_to_hash(dumped_cpu))
+        @cpu_usage.push merge_current_time(transfer_total_cpu_with_top_to_hash(dumped_cpu))
       end
 
       def transfer_total_cpu_to_hash(dump_cpu_array)
@@ -78,7 +79,7 @@ module Droid
             process: 'no package process',
             user: '0%',
             kernel: '0%',
-            time: dump_cpu_array.last,
+            time: dump_cpu_array.last
           }
         else
           {
@@ -86,7 +87,7 @@ module Droid
             process: dump_cpu_array[1],
             user: dump_cpu_array[2],
             kernel: dump_cpu_array[5],
-            time: dump_cpu_array.last,
+            time: dump_cpu_array.last
           }
         end
       end
@@ -94,15 +95,15 @@ module Droid
       def transfer_total_cpu_with_top_to_hash(dump_cpu_array)
         if dump_cpu_array.length <= 1
           {
-              total_cpu: '0%',
-              process: 'no package process',
-              time: dump_cpu_array.last,
+            total_cpu: '0%',
+            process: 'no package process',
+            time: dump_cpu_array.last
           }
         else
           {
-              total_cpu: dump_cpu_array[2],
-              process: dump_cpu_array[0],
-              time: dump_cpu_array.last,
+            total_cpu: dump_cpu_array[2],
+            process: dump_cpu_array[0],
+            time: dump_cpu_array.last
           }
         end
       end
@@ -111,13 +112,12 @@ module Droid
         google_api_data_format = empty_google_api_format
 
         from_cpu_usage.each do |hash|
-
           a_google_api_data_format = {
             c: [
               { v: hash[:time] },
               { v: hash[:total_cpu].delete('%').to_f },
               { v: hash[:user].delete('%').to_f },
-              { v: hash[:kernel].delete('%').to_f },
+              { v: hash[:kernel].delete('%').to_f }
             ]
           }
           google_api_data_format[:rows].push(a_google_api_data_format)
@@ -130,12 +130,11 @@ module Droid
         google_api_data_format = empty_google_api_format_with_top
 
         from_cpu_usage.each do |hash|
-
           a_google_api_data_format = {
-              c: [
-                  { v: hash[:time] },
-                  { v: hash[:total_cpu].delete('%').to_f },
-              ]
+            c: [
+              { v: hash[:time] },
+              { v: hash[:total_cpu].delete('%').to_f }
+            ]
           }
           google_api_data_format[:rows].push(a_google_api_data_format)
         end
@@ -146,9 +145,9 @@ module Droid
       # @params [String] data_file_path A path to data.
       # @params [Hash] graph_opts A hash regarding graph settings.
       # @params [String] output_file_path A path you would like to export data.
-      def create_graph(data_file_path, graph_opts = {}, output_file_path)
-        self.save(Droid::Monitor::GoogleApiTemplate.create_graph(data_file_path, graph_opts),
-                  output_file_path)
+      def create_graph(data_file_path, graph_opts = {}, output_file_path) # rubocop:disable Style/OptionalArguments
+        save(Droid::Monitor::GoogleApiTemplate.create_graph(data_file_path, graph_opts),
+             output_file_path)
       end
 
       private
@@ -159,21 +158,19 @@ module Droid
             { label: 'time', type: 'string' },
             { label: 'total_cpu', type: 'number' },
             { label: 'user', type: 'number' },
-            { label: 'kernel', type: 'number' },
-          ],
-          rows: [
+            { label: 'kernel', type: 'number' }
           ],
+          rows: []
         }
       end
 
       def empty_google_api_format_with_top
         {
-            cols: [
-                { label: 'time', type: 'string' },
-                { label: 'total_cpu', type: 'number' },
-            ],
-            rows: [
-            ],
+          cols: [
+            { label: 'time', type: 'string' },
+            { label: 'total_cpu', type: 'number' }
+          ],
+          rows: []
         }
       end
     end # class Cpu

data/lib/droid/monitor/executor/executor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Droid
   module Monitor
     class Executor