flick 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb64107c4d21b8fc509321fdc0d98763e3e376e6
-  data.tar.gz: 154aa4c74efa4fead2f6cdd5880c7b71602607ed
+  metadata.gz: 25b3b0bb28400f0565fbefc0d417669209bd4ced
+  data.tar.gz: 4a160eaf8cc1795844a13b750d422c6b49e6026c
 SHA512:
-  metadata.gz: 07dba93a03a97b5a725bc98afca7e3cda8c66138aab7ae1f15efaa6f3caf4a43a01599344117130f04f54391ef6c40629178b66e714c5693e0d1dacd7f026c43
-  data.tar.gz: 7e400657a20828488546d0229b251fe3bbe7a125c25aee55eb23aba1cc41fdc275b0d2aa6bd4c76c1c04295194e535fdd2bddab91a18486db83214081abd991e
+  metadata.gz: e5ba77b5cc0d06dd1d67f449f1f435e3cb85b61e4237b77a9a46e0206b6e53ece52f5322c80b89a6ecbb5995c70aa51d2d3b91283abbe6c540733e44550b9ac7
+  data.tar.gz: 32ec8cc036ab3138bbd9f1a6da07c1b0fb864f2e988a47631a0e835eb26f2defd30daa33921d6e40e529d7a7b755bb44ac11f6ad682f41703fb512b22c362c4d

data/README.md

@@ -20,6 +20,8 @@ Features
 * Flick auto selects device when only one device is connected, per platform.
 * Save log output for Android or iOS.
 * Display device information or save it to a file.
+* Install or Uninstall applications from devices.
+* Checkout the latest release notes [here](https://github.com/isonic1/flick/releases).
 
 Reason
 ------
@@ -34,15 +36,8 @@ 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).

data/bin/flick

@@ -2,7 +2,7 @@
 require_relative '../lib/flick'
 require 'commander/import'
 
-program :version, '0.0.1'
+program :version, '0.3.1'
 program :description, 'A CLI to capture screenshots, video, logs, and device info for Android (Devices & Emulators) and iOS (Devices).'
 
 command :video do |c|

data/flick.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   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'
-  spec.add_dependency "colorize", "~> 0.7.7"
+  spec.add_dependency "colorize", "~> 0.8.1"
   spec.add_dependency "commander", '~> 4.4', '>= 4.4.0'
   spec.add_dependency "json", '~> 1.8', '>= 1.8.3'
   spec.add_dependency "wannabe_bool", "~> 0.5.0"

data/lib/flick/android.rb

@@ -1,13 +1,17 @@
 module Flick
   class Android
-    attr_accessor :flick_dir, :dir_name, :udid, :name, :outdir, :unique, :limit, :specs
+    attr_accessor :udid, :flick_dir, :dir_name, :name, :outdir, :unique, :limit, :specs
 
     def initialize options
       Flick::Checker.system_dependency "adb"
-      self.flick_dir = "#{Dir.home}/.flick"
+      if options[:udid].nil?
+        self.udid = get_device_udid
+      else
+        self.udid = options[:udid]
+      end
+      self.flick_dir = "#{Dir.home}/.flick/#{udid}"
       self.dir_name = "sdcard/flick"
-      self.udid = options.fetch(:udid, get_device_udid(options))
-      self.name = options.fetch(:name, self.udid)
+      self.name = remove_bad_characters(options.fetch(:name, self.udid))
       self.outdir = options.fetch(:outdir, Dir.pwd)
       self.unique = options.fetch(:unique, true).to_b
       self.limit = options.fetch(:limit, 180)
@@ -15,13 +19,18 @@ module Flick
       create_flick_dirs
     end
 
