run_loop 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 253c24d7121ffc84824a1d3e7a5e3c79d14dfcd8
-  data.tar.gz: d22bc4efbace3cbcd82e3ab023515984beff9618
+  metadata.gz: 2231305525deb7ff8eef39cab42f66a592e0618d
+  data.tar.gz: e02a550f4dfd50652a406e75ec7f8b5075393c7b
 SHA512:
-  metadata.gz: 716a2225ff8d2ff978b28852d803c84ba97ac05a75a0ce74a714f910ef35317f9322f4818c8812f88b72bafcda6542e3df1a82c87dfe73137e8737a687aeb61f
-  data.tar.gz: 2750db0951ae73dd859fac716b138ffd02972e42f2e1aec600f9faf4bb10addf7e19d334488fed3f59f3476aacbbb87f080bf8eca81a4263166fa2f3c58262e6
+  metadata.gz: f2e693f21f81754350213e4e331d5c400639d59ce135b1c63419f1e6cc585bbdf1af916b09f49ae83bee725b5b6b62ff911a9bfc26541d1ebffc23eb0e1598f4
+  data.tar.gz: 11c87e9d511a1e1ece647b493a24c604c0916d50f302166d80dbc126d92aa70b42eb1c7078ae90beaa0e1354c62c8b93d03cf59d08dbb4b8c75e5735bdf49615

data/lib/run_loop/core.rb

@@ -178,15 +178,12 @@ module RunLoop
       end
 
       # Compute udid and bundle_dir / bundle_id from options and target depending on Xcode version
-      udid, bundle_dir_or_bundle_id = udid_and_bundle_for_launcher(device_target, options, xctools)
+      udid, bundle_dir_or_bundle_id = self.udid_and_bundle_for_launcher(device_target, options, sim_control)
 
       args = options.fetch(:args, [])
 
       log_file ||= File.join(results_dir, 'run_loop.out')
 
-      after = Time.now
-      RunLoop::Logging.log_debug(logger, "Preparation took #{after-before} seconds")
-
       discovered_options =
             {
                   :udid => udid,
@@ -226,7 +223,10 @@ module RunLoop
                   :log_file => log_file,
                   :results_dir => results_dir}
 
-      uia_timeout = options[:uia_timeout] || (ENV['UIA_TIMEOUT'] && ENV['UIA_TIMEOUT'].to_f) || 10
+      uia_timeout = options[:uia_timeout] || RunLoop::Environment.uia_timeout || 10
+
+      after = Time.now
+      RunLoop::Logging.log_debug(logger, "Preparation took #{after-before} seconds")
 
       before = Time.now
       begin
@@ -355,8 +355,10 @@ module RunLoop
       end
     end
 
-    def self.udid_and_bundle_for_launcher(device_target, options, xctools=RunLoop::XCTools.new)
-      bundle_dir_or_bundle_id = options[:app] || ENV['BUNDLE_ID']|| ENV['APP_BUNDLE_PATH'] || ENV['APP']
+    def self.udid_and_bundle_for_launcher(device_target, options, sim_control=RunLoop::SimControl.new)
+      xctools = sim_control.xctools
+
+      bundle_dir_or_bundle_id = options[:app] || RunLoop::Environment.bundle_id || RunLoop::Environment.path_to_app_bundle
 
       unless bundle_dir_or_bundle_id
         raise 'key :app or environment variable APP_BUNDLE_PATH, BUNDLE_ID or APP must be specified as path to app bundle (simulator) or bundle id (device)'
@@ -370,7 +372,7 @@ module RunLoop
         end
         udid = device_target
 
-        unless /simulator/i.match(device_target)
+        unless self.simulator_target?(options, sim_control)
           bundle_dir_or_bundle_id = options[:bundle_id] if options[:bundle_id]
         end
       else
@@ -474,6 +476,8 @@ module RunLoop
     end
 
     def self.read_response(run_loop, expected_index, empty_file_timeout=10, search_for_property='index')
+      debug_read = RunLoop::Environment.debug_read?
+
       log_file = run_loop[:log_file]
       initial_offset = run_loop[:initial_offset] || 0
       offset = initial_offset
@@ -499,7 +503,7 @@ module RunLoop
           raise RunLoop::TimeoutError.new('Exception while running script')
         end
         index_if_found = output.index(START_DELIMITER)
-        if ENV['DEBUG_READ']=='1'
+        if debug_read
           puts output.gsub('*', '')
           puts "Size #{size}"
           puts "offset #{offset}"
@@ -521,7 +525,7 @@ module RunLoop
           json = rest[0..index_of_json]
 
 
-          if ENV['DEBUG_READ']=='1'
+          if debug_read
             puts "Index #{index_if_found}, Size: #{size} Offset #{offset}"
 
             puts ("parse #{json}")
@@ -529,7 +533,7 @@ module RunLoop
 
           offset = offset + json.size
           parsed_result = JSON.parse(json)
-          if ENV['DEBUG_READ']=='1'
+          if debug_read
             p parsed_result
           end
           json_index_if_present = parsed_result[search_for_property]
@@ -552,7 +556,7 @@ module RunLoop
       RunLoop::Instruments.new.instruments_pids(&block)
     end
 
-    def self.automation_template(xctools, candidate = ENV['TRACE_TEMPLATE'])
+    def self.automation_template(xctools, candidate = RunLoop::Environment.trace_template)
       unless candidate && File.exist?(candidate)
         candidate = default_tracetemplate xctools
       end

