run_loop 0.0.22 → 0.1.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4c9ae30a399869907b6160aaabf933532272528
-  data.tar.gz: 5db3c2b9c173101686590d3048a15a43ff73fb02
+  metadata.gz: a964878f5f254c2251799bb935534e9e42b68fdb
+  data.tar.gz: eee14a802d715caeb9758232d5a8e01e9a8d18ed
 SHA512:
-  metadata.gz: a3c31f4c84d8a16eeb1e9f7fd5d5f758d5e14aa7ebe6fac19d4b950f19d4554040e0e2939eb54b39a08743346e2bb0d19b7f71113ed3de5058786bcf9fc900d7
-  data.tar.gz: d9b522821579cd706750a0baf7d9efba560494a0fb1682b0d48ceb142a560ac9f6e8a074b771bbdb984614b929962bd7b0651be41f92a181038a878b1cf2e302
+  metadata.gz: dc29867d1bcf79cb9b1e2c5dd1657840a76695b4f39ef5e3d0b3382bd2d4a89e94e0b8c6934969b6a3aa6764839a77023dbe5c667a94269e8b0423e480fc471c
+  data.tar.gz: 73aeac53bfa5316ace1ede7d475d31b2264d7fcd1b1d9d6c264f126ac8083e45162a5e6e9a1c27d534b30d1bef7cf38f78d916910ac3d2e5d1295ace317df13f

data/lib/run_loop/core.rb

@@ -148,21 +148,23 @@ module RunLoop
 
       run_loop = {:pid => pid, :udid => udid, :app => bundle_dir_or_bundle_id, :repl_path => repl_path, :log_file => log_file, :results_dir => results_dir}
 
-      #read_response(run_loop,0)
       before = Time.now
       begin
         Timeout::timeout(timeout, TimeoutError) do
           read_response(run_loop, 0)
         end
       rescue TimeoutError => e
-        puts "Failed to launch\n"
-        puts "device_target=#{device_target}"
-        puts "udid=#{udid}"
-        puts "bundle_dir_or_bundle_id=#{bundle_dir_or_bundle_id}"
-        puts "script=#{script}"
-        puts "log_file=#{log_file}"
-        puts "timeout=#{timeout}"
-        puts "args=#{args}"
+        if ENV['DEBUG']
+          puts "Failed to launch\n"
+          puts "reason=#{e}: #{e && e.message} "
+          puts "device_target=#{device_target}"
+          puts "udid=#{udid}"
+          puts "bundle_dir_or_bundle_id=#{bundle_dir_or_bundle_id}"
+          puts "script=#{script}"
+          puts "log_file=#{log_file}"
+          puts "timeout=#{timeout}"
+          puts "args=#{args}"
+        end
         raise TimeoutError, "Time out waiting for UIAutomation run-loop to Start. \n Logfile #{log_file} \n\n #{File.read(log_file)}\n"
       end
 
@@ -215,6 +217,10 @@ module RunLoop
 
         size = File.size(log_file)
         output = File.read(log_file, size-offset, offset)
+
+        if /AXError: Could not auto-register for pid status change/.match(output)
+          raise TimeoutError.new('AXError: Could not auto-register for pid status change')
+        end
         index_if_found = output.index(START_DELIMITER)
         if ENV['DEBUG_READ']=='1'
           puts output.gsub("*", '')
@@ -246,6 +252,9 @@ module RunLoop
 
           offset = offset + json.size
           parsed_result = JSON.parse(json)
+          if ENV['DEBUG_READ']=='1'
+            p parsed_result
+          end
           json_index_if_present = parsed_result['index']
           if json_index_if_present && json_index_if_present == expected_index
             result = parsed_result

data/lib/run_loop/version.rb

@@ -1,3 +1,3 @@
 module RunLoop
-  VERSION = '0.0.22'
+  VERSION = '0.1.0.pre1'
 end

data/scripts/run_loop.js

@@ -147,26 +147,15 @@ if (typeof JSON !== 'object') {
     }
 }());
 
-var commandPath = "$PATH";
-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
+    _actualIndex=0,//actual index of next command by reading commandPath
     _exp,//expression to be eval'ed
-    _result,//result of eval
-    _input,//command
-    _process;//host command process
+    _result;
 
 var Log = (function () {
-    // According to Appium,
-    //16384 is the buffer size used by instruments
     var forceFlush = [],
-        N = "$MODE" == "FLUSH" ? 16384 : 0,
+        N = 16384,
         i = N;
     while (i--) {
         forceFlush[i] = "*";
@@ -179,17 +168,14 @@ var Log = (function () {
     }
 
     return {
-        result: function (status, data) {
+        result: function (status, data,flush) {
             log_json({"status": status, "value": data, "index":_actualIndex})
-            if (forceFlush.length > 0) {
+            if (flush) {
                 UIALogger.logMessage(forceFlush);
             }
         },
         output: function (msg) {
             log_json({"output": msg,"last_index":_actualIndex});
-            if (forceFlush.length > 0) {
-                UIALogger.logMessage(forceFlush);
-            }
         }
     };
 })();
@@ -217,8 +203,7 @@ function isLocationPrompt(alert) {
             ["Ja", /Darf (?:.)+ Ihren aktuellen Ort verwenden/]
         ],
         ans, exp,
-        txt,
-        txts;
+        txt;
 
     txt = findAlertViewText(alert);
     for (var i = 0; i < exps.length; i++) {
@@ -263,53 +248,63 @@ UIATarget.onAlert = function (alert) {
 
 
 var target = null,
-    host = null;
+    preferences = null,
+    __calabashRequest = "__calabashRequest",
+    __calabashResponse = "__calabashResponse",
+    _response = function(response) {
+        target.frontMostApp().setPreferencesValueForKey(response, __calabashResponse);
+    },
+    _success = function(result,index) {
+        _response({"status":'success', "value":result, "index": index});
 
+    },
+    _failure = function(err, index) {
+        _response({"status":'error',
+                   "value":err.toString(),
+                   "backtrace":(err.stack ? err.stack.toString() : ""),
+                   "index":index});
+    };
 
+UIATarget.localTarget().frontMostApp().setPreferencesValueForKey(null, __calabashResponse);
+UIATarget.localTarget().frontMostApp().setPreferencesValueForKey(0, __calabashRequest);
+
+Log.result('success',true,true);
 
 while (true) {
     target = UIATarget.localTarget();
-    host = target.host();
-    target.delay(0.2);
     try {
-        _process = host.performTaskWithPathArgumentsTimeout("/bin/cat",
-            [commandPath],
-            2);
-
+        preferences = target.frontMostApp().preferencesValueForKey(__calabashRequest);
     } catch (e) {
-        Log.output("Timeout on cat...");
+        Log.output("Unable to read preferences..."+ e.toString());
+        target.delay(0.5);
         continue;
     }
-    if (_process.exitCode != 0) {
-        Log.output("unable to execute /bin/cat " + commandPath + " exitCode " + _process.exitCode + ". Error: " + _process.stderr);
+
+    if (!preferences) {
+        target.delay(0.2);
+        continue;
     }
-    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;
-                }
-            }
-            else {
-                continue;
-            }
 
+    _actualIndex = preferences['index'];
+    if (!isNaN(_actualIndex) && _actualIndex >= _expectedIndex) {
+        _exp = preferences['command'];
+        UIALogger.logMessage("index " + _actualIndex + " is command: "+ _exp);
+        target.frontMostApp().setPreferencesValueForKey(null, __calabashRequest);
+        try {
+            _result = eval(_exp);
+            UIALogger.logMessage("Success: "+ _result);
+            _success(_result, _actualIndex);
         }
-        catch (err) {
-            Log.result("error", err.toString() + "  " + (err.stack ? err.stack.toString() : ""));
-            _expectedIndex++;
-            continue;
+        catch(err) {
+            UIALogger.logMessage("Failure: "+ err.toString() + "  " + (err.stack ? err.stack.toString() : ""));
+            _failure(err, _actualIndex);
         }
+    }
+    else {//likely old command is lingering...
+        continue;
+    }
+    _expectedIndex++;
 
-        _expectedIndex++;
-        Log.result("success", _result);
 
-    }
+    target.delay(0.2);
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.1.0.pre1
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -84,9 +84,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.2