run_loop 1.1.0 → 1.1.1.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b85916dc0be8fbbf6e5326d953501f5245c15af1
-  data.tar.gz: bed6f2a0b40c4abf114244ce785a68a8b533abde
+  metadata.gz: f3863d38d0bd08af344764bccbfdd02fc74e305f
+  data.tar.gz: f632568b5c4e520eefa771c9c2f94d1589963b2a
 SHA512:
-  metadata.gz: 9892774caa1ec504e78583089c8320681087c01bb70afd4682593d732c544f9ed6e1800847f6035499d3b2a9273820ef2d1d89ffd24c313c7415f74ae3f4ac5c
-  data.tar.gz: 2143458e189c9268bc14e1453df476f9fd67a0c86c5b43f010db444405f8a78fe376c484c74592e4fc39b7d647a012fed37be3cd4fe58cf40f5f2fceaf303f54
+  metadata.gz: 0a6d9b508d2c5478c4d47ffa55d2c194c593366664719ab5e32cebea49390f0b44bb9c990e235c90982e2c015aa6d97cd35688e856c094bd1470bfeb23668cf0
+  data.tar.gz: 29fab379355e8b698dd89cbfcf4cd462c3ca8a033f8b17645e73a951a0ef5f12101cef85658c1f6ecd95d9d38541e43bfc89e0445fadd006826a59e151c656d0

data/lib/run_loop/version.rb

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

data/scripts/calabash-uia-min.js

@@ -0,0 +1,7 @@
+(function(){function m(){return h.frontMostApp()}function r(){return m().mainWindow()}function s(){return m().windows().toArray()}function n(){return m().keyboard()}function l(a,c){this.reason=a;this.a=c||"";this.message=this.toString()}function k(a){return!a||a instanceof UIAElementNil}function t(a,c){var b=c||[],e,d;if(k(a))return b;e=a.elements();for(var f=0,g=e.length;f<g;f+=1)d=e[f],b.push(d),t(d,b);return b}function q(a,c){for(var b=0,e=c.length;b<e;b+=1)a.push(c[b])}function u(a,c){var b=[];
+if(k(c))return b;c instanceof this[a]&&b.push(c);for(var e=c.elements(),d=0,f=e.length;d<f;d+=1)q(b,u(a,e[d]));return b}function x(a,c){var b=null;if(a instanceof Array){if(3===a.length){var e=a[0],b=a[1],d=a[2];if("string"==typeof d)if(-1==d.indexOf("'"))d="'"+d+"'";else if(-1==d.indexOf('"'))d='"'+d+'"';else throw new l("Escaping for filters not supported yet.");b=c.withPredicate(e+" "+b+" "+d);return!k(b)}return!1}for(e in a)if(a.hasOwnProperty(e))if(b=a[e],"marked"==e){if(c.name()!=b&&c.label()!=
+b&&(!c.value||c.value!=b))return!1}else if(b=c.withValueForKey(b,e),k(b))return!1;return!0}function v(a,c){if(c(a))return a;var b,e;if(k(a))return null;b=a.elements();for(var d=0,f=b.length;d<f;d+=1)if(e=b[d],v(e,c))return e;return null}function w(a){h.delay(a);return h}var g={},h=UIATarget.localTarget();h.setTimeout(0);l.prototype=error();l.prototype.toString=function(){var a="UIAutomationError[reason="+this.reason;0<this.a.length&&(a+=", details="+this.a);return a+"]"};g.sleep=w;g.query=function(a,
+c){if(!c)return g.query(a,s());c instanceof UIAElement&&(c=[c]);var b=c,e=null,d=null,f=[],p,h,k,l;p=0;for(k=a.length;p<k;p+=1){e=a[p];h=0;for(l=b.length;h<l;h+=1)d=b[h],"string"===typeof e?"*"===e||"view"==e||"UIAElement"===e?q(f,t(d,[d])):q(f,u(e,d)):x(e,d)&&f.push(d);b=f;f=[]}return b};g.keyboard_visible=function(){return!k(n())};g.keyboard_enter_text=function(a,c){if(!g.keyboard_visible())throw new l("Keyboard not visible");c=c||{};if(c.unsafe)return n().typeString(a),!0;var b=v(r(),function(a){return 1==
+a.hasKeyboardFocus()});if(k(b))return n().typeString(a),!0;var e=c.initial_text||"",d=new Date,f=c.timeout||60,h=n();do try{return h.typeString(a),!0}catch(m){UIALogger.logMessage("keyboard_enter_text failed: "+m),UIALogger.logMessage("keyboard_enter_text retrying with restore to: "+e),b.setValue(e)}while(!(new Date-d>=1E3*f));throw new l("Unable to enter text","text: "+a+" failed after retrying for "+f);};g.deactivate=function(a){h.deactivateAppForDuration(a)};g.tap_offset=function(a,c,b){b=b||{};
+return b.unsafe?function(){return c.apply(this,arguments)}:function(){var e=new Date,d=b.timeout||60,f=b.frequency||.1;do try{return c.apply(this,arguments)}catch(g){UIALogger.logMessage(a+"Error: "+g+". Arguments: "+arguments[0]+", "+arguments[1]),w(f)}while(!(new Date-e>=1E3*d));throw new l(a,"Arguments: "+arguments[0]+", "+arguments[1]);}}("tap_offset failed",function(a,c){h.tapWithOptions(a,c||{})},{timeout:60,frequency:.5});this.target=h;this.uia=g;g.app=m;g.window=r;g.windows=s;g.keyboard=n;
+g.alert=function(){return m().alert()}})();

data/scripts/run_loop_fast_uia.js

@@ -292,17 +292,17 @@ var target = null,
 
         for (i=0; i<MAX_TRIES; i+=1) {
             UIALogger.logMessage("Write result...");
+            target.frontMostApp().preferencesValueForKey(__calabashResponse);
+            UIALogger.logMessage("Last response..."+__calabashResponse);
             target.frontMostApp().setPreferencesValueForKey(sanitized, __calabashResponse);
-            UIALogger.logMessage("Check successful storage...")
-            UIATarget.localTarget().delay(0.1);
-            UIALogger.logMessage("Post delay...")
             res = target.frontMostApp().preferencesValueForKey(__calabashResponse);
+            UIALogger.logMessage("Next response..."+__calabashResponse);
             if (res && res['index'] == sanitized['index']) {
                 UIALogger.logMessage("Storage succeeded: "+ res['index']);
                 return;
             } else {
-                UIALogger.logMessage("Storage failed: "+ res);
-                target.delay(0.5);
+                UIALogger.logMessage("Storage failed: "+ res + " Retrying...");
+                target.delay(0.2);
             }
         }
         throw new Error("Unable to write to preferences");
@@ -318,11 +318,20 @@ var target = null,
                    "value":err.toString(),
                    "backtrace":(err.stack ? err.stack.toString() : ""),
                    "index":index});
+    },
+    _resetCalabashPreferences = function () {
+        //Implementation is weird but reading pref values seems to have side effects
+        //also deleting a key seemed to require writing 0 and then null :)
+        var app = UIATarget.localTarget().frontMostApp();
+        app.preferencesValueForKey(__calabashRequest);
+        app.preferencesValueForKey(__calabashResponse);
+        app.setPreferencesValueForKey(0, __calabashResponse);
+        app.setPreferencesValueForKey(null, __calabashResponse);
+        app.setPreferencesValueForKey(0, __calabashRequest);
+        app.setPreferencesValueForKey(null, __calabashRequest);
     };
 
-UIATarget.localTarget().frontMostApp().setPreferencesValueForKey(null, __calabashResponse);
-UIATarget.localTarget().frontMostApp().setPreferencesValueForKey(0, __calabashRequest);
-
+_resetCalabashPreferences();
 Log.result('success',true,true);
 target = UIATarget.localTarget();
 while (true) {
@@ -340,11 +349,10 @@ while (true) {
     }
 
     _actualIndex = preferences['index'];
-    UIALogger.logMessage("index " + _actualIndex + ", expecting: "+_expectedIndex+" -> command: "+ preferences['command']);
     if (!isNaN(_actualIndex) && _actualIndex >= _expectedIndex) {
+        UIATarget.localTarget().frontMostApp().setPreferencesValueForKey(null, __calabashResponse);
         _exp = preferences['command'];
         UIALogger.logMessage("index " + _actualIndex + " is command: "+ _exp);
-        target.frontMostApp().setPreferencesValueForKey(null, __calabashRequest);
         try {
             if (_exp == 'break;') {
                 _success("OK", _actualIndex);
@@ -364,7 +372,5 @@ while (true) {
         continue;
     }
     _expectedIndex = Math.max(_actualIndex+1, _expectedIndex+1);
-
-
-    target.delay(0.2);
+    target.delay(0.1);
 }

metadata

@@ -1,195 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1.pre1
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: retriable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.3.1
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: travis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.3'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
 description: calabash-cucumber drives tests for native iOS apps. RunLoop provides
@@ -212,6 +212,7 @@ files:
 - lib/run_loop/sim_control.rb
 - lib/run_loop/version.rb
 - lib/run_loop/xctools.rb
+- scripts/calabash-uia-min.js
 - scripts/calabash.lldb.erb
 - scripts/calabash_script_uia.js
 - scripts/json2-min.js
@@ -232,17 +233,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Tools related to running Calabash iOS tests