data/lib/run_loop/environment.rb

@@ -12,8 +12,51 @@ module RunLoop
       ENV['DEBUG'] == '1'
     end
 
+    # Returns true if read debugging is enabled.
+    def self.debug_read?
+      ENV['DEBUG_READ'] == '1'
+    end
+
+    # Returns true if we are running on the XTC
     def self.xtc?
       ENV['XAMARIN_TEST_CLOUD'] == '1'
     end
+
+    # Returns the value of TRACE_TEMPLATE; the Instruments template to use
+    # during testing.
+    def self.trace_template
+      ENV['TRACE_TEMPLATE']
+    end
+
+    # Returns the value of UIA_TIMEOUT.  Use this control how long to wait
+    # for instruments to launch and attach to your application.
+    #
+    # Non-empty values are converted to a float.
+    def self.uia_timeout
+      timeout = ENV['UIA_TIMEOUT']
+      timeout ? timeout.to_f : nil
+    end
+
+    # Returns the value of BUNDLE_ID
+    def self.bundle_id
+      ENV['BUNDLE_ID']
+    end
+
+    # Returns to the path to the app bundle (simulator builds).
+    #
+    # Both APP_BUNDLE_PATH and APP are checked and in that order.
+    #
+    # Use of APP_BUNDLE_PATH is deprecated and will be removed.
+    def self.path_to_app_bundle
+      ENV['APP_BUNDLE_PATH'] || ENV['APP']
+    end
+
+    # Returns the value of DEVELOPER_DIR
+    #
+    # @note Never call this directly.  Always create an XCTool instance
+    #   and allow it to derive the path to the Xcode toolchain.
+    def self.developer_dir
+      ENV['DEVELOPER_DIR']
+    end
   end
 end

data/lib/run_loop/sim_control.rb

@@ -910,6 +910,7 @@ module RunLoop
           out = stdout.read.strip
           err = stderr.read.strip
           if ENV['DEBUG_UNIX_CALLS'] == '1'
+            cmd = "xcrun simctl erase #{udid}"
             puts "#{cmd} => stdout: '#{out}' | stderr: '#{err}'"
           end
           wait_thr.value.success?
@@ -986,17 +987,19 @@ module RunLoop
     #  base sdk version.
     # @see #simctl_list
     def simctl_list_devices
-      cmd = 'xcrun simctl list devices'
-      Open3.popen3(cmd) do  |_, stdout,  stderr, _|
+      args = 'simctl list devices'.split(' ')
+      Open3.popen3('xcrun', *args) do  |_, stdout,  stderr, _|
         out = stdout.read.strip
         err = stderr.read.strip
         if ENV['DEBUG_UNIX_CALLS'] == '1'
+          cmd = "xcrun #{args.join(' ')}"
           puts "#{cmd} => stdout: '#{out}' | stderr: '#{err}'"
         end
 
         current_sdk = nil
         res = {}
         out.split("\n").each do |line|
+
           possible_sdk = line[/(\d\.\d(\.\d)?)/,0]
           if possible_sdk
             current_sdk = possible_sdk
@@ -1004,11 +1007,19 @@ module RunLoop
             next
           end
 
+          unavailable_skd = line[/Unavailable/, 0]
+          if unavailable_skd
+            current_sdk = nil
+            next
+          end
+
           if current_sdk
-            name = line.split('(').first.strip
-            udid = line[XCODE_6_SIM_UDID_REGEX,0]
-            state = line[/(Booted|Shutdown)/,0]
-            res[current_sdk] << {:name => name, :udid => udid, :state => state}
+            unless line[/unavailable/,0]
+              name = line.split('(').first.strip
+              udid = line[XCODE_6_SIM_UDID_REGEX,0]
+              state = line[/(Booted|Shutdown)/,0]
+              res[current_sdk] << {:name => name, :udid => udid, :state => state}
+            end
           end
         end
         res
@@ -1038,11 +1049,12 @@ module RunLoop
     def simctl_list_runtimes
       # The 'com.apple.CoreSimulator.SimRuntime.iOS-7-0' is the runtime-id,
       # which can be used to create devices.
-      cmd = 'xcrun simctl list runtimes'
-      Open3.popen3(cmd) do  |_, stdout,  stderr, _|
+      args = 'simctl list runtimes'.split(' ')
+      Open3.popen3('xcrun', *args) do  |_, stdout,  stderr, _|
         out = stdout.read.strip
         err = stderr.read.strip
         if ENV['DEBUG_UNIX_CALLS'] == '1'
+          cmd = "xcrun #{args.join(' ')}"
           puts "#{cmd}  => stdout: '#{out}' | stderr: '#{err}'"
         end
         # Ex.

data/lib/run_loop/version.rb

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

data/lib/run_loop/xctools.rb

@@ -125,8 +125,8 @@ module RunLoop
     # @return [String] path to current developer directory
     def xcode_developer_dir
       @xcode_developer_dir ||=
-            if ENV['DEVELOPER_DIR']
-              ENV['DEVELOPER_DIR']
+            if RunLoop::Environment.developer_dir
+              RunLoop::Environment.developer_dir
             else
               # fall back to xcode-select
               `xcode-select --print-path`.chomp

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -255,7 +255,6 @@ files:
 - lib/run_loop/simctl/bridge.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
@@ -288,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Tools related to running Calabash iOS tests

data/scripts/calabash-uia-min.js

@@ -1,7 +0,0 @@
-(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()}})();