droid-monitor 0.6.1 → 0.7.0

data/lib/droid/monitor/gfxinfo.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
@@ -49,20 +51,20 @@ module Droid
 
       # called directory
       def store_dumped_gfxinfo_usage
-        self.store_gfxinfo_usage(self.dump_gfxinfo_usage(self.dump_gfxinfo))
+        store_gfxinfo_usage(dump_gfxinfo_usage(dump_gfxinfo))
       end
 
       # @param [String] file_path_gfx A file path to save gfx data.
       # @param [String] file_path_mem A file path to save memory usage regarding gfx data.
       # @param [String] file_path_frame A file path to save frame data.
       def save_gfxinfo_usage_as_google_api(file_path_gfx, file_path_mem, file_path_frame)
-        self.save(export_as_google_api_format_gfx(@gfxinfo_usage), file_path_gfx)
-        self.save(export_as_google_api_format_mem(@gfxinfo_usage), file_path_mem)
-        self.save(export_as_google_api_format_frame(@gfxinfo_usage), file_path_frame)
+        save(export_as_google_api_format_gfx(@gfxinfo_usage), file_path_gfx)
+        save(export_as_google_api_format_mem(@gfxinfo_usage), file_path_mem)
+        save(export_as_google_api_format_frame(@gfxinfo_usage), file_path_frame)
       end
 
       def store_gfxinfo_usage(dumped_gfxinfo)
-        @gfxinfo_usage.push self.merge_current_time(transfer_total_gfxinfo_to_hash(dumped_gfxinfo))
+        @gfxinfo_usage.push merge_current_time(transfer_total_gfxinfo_to_hash(dumped_gfxinfo))
       end
 
       def transfer_total_gfxinfo_to_hash(dump_gfxinfo_array)
@@ -72,7 +74,7 @@ module Droid
             display_lists_kb: 0,
             frames_rendered: 0,
             total_memory: 0,
-            time: dump_gfxinfo_array.last,
+            time: dump_gfxinfo_array.last
           }
         elsif @api_level >= 23
           {
@@ -81,15 +83,15 @@ module Droid
             frames_rendered: dump_gfxinfo_array[14].to_i || 0,
             janky_frame: dump_gfxinfo_array[17].to_i || 0,
             total_memory: (dump_gfxinfo_array[0].to_f / 1024).round(2),
-            time: dump_gfxinfo_array.last,
+            time: dump_gfxinfo_array.last
           }
         else
           {
-              view: dump_gfxinfo_array[4].to_i,
-              display_lists_kb: dump_gfxinfo_array[6].to_f.round(2),
-              frames_rendered: dump_gfxinfo_array[11].to_i || 0,
-              total_memory: (dump_gfxinfo_array[0].to_f / 1024).round(2),
-              time: dump_gfxinfo_array.last,
+            view: dump_gfxinfo_array[4].to_i,
+            display_lists_kb: dump_gfxinfo_array[6].to_f.round(2),
+            frames_rendered: dump_gfxinfo_array[11].to_i || 0,
+            total_memory: (dump_gfxinfo_array[0].to_f / 1024).round(2),
+            time: dump_gfxinfo_array.last
           }
         end
       end
@@ -102,7 +104,7 @@ module Droid
             c: [
               { v: hash[:time] },
               { v: hash[:view] },
-              { v: hash[:display_lists_kb] },
+              { v: hash[:display_lists_kb] }
             ]
           }
           google_api_data_format[:rows].push(a_google_api_data_format)
@@ -118,7 +120,7 @@ module Droid
           a_google_api_data_format = {
             c: [
               { v: hash[:time] },
-              { v: hash[:total_memory] },
+              { v: hash[:total_memory] }
             ]
           }
           google_api_data_format[:rows].push(a_google_api_data_format)
@@ -133,21 +135,21 @@ module Droid
         if @api_level >= 23
           from_gfxinfo_usage.each do |hash|
             a_google_api_data_format = {
-                c: [
-                    { v: hash[:time] },
-                    { v: hash[:frames_rendered] },
-                    { v: hash[:janky_frame] },
-                ]
+              c: [
+                { v: hash[:time] },
+                { v: hash[:frames_rendered] },
+                { v: hash[:janky_frame] }
+              ]
             }
             google_api_data_format[:rows].push(a_google_api_data_format)
           end
         else
           from_gfxinfo_usage.each do |hash|
             a_google_api_data_format = {
-                c: [
-                    { v: hash[:time] },
-                    { v: hash[:frames_rendered] },
-                ]
+              c: [
+                { v: hash[:time] },
+                { v: hash[:frames_rendered] }
+              ]
             }
             google_api_data_format[:rows].push(a_google_api_data_format)
           end
@@ -155,9 +157,9 @@ module Droid
         JSON.generate google_api_data_format
       end
 
