run_loop 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42636cfa373f5b8df604217d9bb9ee8e4d34a338
-  data.tar.gz: 0624902bb001bae1e33631f4840a4999f59da2d2
+  metadata.gz: 555d66495497677e02f04d4636929bb5eaf0915d
+  data.tar.gz: 731b06dbc736209fd00ca51fe9baf5a18a354e95
 SHA512:
-  metadata.gz: 23f1e8173c75dc439197d1d85282790950fcfa54532988fa1bb11085438034ef2f366bc56f6b6f7a7fb6dd1295f1a41d7c564fd033e260009b3e34d4cf4a5e83
-  data.tar.gz: 5484b9c573f9efd6401542e13f89d162489572fb147ea462b361ecc0f01b862098ac6310d4a513176c9e5c5a3525893d82eab46e7d2c00660abcbf9c7021806b
+  metadata.gz: 8415189c600977b255ee274e6cdd9f123fcdf8df8dae8aad3adbf1c4d2c23af945cb3b4cc7a36647adcf38a47bc26ecdd866cf2180739ef0882409d280ef2285
+  data.tar.gz: ccf930290492ddee04e8372f5bf5e25c7f1101c40821b0c227bf8fd624186f8f3f6ce98509d92bffe3845ce7360f43314e9fe797d7df0985a2512cfcd8234e4c

data/lib/run_loop.rb

@@ -25,6 +25,7 @@ require 'run_loop/host_cache'
 require 'run_loop/patches/awesome_print'
 require 'run_loop/core_simulator'
 require 'run_loop/simctl/plists'
+require 'run_loop/template'
 
 module RunLoop
 

data/lib/run_loop/core.rb

@@ -15,15 +15,15 @@ module RunLoop
     START_DELIMITER = "OUTPUT_JSON:\n"
     END_DELIMITER="\nEND_OUTPUT"
 
-    SCRIPTS_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'scripts'))
     SCRIPTS = {
-        :dismiss => 'run_dismiss_location.js',
-        :run_loop_fast_uia => 'run_loop_fast_uia.js',
-        :run_loop_shared_element => 'run_loop_shared_element.js',
-        :run_loop_host => 'run_loop_host.js',
-        :run_loop_basic => 'run_loop_basic.js'
+      :dismiss => 'run_dismiss_location.js',
+      :run_loop_host => 'run_loop_host.js',
+      :run_loop_fast_uia => 'run_loop_fast_uia.js',
+      :run_loop_shared_element => 'run_loop_shared_element.js',
+      :run_loop_basic => 'run_loop_basic.js'
     }
 
+    SCRIPTS_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'scripts'))
     READ_SCRIPT_PATH = File.join(SCRIPTS_PATH, 'read-cmd.sh')
     TIMEOUT_SCRIPT_PATH = File.join(SCRIPTS_PATH, 'timeout3')
 
@@ -54,7 +54,7 @@ module RunLoop
       if SCRIPTS[key].nil?
         return nil
       end
-      File.join(scripts_path, SCRIPTS[key])
+      SCRIPTS[key]
     end
 
     def self.detect_connected_device
@@ -244,7 +244,7 @@ module RunLoop
 
       script = File.join(results_dir, '_run_loop.js')
 
-      code = File.read(options[:script])
+      code = UIAScriptTemplate.new(SCRIPTS_PATH, options[:script]).result
       code = code.gsub(/\$PATH/, results_dir)
       code = code.gsub(/\$READ_SCRIPT_PATH/, READ_SCRIPT_PATH)
       code = code.gsub(/\$TIMEOUT_SCRIPT_PATH/, TIMEOUT_SCRIPT_PATH)
@@ -254,13 +254,15 @@ module RunLoop
       FileUtils.rm_f(repl_path)
 
       uia_strategy = options[:uia_strategy]
+
       if uia_strategy == :host
         create_uia_pipe(repl_path)
-        RunLoop::HostCache.default.clear unless RunLoop::Environment.xtc?
       else
         FileUtils.touch repl_path
       end
 
+      RunLoop::HostCache.default.clear unless RunLoop::Environment.xtc?
+
       cal_script = File.join(SCRIPTS_PATH, 'calabash_script_uia.js')
       File.open(script, 'w') do |file|
         if include_calabash_script?(options)
@@ -472,22 +474,24 @@ Logfile: #{log_file}
   #  version.
   def self.default_simulator(xcode=RunLoop::Xcode.new)
 
