flick 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27692e3fa6ead5fe5bfcf968efa565ab643a950f
-  data.tar.gz: 2150edd88098180e98a17d88e105447de512543e
+  metadata.gz: 5b67e22d9d4cf0912369a645a193c35d9088dd1f
+  data.tar.gz: abacf0063db69232a9d50397a481d4856b47be87
 SHA512:
-  metadata.gz: 4ef309a2fbc5322111e673e5478a726ef9515a7e8c6403a8dad9d6b0aa51402d0e703806420e43e361d0e818b66a00f281e9e96f8f849a6d2ead7779edaa6a50
-  data.tar.gz: 6121f25efc7b26eb55011ad2913c920e43c5c71f07f511fb41a6417167e063c3c7009e35b92d6ee721edaf4cc7391b74121ab7d7d70e03dd44471d6c41d8a561
+  metadata.gz: f9b2bd03632f095f6acb5b970d094cb460fb3980dd5e941d9c69a41e418f17c1c30da41306eb0d1c0662d247afc4ddad51b51b110dbe6bb8746f54a3d7f0d142
+  data.tar.gz: 886bf9763d313e7075aa8385a451da296466fc54cbd0fb81fe5328035426fc86060490c06ad1162a26fdf1eb377061ad70335c0a75749dbbd8fe6098b7912e10

data/README.md

@@ -21,6 +21,7 @@ Features
 * Save log output for Android or iOS.
 * Display device information or save it to a file.
 * Install or Uninstall applications from devices.
