flick 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25b3b0bb28400f0565fbefc0d417669209bd4ced
-  data.tar.gz: 4a160eaf8cc1795844a13b750d422c6b49e6026c
+  metadata.gz: 8fefe51010559fb70ada5f8286e5136f5b9aca04
+  data.tar.gz: 8e97d55ae591cfe30d9c94c52c4de2f7fb40cf9c
 SHA512:
-  metadata.gz: e5ba77b5cc0d06dd1d67f449f1f435e3cb85b61e4237b77a9a46e0206b6e53ece52f5322c80b89a6ecbb5995c70aa51d2d3b91283abbe6c540733e44550b9ac7
-  data.tar.gz: 32ec8cc036ab3138bbd9f1a6da07c1b0fb864f2e988a47631a0e835eb26f2defd30daa33921d6e40e529d7a7b755bb44ac11f6ad682f41703fb512b22c362c4d
+  metadata.gz: d4cf40f34b70b122f25d6422b61e5d0032c28d2a5784fd72cee8cdf0a76f4bdc98851b870209687adb19af27a9b7895bd935c132c4abc5bc2c2f5817bd63d813
+  data.tar.gz: a6533405fc53ce22ec840faee7fd44d11f3ce3dc52aa223e13bfaa03d4bcfd84b4e86c88d76f4dfef9d740faabdb76bbbee25dd971f023d5977af6024971db7f

data/bin/flick

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

data/lib/flick/android.rb

@@ -143,7 +143,7 @@ module Flick
       hash.uniq! { |e| e[:md5] }
       hash.map { |file| file[:file] }
     end
-
+    
     def pull_files type
       if unique
         files = unique_files type
@@ -151,7 +151,10 @@ module Flick
         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 }
+      Parallel.map(files, in_threads: 10) do |file| 
+        pull_file file, flick_dir
+        Flick::System.wait_for_file 10, "#{flick_dir}/#{file.split("/").last}"
+      end
     end
   end
 end

data/lib/flick/system.rb

@@ -44,6 +44,14 @@ module Flick
       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.1"
+  VERSION = "0.3.2"
 end

data/lib/flick/video.rb

@@ -92,8 +92,8 @@ class Video
 
   def stop_record
     Flick::System.kill_process "video", udid #kills recording
-    sleep 5 #wait for video process to finish
-    driver.pull_files "video"
+    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
@@ -104,7 +104,7 @@ class Video
     if format == "gif"
       gif
     else
-      File.rename "#{driver.flick_dir}/#{driver.name}.mp4", "#{driver.outdir}/#{driver.name}.mp4"
+      File.rename "#{driver.flick_dir}/#{driver.name}.mp4", "#{driver.outdir}/#{driver.name}.mp4" #moves file from .flick to output dir.
     end
   end
 
@@ -145,22 +145,13 @@ 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*.png' -c:v libx264 -pix_fmt yuv420p #{driver.flick_dir}/#{driver.name}.mp4)
-    wait_for_file "#{driver.flick_dir}/#{driver.name}.mp4"
+    Flick::System.wait_for_file 30, "#{driver.flick_dir}/#{driver.name}.mp4"
   end
 
   def remove_zero_byte_images
-    Dir.glob("#{driver.flick_dir}/screenshot*.png").each do |f|
-      File.delete f if File.zero? f
-    end
+    Dir.glob("#{driver.flick_dir}/screenshot*.png").each { |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.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Justin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler