flaky 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e970eaab75dfe6fc14f6830cdb90ddc9b72d7cd
-  data.tar.gz: abd1bb1139418e8c6c955afad104c683c8b4619b
+  metadata.gz: 1c518578fad2332c3c4d04a73e4e75348b2e6298
+  data.tar.gz: dac38464aa7e40e539c1fbacd9816dc7671e83ae
 SHA512:
-  metadata.gz: c3a28833c28dc8e5bab36f8c220607c48e8af06489cab4d8aaa703df365e262dcc2df6d2a8814f96dac53ffe0f470b6789ce1eff94e5e8cb9d9ffbe13de1bee5
-  data.tar.gz: 4801462f74d8e772c8851c25c1fab56136840a0f127bf9e344527f9037ba6934aecefe9ab89a9f758ef50ebdeab6618d3736f49271cb1b20a981525c8d14a343
+  metadata.gz: 1600f893244cc2ee6f6e928567c5fbd3183461a765d9d4b813441a9986d9d5d1db74c4d16b53fb649cf3291c2d3113b7e4d974423c6378d6c5f8283034346da5
+  data.tar.gz: ccca18f08d340ceaf32f1f0400f16482eab2ab16bfc22445d988b7c0b3a3ef6342bcda40e88a998ba5b8ecba3fa485933324017994e9cfd079cdcc9926a70002

data/flaky.gemspec

@@ -25,7 +25,7 @@ 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', '~> 0.3.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

@@ -9,8 +9,8 @@ require 'posix/spawn' # http://rubygems.org/gems/posix-spawn
 require 'digest/md5'
 
 module Flaky
-  VERSION = '0.0.12' unless defined? ::Flaky::VERSION
-  DATE = '2013-11-04' unless defined? ::Flaky::DATE
+  VERSION = '0.0.13' unless defined? ::Flaky::VERSION
+  DATE = '2013-11-12' 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

data/lib/flaky/appium.rb

@@ -11,8 +11,11 @@ module Flaky
 
     def stop
       [@in, @out, @err].each { |io| io.close unless io.nil? || io.closed? }
-      Process.kill 'KILL', @pid
-      Process.waitpid @pid
+      begin
+        Process.kill 'KILL', @pid
+        Process.waitpid @pid
+      rescue # no such process
+      end
     end
   end
 
@@ -20,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, :tail, :logcat
+    attr_reader :ready, :pid, :in, :out, :err, :log, :logcat
     @@thread = nil
 
     def self.remove_ios_apps
@@ -30,7 +33,7 @@ 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/6.1/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
       end
@@ -52,7 +55,7 @@ module Flaky
       @ready = false
       @pid, @in, @out, @err = nil
       @log = ''
-      @tail = nil
+      @buffer = ''
       @android = opts.fetch(:android, false)
       if @android
         @droid = Flaky::Android.new
@@ -61,14 +64,13 @@ module Flaky
     end
 
     def start
-      @log = ''
       self.stop # stop existing process
-
+      @log = "/tmp/flaky/tmp_log_#{Random.rand(10**4..10**5-1)}"
       if @android
         @droid.reset
         @logcat.start
       else
-         self.class.remove_ios_apps
+        self.class.remove_ios_apps
       end
 
       @@thread.exit if @@thread
@@ -81,7 +83,28 @@ module Flaky
         sleep 0.5
       end
 
-      @tail = Cmd.new 'tail -f /var/log/system.log'
+      # -e = -A = include other user's processes
+      # -a = include your own processes
+      # -x = include processes without a controlling terminal
+      # ps -eax | grep "tail"
+      # http://askubuntu.com/questions/157075/why-does-ps-aux-grep-x-give-better-results-than-pgrep-x
+    end
+
+    def update_buffer data
+      @buffer += data
+
+      if @buffer.length >= 32_000
+        self.flush_buffer
+      end
+    end
+
+    def flush_buffer
+      return if @buffer.nil? || @buffer.empty?
+      File.open(@log, 'a') do |f|
+        f.write EscapeUtils.escape_html @buffer
+      end
+      @buffer = ''
+      @log
     end
 
     ##
