run_loop 0.0.5 → 0.0.6

data/.irbrc

@@ -15,3 +15,5 @@ IRB.conf[:HISTORY_FILE] = ".irb-history"
 require 'run_loop'
 
 
+@app = "/Users/krukow/github/x-platform-example/ios-source/3.3.1/build/Applications/WordPress.app"
+

data/LICENSE

@@ -1,6 +1,6 @@
 run-loop
 
-Copyright (c) Karl Krukow (http://www.lesspainful.com). All rights reserved.
+Copyright (c) LessPainful ApS (https://www.lesspainful.com). All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,15 +1,6 @@
 run-loop
 ===================
 
-Credits
-=======
-
-UI Screen Shooter @jonathanpenn for the wrapper around instruments
-https://github.com/jonathanpenn/ui-screen-shooter
-
-UI Screen Shooter is licensed under the MIT license.
-See the LICENSE file for more info.
-
 
 License
 =======

data/lib/run_loop/core.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 require 'tmpdir'
 require 'timeout'
-#require 'open4'
+require 'json'
 
 module RunLoop
 
@@ -32,29 +32,27 @@ module RunLoop
       device = options[:device] || :iphone
 
 
-      template = automation_template
-      instruments_path = "instruments"#File.join(scripts_path,"unix_instruments")
       results_dir = options[:results_dir] || Dir.mktmpdir("run_loop")
-      results_dir_trace = File.join(results_dir,"trace")
+      results_dir_trace = File.join(results_dir, "trace")
       FileUtils.mkdir_p(results_dir_trace)
 
-      script = File.join(results_dir,"_run_loop.js")
+      script = File.join(results_dir, "_run_loop.js")
 
 
       code = File.read(options[:script])
       code = code.gsub(/\$PATH/, results_dir)
+      code = code.gsub(/\$MODE/, "FLUSH") unless options[:no_flush]
 
-      repl_path = File.join(results_dir,"repl-cmd.txt")
-      File.open(repl_path, "w") {|file| file.puts "0:UIALogger.logMessage('Listening for run loop commands');"}
+      repl_path = File.join(results_dir, "repl-cmd.txt")
+      File.open(repl_path, "w") { |file| file.puts "0:UIALogger.logMessage('Listening for run loop commands');" }
 
-      File.open(script, "w") {|file| file.puts code}
+      File.open(script, "w") { |file| file.puts code }
 
 
-
-      bundle_dir_or_bundle_id = options[:app] || ENV['APP_BUNDLE_PATH']
+      bundle_dir_or_bundle_id = options[:app] || ENV['BUNDLE_ID']|| ENV['APP_BUNDLE_PATH']
 
       unless bundle_dir_or_bundle_id
-        raise "key :app or environment variable APP_BUNDLE_PATH must be specified as path to app bundle (simulator) or bundle id (device)"
+        raise 'key :app or environment variable APP_BUNDLE_PATH or BUNDLE_ID must be specified as path to app bundle (simulator) or bundle id (device)'
       end
 
       if File.exist?(bundle_dir_or_bundle_id)
@@ -63,9 +61,9 @@ module RunLoop
         plistbuddy="/usr/libexec/PlistBuddy"
         plistfile="#{bundle_dir_or_bundle_id}/Info.plist"
         if device == :iphone
-         uidevicefamily=1
+          uidevicefamily=1
         else
-         uidevicefamily=2
+          uidevicefamily=2
         end
         system("#{plistbuddy} -c 'Delete :UIDeviceFamily' '#{plistfile}'")
         system("#{plistbuddy} -c 'Add :UIDeviceFamily array' '#{plistfile}'")
@@ -74,8 +72,8 @@ module RunLoop
         udid = options[:udid]
         unless udid
           begin
-            Timeout::timeout(3,TimeoutError) do
-               udid = `#{File.join(scripts_path,'udidetect')}`.chomp
+            Timeout::timeout(3, TimeoutError) do
+              udid = `#{File.join(scripts_path, 'udidetect')}`.chomp
             end
           rescue TimeoutError => e
 
@@ -88,21 +86,8 @@ module RunLoop
       end
 
 
-      if udid
-        instruments_path = "#{instruments_path} -w #{udid}"
-      end
-
-
-
-      cmd = [
-        instruments_path,
-        "-D", results_dir_trace,
-        "-t", template,
-        "\"#{bundle_dir_or_bundle_id}\"",
-        "-e", "UIARESULTSPATH", results_dir,
-        "-e", "UIASCRIPT", script,
-        *(options[:instruments_args] || [])
-      ]
+      log_file = File.join(results_dir, 'run_loop.out')
+      cmd = instruments_command(udid, results_dir_trace, bundle_dir_or_bundle_id, results_dir, script, log_file)
 
       pid = fork do
         log_header("Starting App: #{bundle_dir_or_bundle_id}")
@@ -115,16 +100,130 @@ module RunLoop
 
       Process.detach(pid)
 
-      File.open(File.join(results_dir,"run_loop.pid"), "w") do |f|
+      File.open(File.join(results_dir, "run_loop.pid"), "w") do |f|
         f.write pid
       end
 
-      return {:pid => pid, :repl_path => repl_path, :results_dir => results_dir}
+      run_loop = {:pid => pid, :repl_path => repl_path, :log_file => log_file, :results_dir => results_dir}
+
+      read_response(run_loop,0)
+      begin
+        Timeout::timeout(30, TimeoutError) do
+          read_response(run_loop, 0)
+        end
+      rescue TimeoutError => e
+        raise "Time out waiting for UIAutomation run-loop to Start. \n #{File.read(log_file)}"
+      end
+
+      run_loop
+    end
+
+    def self.write_request(run_loop, cmd)
+      repl_path = run_loop[:repl_path]
+
+      cur = File.read(repl_path)
+
+      colon = cur.index(':')
+
+      if colon.nil?
+        raise "Illegal contents of #{repl_path}: #{cur}"
+      end
+      index = cur[0, colon].to_i + 1
+
+
+      tmp_cmd = File.join(File.dirname(repl_path), '__repl-cmd.txt')
+      File.open(tmp_cmd, "w") do |f|
+        f.write("#{index}:#{cmd}")
+      end
+
+      FileUtils.mv(tmp_cmd, repl_path)
+      index
+    end
+
+    def self.read_response(run_loop, expected_index)
+      log_file = run_loop[:log_file]
+      offset = 0
+      json_token = "OUTPUT_JSON:\n"
+      result = nil
+      loop do
+        unless File.exist?(log_file) && File.size?(log_file)
+          sleep(1)
+          next
+        end
+
+        size = File.size(log_file)
+        output = File.read(log_file, size-offset, offset)
+        index_if_found = output.index(json_token)
+        if ENV['DEBUG']=='1'
+          puts output.gsub("*", '')
+          puts "Size #{size}"
+          puts "offset #{offset}"
+          puts "index_of #{json_token}: #{index_if_found}"
+        end
+
+        if index_if_found
+
+          offset = offset + index_if_found
+          rest = output[index_if_found+json_token.size..output.length]
+          index_of_json = rest.index("}\n\n")
+
+          json = rest[0..index_of_json]
+
+          if ENV['DEBUG']=='1'
+            puts "Index #{index_if_found}, Size: #{size} Offset #{offset}"
+
+            puts ("parse #{json}")
+          end
+
+          offset = offset + json.size
+          parsed_result = JSON.parse(json)
+          json_index_if_present = parsed_result['index']
+          if json_index_if_present && json_index_if_present == expected_index
+            result = parsed_result
+            break
+          end
+        else
+
+        end
+
+        sleep(0.5)
+      end
+      result
+
+    end
+
+    def self.pids_for_run_loop(run_loop, &block)
+      pids_str = `ps x -o pid,command | grep -v grep | grep "instruments -D #{run_loop[:results_dir]}" | awk '{printf "%s,", $1}'`
+      pids = pids_str.split(",").map { |pid| pid.to_i }
+      if block_given?
+        pids.each do |pid|
+          block.call(pid)
+        end
+      else
+        pids
+      end
+    end
+
+
+    def self.instruments_command(udid, results_dir_trace, bundle_dir_or_bundle_id, results_dir, script, log_file)
+      instruments_path = 'instruments'
+      if udid
+        instruments_path = "#{instruments_path} -w #{udid}"
+      end
+      [
+          instruments_path,
+          "-D", results_dir_trace,
+          "-t", automation_template,
+          "\"#{bundle_dir_or_bundle_id}\"",
+          "-e", "UIARESULTSPATH", results_dir,
+          "-e", "UIASCRIPT", script,
+          "&> #{log_file}"
+      ]
     end
 
     def self.automation_template
       xcode_path = `xcode-select -print-path`.chomp
-      automation_bundle = File.expand_path(File.join(xcode_path, "..", "Applications", "Instruments.app", "Contents", "PlugIns", "AutomationInstrument.bundle"))
+      automation_bundle = File.expand_path(File.join(xcode_path, "..", 'Applications', "Instruments.app", "Contents", "PlugIns", 'AutomationInstrument.bundle'))
       if not File.exist? automation_bundle
         automation_bundle= File.expand_path(File.join(xcode_path, "Platforms", "iPhoneOS.platform", "Developer", "Library", "Instruments", "PlugIns", "AutomationInstrument.bundle"))
         raise "Unable to find AutomationInstrument.bundle" if not File.exist? automation_bundle
@@ -151,45 +250,50 @@ module RunLoop
     Core.run_with_options(options)
   end
 
-  def self.send_command(run_loop,cmd)
-    repl_path = run_loop[:repl_path]
+  def self.send_command(run_loop, cmd, timeout=15)
 
     if not cmd.is_a?(String)
       raise "Illegal command #{cmd} (must be a string)"
     end
 
-    cur = File.read(repl_path)
 
-    colon = cur.index(":")
-
-    if colon.nil?
-      raise "Illegal contents of #{repl_path}: #{cur}"
-    end
-    index = cur[0,colon].to_i + 1
+    expected_index = Core.write_request(run_loop, cmd)
+    result = nil
 
+    begin
+      Timeout::timeout(timeout, TimeoutError) do
+        result = Core.read_response(run_loop, expected_index)
+      end
 
-    tmp_cmd = File.join(File.dirname(repl_path), "__repl-cmd.txt")
-    File.open(tmp_cmd,"w") do |f|
-      f.write("#{index}:#{cmd}")
+    rescue TimeoutError => e
+      raise "Time out waiting for UIAutomation run-loop for command #{cmd}. Waiting for index:#{expected_index}"
     end
 
-    FileUtils.mv(tmp_cmd,repl_path)
+    result
   end
 
-  def self.stop(options)
-    results_dir = options[:results_dir]
-    pid = options[:pid] || IO.read(File.join(results_dir,"run_loop.pid"))
-    dest = options[:out] || Dir.pwd
+  def self.stop(run_loop, out=Dir.pwd)
+    results_dir = run_loop[:results_dir]
+    pid = run_loop[:pid] || IO.read(File.join(results_dir, "run_loop.pid"))
+    dest = out
 
     if pid
-      Process.kill("HUP",pid.to_i)
+      Process.kill('TERM', pid.to_i)
+    end
+
+    Core.pids_for_run_loop(run_loop) do |pid|
+      Process.kill('TERM', pid.to_i)
     end
 
+    sleep(1)
+
     FileUtils.mkdir_p(dest)
-    pngs = Dir.glob(File.join(results_dir,"Run 1","*.png"))
+    pngs = Dir.glob(File.join(results_dir, "Run 1", "*.png"))
     FileUtils.cp(pngs, dest) if pngs and pngs.length > 0
   end
 
+
+
   def self.validate_script(options)
     script = options[:script]
     if script

data/lib/run_loop/version.rb

@@ -1,3 +1,3 @@
 module RunLoop
-  VERSION = "0.0.5"
+  VERSION = '0.0.6'
 end

data/run_loop.gemspec

@@ -17,5 +17,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency( "thor" )
+  s.add_dependency( "json" )
   #s.add_dependency( "open4", "~> 1.3.0")
 end

data/scripts/run_loop.js

@@ -1,57 +1,190 @@
-if(typeof JSON!=='object'){JSON={};}
-(function(){'use strict';function f(n){return n<10?'0'+n:n;}
-if(typeof Date.prototype.toJSON!=='function'){Date.prototype.toJSON=function(key){return isFinite(this.valueOf())?this.getUTCFullYear()+'-'+
-f(this.getUTCMonth()+1)+'-'+
-f(this.getUTCDate())+'T'+
-f(this.getUTCHours())+':'+
-f(this.getUTCMinutes())+':'+
-f(this.getUTCSeconds())+'Z':null;};String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(key){return this.valueOf();};}
-var cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,escapable=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,gap,indent,meta={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'},rep;function quote(string){escapable.lastIndex=0;return escapable.test(string)?'"'+string.replace(escapable,function(a){var c=meta[a];return typeof c==='string'?c:'\\u'+('0000'+a.charCodeAt(0).toString(16)).slice(-4);})+'"':'"'+string+'"';}
-function str(key,holder){var i,k,v,length,mind=gap,partial,value=holder[key];if(value&&typeof value==='object'&&typeof value.toJSON==='function'){value=value.toJSON(key);}
-if(typeof rep==='function'){value=rep.call(holder,key,value);}
-switch(typeof value){case'string':return quote(value);case'number':return isFinite(value)?String(value):'null';case'boolean':case'null':return String(value);case'object':if(!value){return'null';}
-gap+=indent;partial=[];if(Object.prototype.toString.apply(value)==='[object Array]'){length=value.length;for(i=0;i<length;i+=1){partial[i]=str(i,value)||'null';}
-v=partial.length===0?'[]':gap?'[\n'+gap+partial.join(',\n'+gap)+'\n'+mind+']':'['+partial.join(',')+']';gap=mind;return v;}
-if(rep&&typeof rep==='object'){length=rep.length;for(i=0;i<length;i+=1){if(typeof rep[i]==='string'){k=rep[i];v=str(k,value);if(v){partial.push(quote(k)+(gap?': ':':')+v);}}}}else{for(k in value){if(Object.prototype.hasOwnProperty.call(value,k)){v=str(k,value);if(v){partial.push(quote(k)+(gap?': ':':')+v);}}}}
-v=partial.length===0?'{}':gap?'{\n'+gap+partial.join(',\n'+gap)+'\n'+mind+'}':'{'+partial.join(',')+'}';gap=mind;return v;}}
-if(typeof JSON.stringify!=='function'){JSON.stringify=function(value,replacer,space){var i;gap='';indent='';if(typeof space==='number'){for(i=0;i<space;i+=1){indent+=' ';}}else if(typeof space==='string'){indent=space;}
-rep=replacer;if(replacer&&typeof replacer!=='function'&&(typeof replacer!=='object'||typeof replacer.length!=='number')){throw new Error('JSON.stringify');}
-return str('',{'':value});};}
-if(typeof JSON.parse!=='function'){JSON.parse=function(text,reviver){var j;function walk(holder,key){var k,v,value=holder[key];if(value&&typeof value==='object'){for(k in value){if(Object.prototype.hasOwnProperty.call(value,k)){v=walk(value,k);if(v!==undefined){value[k]=v;}else{delete value[k];}}}}
-return reviver.call(holder,key,value);}
-text=String(text);cx.lastIndex=0;if(cx.test(text)){text=text.replace(cx,function(a){return'\\u'+
-('0000'+a.charCodeAt(0).toString(16)).slice(-4);});}
-if(/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,''))){j=eval('('+text+')');return typeof reviver==='function'?walk({'':j},''):j;}
-throw new SyntaxError('JSON.parse');};}}());
+if (typeof JSON !== 'object') {
+    JSON = {};
+}
+(function () {
+    'use strict';
+    function f(n) {
+        return n < 10 ? '0' + n : n;
+    }
+
+    if (typeof Date.prototype.toJSON !== 'function') {
+        Date.prototype.toJSON = function (key) {
+            return isFinite(this.valueOf()) ? this.getUTCFullYear() + '-' +
+                f(this.getUTCMonth() + 1) + '-' +
+                f(this.getUTCDate()) + 'T' +
+                f(this.getUTCHours()) + ':' +
+                f(this.getUTCMinutes()) + ':' +
+                f(this.getUTCSeconds()) + 'Z' : null;
+        };
+        String.prototype.toJSON = Number.prototype.toJSON = Boolean.prototype.toJSON = function (key) {
+            return this.valueOf();
+        };
+    }
+    var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g, escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g, gap, indent, meta = {'\b': '\\b', '\t': '\\t', '\n': '\\n', '\f': '\\f', '\r': '\\r', '"': '\\"', '\\': '\\\\'}, rep;
+
+    function quote(string) {
+        escapable.lastIndex = 0;
+        return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
+            var c = meta[a];
+            return typeof c === 'string' ? c : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+        }) + '"' : '"' + string + '"';
+    }
+
+    function str(key, holder) {
+        var i, k, v, length, mind = gap, partial, value = holder[key];
+        if (value && typeof value === 'object' && typeof value.toJSON === 'function') {
+            value = value.toJSON(key);
+        }
+        if (typeof rep === 'function') {
+            value = rep.call(holder, key, value);
+        }
+        switch (typeof value) {
+            case'string':
+                return quote(value);
+            case'number':
+                return isFinite(value) ? String(value) : 'null';
+            case'boolean':
+            case'null':
+                return String(value);
+            case'object':
+                if (!value) {
+                    return'null';
+                }
+                gap += indent;
+                partial = [];
+                if (Object.prototype.toString.apply(value) === '[object Array]') {
+                    length = value.length;
+                    for (i = 0; i < length; i += 1) {
+                        partial[i] = str(i, value) || 'null';
+                    }
+                    v = partial.length === 0 ? '[]' : gap ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']' : '[' + partial.join(',') + ']';
+                    gap = mind;
+                    return v;
+                }
+                if (rep && typeof rep === 'object') {
+                    length = rep.length;
+                    for (i = 0; i < length; i += 1) {
+                        if (typeof rep[i] === 'string') {
+                            k = rep[i];
+                            v = str(k, value);
+                            if (v) {
+                                partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                            }
+                        }
+                    }
+                } else {
+                    for (k in value) {
+                        if (Object.prototype.hasOwnProperty.call(value, k)) {
+                            v = str(k, value);
+                            if (v) {
+                                partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                            }
+                        }
+                    }
+                }
+                v = partial.length === 0 ? '{}' : gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}' : '{' + partial.join(',') + '}';
+                gap = mind;
+                return v;
+        }
+    }
+
+    if (typeof JSON.stringify !== 'function') {
+        JSON.stringify = function (value, replacer, space) {
+            var i;
+            gap = '';
+            indent = '';
+            if (typeof space === 'number') {
+                for (i = 0; i < space; i += 1) {
+                    indent += ' ';
+                }
+            } else if (typeof space === 'string') {
+                indent = space;
+            }
+            rep = replacer;
+            if (replacer && typeof replacer !== 'function' && (typeof replacer !== 'object' || typeof replacer.length !== 'number')) {
+                throw new Error('JSON.stringify');
+            }
+            return str('', {'': value});
+        };
+    }
+    if (typeof JSON.parse !== 'function') {
+        JSON.parse = function (text, reviver) {
+            var j;
+
+            function walk(holder, key) {
+                var k, v, value = holder[key];
+                if (value && typeof value === 'object') {
+                    for (k in value) {
+                        if (Object.prototype.hasOwnProperty.call(value, k)) {
+                            v = walk(value, k);
+                            if (v !== undefined) {
+                                value[k] = v;
+                            } else {
+                                delete value[k];
+                            }
+                        }
+                    }
+                }
+                return reviver.call(holder, key, value);
+            }
+
+            text = String(text);
+            cx.lastIndex = 0;
+            if (cx.test(text)) {
+                text = text.replace(cx, function (a) {
+                    return'\\u' +
+                        ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+                });
+            }
+            if (/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+                j = eval('(' + text + ')');
+                return typeof reviver === 'function' ? walk({'': j}, '') : j;
+            }
+            throw new SyntaxError('JSON.parse');
+        };
+    }
+}());
 
 var commandPath = "$PATH";