-      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
@@ -167,10 +169,9 @@ module Droid
           cols: [
             { label: 'time', type: 'string' },
             { label: 'view', type: 'number' },
-            { label: 'display_lists_kb', type: 'number' },
-          ],
-          rows: [
+            { label: 'display_lists_kb', type: 'number' }
           ],
+          rows: []
         }
       end
 
@@ -178,10 +179,9 @@ module Droid
         {
           cols: [
             { label: 'time', type: 'string' },
-            { label: 'total_memory', type: 'number' },
-          ],
-          rows: [
+            { label: 'total_memory', type: 'number' }
           ],
+          rows: []
         }
       end
 
@@ -191,19 +191,17 @@ module Droid
             cols: [
               { label: 'time', type: 'string' },
               { label: 'frames_rendered', type: 'number' },
-              { label: 'janky_frame', type: 'number' },
-            ],
-            rows: [
+              { label: 'janky_frame', type: 'number' }
             ],
+            rows: []
           }
         else
           {
-              cols: [
-                  { label: 'time', type: 'string' },
-                  { label: 'frames_rendered', type: 'number' },
-              ],
-              rows: [
-              ],
+            cols: [
+              { label: 'time', type: 'string' },
+              { label: 'frames_rendered', type: 'number' }
+            ],
+            rows: []
           }
         end
       end

data/lib/droid/monitor/memory.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
@@ -26,11 +28,12 @@ module Droid
       end
 
       def dump_memory_usage(dump_data)
-        fail "no process" if dump_data == "No process found for: #{@package}"
+        raise 'no process' if dump_data == "No process found for: #{@package}"
 
         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
@@ -38,10 +41,12 @@ module Droid
       end
 
       def dump_memory_details_usage(dump_data)
-        fail "no process" if dump_data == "No process found for: #{@package}"
+        raise 'no process' if dump_data == "No process found for: #{@package}"
+
         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
@@ -50,32 +55,32 @@ module Droid
 
       # called directory
       def store_dumped_memory_usage
-        self.store_memory_usage(self.dump_memory_usage(self.dump_meminfo))
+        store_memory_usage(dump_memory_usage(dump_meminfo))
       end
 
       # called directory
       def store_dumped_memory_details_usage
-        self.store_memory_details_usage(self.dump_memory_details_usage(self.dump_meminfo))
+        store_memory_details_usage(dump_memory_details_usage(dump_meminfo))
       end
 
       def save_memory_as_google_api(file_path)
-        self.save(export_as_google_api_format(@memory_usage), file_path)
+        save(export_as_google_api_format(@memory_usage), file_path)
       end
 
       def save_memory_details_as_google_api(file_path)
-        self.save(export_as_google_api_format(@memory_detail_usage), file_path)
+        save(export_as_google_api_format(@memory_detail_usage), file_path)
       end
 
       # @param [Array] dumped_memory Array of dumped memory data
       # @return [Hash] Google API formatted data
       def store_memory_usage(dumped_memory)
-        @memory_usage.push self.merge_current_time(transfer_total_memory_to_hash(dumped_memory))
+        @memory_usage.push merge_current_time(transfer_total_memory_to_hash(dumped_memory))
       end
 
       # @param [Array] dumped_memory_details Array of dumped memory data
       # @return [Hash] Google API formatted data
       def store_memory_details_usage(dumped_memory_details)
-        @memory_detail_usage.push self.merge_current_time(transfer_total_memory_details_to_hash(dumped_memory_details))
+        @memory_detail_usage.push merge_current_time(transfer_total_memory_details_to_hash(dumped_memory_details))
       end
 
       def transfer_total_memory_to_hash(data)
@@ -103,12 +108,11 @@ module Droid
                 { v: hash[:swapped_dirty] },
                 { v: hash[:heap_size] },
                 { v: hash[:heap_alloc] },
-                { v: hash[:heap_free] },
-              ],
+                { v: hash[:heap_free] }
+              ]
             }
             google_api_data_format[:rows].push(a_google_api_data_format)
           end
-          JSON.generate google_api_data_format
         else
           google_api_data_format = empty_google_api_format_over43
 
@@ -121,22 +125,21 @@ module Droid
                 { v: hash[:private_dirty] },
                 { v: hash[:heap_size] },
                 { v: hash[:heap_alloc] },
-                { v: hash[:heap_free] },
-              ],
+                { v: hash[:heap_free] }
+              ]
             }
             google_api_data_format[:rows].push(a_google_api_data_format)
           end
-
-          JSON.generate google_api_data_format
         end
+        JSON.generate google_api_data_format
       end
 
       # @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
@@ -151,10 +154,9 @@ module Droid
             { label: 'swapped_dirty', type: 'number' },
             { label: 'heap_size', type: 'number' },
             { label: 'heap_alloc', type: 'number' },
