flick 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e81859ea546a01df31102f29fc4657df27c46fe0
-  data.tar.gz: 9f1a43b57c5337fe732b01bdabec233a4cf0040c
+  metadata.gz: bb64107c4d21b8fc509321fdc0d98763e3e376e6
+  data.tar.gz: 154aa4c74efa4fead2f6cdd5880c7b71602607ed
 SHA512:
-  metadata.gz: 5da1d5231a633095d3fe7cda6452d007d7c13e78f17ddee6939bc6427f1135909a544649a83285850f71cd06de4a43b7ade43c10bd463e493a9dad4cf7e14f8b
-  data.tar.gz: 83780db9a51eb5ab0b50a0e812138e95082389ed5ddf197cc22bf000d62ed9575dc869bec50ebfbc11160640395cd68f72f0f25e04b1beca4ac87f5a6470072d
+  metadata.gz: 07dba93a03a97b5a725bc98afca7e3cda8c66138aab7ae1f15efaa6f3caf4a43a01599344117130f04f54391ef6c40629178b66e714c5693e0d1dacd7f026c43
+  data.tar.gz: 7e400657a20828488546d0229b251fe3bbe7a125c25aee55eb23aba1cc41fdc275b0d2aa6bd4c76c1c04295194e535fdd2bddab91a18486db83214081abd991e

data/README.md

@@ -14,6 +14,7 @@ Features
 	* Falls back to screenshot recording if video record is not available.
 * Video record android emulators and **real** iOS devices.
 	* Takes a screenshot every 0.5 seconds (default), then combines the screenshots into a single mp4 or gif.
