run_loop 2.1.1.pre1 → 2.1.1.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c918815b4ef775ad83f3f3ade7e33db64704d5b
-  data.tar.gz: a41970f9c49cb57129305389b4613af8ae2eb833
+  metadata.gz: c874aaaaba2d83da288814e78328d8b663a4d44a
+  data.tar.gz: 32a4447b971655081d08d06684e974a907d1da8a
 SHA512:
-  metadata.gz: 4602a64d7e56fadc22bb0eeb77f11421367b6513c51b0ab3dd6da8e5d38ed836e48223cfbd72176cc878e31c0e748ea5444a4eb5e5c38eee4ce9a58dc6491df5
-  data.tar.gz: 4b6faebb8be5987067ee0a3af74c35f3c0010256d3636c40fef9d638fd9a3027c693c6786b5f715b04dd85d1fd2f4b63ddccdd10391898bbf8d0218038e52af1
+  metadata.gz: 518708e1ce2e1b5f305c2c0b337f85dd2ca86d62431052eba8837cf88b5834c37b56fc397ed5c67c0f8520b7430779b2e788180dac14aae5a6856c301b29eca1
+  data.tar.gz: 1899a1efbc4e93ee4bb37763e6a3cf5caacf7001b7cfdea350bc5c12f2c266b67b844c63791e3d5f6f1691695fb338310dfcda6ead233caf95b9229eaa8732d2

data/lib/run_loop/core.rb

@@ -89,11 +89,20 @@ module RunLoop
 
       script = File.join(results_dir, '_run_loop.js')
 
-      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)
-      code = code.gsub(/\$MODE/, 'FLUSH') unless options[:no_flush]
+      javascript = UIAScriptTemplate.new(SCRIPTS_PATH, options[:script]).result
+      UIAScriptTemplate.sub_path_var!(javascript, results_dir)
+      UIAScriptTemplate.sub_read_script_path_var!(javascript, READ_SCRIPT_PATH)
+      UIAScriptTemplate.sub_timeout_script_path_var!(javascript, TIMEOUT_SCRIPT_PATH)
+
+      # Using a :no_* option is confusing.
+      # TODO Replace :no_flush with :flush_uia_logs; it should default to true
+      if RunLoop::Environment.xtc?
+        UIAScriptTemplate.sub_mode_var!(javascript, "FLUSH") unless options[:no_flush]
+      else
+        if self.detect_flush_uia_log_option(options)
+          UIAScriptTemplate.sub_flush_uia_logs_var!(javascript, "FLUSH_LOGS")
+        end
+      end
 
       repl_path = File.join(results_dir, 'repl-cmd.pipe')
       FileUtils.rm_f(repl_path)
@@ -111,7 +120,7 @@ module RunLoop
         if include_calabash_script?(options)
           file.puts IO.read(cal_script)
         end
-        file.puts code
+        file.puts javascript
       end
 
       args = options.fetch(:args, [])
@@ -661,6 +670,31 @@ Logfile: #{log_file}
       strategy
     end
 
+    # @!visibility private
+    #
+    # UIAutomation buffers log output in some very strange ways.  RunLoop
+    # attempts to work around this buffering by forcing characters onto the
+    # UIALogger buffer.  Once the buffer is full, UIAutomation will dump its
+    # contents.  It is essential that the communication between UIAutomation
+    # and RunLoop be synchronized.
+    #
+    # Casual users should never set the :flush_uia_logs key; they should use the
+    # defaults.
+    #
+    # :no_flush is supported (for now) as alternative key.
+    #
+    # @param [Hash] options The launch options passed to .run_with_options
+    def self.detect_flush_uia_log_option(options)
+      if options.has_key?(:no_flush)
+        # Confusing.
+        # :no_flush == false means, flush the logs.
+        # :no_flush == true means, don't flush the logs.
+        return !options[:no_flush]
+      end
+
+      return options.fetch(:flush_uia_logs, true)
+    end
+
     # @!visibility private
     #
     # @param [Hash] options The launch options passed to .run_with_options

data/lib/run_loop/core_simulator.rb

@@ -408,6 +408,7 @@ $ bundle exec run-loop simctl manage-processes
       hash = launch_app_with_simctl
       exit_status = hash[:exit_status]
       if exit_status != 0
+        out = hash[:out]
         RunLoop.log_debug("Failed to launch app.")
         out.split($-0).each do |line|
           RunLoop.log_debug("    #{line}")

data/lib/run_loop/dot_dir.rb

@@ -17,6 +17,10 @@ module RunLoop::DotDir
       results_dir = File.join(self.directory, 'results')
       next_results_dir = self.next_timestamped_dirname(results_dir)
       FileUtils.mkdir_p(next_results_dir)
+
+      current = File.join(self.directory, "results", "current")
+      FileUtils.rm_rf(current)
+      FileUtils.ln_s(next_results_dir, current)
     end
 
     next_results_dir
@@ -32,7 +36,7 @@ module RunLoop::DotDir
     RunLoop.log_debug("Searching for run-loop results with glob: #{glob}")
 
     directories = Dir.glob(glob).select do |path|
-      File.directory?(path)
+      File.directory?(path) && !File.symlink?(path)
     end
 
     oldest_first = directories.sort_by { |f| File.mtime(f) }

data/lib/run_loop/template.rb

@@ -9,7 +9,8 @@ module RunLoop
     # @!visibility private
     def initialize(template_root, template_relative_path)
       @template_root = template_root
-      @template = File.read(File.join(@template_root, template_relative_path)).force_encoding("utf-8")
+      template_path = File.join(@template_root, template_relative_path)
+      @template = File.read(template_path).force_encoding("utf-8")
       super(@template)
     end
 
@@ -22,5 +23,39 @@ module RunLoop
     def result
       super(binding)
     end
+
+    # @!visibility private
+    def self.sub_path_var!(javascript, results_dir)
+      self.substitute_variable!(javascript, "PATH", results_dir)
+    end
+
+    # @!visibility private
+    def self.sub_read_script_path_var!(javascript, read_cmd_sh)
+      self.substitute_variable!(javascript, "READ_SCRIPT_PATH", read_cmd_sh)
+    end
+
+    # @!visibility private
+    def self.sub_timeout_script_path_var!(javascript, timeout_sh)
+      self.substitute_variable!(javascript, "TIMEOUT_SCRIPT_PATH", timeout_sh)
+    end
+
+    # @!visibility private
+    def self.sub_flush_uia_logs_var!(javascript, value)
+      self.substitute_variable!(javascript, "FLUSH_LOGS", value)
+    end
+
+    # @!visibility private
+    #
+    # Legacy and XTC - related to :no_flush which is a deprecated option.
+    #
+    # Replaced with :flush_uia_logs
+    def self.sub_mode_var!(javascript, value)
+      self.substitute_variable!(javascript, "MODE", value)
+    end
+
+    # @!visibility private
+    def self.substitute_variable!(javascript, variable, value)
+      javascript.gsub!(/\$#{variable}/, value)
+    end
   end
 end

data/lib/run_loop/version.rb

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

data/scripts/lib/log.js

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

data/scripts/run_loop_basic.js

@@ -3,7 +3,7 @@
 <%= render_template("lib/on_alert.js"); %>
 
 UIATarget.onAlert = function (alert) {
-    Log.output({"output":"on alert"}, true);
+    Log.output({"output":"on alert"});
     var target = UIATarget.localTarget();
     target.pushTimeout(10);
     function dismissPrivacyAlert(retry_count) {

data/scripts/run_loop_fast_uia.js

@@ -41,6 +41,7 @@ UIATarget.onAlert = function (alert) {
 
     dismissPrivacyAlert(0);
     target.popTimeout();
+
     for (var i=0;i<_RUN_LOOP_MAX_RETRY_AFTER_HANDLER;i++) {
         req = app.preferencesValueForKey(__calabashRequest);
         rsp = app.preferencesValueForKey(__calabashResponse);
@@ -143,7 +144,7 @@ var target = null,
     };
 
 _resetCalabashPreferences();
-Log.result('success',true,true);
+Log.result('success', true);
 target = UIATarget.localTarget();
 while (true) {
     try {
@@ -175,7 +176,7 @@ while (true) {
         }
         catch(err) {
             failureMessage = "Failure: "+ err.toString() + "  " + (err.stack ? err.stack.toString() : "");
-            Log.output({"output":failureMessage}, true);
+            Log.output({"output":failureMessage});
             _failure(err, _actualIndex);
         }
     }

data/scripts/run_loop_host.js

@@ -23,7 +23,7 @@ var _expectedIndex = 0,//expected index of next command
 <%= render_template("lib/on_alert.js"); %>
 
 UIATarget.onAlert = function (alert) {
-    Log.output({"output":"on alert"}, true);
+    Log.output({"output":"on alert");
     var target = UIATarget.localTarget();
     target.pushTimeout(10);
     function dismissPrivacyAlert(retry_count) {
@@ -74,7 +74,12 @@ while (true) {
     }
     if (_process.exitCode != 0) {
         if (_process.exitCode != 15) {
-            Log.output("unable to execute: " + timeoutScriptPath + " " +readPipeScriptPath + " " + commandPath + " exitCode " + _process.exitCode + ". Error: " + _process.stderr + _process.stdout);
+            Log.output("unable to execute: " +
+                  timeoutScriptPath + " " +
+                  readPipeScriptPath + " " +
+                  commandPath + " exitCode "
+                  + _process.exitCode + ". Error: " +
+                  _process.stderr + _process.stdout);
         }
     }
     else {
@@ -98,7 +103,9 @@ while (true) {
 
         }
         catch (err) {
-            Log.result("error", "Input: " + (_exp ? _exp.toString() : "null") + ". Error: " + err.toString() + "  " + (err.stack ? err.stack.toString() : ""));
+            Log.result("error", "Input: " + (_exp ? _exp.toString() : "null") +
+                  ". Error: " + err.toString() + "  " +
+                  (err.stack ? err.stack.toString() : ""));
             _expectedIndex++;
             continue;
         }

data/scripts/run_loop_shared_element.js

@@ -45,7 +45,7 @@ UIATarget.onAlert = function (alert) {
 };
 
 
-Log.result('success',true,true);
+Log.result('success', true);
 
 var _calabashSharedTextField = null,
     __calabashSharedTextFieldName = '__calabash_uia_channel',
@@ -114,7 +114,7 @@ while (true) {
         }
         catch(err) {
             failureMessage = "Failure: "+ err.toString() + "  " + (err.stack ? err.stack.toString() : "");
-            Log.output({"output":failureMessage}, true);
+            Log.output({"output":failureMessage});
             _failure(err, _actualIndex);
         }
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 2.1.1.pre1
+  version: 2.1.1.pre2
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json