-if (!/\/$/.test(commandPath))
-{
+if (!/\/$/.test(commandPath)) {
     commandPath += "/";
 }
 commandPath += "repl-cmd.txt";
 
+
+var _expectedIndex = 0,//expected index of next command
+    _actualIndex,//actual index of next command by reading commandPath
+    _index,//index of ':' char in command
+    _exp,//expression to be eval'ed
+    _result,//result of eval
+    _input,//command
+    _process;//host command process
+
 var Log = (function () {
     // According to Appium,
     //16384 is the buffer size used by instruments
     var forceFlush = [],
-        N = 0, i = N;
-    if ("$MODE" == "FLUSH")
-    {
-        N = 16384;
+        N = "$MODE" == "FLUSH" ? 16384 : 0,
+        i = N;
+    while (i--) {
+        forceFlush[i] = "*";
     }
-    while(i--) { forceFlush[i] = "*"; }
     forceFlush = forceFlush.join('');
 
+    function log_json(object)
+    {
+        UIALogger.logMessage("OUTPUT_JSON:\n"+JSON.stringify(object)+"\n");
+    }
+
     return {
         result: function (status, data) {
-            UIALogger.logMessage(JSON.stringify({"status":status, "value":data}));
+            log_json({"status": status, "value": data, "index":_actualIndex})
             if (forceFlush.length > 0) {
                 UIALogger.logMessage(forceFlush);
             }
         },
         output: function (msg) {
-            UIALogger.logMessage(JSON.stringify({"output":msg}));
+            log_json({"output": msg,"last_index":_actualIndex});
             if (forceFlush.length > 0) {
                 UIALogger.logMessage(forceFlush);
             }
@@ -60,26 +193,22 @@ var Log = (function () {
 })();
 
 
-function findAlertViewText(alert)
-{
-    if (!alert) {return false;}
+function findAlertViewText(alert) {
+    if (!alert) {
+        return false;
+    }
     var txt = alert.name(),
         txts;
-    if (txt == null)
-    {
+    if (txt == null) {
         txts = alert.staticTexts();
-        if (txts != null && txts.length > 0)
-        {
-
+        if (txts != null && txts.length > 0) {
             txt = txts[0].name();
         }
-
     }
     return txt;
 }
 
-function isLocationPrompt(alert)
-{
+function isLocationPrompt(alert) {
     var exps = [
             ["OK", /vil bruge din aktuelle placering/],
             ["OK", /Would Like to Use Your Current Location/],
@@ -90,74 +219,77 @@ function isLocationPrompt(alert)
         txts;
 
     txt = findAlertViewText(alert);
-    for (var i = 0; i < exps.length; i++)
-    {
+    for (var i = 0; i < exps.length; i++) {
         ans = exps[i][0];
         exp = exps[i][1];
-        if (exp.test(txt))
-        {
+        if (exp.test(txt)) {
             return ans;
         }
     }
     return false;
 }
 
-
-UIATarget.onAlert = function (alert)
-{
-    var answer = isLocationPrompt(alert);
-    if (answer)
-    {
-        alert.buttons()[answer].tap();
+UIATarget.onAlert = function (alert) {
+    var target = UIATarget.localTarget();
+    target.pushTimeout(10);
+    function attemptTouchOKOnLocation(retry_count) {
+        retry_count = retry_count || 0;
+        if (retry_count >= 5) {
+            Log.output("Maxed out retry (5) - unable to dismiss location dialog.");
+            return;
+        }
+        try {
+            var answer = isLocationPrompt(alert);
+            if (answer) {
+                alert.buttons()[answer].tap();
+            }
+        }
+        catch (e) {
+            Log.output("Exception while trying to touch alert dialog. Retrying...");
+            if (e && typeof e.toString == 'function') {
+                Log.output(e.toString());
+            }
+            target.delay(1);
+            attemptTouchOKOnLocation(retry_count + 1);
+        }
     }
+
+    attemptTouchOKOnLocation(0);
+    target.popTimeout();
     return true;
 };
 
 
-
-
 var target = null,
     host = null;
 
-var expectedIndex = 0,//expected index of next command
-    actualIndex,//actual index of next command by reading commandPath
-    index,//index of ':' char in command
-    exp,//expression to be eval'ed
-    result,//result of eval
-    input,//command
-    process;//host command process
 
-while (true)
-{
+
+while (true) {
     target = UIATarget.localTarget();
     host = target.host();
     target.delay(0.2);
-    try
-    {
-        process = host.performTaskWithPathArgumentsTimeout("/bin/cat",
-                                                           [commandPath],
-                                                           2);
+    try {
+        _process = host.performTaskWithPathArgumentsTimeout("/bin/cat",
+            [commandPath],
+            2);
 
-    } catch (e)
-    {
+    } catch (e) {
         Log.output("Timeout on cat...");
         continue;
     }
-    if (process.exitCode != 0)
-    {
-        Log.output("unable to execute /bin/cat " + commandPath + " exitCode " + process.exitCode + ". Error: " + process.stderr);
+    if (_process.exitCode != 0) {
+        Log.output("unable to execute /bin/cat " + commandPath + " exitCode " + _process.exitCode + ". Error: " + _process.stderr);
     }
-    else
-    {
-        input = process.stdout;
-        try
-        {
-            index = input.indexOf(":", 0);
-            if (index > -1) {
-                actualIndex = parseInt(input.substring(0,index),10);
-                if (!isNaN(actualIndex) && actualIndex >= expectedIndex) {
-                    exp = input.substring(index+1, input.length);
-                    result = eval(exp);
+    else {
+        _input = _process.stdout;
+        try {
+            _index = _input.indexOf(":", 0);
+            if (_index > -1) {
+                _actualIndex = parseInt(_input.substring(0, _index), 10);
+                if (!isNaN(_actualIndex) && _actualIndex >= _expectedIndex) {
+                    _exp = _input.substring(_index + 1, _input.length);
+                    _result = eval(_exp);
                 }
                 else {//likely old command is lingering...
                     continue;
@@ -168,15 +300,14 @@ while (true)
             }
 
         }
-        catch (err)
-        {
+        catch (err) {
             Log.result("error", err.toString() + "  " + (err.stack ? err.stack.toString() : ""));
-            expectedIndex++;
+            _expectedIndex++;
             continue;
         }
 
-        expectedIndex++;
-        Log.result("success",result);
+        _expectedIndex++;
+        Log.result("success", _result);
 
     }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: calabash-cucumber drives tests for native iOS apps. RunLoop provides
   a number of tools associated with running Calabash tests.
 email:
@@ -57,8 +73,6 @@ files:
 - scripts/json2.js
 - scripts/run_dismiss_location.js
 - scripts/run_loop.js
-- scripts/run_screenshooter.sh
-- scripts/unix_instruments
 homepage: http://calaba.sh
 licenses: []
 post_install_message: 
@@ -84,3 +98,4 @@ signing_key:
 specification_version: 3
 summary: Tools related to running Calabash iOS tests
 test_files: []
+has_rdoc: 

data/scripts/run_screenshooter.sh

@@ -1,172 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2012 Jonathan Penn (http://cocoamanifest.net/)
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-
-# Tell bash that we want the whole script to fail if any part fails.
-set -e
-
-# We require a parameter for where to put the results
-destination="$1"
-
-main() {
-  check_destination
-
-  xcode clean build TARGETED_DEVICE_FAMILY=1
-
-  bin/choose_sim_device "iPhone (Retina 3.5-inch)"
-  shoot en fr ja
-
-  bin/choose_sim_device "iPhone (Retina 4-inch)"
-  shoot en fr ja
-
-  # We to build again with the iPad device family because otherwise Instruments
-  # will build and run for iPhone even though the simulator says otherwise.
-  xcode build TARGETED_DEVICE_FAMILY=2
-
-  bin/choose_sim_device "iPad (Retina)"
-  shoot en fr ja
-
-  close_sim
-}
-
-# Global variables to keep track of where everything goes
-dev_tools_dir=`xcode-select -print-path`
-tmp_dir="/tmp"
-build_dir="$tmp_dir/screen_shooter"
-bundle_dir="$build_dir/app.app"
-trace_results_dir="$build_dir/traces"
-
-check_destination() {
-  # Abort if the destination directory already exists. Better safe than sorry.
-
-  if [ -z "$destination" ]; then
-    echo "usage: run_screenshooter.sh destination_directory"
-    exit 1
-  elif [ -d "$destination" ]; then
-    echo "Destination directory \"$destination\" already exists! Aborting."
-    exit 1
-  fi
-}
-
-shoot() {
-  # Takes the sim device type and a language code, runs the screenshot script,
-  # and then copies over the screenshots to the destination
-
-  for language in $*; do
-    clean_trace_results_dir
-    choose_sim_language $language
-    run_automation "automation/shoot_the_screens.js"
-    copy_screenshots
-  done
-}
-
-xcode() {
-  # A wrapper around `xcodebuild` that tells it to build the app in the temp
-  # directory. If your app uses workspaces or special schemes, you'll need to
-  # specify them here.
-  #
-  # Use `man xcodebuild` for more information on how to build your project.
-
-  xcodebuild -sdk iphonesimulator \
-    CONFIGURATION_BUILD_DIR=$build_dir \
-    PRODUCT_NAME=app \
-    $*
-}
-
-clean_trace_results_dir() {
-  # Removes the trace results directory. We need to do this because Instruments
-  # keeps appending new trace runs and it's simpler for us to always assume
-  # there's just one run recorded where we look for screenshots.
-
-  rm -rf "$trace_results_dir"
-  mkdir -p "$trace_results_dir"
-}
-
-choose_sim_language() {
-  # Alters the global preference file for every simulator type and moves the
-  # chosen language identifier to the top.
-
-  echo "Localizing for $1"
-
-  pref_files=`ls ~/Library/Application\ Support/iPhone\ Simulator/[0-9]*/Library/Preferences/.GlobalPreferences.plist`
-
-  close_sim
-
-
-  # Set the string split delimiter to a newline for the 'for..in'
-  old=$IFS
-  IFS="
-"
-
-  for file in $pref_files; do
-    # Disable errors temporarily just in case the prefs don't have the key
-    # we're trying to delete. This could happen when experimenting and leaving
-    # the prefs file in an inconsistent state. If anything goes horribly wrong,
-    # just delete the prefs file altogether and run the simulator to recreate
-    # it.
-    set +e
-    /usr/libexec/PlistBuddy "$file" -c "Delete :AppleLanguages"
-    set -e
-
-    # Create the language array with just the given language
-    /usr/libexec/PlistBuddy "$file" \
-      -c "Add :AppleLanguages array" \
-      -c "Add :AppleLanguages:0 string '$1'" \
-      -c "Set :AppleLocale '$1'"
-  done
-
-  # Put the old string split delimiter back
-  IFS=$old
-}
-
-
-close_sim() {
-  # Closes the simulator. We need to do this after altering the languages and
-  # when we want to clean up at the end.
-
-  osascript -e 'tell application "iPhone Simulator" to quit'
-}
-
-run_automation() {
-  # Runs the UI Automation JavaScript file that actually takes the screenshots.
-
-  tracetemplate="$dev_tools_dir/../Applications/Instruments.app/Contents/PlugIns/AutomationInstrument.bundle/Contents/Resources/Automation.tracetemplate"
-
-  # Check out the `unix_instruments` script to see why we need this wrapper.
-  bin/unix_instruments \
-    -D "$trace_results_dir/trace" \
-    -t "$tracetemplate" \
-    $bundle_dir \
-    -e UIARESULTSPATH "$trace_results_dir" \
-    -e UIASCRIPT "$1" \
-    $*
-}
-
-copy_screenshots() {
-  # Since we're always clearing out the trace results before every run, we can
-  # assume that any screenshots were saved in the "Run 1" directory. Copy them
-  # to the destination!
-
-  mkdir -p "$destination"
-  cp $trace_results_dir/Run\ 1/*.png $destination
-}
-
-main

data/scripts/unix_instruments

@@ -1,92 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2012 Jonathan Penn (http://cocoamanifest.net)
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-
-
-# unix_instruments
-#
-# A wrapper around `instruments` that returns a proper unix status code
-# depending on whether the run failed or not. Alas, Apple's instruments tool
-# doesn't care about unix status codes, so I must grep for the "Fail:" string
-# and figure it out myself. As long as the command doesn't output that string
-# anywhere else inside it, then it should work.
-#
-# I use a tee pipe to capture the output and deliver it to stdout
-#
-# Author: Jonathan Penn (jonathan@cocoamanifest.net)
-#
-
-set -e  # Bomb on any script errors
-
-run_instruments() {
-  # Because instruments buffers it's output if it determines that it is being
-  # piped to another process, we have to use ptys to get around that so that we
-  # can use `tee` to save the output for grepping and print to stdout in real
-  # time at the same time.
-  #
-  # I don't like this because I'm hard coding a tty/pty pair in here. Suggestions
-  # to make this cleaner?
-
-  output=$(mktemp -t unix-instruments)
-  instruments $@ &> /dev/ttyvf & pid_instruments=$!
-
-  # Cat the instruments output to tee which outputs to stdout and saves to
-  # $output at the same time
-  cat < /dev/ptyvf | tee $output
-
-  # Clear the process id we saved when forking instruments so the cleanup
-  # function called on exit knows it doesn't have to kill anything
-  pid_instruments=0
-
-  # Process the instruments output looking for anything that resembles a fail
-  # message
-  cat $output | get_error_status
-}
-
-get_error_status() {
-  # Catch "Instruments Trace Error"
-  # Catch "Instruments Usage Error"
-  # Catch "00-00-00 00:00:00 +000 Fail:"
-  # Catch "00-00-00 00:00:00 +000 Error:"
-  # Catch "00-00-00 00:00:00 +000 None: Script threw an uncaught JavaScript error"
-  ruby -e 'exit 1 if STDIN.read =~ /Instruments Usage Error|Instruments Trace Error|^\d+-\d+-\d+ \d+:\d+:\d+ [-+]\d+ (Fail:|Error:|None: Script threw an uncaught JavaScript error)/'
-}
-
-trap cleanup_instruments EXIT INT TERM
-function cleanup_instruments() {
-  # Because we fork instruments in this script, we need to clean up if it's
-  # still running because of an error or the user pressed Ctrl-C
-  if [[ $pid_instruments -gt 0 ]]; then
-    echo "Cleaning up instruments..."
-    kill $pid_instruments
-  fi
-}
-
-# Running this file with "----test" will try to parse an error out of whatever
-# is handed in to it from stdin. Use this method to double check your work if
-# you need a custom "get_error_status" function above.
-if [[ $1 == "----test" ]]; then
-  get_error_status
-else
-  run_instruments $@
-fi
-