-    if xcode.version_gte_71?
-      'iPhone 6s (9.1)'
+    if xcode.version_gte_72?
+      "iPhone 6s (9.2)"
+    elsif xcode.version_gte_71?
+      "iPhone 6s (9.1)"
     elsif xcode.version_gte_7?
-      'iPhone 5s (9.0)'
+      "iPhone 5s (9.0)"
     elsif xcode.version_gte_64?
-      'iPhone 5s (8.4 Simulator)'
+      "iPhone 5s (8.4 Simulator)"
     elsif xcode.version_gte_63?
-      'iPhone 5s (8.3 Simulator)'
+      "iPhone 5s (8.3 Simulator)"
     elsif xcode.version_gte_62?
-      'iPhone 5s (8.2 Simulator)'
+      "iPhone 5s (8.2 Simulator)"
     elsif xcode.version_gte_61?
-      'iPhone 5s (8.1 Simulator)'
+      "iPhone 5s (8.1 Simulator)"
     elsif xcode.version_gte_6?
-      'iPhone 5s (8.0 Simulator)'
+      "iPhone 5s (8.0 Simulator)"
     else
-      'iPhone Retina (4-inch) - Simulator - iOS 7.1'
+      "iPhone Retina (4-inch) - Simulator - iOS 7.1"
     end
   end
 

data/lib/run_loop/environment.rb

@@ -85,7 +85,7 @@ module RunLoop
     # Checks the value of JENKINS_HOME
     def self.jenkins?
       value = ENV["JENKINS_HOME"]
-      return value && value != ''
+      !!value && value != ''
     end
 
     # Returns true if running in Travis CI
@@ -93,7 +93,7 @@ module RunLoop
     # Checks the value of TRAVIS
     def self.travis?
       value = ENV["TRAVIS"]
-      return value && value != ''
+      !!value && value != ''
     end
 
     # Returns true if running in Circle CI
@@ -101,7 +101,7 @@ module RunLoop
     # Checks the value of CIRCLECI
     def self.circle_ci?
       value = ENV["CIRCLECI"]
-      return value && value != ''
+      !!value && value != ''
     end
 
     # Returns true if running in Teamcity
@@ -109,7 +109,15 @@ module RunLoop
     # Checks the value of TEAMCITY_PROJECT_NAME
     def self.teamcity?
       value = ENV["TEAMCITY_PROJECT_NAME"]
-      return value && value != ''
+      !!value && value != ''
+    end
+
+    # Returns true if running in Teamcity
+    #
+    # Checks the value of GITLAB_CI
+    def self.gitlab?
+      value = ENV["GITLAB_CI"]
+      !!value && value != ''
     end
 
     # Returns true if running in a CI environment
@@ -119,7 +127,8 @@ module RunLoop
         self.travis?,
         self.jenkins?,
         self.circle_ci?,
-        self.teamcity?
+        self.teamcity?,
+        self.gitlab?
       ].any?
     end
 
@@ -145,7 +154,7 @@ module RunLoop
     # !@visibility private
     def self.ci_var_defined?
       value = ENV["CI"]
-      return value && value != ''
+      !!value && value != ''
     end
   end
 end

data/lib/run_loop/template.rb

@@ -0,0 +1,22 @@
+require 'erb'
+
+module RunLoop
+
+  # class to break up javascript templates in to reusable chunks
+  class UIAScriptTemplate < ERB
+    def initialize(template_root, template_relative_path)
+      @template_root = template_root
+      @template = File.read(File.join(@template_root, template_relative_path))
+      super(@template)
+    end
+
+    def render_template(template_relative_path)
+      return UIAScriptTemplate.new(@template_root, template_relative_path).result
+    end
+
+    def result
+      super(binding)
+    end
+  end
+
+end

data/lib/run_loop/version.rb

@@ -1,5 +1,5 @@
 module RunLoop
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 
   # A model of a software release version that can be used to compare two versions.
   #

data/lib/run_loop/xcode.rb

@@ -24,6 +24,14 @@ module RunLoop
       to_s
     end
 
+    # Returns a version instance for `Xcode 7.1`; used to check for the
+    # availability of features and paths to various items on the filesystem.
+    #
+    # @return [RunLoop::Version] 7.1
+    def v72
+      fetch_version(:v72)
+    end
+
     # Returns a version instance for `Xcode 7.1`; used to check for the
     # availability of features and paths to various items on the filesystem.
     #
@@ -96,6 +104,13 @@ module RunLoop
       fetch_version(:v50)
     end
 