+* Capture device vitals (Android Only) for app and system performance.
 * Checkout the latest release notes [here](https://github.com/isonic1/flick/releases).
 
 Reason
@@ -85,34 +86,34 @@ Usage:
     -t, --trace
       Display backtrace when an error occurs
 
-	`$ flick info --help`
+	 $ flick info --help
 
 		$ flick info -p (ios or android)
 		$ flick info -p (ios or android) -s true -o $HOME
 
 
-	`$ flick log --help`
+	 $ flick log --help
 
 		$ flick log -a start -p (ios or android) -o $HOME -n iosLog
 		$ flick log -a stop -p (ios or android)
 
-	`$ flick screenshot --help`
+	 $ flick screenshot --help
 
 		$ flick screenshot -p (ios or android) -o $HOME -n myImage
 
-	`$ flick video --help`
+	 $ flick video --help
 
 		$ flick video -a start -p (ios or android)
 		$ flick video -a stop -p (ios or android) -o /output -n myVideo -f gif
 		$ flick video -a start -p android -u emulator-5554 -c 1000
 		$ flick video -a stop -p android -u emulator-5554
 
-	`$ flick manager --help`
+	 $ flick manager --help
 		$ 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
+	 $ flick vitals --help
+		$ flick vitals -p android -n com.awsome-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.6'
+program :version, '0.4.0'
 program :description, 'A CLI to capture screenshots, video, logs, and device info for Android (Devices & Emulators) and iOS (Devices).'
 
 command :video do |c|
@@ -19,16 +19,17 @@ command :video do |c|
   c.option '-n', '--name NAME', String, 'Set name of output file, Default: UDID'
   c.option '-q', '--unique UNIQUE', 'Pull only unique screenshots. Significantly speeds up the pulling process. Default: true'
   c.option '-f', '--format FORMAT', String, 'Set output format (mp4 or gif). Default: mp4'
+  c.option '-r', '--rate RATE', String, 'Set the framerate (in seconds) when converting screenshots to video. Default: 1'
   c.option '-o', '--outdir OUTDIR', String, "Set output directory. Default is #{Dir.pwd}"
   c.action do |args, options|
     options.default \
     :seconds => 0.5, #Seconds per screenshot.
+    :rate => 1, #Seconds per framerate for screenshot to video conversion.  
     :count => 500, #This is a safety check to stop runaway screenshot process.
     :extend => false, #Extend android video recording (for REAL devices and os >= 4.4) past 180 seconds.
     :unique => true, #defaults to pulling only unique screenshots. Speeds up pulling process from device.
     :format => "mp4",
     :outdir => Dir.pwd #defaults to save in current directory.
-
     Video.new(options.default).run
   end
 end
@@ -45,7 +46,6 @@ command :screenshot do |c|
   c.action do |args, options|
     options.default \
     :outdir => Dir.pwd #defaults to save in current directory.
-
     Screenshot.new(options.default).screenshot
   end
 end
@@ -63,7 +63,6 @@ command :log do |c|
   c.action do |args, options|
     options.default \
     :outdir => Dir.pwd #defaults to save in current directory.
-
     Log.new(options.default).run
   end
 end
@@ -81,7 +80,6 @@ command :info do |c|
     options.default \
     :save => false,
     :outdir => Dir.pwd #defaults to save in current directory.
-
     Info.new(options.default).info
   end
 end
@@ -96,22 +94,16 @@ command :manager do |c|
   c.option '-u', '--udid UDID', String, 'Set device UDID.'
   c.option '-f', '--file FILE', String, 'Set the apk or app file location path.'
   c.option '-n', '--name NAME', String, 'Set the package name.'
-  c.action do |args, options|
-
-    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.option '-u', '--udid UDID', String, 'Set device UDID.'
-    c.action do |args, options|
+  c.action { |args, options| Manager.new(options.default).run }
+end
 
-      Vitals.new(options.default).vitals
-    end
-  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.option '-u', '--udid UDID', String, 'Set device UDID.'
+  c.action { |args, options| Vitals.new(options.default).vitals }
 end

data/lib/flick/android.rb

@@ -1,6 +1,6 @@
 module Flick
   class Android
-    attr_accessor :udid, :flick_dir, :dir_name, :name, :outdir, :unique, :limit, :specs
+    attr_accessor :udid, :flick_dir, :dir_name, :name, :outdir, :unique, :limit, :specs, :size
 
     def initialize options
       Flick::Checker.system_dependency "adb"
@@ -16,6 +16,7 @@ module Flick
       self.unique = options.fetch(:unique, true).to_b
       self.limit = options.fetch(:limit, 180)
       self.specs = options.fetch(:specs, false)
+      self.size = options.fetch(:size, "720x1280")
       create_flick_dirs
     end
 
@@ -26,7 +27,11 @@ module Flick
     def create_flick_dirs
       Flick::System.setup_system_dir "#{Dir.home}/.flick"
       Flick::System.setup_system_dir flick_dir
-      %x(adb -s #{udid} shell 'mkdir #{dir_name}')
+      message = %x(adb -s #{udid} shell 'mkdir #{dir_name}').split(":").last.strip
+      if message == "Read-only file system"
+        puts "\nDevice: '#{udid}' is a 'Read-only file system'! Flick cannot write to the sdcard folder. Aborting...\n".red
+        abort
+      end
     end
 
     def clear_files
@@ -88,9 +93,10 @@ module Flick
     
     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
+        stats = JSON.generate({ app_stats: { memory_mb: memory(package), cpu_per: cpu(package) }, system_stats: system_stats })
+        json = JSON.parse stats
+        puts json
+        json
       else
         puts packages
         puts "\n#{package} was not found on device #{udid}! Please choose one from above. e.g. #{packages.sample}\n".red
@@ -154,7 +160,7 @@ module Flick
     end
 
     def screenrecord name
-      %x(adb -s #{udid} shell screenrecord --time-limit #{limit} --size 720x1280 #{dir_name}/#{name}.mp4)
+      %x(adb -s #{udid} shell screenrecord --time-limit #{limit} --size #{size} #{dir_name}/#{name}.mp4)
     end
 
     def pull_file file, dir

data/lib/flick/ios.rb

@@ -26,7 +26,7 @@ module Flick
       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
+        puts "Run: idevicepair -u <udid> pair\nIf not working still, see: https://github.com/isonic1/flick/issues/10".red
         abort
       end
     end

data/lib/flick/version.rb

@@ -1,3 +1,3 @@
 module Flick
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

data/lib/flick/video.rb

@@ -1,6 +1,6 @@
 class Video
 
-  attr_accessor :action, :platform, :driver, :image_count, :seconds, :extended, :udid, :format
+  attr_accessor :action, :platform, :driver, :image_count, :seconds, :rate, :extended, :udid, :format
 
   def initialize options
     Flick::Checker.action options[:action]
@@ -16,6 +16,7 @@ class Video
     end
     self.image_count = options[:count]
     self.seconds = options[:seconds].to_f
+    self.rate = options[:rate].to_f
     self.extended = options[:extend].to_b
     self.udid = self.driver.udid
     self.format = options[:format]
@@ -68,8 +69,8 @@ class Video
     $0 = "flick-video-#{udid}"
     SimpleDaemon.daemonize!
     command = -> do
-       driver.screenrecord "video-#{udid}-single"
-     end
+      driver.screenrecord "video-#{udid}-single"
+    end
     command.call
   end
 
@@ -143,7 +144,7 @@ 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-#{udid}*.png' -c:v libx264 -pix_fmt yuv420p #{driver.flick_dir}/#{driver.name}.mp4)
+    %x(ffmpeg -loglevel quiet -framerate #{rate} -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flick
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Justin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler