flaky 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e85d81f9e7ad261be0cff5ab059fa1b5c2492d6
-  data.tar.gz: 287c4adf9b939e1a767583c9ae5aaf003a4aa9f0
+  metadata.gz: 114eb59e36a70bf9654f2ff5b456325bdff0ab70
+  data.tar.gz: 3e201be6fc05c9d2786067aa7971d9dfe48b432b
 SHA512:
-  metadata.gz: 8e544470b5663a3f3ac816d0fc945b512c2ae443353e598ed9581b48be0bd7b4652605e365948b69df850a94c4ce8d506548ce3d202befb31268468e202b5866
-  data.tar.gz: 7d695c71580ab151b30da17274498b3dd143724d3a58cb895626bed521e1d11229f24f5b31b27ed75c5b14a8e6e82bb5c6fff0a64935e3aba38e659f438a84ef
+  metadata.gz: 13e0202fd081788b1c49d3ce80454ecf606e2408711b113f86f7215d96526991ddaa5ee3b052e4b9ee1e4b863b2a16ac3f0fab0086c77623ff6f04071f611f47
+  data.tar.gz: 1a123780cacd99a3f9af0da8ea64b303558336c0629e793b76d5e59b7c8c0529967cf0e628c0cd8f899f7c2282784b3d5f78bfe3cc56912736d1302fceef5f67

data/flaky.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
   s.require_paths = %w(lib)
 
   s.add_runtime_dependency 'chronic_duration', '~> 0.10.2'
-  s.add_runtime_dependency 'escape_utils', '~> 1.0.0'
   s.add_runtime_dependency 'posix-spawn', '~> 0.3.6'
 
   s.add_development_dependency 'rake', '~> 10.1.0'

data/lib/flaky.rb

@@ -1,16 +1,16 @@
 # encoding: utf-8
 require 'fileutils' # system requires
 require 'open3'
+require 'timeout' # to timeout long running color runs
 
 require 'rubygems' # gem requires
 require 'chronic_duration'
-require 'escape_utils'
 require 'posix/spawn' # http://rubygems.org/gems/posix-spawn
 require 'digest/md5'
 
 module Flaky
-  VERSION = '0.0.16' unless defined? ::Flaky::VERSION
-  DATE = '2013-12-09' unless defined? ::Flaky::DATE
+  VERSION = '0.0.17' unless defined? ::Flaky::VERSION
+  DATE = '2013-12-10' 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
@@ -26,7 +26,6 @@ module Flaky
   # require internal files
   require 'flaky/appium'
   require 'flaky/applescript'
-  require 'flaky/log'
   require 'flaky/run'
 
   require 'flaky/run/all_tests'

data/lib/flaky/appium.rb

@@ -23,7 +23,7 @@ module Flaky
   class Appium
     include POSIX::Spawn
     # logcat is read & stopped by run.execute
-    attr_reader :ready, :pid, :in, :out, :err, :log, :logcat
+    attr_reader :ready, :pid, :in, :out, :err, :log, :logcat, :ios, :android
     @@thread = nil
 
     def self.remove_ios_apps
@@ -61,6 +61,7 @@ module Flaky
         @droid = Flaky::Android.new
         @logcat = Flaky::Logcat.new
       end
+      @ios = ! @android
     end
 
     def start
@@ -101,7 +102,7 @@ module Flaky
     def flush_buffer
       return if @buffer.nil? || @buffer.empty?
       File.open(@log, 'a') do |f|
-        f.write EscapeUtils.escape_html @buffer
+        f.write @buffer
       end
       @buffer = ''
       @log

data/lib/flaky/run.rb

@@ -126,8 +126,13 @@ module Flaky
 
       log_file = LogArtifact.new result_dir: result_dir, pass_str: pass_str, test_name: test_name
 
+      # File.open 'w' will not create folders. Use mkdir_p before.
+      test_file_path = log_file.name("#{postfix}.html")
+      FileUtils.mkdir_p File.dirname(test_file_path)
       # html Ruby test log
-      Flaky.write log_file.name("#{postfix}.html"), log
+      File.open(test_file_path, 'w') do |f|
+        f.write log
+      end
 
       # TODO: Get iOS simulator system log from appium
       # File.open(log_file.name("#{postfix}.server.log.txt"), 'w') do |f|
@@ -136,21 +141,45 @@ module Flaky
 
       # adb logcat log
       logcat = appium.logcat ? appium.logcat.stop : nil
-      File.open(log_file.name("#{postfix}.logcat.txt"), 'w') do |f|
+      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
-      Flaky.write log_file.name("#{postfix}.appium.html"), nil, appium.flush_buffer
+      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
+        end
+      end
 
       passed
     end
 
+    def collect_crashes array
+      Dir.glob(File.join(Dir.home, '/Library/Logs/DiagnosticReports/*.crash')) do |crash|
+        array << crash
+      end
+      array
+    end
+
     def execute opts={}
       run_cmd = opts[:run_cmd]
       test_name = opts[:test_name]
       appium = opts[:appium]
 