+    # Is the active Xcode version 7.1 or above?
+    #
+    # @return [Boolean] `true` if the current Xcode version is >= 7.1
+    def version_gte_72?
+      version >= v72
+    end
+
     # Is the active Xcode version 7.1 or above?
     #
     # @return [Boolean] `true` if the current Xcode version is >= 7.1

data/scripts/lib/log.js

@@ -0,0 +1,26 @@
+var Log = (function () {
+    var forceFlush = [],
+        N = 16384,
+        i = N;
+    while (i--) {
+        forceFlush[i] = "*";
+    }
+    forceFlush = forceFlush.join('');
+
+    function log_json(object, flush)
+    {
+        UIALogger.logMessage("OUTPUT_JSON:\n"+JSON.stringify(object)+"\nEND_OUTPUT");
+        if (flush) {
+            UIALogger.logMessage(forceFlush);
+        }
+    }
+
+    return {
+        result: function (status, data, flush) {
+            log_json({"status": status, "value": data, "index":_actualIndex}, flush)
+        },
+        output: function (msg, flush) {
+            log_json({"output": msg,"last_index":_actualIndex}, flush);
+        }
+    };
+})();

data/scripts/lib/on_alert.js

@@ -0,0 +1,103 @@
+function findAlertViewText(alert) {
+    if (!alert) {
+        return false;
+    }
+    var txt = alert.name(),
+        txts;
+    if (txt == null) {
+        txts = alert.staticTexts();
+        if (txts != null && txts.length > 0) {
+
+            txt = txts[0].name();
+        }
+
+    }
+    return txt;
+}
+
+function englishLocalizations() {
+  return [
+    ["OK", /Would Like to Use Your Current Location/],
+    ["OK", /Location Accuracy/],
+    ["Allow", /access your location/],
+    ["OK", /Would Like to Access Your Photos/],
+    ["OK", /Would Like to Access Your Contacts/],
+    ["OK", /Access the Microphone/],
+    ["OK", /Would Like to Access Your Calendar/],
+    ["OK", /Would Like to Access Your Reminders/],
+    ["OK", /Would Like to Access Your Motion Activity/],
+    ["OK", /Would Like to Access the Camera/],
+    ["OK", /Would Like to Access Your Motion & Fitness Activity/],
+    ["OK", /Would Like Access to Twitter Accounts/],
+    ["OK", /data available to nearby bluetooth devices/],
+    ["OK", /Would Like to Send You Notifications/],
+    ["OK", /would like to send you Push Notifications/]
+  ];
+}
+
+function danishLocalizations() {
+  return [
+    // Location
+    ["Tillad", /bruge din lokalitet, når du bruger appen/],
+    ["Tillad", /også når du ikke bruger appen/],
+    ["OK", /vil bruge din aktuelle placering/]
+  ];
+}
+
+function spanishLocalizations() {
+  return [
+    // APNS
+    ["OK", /enviarle notificaiones/]
+  ];
+}
+
+function germanLocalizations() {
+  return [
+    // Location
+    ["Ja", /Darf (?:.)+ Ihren aktuellen Ort verwenden/]
+  ];
+}
+
+function dutchLocalizations() {
+  return [
+    // APNS
+    ["OK", /wil u berichten stuern/]
+  ];
+}
+
+function russianLocalizations() {
+  return [
+    // Location
+    ["OK", /запрашивает разрешение на использование Ващей текущей пгеопозиции/]
+  ];
+}
+
+function localizations() {
+  return [].concat(
+     danishLocalizations(),
+     dutchLocalizations(),
+     englishLocalizations(),
+     germanLocalizations(),
+     russianLocalizations(),
+     spanishLocalizations()
+  );
+}
+
+function isPrivacyAlert(alert) {
+
+  var ans, exp, txt;
+
+  var exps = localizations();
+
+  txt = findAlertViewText(alert);
+  Log.output({"output":"alert: "+txt}, true);
+  for (var i = 0; i < exps.length; i++) {
+    ans = exps[i][0];
+    exp = exps[i][1];
+    if (exp.test(txt)) {
+      return ans;
+    }
+  }
+  return false;
+}
+

data/scripts/run_dismiss_location.js

@@ -1,43 +1,7 @@
 var target = UIATarget.localTarget(),
     screenshot_count = 0;
 
-function findAlertViewText(alert) {
-    if (!alert) {
-        return false;
-    }
-    var txt = alert.name(),
-        txts;
-    if (txt == null) {
-        txts = alert.staticTexts();
-        if (txts != null && txts.length > 0) {
-
-            txt = txts[0].name();
-        }
-
-    }
-    return txt;
-}
-
-function isLocationPrompt(alert) {
-    var exps = [
-            ["OK", /vil bruge din aktuelle placering/],
-            ["OK", /Would Like to Use Your Current Location/],
-            ["Ja", /Darf (?:.)+ Ihren aktuellen Ort verwenden/]
-        ],
-        ans, exp,
-        txt;
-
-    txt = findAlertViewText(alert);
-    for (var i = 0; i < exps.length; i++) {
-        ans = exps[i][0];
-        exp = exps[i][1];
-        if (exp.test(txt)) {
-            return ans;
-        }
-    }
-    return false;
-}
-
+<%= render_template("lib/on_alert.js") %>
 
 var alertHandlers = [//run in reverse order of this:
     isLocationPrompt

data/scripts/run_loop_basic.js

@@ -1,248 +1,34 @@
-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 Log = (function () {
-    var forceFlush = [],
-        N = 16384,
-        i = N;
-    while (i--) {
-        forceFlush[i] = "*";
-    }
-    forceFlush = forceFlush.join('');
-
-    function log_json(object, flush)
-    {
-        UIALogger.logMessage("OUTPUT_JSON:\n"+JSON.stringify(object)+"\nEND_OUTPUT");
-        if (flush) {
-            UIALogger.logMessage(forceFlush);
-        }
-    }
-
-    return {
-        result: function (status, data, flush) {
-            log_json({"status": status, "value": data, "index":_actualIndex}, flush)
-        },
-        output: function (msg, flush) {
-            log_json({"output": msg,"last_index":_actualIndex}, flush);
-        }
-    };
-})();
-
-
-function findAlertViewText(alert) {
-    if (!alert) {
-        return false;
-    }
-    var txt = alert.name(),
-        txts;
-    if (txt == null) {
-        txts = alert.staticTexts();
-        if (txts != null && txts.length > 0) {
-            txt = txts[0].name();
-        }
-    }
-    return txt;
-}
-
-function isLocationPrompt(alert) {
-    var exps = [
-            ["OK", /vil bruge din aktuelle placering/],
-            ["OK", /Would Like to Use Your Current Location/],
-            ["OK", /Would Like to Send You Notifications/],
-            ["Allow", /access your location/],
-            ["Ja", /Darf (?:.)+ Ihren aktuellen Ort verwenden/],
-            ["OK", /Would Like to Access Your Photos/],
-            ["OK", /Would Like to Access Your Contacts/],
-            ["OK", /Location Accuracy/],
-            ["OK", /запрашивает разрешение на использование Ващей текущей пгеопозиции/]
-        ],
-        ans, exp,
-        txt;
-
-    txt = findAlertViewText(alert);
-    Log.output({"output":"alert: "+txt}, true);
-    for (var i = 0; i < exps.length; i++) {
-        ans = exps[i][0];
-        exp = exps[i][1];
-        if (exp.test(txt)) {
-            return ans;
-        }
-    }
-    return false;
-}
+<%= render_template("lib/json2.min.js") %>
+<%= render_template("lib/log.js"); %>
+<%= render_template("lib/on_alert.js"); %>
 
 UIATarget.onAlert = function (alert) {
     Log.output({"output":"on alert"}, true);
     var target = UIATarget.localTarget();
     target.pushTimeout(10);
-    function attemptTouchOKOnLocation(retry_count) {
+    function dismissPrivacyAlert(retry_count) {
         retry_count = retry_count || 0;
         if (retry_count >= 5) {
-            Log.output("Maxed out retry (5) - unable to dismiss location dialog.");
+            Log.output("Maxed out retry (5) - unable to dismiss privacy alert.");
             return;
         }
         try {
-            var answer = isLocationPrompt(alert);
+            var answer = isPrivacyAlert(alert);
             if (answer) {
                 alert.buttons()[answer].tap();
             }
         }
         catch (e) {
-            Log.output("Exception while trying to touch alert dialog. Retrying...");
+            Log.output("Exception while trying to touch alert. Retrying...");
             if (e && typeof e.toString == 'function') {
                 Log.output(e.toString());
             }
             target.delay(1);
-            attemptTouchOKOnLocation(retry_count + 1);
+            dismissPrivacyAlert(retry_count + 1);
         }
     }
 
-    attemptTouchOKOnLocation(0);
+    dismissPrivacyAlert(0);
     target.popTimeout();
     return true;
 };