@@ -100,7 +123,7 @@ module Flaky
         ready_for_reading.each do |stream|
           begin
             capture = stream.readpartial 999_999
-            @log += capture if capture
+            update_buffer(capture) if capture
             @ready = true if !@ready && capture.include?('Appium REST http interface listener started')
           rescue EOFError
             out_err.delete stream
@@ -121,7 +144,6 @@ module Flaky
 
     # Invoked inside a thread by `self.go`
     def launch
-      @log = ''
       self.end_all_nodes
       @ready = false
       appium_home = ENV['APPIUM_HOME']
@@ -135,7 +157,6 @@ module Flaky
     end
 
     def stop
-      @log = ''
       # https://github.com/tmm1/pygments.rb/blob/master/lib/pygments/popen.rb
       begin
         Process.kill 'KILL', @pid
@@ -144,8 +165,6 @@ module Flaky
       @pid = nil
       self.end_all_nodes
       self.end_all_instruments unless @android
-
-      @tail.stop if @tail
     end
   end # class Appium
 end # module Flaky

data/lib/flaky/log.rb

@@ -47,18 +47,19 @@ div.grey  { color: #666666; }
       HTML
     end
 
-    def write log_file, log
+    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.
 
       # must escape for rendering HTML in the browser
-      log = EscapeUtils.escape_html log
+      log = EscapeUtils.escape_html log unless file_path
 
       # POST /wd/hub/session 303 6877ms - 9
 
-      scan = StringScanner.new log
+      scan = StringScanner.new log || File.read(file_path)
+      File.delete(file_path) if file_path # delete tmp buffer file
 
       new_log = '<div>'
 
@@ -78,21 +79,21 @@ div.grey  { color: #666666; }
         new_log += match[0..-1 - match_size]
         new_log += '</div>'
 
-        found_number = match.match(color_rgx).to_a.last.gsub(/[^\d]/,'').to_i
+        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
+        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

data/lib/flaky/run.rb

@@ -129,10 +129,10 @@ module Flaky
       # html Ruby test log
       Flaky.write log_file.name("#{postfix}.html"), log
 
-      # iOS simulator system log
-      File.open(log_file.name("#{postfix}.server.log.txt"), 'w') do |f|
-        f.write appium.tail.out.readpartial(999_999_999)
-      end
+      # TODO: Get iOS simulator system log from appium
+      # File.open(log_file.name("#{postfix}.server.log.txt"), 'w') do |f|
+      #  f.write appium.tail.out.readpartial(999_999_999)
+      # end
 
       # adb logcat log
       logcat = appium.logcat ? appium.logcat.stop : nil
@@ -141,7 +141,7 @@ module Flaky
       end if logcat
 
       # appium server log
-      Flaky.write log_file.name("#{postfix}.appium.html"), appium.log
+      Flaky.write log_file.name("#{postfix}.appium.html"), nil, appium.flush_buffer
 
       passed
     end

data/readme.md

@@ -41,8 +41,7 @@ Run `flake auth` to automatically dismiss security dialogs.
 #### For each test:
 
 - iOS Simulator is closed
-- All `iPhone Simulator/6.1/Applications/*` are removed
+- All `/Users/#{user}/Library/Application Support/iPhone Simulator/**/Applications/*` are removed
 - 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
-- iOS Simulator logs are saved `/var/log/system.log`

data/release_notes.md

@@ -1,3 +1,10 @@
+#### v0.0.12 2013-11-04
+
+- [d10c66d](https://github.com/appium/flaky/commit/d10c66dc5a882d54a64fe70709968d856a6a932e) Release 0.0.12
+- [ec86209](https://github.com/appium/flaky/commit/ec862093b64a0319c1f9bc233858e3568acbfcc1) Move applescript to the flake auth command
+- [983998a](https://github.com/appium/flaky/commit/983998a4fdcf5809b24d1c18b2f48ff67c9a70db) Revert "Work around OS X auth issue"
+
+
 #### v0.0.11 2013-11-04
 
 - [017a45f](https://github.com/appium/flaky/commit/017a45ffb32663570c6e6a2f0f7943a143edaf5f) Release 0.0.11

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flaky
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_duration
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: posix-spawn
   requirement: !ruby/object:Gem::Requirement