flaky 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 114eb59e36a70bf9654f2ff5b456325bdff0ab70
-  data.tar.gz: 3e201be6fc05c9d2786067aa7971d9dfe48b432b
+  metadata.gz: 1230df6faa06f97954248aa5ecdce8c96ad43495
+  data.tar.gz: e1af21e3f6f1f43893ae8d5305253299f095d6ae
 SHA512:
-  metadata.gz: 13e0202fd081788b1c49d3ce80454ecf606e2408711b113f86f7215d96526991ddaa5ee3b052e4b9ee1e4b863b2a16ac3f0fab0086c77623ff6f04071f611f47
-  data.tar.gz: 1a123780cacd99a3f9af0da8ea64b303558336c0629e793b76d5e59b7c8c0529967cf0e628c0cd8f899f7c2282784b3d5f78bfe3cc56912736d1302fceef5f67
+  metadata.gz: 1b9041b34ae739d33093955b91379a0e0571d7a2f24c8df9570eaf97952c2635f779f994bd4ed529279be39c08686fc8ab18da7eca934d45fee5c17f173afcc0
+  data.tar.gz: c314d8c08a8d2544ffaa1e80ae6edbf6647a2825bcd83371f4f1759d15496573423b06bf2ea41b636aefe4b02c968a4493b643dcb34dd246986b50e7e68e06ab

data/lib/flaky.rb

@@ -9,26 +9,15 @@ require 'posix/spawn' # http://rubygems.org/gems/posix-spawn
 require 'digest/md5'
 
 module Flaky
-  VERSION = '0.0.17' unless defined? ::Flaky::VERSION
-  DATE = '2013-12-10' unless defined? ::Flaky::DATE
+  VERSION = '0.0.18' unless defined? ::Flaky::VERSION
+  DATE = '2013-12-23' unless defined? ::Flaky::DATE
 
-  # https://github.com/appium/ruby_lib/blob/0e203d76610abd519ba9d2fe9c14b50c94df5bbd/lib/appium_lib.rb#L24
-  def self.add_to_path file, path=false
-    path = path ? "../#{path}/" : '..'
-    path = File.expand_path path, file
-
-    $:.unshift path unless $:.include? path
-  end
-
-  add_to_path __FILE__ # add this dir to path
-
-  # TODO: Use require_relative instead of add_to_path
   # require internal files
-  require 'flaky/appium'
-  require 'flaky/applescript'
-  require 'flaky/run'
+  require_relative 'flaky/appium'
+  require_relative 'flaky/applescript'
+  require_relative 'flaky/run'
 
-  require 'flaky/run/all_tests'
-  require 'flaky/run/from_file'
-  require 'flaky/run/one_test'
+  require_relative 'flaky/run/all_tests'
+  require_relative 'flaky/run/from_file'
+  require_relative 'flaky/run/one_test'
 end

data/lib/flaky/appium.rb

@@ -22,8 +22,7 @@ module Flaky
   #noinspection RubyResolve
   class Appium
     include POSIX::Spawn
-    # logcat is read & stopped by run.execute
-    attr_reader :ready, :pid, :in, :out, :err, :log, :logcat, :ios, :android
+    attr_reader :ready, :pid, :in, :out, :err, :log, :ios, :android
     @@thread = nil
 
     def self.remove_ios_apps
@@ -33,9 +32,13 @@ module Flaky
       # Must kill iPhone simulator or strange install errors will occur.
       self.kill_all 'iPhone Simulator'
 
-      app_glob = "/Users/#{user}/Library/Application Support/iPhone Simulator/**/Applications/*"
+      app_glob = "/Users/#{user}/Library/Application Support/iPhone Simulator/**/Applications"
       Dir.glob(app_glob) do |ios_app_folder|
         FileUtils.rm_rf ios_app_folder
+        root = File.dirname ios_app_folder
+        FileUtils.rm_rf File.join(root, 'Library/TCC')
+        FileUtils.rm_rf File.join(root, 'Library/Caches')
+        FileUtils.rm_rf File.join(root, 'Library/Media')
       end
     end
 
@@ -59,7 +62,6 @@ module Flaky
       @android = opts.fetch(:android, false)
       if @android
         @droid = Flaky::Android.new
-        @logcat = Flaky::Logcat.new
       end
       @ios = ! @android
     end
@@ -69,7 +71,6 @@ module Flaky
       @log = "/tmp/flaky/tmp_log_#{Random.rand(10**4..10**5-1)}"
       if @android
         @droid.reset
-        @logcat.start
       else
         self.class.remove_ios_apps
       end
@@ -100,12 +101,12 @@ module Flaky
     end
 
     def flush_buffer
-      return if @buffer.nil? || @buffer.empty?
+      return '' if @buffer.nil? || @buffer.empty?
       File.open(@log, 'a') do |f|
         f.write @buffer
       end
       @buffer = ''
-      @log
+      @log || ''
     end
 
     ##

data/lib/flaky/run.rb

