flaky 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f73dc19cae9ae4a85bf25839a950e4d02cb0e77a
-  data.tar.gz: bc50f6c1cfe2464ba89466c1423863708cf8912e
+  metadata.gz: 5a66676fa3248d3b07816db77305c598ca448155
+  data.tar.gz: b02de59738db71d7737d4bdcb03286935965a964
 SHA512:
-  metadata.gz: 46c2060cb26e6d710943de2b0be7de1ddff1c28176a9d0802e4d10265c974e7fc8dcf803204e50648d2a5be4a9faa09e91b459691daa1c58cf2d0ae45a7bcb49
-  data.tar.gz: f79b8b536b0c25c0b5cb402ed88c1350d4a5a0ac12ad36510b326e604b24ad2b1aebb297c96b291a1eaac0f3df9e6c989a4f3dfada30e9b74c24a4d4c543d44a
+  metadata.gz: d9f8b2a16dbe1eb018a1e201880a07c46182938b17ff8582664f39fcc4e4189037fa434e78b80e664e3be4311867852bcb99f52446ff1865ba3f7ab9f3ec8242
+  data.tar.gz: 48293b05c801107679a43639a022a8e9c20e2d270c1e9bbf92712b7d24fb4955094f397222cc8deadf0f8944e385184dcd32114c9ae3dd2c21b062076d1f7f5a

data/bin/flake

@@ -16,33 +16,43 @@ flake 3 ios files.txt
   If one run passes or 3 runs fail, then we move onto the next test.
 MSG
 
-if ARGV && ARGV.length === 1 && ARGV.first === 'auth'
+args = ARGV
+
+disable_video = args.index '--no-video'
+if disable_video != nil
+  Flaky.no_video = true
+  args.delete_at(disable_video) # remove flag from args
+end
+
+puts "Recording Video: #{!Flaky.no_video}"
+
+if args && args.length === 1 && args.first === 'auth'
   Flaky::AppleScript.beat_security_agent
   exit
-elsif ARGV && ARGV.length === 3
+elsif args && args.length === 3
   # .to_i will convert any string to 0 so check using a match regex.
-  if ARGV[0].match(/\d+/) && ARGV[1].match(/\d+/)
-    raise 'First pass must be 1' unless ARGV[0].to_i == 1
+  if args[0].match(/\d+/) && args[1].match(/\d+/)
+    raise 'First pass must be 1' unless args[0].to_i == 1
     # flake 1 2 ios
-    pass_1 = ARGV[0] # 1
-    count = ARGV[1] # 2
-    os = ARGV[2] # ios
+    pass_1 = args[0] # 1
+    count = args[1] # 2
+    os = args[2] # ios
     puts "Running all #{os} tests 1x #{count}x"
     Flaky.two_pass count: count, os: os
     exit
   else
     # rake 3 ios files.txt
-    count = ARGV.first
-    os = ARGV[1]
-    file = ARGV.last
-    raise 'File must end in .txt' unless File.extname(ARGV.last).downcase == '.txt'
+    count = args.first
+    os = args[1]
+    file = args.last
+    raise 'File must end in .txt' unless File.extname(args.last).downcase == '.txt'
     puts "Running select #{os} tests from file #{file} #{count}x"
     Flaky.run_from_file count: count, os: os, file: file
     exit
   end
 
 else
-  unless ARGV && ARGV.length === 2
+  unless args && args.length === 2
     puts usage_string
     exit
   end
@@ -50,9 +60,9 @@ end
 
 # flaky 1 ios[test_name]
 
-count = ARGV.first
+count = args.first
 
-last = ARGV.last
+last = args.last
 single_test_match = last.match(/(.+)\[(.*)\]$/)
 all_tests_match = last.match(/(.+)$/)
 

data/lib/flaky.rb

@@ -9,8 +9,11 @@ require 'posix/spawn' # http://rubygems.org/gems/posix-spawn
 require 'digest/md5'
 
 module Flaky
-  VERSION = '0.0.21' unless defined? ::Flaky::VERSION
-  DATE = '2014-01-02' unless defined? ::Flaky::DATE
+  VERSION = '0.0.22' unless defined? ::Flaky::VERSION
+  DATE = '2014-01-03' unless defined? ::Flaky::DATE
+
+  class << self; attr_accessor :no_video; end
+  self.no_video = false; # set default value
 
   # require internal files
   require_relative 'flaky/appium'

data/lib/flaky/run.rb

@@ -160,8 +160,10 @@ module Flaky
         FileUtils.mkdir_p File.dirname(movie_path)
         movie_src = '/tmp/video.mov'
         if File.exists?(movie_src)
-          # save movie on failure
-          FileUtils.copy movie_src, movie_path if !passed
+          unless Flaky.no_video
+            # save movie on failure
+            FileUtils.copy movie_src, movie_path if !passed
+          end
           # always clean up movie
           File.delete movie_src if File.exists? movie_src
         end

data/lib/flaky/run/all_tests.rb

@@ -28,7 +28,7 @@ module Flaky
       count.times do
         File.open('/tmp/flaky/current.txt', 'a') { |f| f.puts "Running: #{test_name} on #{os}" }
         appium.start unless running_on_sauce
-        run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{name}']"
+        run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{name}',#{Flaky.no_video}]"
         passed = flaky.execute run_cmd: run_cmd, test_name: test_name, appium: appium, sauce: running_on_sauce
         break if passed # move onto the next test after one successful run
       end

data/lib/flaky/run/from_file.rb

@@ -47,7 +47,7 @@ module Flaky
 
       count.times do
         appium.start unless running_on_sauce
-        run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{name}']"
+        run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{name}',#{Flaky.no_video}]"
         passed = flaky.execute run_cmd: run_cmd, test_name: test_name, appium: appium, sauce: running_on_sauce
         break if passed # move onto the next test after one successful run
       end

data/lib/flaky/run/one_test.rb

@@ -34,7 +34,7 @@ module Flaky
 
     count.times do
       appium.start unless running_on_sauce
-      run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{name}']"
+      run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{name}',#{Flaky.no_video}]"
       flaky.execute run_cmd: run_cmd, test_name: test_name, appium: appium, sauce: running_on_sauce
     end
 

data/lib/flaky/run/two_pass.rb

@@ -34,7 +34,7 @@ module Flaky
       count1.times do
         File.open('/tmp/flaky/current.txt', 'a') { |f| f.puts "Running: #{test_name} on #{os}" }
         appium.start unless running_on_sauce
-        run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{name}']"
+        run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{name}',#{Flaky.no_video}]"
         passed = flaky.execute(run_cmd: run_cmd, test_name: test_name, appium: appium, sauce: running_on_sauce)
         break if passed # move onto the next test after one successful run
       end
@@ -64,7 +64,7 @@ module Flaky
       count2.times do
         File.open('/tmp/flaky/current.txt', 'a') { |f| f.puts "Running: #{test_name} on #{os}" }
         appium.start unless running_on_sauce
-        run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{name}']"
+        run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{name}',#{Flaky.no_video}]"
         passed = flaky.execute run_cmd: run_cmd, test_name: test_name, appium: appium, sauce: running_on_sauce
         break if passed # move onto the next test after one successful run
       end

data/lib/screen_recording.rb

@@ -17,6 +17,13 @@ module Flaky
 
       raise 'Invalid os. Must be ios or android' unless %w[ios android].include? os
       raise 'Invalid path. Must end with .mov' unless File.extname(path) == '.mov'
+      raise 'Invalid path. Must not be a dir' if File.exists?(path) && File.directory?(path)
+
+      # ensure we have exactly one screen-recording process
+      # wait for killall to complete
+      Process::waitpid(spawn('killall', '-9', 'screen-recording', :in => '/dev/null', :out => '/dev/null', :err => '/dev/null'))
+
+      File.delete(path) if File.exists? path
 
       pid = spawn(screen_recording_binary, os, path,
                   :in => '/dev/null', :out => '/dev/null', :err => '/dev/null')

data/readme.md

@@ -46,3 +46,45 @@ Run `flake auth` to automatically dismiss security dialogs.
 - Appium server is restarted
 - [spec](https://github.com/bootstraponline/spec) test logs are saved and colored
 - [Appium](https://github.com/appium/appium) logs are saved and colored
+
+--
+
+#### logs & video
+
+```ruby
+  # Sample setup/teardown that saves logs and records videos.
+  # Appium::Driver.new(app_path: env_app_path, debug: true,
+  #                   device: device, device_cap: device_cap,
+  #                   export_session: true).start_driver
+  #
+  # The following code goes after Driver.new.start_driver
+
+  def save_logs
+    file = '/tmp/flaky_logs.txt'
+    logs = nil
+
+    begin
+      logs = $driver.driver.manage.logs.get(:logcat)
+    rescue # try iOS
+      logs = $driver.driver.manage.logs.get(:syslog)
+    end
+
+    File.open(file, 'w') do |f|
+      # Save only the message from Selenium::WebDriver::LogEntry
+      f.write (logs.map { |line| line.message }).join("\n")
+    end
+  end
+
+  puts "Recording #{device} to /tmp/video.mov"
+  flaky_screen_recording_pid = Flaky.screen_recording_start os: device, path: '/tmp/video.mov'
+
+  Minitest.after_run do
+    if $driver
+      save_logs
+      puts "Ending pid: #{flaky_screen_recording_pid}"
+      Flaky.screen_recording_stop flaky_screen_recording_pid # save video
+      $driver.x
+    end
+  end
+```
+

data/release_notes.md

@@ -1,3 +1,10 @@
+#### v0.0.21 2014-01-02
+
+- [10babb7](https://github.com/appium/flaky/commit/10babb7dcee2e811c6fb6a78d5dcf2c6fffba2f2) Release 0.0.21
+- [3d93fb2](https://github.com/appium/flaky/commit/3d93fb2b2bd6dd2b8a453750c5425c73cf3db570) Add screen recording to flaky
+- [ec67868](https://github.com/appium/flaky/commit/ec6786818640f22183ce146f3bd75e868d8deada) Fix spacing
+
+
 #### v0.0.20 2013-12-26
 
 - [858047e](https://github.com/appium/flaky/commit/858047e530e8d1e4294bfaa91f26492b36a68fda) Release 0.0.20

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flaky
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_duration