+    def remove_bad_characters string
+      string.gsub(/[\x00\/\\:\*\?\"<>\|]/, '_')
+    end
+
     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}')
     end
 
     def clear_files
-      Flick::System.clean_system_dir flick_dir, udid
+      Flick::System.clean_system_dir flick_dir
       %x(adb -s #{udid} shell rm '#{dir_name}/*')
     end
 
@@ -40,9 +49,8 @@ module Flick
       end
     end
 
-    def get_device_udid opts_hash
-      devices_connected?
-      return unless opts_hash[:udid].nil?
+    def get_device_udid
+      check_for_devices
       if devices.size == 1
         devices.first
       else
@@ -109,7 +117,11 @@ module Flick
     end
 
     def recordable?
-      %x(adb -s #{udid} shell "ls /system/bin/screenrecord").strip == "/system/bin/screenrecord"
+      if info[:manufacturer] == "Genymotion"
+        return false
+      else
+        %x(adb -s #{udid} shell "ls /system/bin/screenrecord").strip == "/system/bin/screenrecord"
+      end
     end
 
     def screenrecord name
@@ -126,7 +138,7 @@ module Flick
       else
         command = "md5sum"
       end
-      files = %x(adb -s #{udid} shell "#{command} #{dir_name}/#{type}-#{udid}*")
+      files = %x(adb -s #{udid} shell "#{command} #{dir_name}/#{type}*")
       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] }
@@ -136,7 +148,7 @@ module Flick
       if unique
         files = unique_files type
       else
-        files = %x(adb -s #{udid} shell "ls #{dir_name}/#{type}-#{udid}*").split("\r\n")
+        files = %x(adb -s #{udid} shell "ls #{dir_name}/#{type}*").split("\r\n")
       end
       return if files.empty?
       Parallel.map(files, in_threads: 10) { |file| pull_file file, flick_dir }

data/lib/flick/checker.rb

@@ -13,7 +13,7 @@ module Flick
 
     def self.system_dependency dep
       program = self.which dep
-      if program.empty?
+      if program.nil? || program.empty? 
         puts "\n#{dep} was not found. Please ensure you have installed #{dep} and it's in your $PATH\n".red
         abort
       end

data/lib/flick/info.rb

@@ -1,7 +1,7 @@
 class Info
-  
+
   attr_accessor :platform, :driver, :save
-  
+
   def initialize options
     Flick::Checker.platform options[:platform]
     self.platform = options[:platform]
@@ -14,15 +14,7 @@ class Info
     end
     self.save = options[:save].to_b
   end
-  
-  def save_device_data info
-    info.each do |k,v|
-      open("#{driver.outdir}/info-#{driver.udid}.log", 'a') do |file|
-        file << "#{k}: #{v}\n"
-      end
-    end
-  end
-    
+
   def info
     ap driver.info
     if save
@@ -30,4 +22,14 @@ class Info
       save_device_data driver.info
     end
   end
+
+  private
+
+  def save_device_data info
+    info.each do |k,v|
+      open("#{driver.outdir}/info-#{driver.name}.log", 'a') do |file|
+        file << "#{k}: #{v}\n"
+      end
+    end
+  end
 end

data/lib/flick/ios.rb

@@ -3,21 +3,26 @@ module Flick
     attr_accessor :flick_dir, :udid, :name, :outdir, :todir, :specs
 
     def initialize options
-      Flick::Checker.system_dependency "idevice_id"
-      self.flick_dir = "#{Dir.home}/.flick"
       self.udid = options.fetch(:udid, get_device_udid(options))
-      self.name = options.fetch(:name, self.udid)
+      self.flick_dir = "#{Dir.home}/.flick/#{udid}"
+      self.name = remove_bad_characters(options.fetch(:name, self.udid))
       self.todir = options.fetch(:todir, self.flick_dir)
       self.outdir = options.fetch(:outdir, Dir.pwd)
       self.specs = options.fetch(:specs, false)
       create_flick_dirs
     end
 
+    def remove_bad_characters string
+      string.gsub(/[\x00\/\\:\*\?\"<>\|]/, '_')
+    end
+
     def create_flick_dirs
+      Flick::System.setup_system_dir "#{Dir.home}/.flick"
       Flick::System.setup_system_dir flick_dir
     end
 
     def devices
+      Flick::Checker.system_dependency "idevice_id"
       (`idevice_id -l`).split.uniq.map { |d| d }
     end
 
@@ -58,7 +63,7 @@ module Flick
     end
 
     def clear_files
-      Flick::System.clean_system_dir flick_dir, udid
+      Flick::System.clean_system_dir flick_dir
     end
 
     def screenshot name

data/lib/flick/log.rb

@@ -17,14 +17,6 @@ class Log
     self.udid = self.driver.udid
   end
 
-  def android
-    platform == "android"
-  end
-
-  def ios
-    platform == "ios"
-  end
-
   def run
     self.send(action)
   end
@@ -45,8 +37,18 @@ class Log
     $0 = "flick-log-#{udid}"
     SimpleDaemon.daemonize!
     command = -> do
-      driver.log driver.name
+      driver.log "#{driver.name}"
     end
    command.call
   end
+
+  private
+
+  def android
+    platform == "android"
+  end
+
+  def ios
+    platform == "ios"
+  end
 end

data/lib/flick/screenshot.rb

@@ -15,10 +15,6 @@ class Screenshot
     setup
   end
 
-  def android
-    platform == "android"
-  end
-
   def screenshot
     puts "Saving to #{driver.outdir}/#{driver.name}.png"
     driver.screenshot driver.name
@@ -27,6 +23,10 @@ class Screenshot
 
   private
 
+  def android
+    platform == "android"
+  end
+
   def setup
     driver.clear_files
   end

data/lib/flick/simple_daemon.rb

@@ -82,7 +82,7 @@ class SimpleDaemon
     raise 'Second fork failed' if (pid = fork) == -1
     exit unless pid.nil?
     kill_pid
-    @file = Tempfile.new
+    @file = Tempfile.new("flick-temp")
     @file.write Process.pid
     @file.rewind
     unless safe
@@ -115,9 +115,9 @@ class SimpleDaemon
   rescue TypeError
     $stdout.puts "#{pidfile} was empty: TypeError"
   rescue Errno::ENOENT
-    #$stdout.puts "#{pidfile} did not exist: Errno::ENOENT"
+    $stdout.puts "#{pidfile} did not exist: Errno::ENOENT"
   rescue Errno::ESRCH
-    #$stdout.puts "The process #{opid} did not exist: Errno::ESRCH"
+    $stdout.puts "The process #{opid} did not exist: Errno::ESRCH"
   rescue Errno::EPERM
     raise "Lack of privileges to manage the process #{opid}: Errno::EPERM"
   rescue ::Exception => e

data/lib/flick/system.rb

@@ -7,10 +7,8 @@ module Flick
       Dir.mkdir dir_name unless File.exists? dir_name
     end
 
-    def self.clean_system_dir dir_name, udid
-      Dir.glob("#{dir_name}/*#{udid}*").each do |file|
-        File.delete file
-      end
+    def self.clean_system_dir dir_name
+      Dir.glob("#{dir_name}/*").each { |file| File.delete file }
     end
 
     def self.find_pid string
@@ -36,6 +34,10 @@ 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

data/lib/flick/version.rb

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

data/lib/flick/video.rb

@@ -21,31 +21,24 @@ 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 "In extended mode."
-        Flick::Checker.system_dependency "mp4box"
+        puts "Starting Recorder In Extended Mode.\n"
         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
@@ -63,12 +56,20 @@ 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-#{udid}-single"
+       driver.screenrecord "video-single"
      end
     command.call
   end
@@ -81,7 +82,7 @@ class Video
       count = "%03d" % 1
       loop do
         unless Flick::System.process_running? "#{udid}-"
-          driver.screenrecord "video-#{udid}-#{count}"
+          driver.screenrecord "video-#{count}"
           count.next!
         end
       end
@@ -90,12 +91,15 @@ class Video
   end
 
   def stop_record
-    Flick::System.kill_process "video", udid
+    Flick::System.kill_process "video", udid #kills recording
     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") }
+    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...
     puts "Saving to #{driver.outdir}/#{driver.name}.#{format}"
     if format == "gif"
       gif
@@ -113,7 +117,7 @@ class Video
       count = "%03d" % 1
       loop do
         if count.to_i <= image_count
-          driver.screenshot "screenshot-#{udid}-#{count}"
+          driver.screenshot "screenshot-#{count}"
           count.next!; sleep seconds
         else
           stop_screenshot_recording
@@ -126,8 +130,9 @@ class Video
 
   def stop_screenshot_recording
     driver.pull_files "screenshot" if android
-    puts "Saving to #{driver.outdir}/#{driver.name}.#{format}"
     self.send(format)
+    Flick::System.kill_process "screenshot", udid
+    puts "Saving to #{driver.outdir}/#{driver.name}.#{format}"
   end
 
   def gif
@@ -140,13 +145,21 @@ class Video
     File.rename "#{driver.flick_dir}/#{driver.name}.mp4", "#{driver.outdir}/#{driver.name}.mp4" unless format == "gif"
   end
 
+  def wait_for_file file
+    start = Time.now
+    until File.exists? file
+      sleep 1; break if Time.now - start > 30
+    end
+  end
+
   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 1 -pattern_type glob -i '#{driver.flick_dir}/screenshot*.png' -c:v libx264 -pix_fmt yuv420p #{driver.flick_dir}/#{driver.name}.mp4)
+    wait_for_file "#{driver.flick_dir}/#{driver.name}.mp4"
   end
 
   def remove_zero_byte_images
-    Dir.glob("#{driver.flick_dir}/screenshot-#{udid}*.png").each do |f|
+    Dir.glob("#{driver.flick_dir}/screenshot*.png").each do |f|
       File.delete f if File.zero? f
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flick
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Justin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-10 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
@@ -273,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A CLI to capture screenshots, video, logs, and device information for Android