+	* Android pulls only unique (default) screenshots from devices/emulators. e.g. A 1 minute test run might convert to only 30 seconds of video based on unique images. You can change this by passing `-q false` to pull all images instead.
 	* iOS example [here](https://www.dropbox.com/s/4pjhhmnsx9gj5pi/ios-flick-example.mp4?dl=0)
 	* Android Emulator example [here](https://www.dropbox.com/s/gwunrvgzxkny13z/android-flick-example.mp4?dl=0)
 * Flick auto selects device when only one device is connected, per platform.
@@ -28,17 +29,24 @@ So I created Flick to work for my needs, and included a couple other tools I use
 
 If you're looking for high-quality video, then this wouldn't be the tool for you. Take a look at this great tool [androidtool-mac](https://github.com/mortenjust/androidtool-mac) instead.
 
-Prerequisites 
+Prerequisites
 -------------
 #### System Tools
 * Install ffmpeg. [OSX](https://trac.ffmpeg.org/wiki/CompilationGuide/MacOSX)
 	* ```$ brew install ffmpeg```
+* Install ffmpeg. [Windows](https://ffmpeg.zeranoe.com/builds/)
+	* Download either the 32-bit or 64-bit static versions.
+	* Extract the zip file and move the ffmpeg folder somewhere else.
+	* Add the ffmpeg bin location to your PATH user variables. e.g. C:\ffmpeg\bin
 * Install mp4box. [OSX](http://hunterford.me/compiling-mp4box-on-mac-os-x/)
 	* ```$ brew install mp4box```
+* Install mp4box. [Windows](http://www.videohelp.com/software/MP4Box)
+	* Run the gpac-0.6.2-DEV-rev634-gd2332cb-master-x(64 or 32 bit).exe
+	* Select to install only the MP4Box component.
 
 #### Android
 * Install [SDK Tools](http://developer.android.com/sdk/installing/index.html?pkg=tools).
-* SDK tools are added to your $PATH. [OSX](http://stackoverflow.com/questions/5526470/trying-to-add-adb-to-path-variable-osx) 
+* SDK tools are added to your $PATH. [OSX](http://stackoverflow.com/questions/5526470/trying-to-add-adb-to-path-variable-osx)
 * Enable [USB Debugging](https://www.kingoapp.com/root-tutorials/how-to-enable-usb-debugging-mode-on-android.htm) on your device(s).
 * Emulator or Devices have approximately 1GB of [sdcard space](http://developer.android.com/tools/help/mksdcard.html).
 
@@ -60,54 +68,55 @@ Usage:
     $ flick --help
 
     DESCRIPTION:
-  
+
     A CLI to capture screenshots, video, logs, and device info for Android (Devices & Emulators) and iOS (Devices).
-	
+
 	COMMANDS:
-   
-    help       Display global or [command] help documentation           
-    info       Get device information           
-    log        Get device log output            
-    screenshot Take a screenshot                
-    video      Record video     
-    
+
+    help       Display global or [command] help documentation
+    info       Get device information
+    log        Get device log output
+    screenshot Take a screenshot
+    video      Record video
+
     GLOBAL OPTIONS:
-        
-    -h, --help 
+
+    -h, --help
       Display help documentation
-        
-    -v, --version 
+
+    -v, --version
       Display version information
-        
-    -t, --trace 
+
+    -t, --trace
       Display backtrace when an error occurs
 
-* See usage examples in:
-	
 	`$ flick info --help`
-		
+
 		$ flick info -p (ios or android)
 		$ flick info -p (ios or android) -s true -o $HOME
-	
- 
+
+
 	`$ 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 -p (ios or android)
- 
+
+		$ flick screenshot -p (ios or android) -o $HOME -n myImage
+
 	`$ 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
 
-Demo
-----
+	`$ 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
+
+##Demo
 <img src="https://www.dropbox.com/s/9be37gc1c2dlxa6/flick-demo.gif?raw=1" width="600">
 
 ## Contributing
@@ -119,7 +128,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/isonic
 * Setup Flick android for cross platform os's (windows & linux)
 * Add screenshot capture for iOS Simulators.
 * Multithread the screenshot and pull process.
-* Look into capturing video from iOS similar to [this](https://github.com/mortenjust/androidtool-mac/blob/9347cd9aeca9e7370e323d12f862bc5d8beacc25/AndroidTool/IOSDeviceHelper.swift#L56)
+* Look into capturing video for iOS similar to [this](https://github.com/mortenjust/androidtool-mac/blob/9347cd9aeca9e7370e323d12f862bc5d8beacc25/AndroidTool/IOSDeviceHelper.swift#L56)
 
 ## License
 

data/bin/flick

@@ -28,7 +28,7 @@ command :video do |c|
     :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,11 +45,11 @@ 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
-  
+
 command :log do |c|
   c.syntax = 'flick log [options]'
   c.summary = 'Get device log output'
@@ -63,7 +63,7 @@ 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 +81,23 @@ command :info do |c|
     options.default \
     :save => false,
     :outdir => Dir.pwd #defaults to save in current directory.
-  
+
     Info.new(options.default).info
   end
+end
+
+command :manager do |c|
+  c.syntax = 'flick manager [options]'
+  c.summary = 'Manage apps on devices'
+  c.description = c.summary
+  c.example 'description', "flick manager -a install -p android -f ~/my-awesome-app.apk\n    flick manager -a uninstall -p ios -n com.viber"
+  c.option '-a', '--action ACTION', String, 'Set action: install or uninstall'
+  c.option '-p', '--platform PLATFORM', String, 'Set platform: android or ios'
+  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
 end

data/flick.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "bin"
   spec.executables   = ["flick"]
   spec.require_paths = ["lib"]
-  
+
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", '~> 3.4', '>= 3.4.0'
@@ -34,4 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "json", '~> 1.8', '>= 1.8.3'
   spec.add_dependency "wannabe_bool", "~> 0.5.0"
   spec.add_dependency "awesome_print", '~> 1.6', '>= 1.6.1'
+  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'
 end

data/lib/flick.rb

@@ -3,6 +3,10 @@ require 'json'
 require 'parallel'
 require 'wannabe_bool'
 require 'awesome_print'
+require 'os'
+require 'tempfile'
+require 'sys/proctable'
+require 'apktools/apkxml'
 
 require "flick/version"
 require_relative "./flick/android"
@@ -13,4 +17,5 @@ require_relative "./flick/log"
 require_relative "./flick/screenshot"
 require_relative "./flick/simple_daemon"
 require_relative "./flick/system"
-require_relative "./flick/video"
+require_relative "./flick/video"
+require_relative "./flick/manager"

data/lib/flick/android.rb

@@ -1,7 +1,7 @@
 module Flick
   class Android
     attr_accessor :flick_dir, :dir_name, :udid, :name, :outdir, :unique, :limit, :specs
-    
+
     def initialize options
       Flick::Checker.system_dependency "adb"
       self.flick_dir = "#{Dir.home}/.flick"
@@ -14,43 +14,43 @@ module Flick
       self.specs = options.fetch(:specs, false)
       create_flick_dirs
     end
-    
+
     def create_flick_dirs
       Flick::System.setup_system_dir flick_dir
-      %x(adb -s #{udid} shell 'mkdir #{dir_name}' >> /dev/null 2>&1)
+      %x(adb -s #{udid} shell 'mkdir #{dir_name}')
     end
-    
+
     def clear_files
-      %x(adb -s #{udid} shell rm '#{dir_name}/*' >> /dev/null 2>&1)
       Flick::System.clean_system_dir flick_dir, udid
+      %x(adb -s #{udid} shell rm '#{dir_name}/*')
     end
-    
+
     def devices
       (`adb devices`).scan(/\n(.*)\t/).flatten
     end
-    
+
     def devices_connected?
-      !devices.empty?
+      devices.any?
     end
-    
+
     def check_for_devices
       unless devices_connected?
-        puts "\nNo Devices Connected or Authorized!!!\nMake sure at least one device (emulator/simulator) is started!\n".red
+        puts "\nNo Devices Connected or Authorized!!!\nMake sure at least one device (emulator/simulator) is connected!\n".red
         abort
       end
     end
-    
+
     def get_device_udid opts_hash
       devices_connected?
       return unless opts_hash[:udid].nil?
       if devices.size == 1
-        devices[0]
+        devices.first
       else
         puts "\nMultiple android devices '#{devices}' found.\nSpecify a single UDID. e.g. -u #{devices.sample}\n".red
         abort unless specs
       end
     end
-    
+
     def info
       specs = { os: "ro.build.version.release", manufacturer: "ro.product.manufacturer", model: "ro.product.model", sdk: "ro.build.version.sdk" }
       hash = { udid: udid }
@@ -61,54 +61,85 @@ module Flick
       hash
     end
 
+    def install app_path
+      %x(adb -s #{udid} install -r #{app_path})
+    end
+
+    def uninstall package
+      if app_installed? package
+        %x(adb -s #{udid} shell pm uninstall #{package})
+      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 app_version app_path
+      manifest(app_path).find {|x| x.name == "versionName" }["value"]
+    end
+
+    def package_name app_path
+      manifest(app_path).find {|x| x.name == "package" }["value"]
+    end
+
+    def manifest app_path
+      data = ApkXml.new app_path
+      data.parse_xml("AndroidManifest.xml", false, true)
+      data.xml_elements[0].attributes
+    end
+
+    def app_installed? package
+      packages.include? "package:#{package}"
+    end
+
+    def packages
+      %x(adb -s #{udid} shell pm list packages).split
+    end
+
     def os_version
-      `adb -s #{udid} shell getprop "ro.build.version.release"`.strip.to_f
+      %x(adb -s #{udid} shell getprop "ro.build.version.release").strip.to_f
     end
-        
+
     def screenshot name
       %x(adb -s #{udid} shell screencap #{dir_name}/#{name}.png)
     end
-    
+
     def log name
       %x(adb -s #{udid} logcat -v long > #{outdir}/#{name}.log)
     end
-    
+
     def recordable?
-      (`adb -s #{udid} shell 'ls /system/bin/screenrecord'`).strip == "/system/bin/screenrecord"
+      %x(adb -s #{udid} shell "ls /system/bin/screenrecord").strip == "/system/bin/screenrecord"
     end
-    
+
     def screenrecord name
       %x(adb -s #{udid} shell screenrecord --time-limit #{limit} --size 720x1280 #{dir_name}/#{name}.mp4)
     end
-    
+
     def pull_file file, dir
-      %x(adb -s #{udid} pull #{file} #{dir} >> /dev/null 2>&1)
+      %x(adb -s #{udid} pull #{file} #{dir})
     end
-        
-    def unique_files
+
+    def unique_files type
       if os_version < 6.0
         command = "md5"
       else
         command = "md5sum"
       end
-      files = `adb -s #{udid} shell "#{command} #{dir_name}/#{udid}*"`
+      files = %x(adb -s #{udid} shell "#{command} #{dir_name}/#{type}-#{udid}*")
       hash = files.split("\r\n").map { |file| { md5: file.match(/(.*) /)[1].strip, file: file.match(/ (.*)/)[1].strip } }
       hash.uniq! { |e| e[:md5] }
       hash.map { |file| file[:file] }
     end
-    
-    def pull_files
+
+    def pull_files type
       if unique
-        files = unique_files
+        files = unique_files type
       else
-        files = (`adb -s #{udid} shell "ls #{dir_name}/#{udid}*"`).split("\r\n")
+        files = %x(adb -s #{udid} shell "ls #{dir_name}/#{type}-#{udid}*").split("\r\n")
       end
       return if files.empty?
       Parallel.map(files, in_threads: 10) { |file| pull_file file, flick_dir }
     end
-        
-    def screenshots_exist?
-      (`adb -s #{udid} shell "ls #{dir_name}/#{udid}-*.png | wc -l"`).to_i > 0
-    end
   end
 end

data/lib/flick/checker.rb

@@ -1,13 +1,24 @@
 module Flick
   module Checker
+    def self.which(cmd)
+      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each { |ext|
+          exe = File.join(path, "#{cmd}#{ext}")
+          return exe if File.executable?(exe) && !File.directory?(exe)
+        }
+      end
+      return nil
+    end
+
     def self.system_dependency dep
-      program = `which #{dep}`
+      program = self.which dep
       if program.empty?
         puts "\n#{dep} was not found. Please ensure you have installed #{dep} and it's in your $PATH\n".red
         abort
       end
     end
-    
+
     def self.platform platform
       platforms = ["android","ios"]
       unless platforms.include? platform
@@ -15,7 +26,7 @@ module Flick
         abort
       end
     end
-    
+
     def self.action action
       actions = ["start","stop"]
       unless actions.include? action
@@ -23,7 +34,22 @@ module Flick
         abort
       end
     end
-    
+
+    def self.manager option
+      options = ["install","uninstall"]
+      unless options.include? option
+        puts "\nPlease specify a valid option #{options}. e.g. flick <job> -a #{options.sample} -p ios\n".red
+        abort
+      end
+    end
+
+    def self.file_exists? file
+      unless File.exists? file
+        puts "\n#{file} does not exist! Please specify a valid file path.".red
+        abort
+      end
+    end
+
     def self.format format
       formats = ["mp4","gif"]
       unless formats.include? format

data/lib/flick/ios.rb

@@ -1,7 +1,7 @@
 module Flick
   class Ios
     attr_accessor :flick_dir, :udid, :name, :outdir, :todir, :specs
-    
+
     def initialize options
       Flick::Checker.system_dependency "idevice_id"
       self.flick_dir = "#{Dir.home}/.flick"
@@ -12,26 +12,26 @@ module Flick
       self.specs = options.fetch(:specs, false)
       create_flick_dirs
     end
-    
+
     def create_flick_dirs
       Flick::System.setup_system_dir flick_dir
     end
-    
+
     def devices
       (`idevice_id -l`).split.uniq.map { |d| d }
     end
-    
+
     def devices_connected?
-      !devices.empty?
+      devices.any?
     end
-    
+
     def check_for_devices
       unless devices_connected?
         puts "\nNo iPhone or iPad Devices Connected!!!\nMake sure at least one REAL device is connected!\n".red
         abort
-      end 
+      end
     end
-    
+
     def get_device_udid opts_hash
       check_for_devices
       return unless opts_hash[:udid].nil?
@@ -42,7 +42,7 @@ module Flick
         abort unless specs
       end
     end
-    
+
     def info
       specs = { os: "ProductVersion", name: "DeviceName", arc: "CPUArchitecture", type: "DeviceClass", sdk: "ProductType" }
       hash = { udid: udid }
@@ -52,23 +52,46 @@ module Flick
       end
       hash
     end
-    
+
     def recordable?
       false
     end
-    
+
     def clear_files
       Flick::System.clean_system_dir flick_dir, udid
     end
-    
+
     def screenshot name
       Flick::Checker.system_dependency "idevicescreenshot"
       %x(idevicescreenshot -u #{udid} #{todir}/#{name}.png)
     end
-    
+
     def log name
       Flick::Checker.system_dependency "idevicesyslog"
       %x(idevicesyslog -u #{udid} > #{outdir}/#{name}.log)
     end
+
+    def install app_path
+      Flick::Checker.system_dependency "ideviceinstaller"
+      %x(ideviceinstaller -u #{udid} -i #{app_path})
+    end
+
+    def uninstall package
+      Flick::Checker.system_dependency "ideviceinstaller"
+      if app_installed? package
+        %x(ideviceinstaller -u #{udid} -U #{package})
+      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 app_installed? package
+      packages.include? "#{package}"
+    end
+
+    def packages
+      %x(ideviceinstaller -u #{udid} -l -o list_user).split("\n")[1..100000].map { |p| p.match(/(.*) -/)[1] }
+    end
   end
 end

data/lib/flick/log.rb

@@ -1,7 +1,7 @@
 class Log
-  
+
   attr_accessor :action, :platform, :driver, :udid
-  
+
   def initialize options
     Flick::Checker.action options[:action]
     Flick::Checker.platform options[:platform]
@@ -16,24 +16,34 @@ class Log
     end
     self.udid = self.driver.udid
   end
-  
+
+  def android
+    platform == "android"
+  end
+
+  def ios
+    platform == "ios"
+  end
+
   def run
     self.send(action)
   end
-  
+
   def start
     puts "Saving to #{driver.outdir}/#{driver.name}.log"
     log
   end
-  
+
   def stop
     Flick::System.kill_process "log", udid
+    Flick::System.kill "idevicesyslog -u #{udid}" if ios
+    Flick::System.kill "adb -s #{udid} logcat" if android
   end
-    
+
   def log
     stop
     $0 = "flick-log-#{udid}"
-    SimpleDaemon.daemonize! "/tmp/#{udid}-pidfile"
+    SimpleDaemon.daemonize!
     command = -> do
       driver.log driver.name
     end

data/lib/flick/manager.rb

@@ -0,0 +1,41 @@
+class Manager
+
+  attr_accessor :action, :platform, :driver, :udid, :file, :name
+
+  def initialize options
+    Flick::Checker.manager options[:action]
+    Flick::Checker.platform options[:platform]
+    self.action = options[:action]
+    self.platform = options[:platform]
+    case platform
+    when "ios"
+      self.driver = Flick::Ios.new options
+    when "android"
+      self.driver = Flick::Android.new options
+    end
+    self.udid = self.driver.udid
+    self.file = options[:file]
+    self.name = options[:name]
+  end
+
+  def run
+    self.send(action)
+  end
+
+  def install
+    if file.nil?
+      puts "Specify a file path. e.g. -f #{Dir.home}/myApp/amazing-app.apk or .app".red; abort
+    else
+      Flick::Checker.file_exists? file
+      driver.install file
+    end
+  end
+
+  def uninstall
+    if name.nil?
+      puts "Specify a Package Name or Bundle ID. e.g. -n ".red; abort
+    else
+      driver.uninstall name
+    end
+  end
+end

data/lib/flick/screenshot.rb

@@ -1,7 +1,7 @@
 class Screenshot
-  
+
   attr_accessor :platform, :driver
-  
+
   def initialize options
     Flick::Checker.platform options[:platform]
     self.platform = options[:platform]
@@ -14,15 +14,19 @@ class Screenshot
     end
     setup
   end
-    
+
+  def android
+    platform == "android"
+  end
+
   def screenshot
     puts "Saving to #{driver.outdir}/#{driver.name}.png"
     driver.screenshot driver.name
-    driver.pull_file "#{driver.dir_name}/#{driver.name}.png", driver.outdir if platform == "android"
+    driver.pull_file "#{driver.dir_name}/#{driver.name}.png", driver.outdir if android
   end
-  
+
   private
-  
+
   def setup
     driver.clear_files
   end

data/lib/flick/simple_daemon.rb

@@ -18,7 +18,7 @@
 # * The process becomes a session leader of a new session
 # * The process becomes the process group leader of a new process group
 # * The process has no controlling terminal
-# 
+#
 # Optionally fork again and have the parent exit. This guarantes that
 # the daemon is not a session leader nor can it acquire a controlling
 # terminal (under SVR4)
@@ -28,13 +28,13 @@
 #       \_ simple daemon - writes out its pid to file
 #
 # Change the current working directory to / to avoid interfering with
-# mounting and unmounting. By default don't bother to chdir("/") here 
+# mounting and unmounting. By default don't bother to chdir("/") here
 # because we might to run inside APP_ROOT.
 #
 # Set file mode creation mask to 000 to allow creation of files with any
-# required permission later. By default umask is whatever was set by the 
-# parent process at startup and can be set in config.ru and config_file, 
-# so making it 0000 and potentially exposing sensitive log data can be 
+# required permission later. By default umask is whatever was set by the
+# parent process at startup and can be set in config.ru and config_file,
+# so making it 0000 and potentially exposing sensitive log data can be
 # bad policy.
 #
 # Close unneeded file descriptors inherited from the parent (there is no
@@ -46,8 +46,9 @@
 # value of getpid() after step 3.
 #
 class SimpleDaemon
+
   # In the directory where you want your daemon add a git submodule to
-  # your project and create a daemon launcher script: 
+  # your project and create a daemon launcher script:
   #
   #     #!/usr/bin/env ruby
   #
@@ -74,14 +75,16 @@ class SimpleDaemon
   #     $ ps aux | grep "my daemon"
   #
   #
-  def self.daemonize! pidfile, out = '/dev/null', err = '/dev/null', safe = true
+  def self.daemonize! out = '/dev/null', err = '/dev/null', safe = true
     raise 'First fork failed' if (pid = fork) == -1
     exit unless pid.nil?
     Process.setsid
     raise 'Second fork failed' if (pid = fork) == -1
     exit unless pid.nil?
-    kill pidfile
-    write Process.pid, pidfile
+    kill_pid
+    @file = Tempfile.new
+    @file.write Process.pid
+    @file.rewind
     unless safe
       Dir.chdir '/'
       File.umask 0000
@@ -103,9 +106,12 @@ class SimpleDaemon
 
   # Try and read the existing pid from the pid file and signal HUP to
   # process.
-  def self.kill pidfile
-    opid = open(pidfile).read.strip.to_i
-    Process.kill "HUP", opid
+  def self.kill_pid
+    unless @file.nil?
+      opid = @file.read
+      Process.kill "HUP", opid
+      @file.unlink
+    end
   rescue TypeError
     $stdout.puts "#{pidfile} was empty: TypeError"
   rescue Errno::ENOENT

data/lib/flick/system.rb

@@ -1,28 +1,48 @@
 module Flick
   module System
+
+    include Sys #load sys-proctable methods
+
     def self.setup_system_dir dir_name
-      %x(mkdir #{dir_name} >> /dev/null 2>&1)
+      Dir.mkdir dir_name unless File.exists? dir_name
     end
-    
+
     def self.clean_system_dir dir_name, udid
-      %x(rm #{dir_name}/#{udid}* >> /dev/null 2>&1)
+      Dir.glob("#{dir_name}/*#{udid}*").each do |file|
+        File.delete file
+      end
     end
-    
-    def self.process_running? type, udid
-      `pgrep -f #{type}-#{udid}`.to_i > 0
+
+    def self.find_pid string
+      processes = ProcTable.ps.find_all { |x| x.cmdline.include? string }
+      processes.map { |p| p.pid } rescue []
     end
-            
-    def self.kill_process type, udid
-      if self.process_running? type, udid
-        pid = `pgrep -f flick-#{type}-#{udid}`.to_i
-        `kill #{pid}` unless pid.zero?
-      end
-      if type == "video"
-        pid = `pgrep -f #{udid}-`.to_i
-        `kill #{pid}` unless pid.zero?
+
+    def self.kill_pids pid_array
+      return if pid_array.empty?
+      pid_array.each { |p| Process.kill 'SIGKILL', p }
+    end
+
+    def self.process_running? string
+      pid = self.find_pid string
+      unless pid.empty?
+        puts "PROCESSING IS RUNNING!!!"
+        true
+      else
+        false
       end
     end
-    
+
+    def self.kill_process type, udid
+      pids = self.find_pid "#{type}-#{udid}"
+      self.kill_pids pids
+    end
+
+    def self.kill string
+      pids = self.find_pid string
+      self.kill_pids pids
+    end
+
     def self.video_length file
       (`ffmpeg -i #{file} 2>&1 | grep Duration | cut -d ' ' -f 4 | sed s/,//`).strip
     end

data/lib/flick/version.rb

@@ -1,3 +1,3 @@
 module Flick
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/flick/video.rb

@@ -1,7 +1,7 @@
 class Video
 
   attr_accessor :action, :platform, :driver, :image_count, :seconds, :extended, :udid, :format
-  
+
   def initialize options
     Flick::Checker.action options[:action]
     Flick::Checker.platform options[:platform]
@@ -20,19 +20,19 @@ class Video
     self.udid = self.driver.udid
     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!!!"
@@ -49,7 +49,7 @@ class Video
       start_screenshot_record
     end
   end
-  
+
   def stop
     puts "\nStopping Recorder!!!"
     if driver.recordable?
@@ -60,99 +60,94 @@ class Video
     sleep 1
     driver.clear_files
   end
-  
-  private 
-  
+
+  private
+
   def start_record
     Flick::System.kill_process "video", udid
     $0 = "flick-video-#{udid}"
-    SimpleDaemon.daemonize! "/tmp/#{udid}-pidfile"
+    SimpleDaemon.daemonize!
     command = -> do
-       driver.screenrecord "#{udid}-single"
+       driver.screenrecord "video-#{udid}-single"
      end
     command.call
   end
-  
-  def is_recording?
-    !(`pgrep -f #{udid}-`).empty?
-  end
-  
+
   def loop_record
     Flick::System.kill_process "video", udid
     $0 = "flick-video-#{udid}"
-    SimpleDaemon.daemonize! "/tmp/#{udid}-pidfile"
+    SimpleDaemon.daemonize!
     command = -> do
       count = "%03d" % 1
       loop do
-        unless is_recording?
-          driver.screenrecord "#{udid}-#{count}"
+        unless Flick::System.process_running? "#{udid}-"
+          driver.screenrecord "video-#{udid}-#{count}"
           count.next!
         end
       end
     end
     command.call
   end
-    
+
   def stop_record
     Flick::System.kill_process "video", udid
     sleep 5 #wait for video process to finish
-    driver.pull_files
-    files = (`ls #{driver.flick_dir}/#{udid}*.mp4`).split("\n")
+    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
-      %x(nohup mv #{driver.flick_dir}/#{driver.name}.mp4 #{driver.outdir}/#{driver.name}.mp4)
+      File.rename "#{driver.flick_dir}/#{driver.name}.mp4", "#{driver.outdir}/#{driver.name}.mp4"
     end
   end
-  
+
   def start_screenshot_record
     Flick::System.kill_process "screenshot", udid
     puts "Process will stop after #{image_count} screenshots.\n"
     $0 = "flick-screenshot-#{udid}"
-    SimpleDaemon.daemonize! "/tmp/#{udid}-pidfile"
+    SimpleDaemon.daemonize!
     command = -> do
       count = "%03d" % 1
       loop do
-        if count.to_i < image_count
-          driver.screenshot "#{udid}-#{count}"
+        if count.to_i <= image_count
+          driver.screenshot "screenshot-#{udid}-#{count}"
           count.next!; sleep seconds
         else
-          puts "\nStop count exceeded. Saving to #{driver.outdir}/#{driver.name}.#{format}".red 
-          self.send(format)
+          stop_screenshot_recording
           break
         end
       end
     end
     command.call
   end
-  
-  def stop_screenshot_recording 
-    Flick::System.kill_process "screenshot", udid
-    `rm /tmp/#{udid}-pidfile >> /dev/null 2>&1`
-    driver.pull_files if android
+
+  def stop_screenshot_recording
+    driver.pull_files "screenshot" if android
     puts "Saving to #{driver.outdir}/#{driver.name}.#{format}"
     self.send(format)
   end
-  
+
   def gif
     convert_images_to_mp4 unless driver.recordable?
-    %x(nohup ffmpeg -i #{driver.flick_dir}/#{driver.name}.mp4 -pix_fmt rgb24 #{driver.outdir}/#{driver.name}.gif)
+    %x(ffmpeg -loglevel quiet -i #{driver.flick_dir}/#{driver.name}.mp4 -pix_fmt rgb24 #{driver.outdir}/#{driver.name}.gif)
   end
-  
+
   def mp4
     convert_images_to_mp4
-    %x(nohup mv #{driver.flick_dir}/#{driver.name}.mp4 #{driver.outdir}/#{driver.name}.mp4) unless format == "gif"
+    File.rename "#{driver.flick_dir}/#{driver.name}.mp4", "#{driver.outdir}/#{driver.name}.mp4" unless format == "gif"
   end
-  
+
   def convert_images_to_mp4
     remove_zero_byte_images
-    %x(nohup ffmpeg -framerate 1 -pattern_type glob -i '#{driver.flick_dir}/#{udid}*.png' -c:v libx264 -pix_fmt yuv420p #{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
-    %x(nohup find #{driver.flick_dir} -type f -size 0 | xargs rm '#{udid}*.png' -f)
+    Dir.glob("#{driver.flick_dir}/screenshot-#{udid}*.png").each do |f|
+      File.delete f if File.zero? f
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flick
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Justin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -166,6 +166,60 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+- !ruby/object:Gem::Dependency
+  name: sys-proctable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: apktools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 description: A CLI with helpful QA tools for iOS and Android from the command line
 email:
 - justin.ison@gmail.com
@@ -192,6 +246,7 @@ files:
 - lib/flick/info.rb
 - lib/flick/ios.rb
 - lib/flick/log.rb
+- lib/flick/manager.rb
 - lib/flick/screenshot.rb
 - lib/flick/simple_daemon.rb
 - lib/flick/system.rb
@@ -224,4 +279,3 @@ specification_version: 4
 summary: A CLI to capture screenshots, video, logs, and device information for Android
   (Devices & Emulators) and iOS (Devices).
 test_files: []
-has_rdoc: