flick 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fefe51010559fb70ada5f8286e5136f5b9aca04
-  data.tar.gz: 8e97d55ae591cfe30d9c94c52c4de2f7fb40cf9c
+  metadata.gz: 60c1f971ea573c80a3728c5b6473637edc635510
+  data.tar.gz: 38a0fc9d7c3b996a44d3721262ee020a40745c27
 SHA512:
-  metadata.gz: d4cf40f34b70b122f25d6422b61e5d0032c28d2a5784fd72cee8cdf0a76f4bdc98851b870209687adb19af27a9b7895bd935c132c4abc5bc2c2f5817bd63d813
-  data.tar.gz: a6533405fc53ce22ec840faee7fd44d11f3ce3dc52aa223e13bfaa03d4bcfd84b4e86c88d76f4dfef9d740faabdb76bbbee25dd971f023d5977af6024971db7f
+  metadata.gz: 3c001315844ae3126cbb92d6d786522d6d07d7335021dd842ac915fefae80425f8f082e502fa532d0c4103ad4125e5b1dc2b26a5702a0753cc8a6b10afaaccbd
+  data.tar.gz: 4cd4aa8fe85f50196d59190f13f75e4ff9e9179b45ce90450427e479ca132403e823538c75cdda4c295589a8b7668ea8509485a57a98c065bb9386448a2f3bdc

data/README.md

@@ -1,5 +1,5 @@
 # FLICK
-A CLI to capture screenshots, video, logs, and device information for Android (Devices & Emulators) and iOS (Devices).
+A CLI to capture screenshots, video, logs, device info and device vitals(memory, cpu) for Android (Devices & Emulators) and iOS (Devices).
 
 <img src="https://www.dropbox.com/s/o49et3fhncu3l4v/animacii_09.gif?raw=1" width="600">
 
@@ -111,6 +111,9 @@ Usage:
 		$ flick manager -a install -p (ios or android) -f ~/myApp/my-awesome-app.apk or .app
 		$ flick maanger -a uninstall -p (ios or android) -n com.package.name
 
+	`$ flick vitals --help`
+		$ flick vitals -n com.package.name
+
 ##Demo
 <img src="https://www.dropbox.com/s/9be37gc1c2dlxa6/flick-demo.gif?raw=1" width="600">
 

data/bin/flick

@@ -2,7 +2,7 @@
 require_relative '../lib/flick'
 require 'commander/import'
 
-program :version, '0.3.2'
+program :version, '0.3.5'
 program :description, 'A CLI to capture screenshots, video, logs, and device info for Android (Devices & Emulators) and iOS (Devices).'
 
 command :video do |c|
@@ -100,4 +100,17 @@ command :manager do |c|
 
     Manager.new(options.default).run
   end
+  
+  command :vitals do |c|
+    c.syntax = 'flick vitals [options]'
+    c.summary = 'Android Only! Get apps and device vitals - App Memory Used, App CPU %. System Stats: (User, System, IQW, IRQ)'
+    c.description = c.summary
+    c.example 'description', "flick vitals -p android -n com.viber"
+    c.option '-p', '--platform PLATFORM', String, 'Set platform: android or ios'
+    c.option '-n', '--name NAME', String, 'Set the package name.'
+    c.action do |args, options|
+
+      Vitals.new(options.default).vitals
+    end
+  end
 end

data/flick.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = ["flick"]
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", '~> 3.4', '>= 3.4.0'
   spec.add_dependency "parallel", '~> 1.6', '>= 1.6.2'
@@ -37,4 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "os", "~> 0.9.6"
   spec.add_dependency "sys-proctable", '~> 1.1', '>= 1.1.1'
   spec.add_dependency "apktools", '~> 0.7.1', '>= 0.7.1'
+  spec.add_dependency "ffi"
 end

data/lib/flick.rb

@@ -18,4 +18,5 @@ require_relative "./flick/screenshot"
 require_relative "./flick/simple_daemon"
 require_relative "./flick/system"
 require_relative "./flick/video"
-require_relative "./flick/manager"
+require_relative "./flick/manager"
+require_relative "./flick/vitals"

data/lib/flick/android.rb