@@ -28,7 +28,9 @@ module Flaky
       str = str + '_' if str[-1] != '_'
       str += @test_name.split('/').last
 
-      File.join @result_dir, @pass_str, str, file_name
+      filename_only = File.basename(@test_name)
+
+      File.join @result_dir, @pass_str, filename_only, str, file_name
     end
   end
 
@@ -87,7 +89,7 @@ module Flaky
       puts out
     end
 
-    def _execute run_cmd, test_name, runs, appium
+    def _execute run_cmd, test_name, runs, appium, sauce
       # must capture exit code or log is an array.
       log, exit_code = Open3.capture2e run_cmd
 
@@ -139,24 +141,28 @@ module Flaky
       #  f.write appium.tail.out.readpartial(999_999_999)
       # end
 
-      # adb logcat log
-      logcat = appium.logcat ? appium.logcat.stop : nil
-      logcat_file_path = log_file.name("#{postfix}.logcat.txt")
-      FileUtils.mkdir_p File.dirname(logcat_file_path)
-      File.open(logcat_file_path, 'w') do |f|
-        f.write logcat
-      end if logcat
-
-      # appium server log
-      appium_server_path = log_file.name("#{postfix}.appium.html")
-      FileUtils.mkdir_p File.dirname(appium_server_path)
-      File.open(appium_server_path, 'w') do |f|
-        # this may return nil
-        tmp_file = appium.flush_buffer
-
-        if !tmp_file.nil? && !tmp_file.empty?
-          f.write File.read tmp_file
-          File.delete tmp_file
+      unless sauce
+        src_system_log = '/tmp/flaky_logs.txt'
+        if File.exists? src_system_log
+          # postfix is required! or the log will be saved to an incorrect path
+          system_log_path = log_file.name("#{postfix}.system.txt")
+          FileUtils.mkdir_p File.dirname(system_log_path)
+          FileUtils.copy_file src_system_log, system_log_path
+          File.delete src_system_log
+        end
+
+        # appium server log
+        appium_server_path = log_file.name("#{postfix}.appium.html")
+        FileUtils.mkdir_p File.dirname(appium_server_path)
+        File.open(appium_server_path, 'w') do |f|
+          # this may return nil
+          tmp_file = appium.flush_buffer
+
+          # todo: copy file instead of read & delete
+          if !tmp_file.nil? && !tmp_file.empty?
+            f.write File.read tmp_file
+            File.delete tmp_file
+          end
         end
       end
 
@@ -174,27 +180,36 @@ module Flaky
       run_cmd = opts[:run_cmd]
       test_name = opts[:test_name]
       appium = opts[:appium]
+      sauce = opts[:sauce]
 
       old_crash_files = []
-      if appium.ios
+      # appium is nil when on sauce
+      if !sauce && appium && appium.ios
         collect_crashes old_crash_files
       end
 
       raise 'must pass :run_cmd' unless run_cmd
       raise 'must pass :test_name' unless test_name
-      raise 'must pass :appium' unless appium
+      # local appium is not required when running on Sauce
+      raise 'must pass :appium' unless appium || sauce
 
       test = @tests[test_name] ||= {runs: 0, pass: 0, fail: 0}
       runs = test[:runs] += 1
 
-      passed = _execute run_cmd, test_name, runs, appium
-
+      passed = _execute run_cmd, test_name, runs, appium, sauce
+      unless sauce
       print cyan("\n #{test_name} ") if @last_test.nil? ||
           @last_test != test_name
 
       print passed ? green(' ✓') : red(' ✖')
+      else
+        print cyan("\n #{test_name} ")
+        print passed ? green(' ✓') : red(' ✖')
+        print " https://saucelabs.com/tests/#{File.read('/tmp/appium_lib_session').chomp}\n"
+      end
 
-      if appium.ios
+      # appium is nil when running on Sauce
+      if !sauce && appium && appium.ios
         new_crash_files = []
         collect_crashes new_crash_files
 

data/lib/flaky/run/all_tests.rb

@@ -9,8 +9,9 @@ module Flaky
     raise ':count must be an int' unless count.kind_of?(Integer)
     raise ':os must be a string' unless os.kind_of?(String)
 
+    running_on_sauce = ENV['SAUCE_USERNAME'] ? true : false
     flaky = Flaky::Run.new
-    appium = Appium.new
+    appium = Appium.new unless running_on_sauce
 
     current_dir = Dir.pwd
     raise "Rakefile doesn't exist in #{current_dir}" unless File.exists?(File.join(current_dir, 'Rakefile'))
@@ -26,14 +27,14 @@ module Flaky
 
       count.times do
         File.open('/tmp/flaky/current.txt', 'a') { |f| f.puts "Running: #{test_name} on #{os}" }
-        appium.start
+        appium.start unless running_on_sauce
         run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{name}']"
-        passed = flaky.execute run_cmd: run_cmd, test_name: test_name, appium: appium
+        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
     end
 
-    appium.stop
+    appium.stop unless running_on_sauce
     flaky.report
   end
 end # module Flaky

data/lib/flaky/run/from_file.rb

@@ -30,8 +30,9 @@ module Flaky
       raise "Missing tests #{missing_tests}"
     end
 
+    running_on_sauce = ENV['SAUCE_USERNAME'] ? true : false
     flaky = Flaky::Run.new
-    appium = Appium.new
+    appium = Appium.new unless running_on_sauce
 
     raise "Rakefile doesn't exist in #{current_dir}" unless File.exists?(File.join(current_dir, 'Rakefile'))
 
@@ -45,14 +46,14 @@ module Flaky
       test_name = File.join(File.dirname(test_name), File.basename(test_name, '.*'))
 
       count.times do
-        appium.start
+        appium.start unless running_on_sauce
         run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{name}']"
-        passed = flaky.execute run_cmd: run_cmd, test_name: test_name, appium: appium
+        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
     end
 
-    appium.stop
+    appium.stop unless running_on_sauce
     flaky.report
   end
 end # module Flaky

data/lib/flaky/run/one_test.rb

@@ -14,8 +14,9 @@ module Flaky
     # ensure file name does not contain an extension
     name = File.basename name, '.*'
 
+    running_on_sauce = ENV['SAUCE_USERNAME'] ? true : false
     flaky = Flaky::Run.new
-    appium = Appium.new
+    appium = Appium.new unless running_on_sauce
 
     current_dir = Dir.pwd
 
@@ -32,12 +33,12 @@ module Flaky
     test_name = File.join(File.dirname(test_name), File.basename(test_name, '.*'))
 
     count.times do
-      appium.start
+      appium.start unless running_on_sauce
       run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{name}']"
-      flaky.execute run_cmd: run_cmd, test_name: test_name, appium: appium
+      flaky.execute run_cmd: run_cmd, test_name: test_name, appium: appium, sauce: running_on_sauce
     end
 
-    appium.stop
+    appium.stop unless running_on_sauce
     flaky.report
   end
 end # module Flaky

data/release_notes.md

@@ -1,3 +1,12 @@
+#### v0.0.17 2013-12-10
+
+- [64078c1](https://github.com/appium/flaky/commit/64078c1ed2ee8a96a52f05aefb460216b48ea2b5) Release 0.0.17
+- [208c9bb](https://github.com/appium/flaky/commit/208c9bbbeb17f2a70965cd530c3f5ee8d9a32369) Disable coloring
+- [bf30e8e](https://github.com/appium/flaky/commit/bf30e8ed918a184f34ba316f472e5c0bfe9c0bb1) Fix nil error
+- [b19f9e5](https://github.com/appium/flaky/commit/b19f9e548bcc40f70b232ac2225b7c71abd01415) Don't escape appium log. Timeout after 60s of color
+- [a4a569f](https://github.com/appium/flaky/commit/a4a569fbaebdce9683d8294afae61ff7712a0e92) Record crashes per test in crashes.txt
+
+
 #### v0.0.16 2013-12-09
 
 - [fed719a](https://github.com/appium/flaky/commit/fed719af184a6f38a4d29b3c65f1906d6917c1fb) Release 0.0.16

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: flaky
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: posix-spawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.1.0
 description: Measure flaky Ruby Appium tests.
@@ -60,7 +60,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - LICENSE-2.0.txt
 - Rakefile
 - bin/flake
@@ -70,7 +70,6 @@ files:
 - lib/flaky.rb
 - lib/flaky/appium.rb
 - lib/flaky/applescript.rb
-- lib/flaky/logcat.rb
 - lib/flaky/reset_android.rb
 - lib/flaky/run.rb
 - lib/flaky/run/all_tests.rb
@@ -92,12 +91,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/lib/flaky/logcat.rb

@@ -1,41 +0,0 @@
-# encoding: utf-8
-# log = Flaky::Logcat.new
-# log.start; log.stop
-module Flaky
-  class Logcat
-    attr_reader :pid, :in, :out, :err
-    @@thread = nil
-    @@data = nil
-
-    # Start the logcat process and capture the output
-    def start
-      # make sure the adb devices command doesn't error.
-      while (!POSIX::Spawn::Child.new('adb kill-server; adb devices').err.empty?)
-        sleep 0.5
-      end
-
-      cmd = 'adb logcat'
-      @pid, @in, @@out, @err = POSIX::Spawn::popen4 cmd
-      @in.close
-      @data = ''
-
-      @@thread.exit if @@thread
-      @@thread = Thread.new do
-        # out.read blocks until the process ends
-        @@data = @@out.read
-      end
-    end
-
-    # Stop and return the data
-    def stop
-      begin
-        [@in, @out, @err].each { |io| io.close unless io.nil? || io.closed? }
-        Process.kill 'KILL', @pid
-        Process.waitpid @pid
-      rescue
-      end
-
-      @@data
-    end
-  end
-end