-            { label: 'heap_free', type: 'number' },
-          ],
-          rows: [
+            { label: 'heap_free', type: 'number' }
           ],
+          rows: []
         }
       end
 
@@ -167,17 +169,16 @@ module Droid
             { label: 'private_dirty', type: 'number' },
             { label: 'heap_size', type: 'number' },
             { label: 'heap_alloc', type: 'number' },
-            { label: 'heap_free', type: 'number' },
-          ],
-          rows: [
+            { label: 'heap_free', type: 'number' }
           ],
+          rows: []
         }
       end
 
       def total_memory(data)
         {
           uptime: data[1].to_i ||= 0,
-          realtime: data[3].to_i ||= 0,
+          realtime: data[3].to_i ||= 0
         }
       end
 
@@ -189,7 +190,7 @@ module Droid
           swapped_dirty: data[4].to_i ||= 0,
           heap_size: data[5].to_i ||= 0,
           heap_alloc: data[6].to_i ||= 0,
-          heap_free: data[7].to_i ||= 0,
+          heap_free: data[7].to_i ||= 0
         }
       end
 
@@ -200,10 +201,9 @@ module Droid
           private_dirty: data[3].to_i ||= 0,
           heap_size: data[4].to_i ||= 0,
           heap_alloc: data[5].to_i ||= 0,
-          heap_free: data[6].to_i ||= 0,
+          heap_free: data[6].to_i ||= 0
         }
       end
-
     end # class Memory
   end # module Monitor
 end # module Droid

data/lib/droid/monitor/net.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
@@ -40,27 +42,27 @@ module Droid
 
       # called directory
       def store_dumped_tcp_rec
-        self.store_tcp_rec(self.dump_tcp_rec_usage(self.dump_tcp_rec))
+        store_tcp_rec(dump_tcp_rec_usage(dump_tcp_rec))
       end
 
       def store_dumped_tcp_snd
-        self.store_tcp_snd(self.dump_tcp_snd_usage(self.dump_tcp_snd))
+        store_tcp_snd(dump_tcp_snd_usage(dump_tcp_snd))
       end
 
       def save_cpu_usage_as_google_api_rec(file_path)
-        self.save(export_as_google_api_format_rec(@tcp_rec), file_path)
+        save(export_as_google_api_format_rec(@tcp_rec), file_path)
       end
 
       def save_cpu_usage_as_google_api_snd(file_path)
-        self.save(export_as_google_api_format_snd(@tcp_snd), file_path)
+        save(export_as_google_api_format_snd(@tcp_snd), file_path)
       end
 
       def store_tcp_rec(dumped_tcp_rec)
-        @tcp_rec.push self.merge_current_time(transfer_tcp_rec_to_hash_rec(dumped_tcp_rec))
+        @tcp_rec.push merge_current_time(transfer_tcp_rec_to_hash_rec(dumped_tcp_rec))
       end
 
       def store_tcp_snd(dumped_tcp_snd)
-        @tcp_snd.push self.merge_current_time(transfer_tcp_rec_to_hash_snd(dumped_tcp_snd))
+        @tcp_snd.push merge_current_time(transfer_tcp_rec_to_hash_snd(dumped_tcp_snd))
       end
 
       def transfer_tcp_rec_to_hash_rec(dumped_tcp_rec)
@@ -79,11 +81,10 @@ module Droid
         google_api_data_format = empty_google_api_format_rec
 
         from_tcp_rec.each do |hash|
-
           a_google_api_data_format = {
             c: [
               { v: hash[:time] },
-              { v: hash[:tcp_rec] },
+              { v: hash[:tcp_rec] }
             ]
           }
           google_api_data_format[:rows].push(a_google_api_data_format)
@@ -96,11 +97,10 @@ module Droid
         google_api_data_format = empty_google_api_format_snd
 
         from_tcp_snd.each do |hash|
-
           a_google_api_data_format = {
             c: [
               { v: hash[:time] },
-              { v: hash[:tcp_snd] },
+              { v: hash[:tcp_snd] }
             ]
           }
           google_api_data_format[:rows].push(a_google_api_data_format)
@@ -112,9 +112,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
@@ -123,10 +123,9 @@ module Droid
         {
           cols: [
             { label: 'time', type: 'string' },
-            { label: 'tcp_rec', type: 'number' },
-          ],
-          rows: [
+            { label: 'tcp_rec', type: 'number' }
           ],
+          rows: []
         }
       end
 
@@ -134,14 +133,11 @@ module Droid
         {
           cols: [
             { label: 'time', type: 'string' },
-            { label: 'tcp_snd', type: 'number' },
-          ],
-          rows: [
+            { label: 'tcp_snd', type: 'number' }
           ],
+          rows: []
         }
       end
-
-
     end # class Cpu
   end # module Monitor
 end # module Droid