@@ -30,7 +30,7 @@ module Flick
     end
 
     def clear_files
-      Flick::System.clean_system_dir flick_dir
+      Flick::System.clean_system_dir flick_dir, udid
       %x(adb -s #{udid} shell rm '#{dir_name}/*')
     end
 
@@ -68,7 +68,35 @@ module Flick
       end
       hash
     end
+    
+    def system_stats
+      x = %x(adb shell top -n 1 -d 1 | grep System).split(",")
+      user = x.find { |x| x.include? "User" }.match(/User (.*)%/)[1].to_i
+      sys  = x.find { |x| x.include? "System" }.match(/System (.*)%/)[1].to_i
+      iow  = x.find { |x| x.include? "IOW" }.match(/IOW (.*)%/)[1].to_i
+      irq  = x.find { |x| x.include? "IRQ" }.match(/IRQ (.*)%/)[1].to_i
+      { user: user, system: sys, iow: iow, irq: irq }
+    end
+
+    def memory package
+      (%x(adb shell dumpsys meminfo | grep #{package} | awk '{print $1}').strip.split.last.to_i * 0.001).round(2)
+    end
 
+    def cpu package
+      %x(adb shell top -n 1 -d 1 | grep #{package} | awk '{print $3}').strip.chomp("%").to_i
+    end
+    
+    def get_vitals package
+      if app_installed? package
+        stats = { app_stats: { memory_mb: memory(package), cpu_per: cpu(package) }, system_stats: system_stats }
+        puts stats
+        return stats
+      else
+        puts packages
+        puts "\n#{package} was not found on device #{udid}! Please choose one from above. e.g. #{packages.sample}\n".red
+      end
+    end
+    
     def install app_path
       %x(adb -s #{udid} install -r #{app_path})
     end
@@ -113,6 +141,7 @@ module Flick
     end
 
     def log name
+      %x(adb -s #{udid} logcat -c)
       %x(adb -s #{udid} logcat -v long > #{outdir}/#{name}.log)
     end
 
@@ -153,7 +182,7 @@ module Flick
       return if files.empty?
       Parallel.map(files, in_threads: 10) do |file| 
         pull_file file, flick_dir
-        Flick::System.wait_for_file 10, "#{flick_dir}/#{file.split("/").last}"
+        #Flick::System.wait_for_file 10, "#{flick_dir}/#{file.split("/").last}"
       end
     end
   end

data/lib/flick/info.rb

@@ -14,7 +14,7 @@ class Info
     end
     self.save = options[:save].to_b
   end
-
+  
   def info
     ap driver.info
     if save
@@ -22,12 +22,14 @@ class Info
       save_device_data driver.info
     end
   end
-
+  
   private
 
   def save_device_data info
+    file = "#{driver.outdir}/info-#{driver.name}.log" 
+    File.delete file if File.exists? file
     info.each do |k,v|
-      open("#{driver.outdir}/info-#{driver.name}.log", 'a') do |file|
+      open(file, 'a') do |file|
         file << "#{k}: #{v}\n"
       end
     end

data/lib/flick/ios.rb

@@ -10,6 +10,7 @@ module Flick
       self.outdir = options.fetch(:outdir, Dir.pwd)
       self.specs = options.fetch(:specs, false)
       create_flick_dirs
+      is_paired?
     end
 
     def remove_bad_characters string
@@ -20,6 +21,15 @@ module Flick
       Flick::System.setup_system_dir "#{Dir.home}/.flick"
       Flick::System.setup_system_dir flick_dir
     end
+    
+    def is_paired?
+      Flick::Checker.system_dependency "idevicepair"
+      unless %x(idevicepair -u #{udid} validate).split[0] == "SUCCESS:"
+        puts "\nUDID: #{udid} - Is not paired with your machine!".red
+        puts "Run: idevicepair -u <udid> pair\n".red
+        abort
+      end
+    end
 
     def devices
       Flick::Checker.system_dependency "idevice_id"
@@ -63,7 +73,7 @@ module Flick
     end
 
     def clear_files
-      Flick::System.clean_system_dir flick_dir
+      Flick::System.clean_system_dir flick_dir, udid
     end
 
     def screenshot name
@@ -73,7 +83,9 @@ module Flick
 
     def log name
       Flick::Checker.system_dependency "idevicesyslog"
-      %x(idevicesyslog -u #{udid} > #{outdir}/#{name}.log)
+      system("idevicesyslog -u #{udid} > #{outdir}/#{name}.log")
+      #file = File.open("#{outdir}/#{name}.log", 'a') { |f| f.puts "\n<<<<<<<<<<<<<<<<<<<<<<<<< FLICK LOG START >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n" }
+      #file.close
     end
 
     def install app_path

data/lib/flick/simple_daemon.rb

@@ -45,6 +45,7 @@
 # grandchild, either the return value of the second fork (step 3) or the
 # value of getpid() after step 3.
 #
+
 class SimpleDaemon
 
   # In the directory where you want your daemon add a git submodule to

data/lib/flick/system.rb

@@ -7,8 +7,10 @@ module Flick
       Dir.mkdir dir_name unless File.exists? dir_name
     end
 
-    def self.clean_system_dir dir_name
-      Dir.glob("#{dir_name}/*").each { |file| File.delete file }
+    def self.clean_system_dir dir_name, udid
+      Dir.glob("#{dir_name}/*#{udid}*").each do |file|
+        File.delete file
+      end
     end
 
     def self.find_pid string
@@ -34,24 +36,12 @@ module Flick
     def self.kill_process type, udid
       pids = self.find_pid "#{type}-#{udid}"
       self.kill_pids pids
-      if type == "video"
-        pid = `pgrep -f #{udid}`.to_i
-        `kill #{pid}` unless pid.zero?
-      end
     end
 
     def self.kill string
       pids = self.find_pid string
       self.kill_pids pids
     end
-    
-    def self.wait_for_file time, file
-      start = Time.now
-      until File.exists? file
-        puts "Waiting for #{file} to exist..."
-        sleep 1; break if Time.now - start > time
-      end
-    end
 
     def self.video_length file
       (`ffmpeg -i #{file} 2>&1 | grep Duration | cut -d ' ' -f 4 | sed s/,//`).strip

data/lib/flick/version.rb

@@ -1,3 +1,3 @@
 module Flick
-  VERSION = "0.3.2"
+  VERSION = "0.3.5"
 end

data/lib/flick/video.rb

@@ -21,24 +21,31 @@ class Video
     self.format = options[:format]
   end
 
+  def android
+    platform == "android"
+  end
+
+  def ios
+    platform == "ios"
+  end
+
   def run
     self.send(action)
   end
 
   def start
     driver.clear_files
+    puts "\nStarting Recoder!!!"
     if driver.recordable?
-      Flick::Checker.system_dependency "mp4box"
       if extended
-        puts "Starting Recorder In Extended Mode.\n"
+        puts "In extended mode."
+        Flick::Checker.system_dependency "mp4box"
         loop_record
       else
-        puts "Starting Recorder In Normal Mode.\nRecorder will automatically stop after 180 seconds...\n"
         start_record
       end
     else
       Flick::Checker.system_dependency "ffmpeg"
-      puts "Starting Screenshot Recorder...\n"
       start_screenshot_record
     end
   end
@@ -56,20 +63,12 @@ class Video
 
   private
 
-  def android
-    platform == "android"
-  end
-
-  def ios
-    platform == "ios"
-  end
-
   def start_record
     Flick::System.kill_process "video", udid
     $0 = "flick-video-#{udid}"
     SimpleDaemon.daemonize!
     command = -> do
-       driver.screenrecord "video-single"
+       driver.screenrecord "video-#{udid}-single"
      end
     command.call
   end
@@ -82,7 +81,7 @@ class Video
       count = "%03d" % 1
       loop do
         unless Flick::System.process_running? "#{udid}-"
-          driver.screenrecord "video-#{count}"
+          driver.screenrecord "video-#{udid}-#{count}"
           count.next!
         end
       end
@@ -91,20 +90,17 @@ class Video
   end
 
   def stop_record
-    Flick::System.kill_process "video", udid #kills recording
-    sleep 5 #wait for video process to completely finish on device.
-    driver.pull_files "video" 
-    files = Dir.glob("#{driver.flick_dir}/video*.mp4")
-    if files.empty?
-      puts "\nError! No video files found in #{driver.flick_dir}\n".red
-      return
-    end
-    files.each { |file| system("mp4box -cat #{file} #{driver.flick_dir}/#{driver.name}.mp4") } #renames video-single to udid or name if given...
+    Flick::System.kill_process "video", udid
+    sleep 5 #wait for video process to finish
+    driver.pull_files "video"
+    files = Dir.glob("#{driver.flick_dir}/video-#{udid}*.mp4")
+    return if files.empty?
+    files.each { |file| system("mp4box -cat #{file} #{driver.flick_dir}/#{driver.name}.mp4") }
     puts "Saving to #{driver.outdir}/#{driver.name}.#{format}"
     if format == "gif"
       gif
     else
-      File.rename "#{driver.flick_dir}/#{driver.name}.mp4", "#{driver.outdir}/#{driver.name}.mp4" #moves file from .flick to output dir.
+      File.rename "#{driver.flick_dir}/#{driver.name}.mp4", "#{driver.outdir}/#{driver.name}.mp4"
     end
   end
 
@@ -117,7 +113,7 @@ class Video
       count = "%03d" % 1
       loop do
         if count.to_i <= image_count
-          driver.screenshot "screenshot-#{count}"
+          driver.screenshot "screenshot-#{udid}-#{count}"
           count.next!; sleep seconds
         else
           stop_screenshot_recording
@@ -130,9 +126,9 @@ class Video
 
   def stop_screenshot_recording
     driver.pull_files "screenshot" if android
-    self.send(format)
     Flick::System.kill_process "screenshot", udid
     puts "Saving to #{driver.outdir}/#{driver.name}.#{format}"
+    self.send(format)
   end
 
   def gif
@@ -147,11 +143,12 @@ class Video
 
   def convert_images_to_mp4
     remove_zero_byte_images
-    %x(ffmpeg -loglevel quiet -framerate 1 -pattern_type glob -i '#{driver.flick_dir}/screenshot*.png' -c:v libx264 -pix_fmt yuv420p #{driver.flick_dir}/#{driver.name}.mp4)
-    Flick::System.wait_for_file 30, "#{driver.flick_dir}/#{driver.name}.mp4"
+    %x(ffmpeg -loglevel quiet -framerate 1 -pattern_type glob -i '#{driver.flick_dir}/screenshot-#{udid}*.png' -c:v libx264 -pix_fmt yuv420p #{driver.flick_dir}/#{driver.name}.mp4)
   end
 
   def remove_zero_byte_images
-    Dir.glob("#{driver.flick_dir}/screenshot*.png").each { |f| File.delete f if File.zero? f }
+    Dir.glob("#{driver.flick_dir}/screenshot-#{udid}*.png").each do |f|
+      File.delete f if File.zero? f
+    end
   end
 end

data/lib/flick/vitals.rb

@@ -0,0 +1,28 @@
+class Vitals
+
+  attr_accessor :platform, :driver, :name
+
+  def initialize options
+    Flick::Checker.platform options[:platform]
+    self.platform = options[:platform]
+    case @platform
+    when "ios"
+      options[:todir] = options[:outdir]
+      self.driver = Flick::Ios.new options
+    when "android"
+      self.driver = Flick::Android.new options
+    end
+    self.name = options[:name]
+  end
+    
+  def vitals
+    if platform == "ios"
+      puts "\nAndroid only for now. If you know of a tool to get this info for iOS please let me know or add a PR :)\n".yellow; abort
+    end
+    if name.nil?
+      puts "Specify a Package Name. e.g. -n com.viber".red; abort
+    else
+      driver.get_vitals name
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flick
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors:
 - Justin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-02 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A CLI with helpful QA tools for iOS and Android from the command line
 email:
 - justin.ison@gmail.com
@@ -252,6 +266,7 @@ files:
 - lib/flick/system.rb
 - lib/flick/version.rb
 - lib/flick/video.rb
+- lib/flick/vitals.rb
 homepage: https://github.com/isonic1/flick
 licenses:
 - MIT
@@ -273,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A CLI to capture screenshots, video, logs, and device information for Android