+      old_crash_files = []
+      if 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
@@ -165,6 +194,21 @@ module Flaky
 
       print passed ? green(' ✓') : red(' ✖')
 
+      if appium.ios
+        new_crash_files = []
+        collect_crashes new_crash_files
+
+        new_crash_files = new_crash_files - old_crash_files
+        if new_crash_files.length > 0
+          File.open('/tmp/flaky/crashes.txt', 'a') do |f|
+            f.puts '--'
+            f.puts "Test: #{test_name} crashed on iOS:"
+            new_crash_files.each { |crash| f.puts crash }
+            f.puts '--'
+          end
+        end
+      end
+
       @last_test = test_name
       passed
     end

data/release_notes.md

@@ -1,3 +1,10 @@
+#### v0.0.16 2013-12-09
+
+- [fed719a](https://github.com/appium/flaky/commit/fed719af184a6f38a4d29b3c65f1906d6917c1fb) Release 0.0.16
+- [4aa7711](https://github.com/appium/flaky/commit/4aa7711b206a71338fc8d771c5ef49ec036f1ab8) Fix file exists error. Write current test to current.txt
+- [1b0589c](https://github.com/appium/flaky/commit/1b0589c232219b5c535432976056a6d5c30ed073) Update todo.md
+
+
 #### v0.0.15 2013-12-05
 
 - [5397189](https://github.com/appium/flaky/commit/539718980a1c1578da63c30f773e5c249415b2b9) Release 0.0.15

data/test/all_tests.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require File.expand_path '../lib/flaky/log', __FILE__
 require File.expand_path '../lib/flaky/run', __FILE__
 require File.expand_path '../mock_execute', __FILE__
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flaky
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_duration
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.2
-- !ruby/object:Gem::Dependency
-  name: escape_utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: posix-spawn
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +70,6 @@ files:
 - lib/flaky.rb
 - lib/flaky/appium.rb
 - lib/flaky/applescript.rb
-- lib/flaky/log.rb
 - lib/flaky/logcat.rb
 - lib/flaky/reset_android.rb
 - lib/flaky/run.rb

data/lib/flaky/log.rb

@@ -1,106 +0,0 @@
-# encoding: utf-8
-module Flaky
-  class << self
-    # Monaco 18 pt
-    # ANSI colors
-    #
-    # [36m = 00eee9 = cyan
-    # [32m = 00e800 = green
-    # [0m  = f4f4f4 = reset
-    def html_before
-      <<-'HTML'
-<html>
-<head>
-<style>
-* {
-  padding: 0;
-  margin: 0;
-  border: 0;
-  width: 0;
-  height: 0;
-}
-div { display: inline; }
-body { background-color: #262626; }
-#terminal {
-  display: inherit;
-  white-space: pre;
-  font-family: "Monaco";
-  font-size: 14px;
-  color: #f4f4f4;
-  padding-left: 18px;
-}
-div.cyan  { color: #00eee9; }
-div.green { color: #00e800; }
-div.grey  { color: #666666; }
-</style>
-</head>
-<body>
-<div id="terminal">
-      HTML
-    end
-
-    def html_after
-      <<-'HTML'
-</div>
-</body>
-</html>
-      HTML
-    end
-
-    def write log_file, log, file_path=nil
-      # directory must exist
-      FileUtils.mkdir_p File.dirname log_file
-      # Pry & Awesome Print use the ruby objects to insert term colors.
-      # this can't be done with the raw text output.
-
-      # escape_html will error if called when log is nil
-      # must escape for rendering HTML in the browser
-      log = EscapeUtils.escape_html log || '' unless file_path
-      # POST /wd/hub/session 303 6877ms - 9
-
-      scan = StringScanner.new log || File.read(file_path)
-      File.delete(file_path) if file_path # delete tmp buffer file
-
-      new_log = '<div>'
-
-      color_rgx = /\[(\d+)m/
-      while !scan.eos?
-        match = scan.scan_until color_rgx
-        match_size = scan.matched_size
-
-        # no more color codes
-        if match_size.nil?
-          new_log += scan.rest
-          new_log += '</div>'
-          break
-        end
-
-        # save before the color code, excluding the color code
-        new_log += match[0..-1 - match_size]
-        new_log += '</div>'
-
-        found_number = match.match(color_rgx).to_a.last.gsub(/[^\d]/, '').to_i
-
-        # now make a new colored div
-        color = case (found_number)
-                  when 39, 0 # white text
-                    '<div>'
-                  when 90 # grey
-                    '<div class="grey">'
-                  when 36
-                    '<div class="cyan">'
-                  when 32
-                    '<div class="green">'
-                  else
-                    '<div>' # Unknown color code
-                end
-
-        new_log += color
-      end
-
-      File.open(log_file, 'w') do |f|
-        f.write html_before + new_log + html_after
-      end
-    end
-  end # class << self
-end # module Flaky