run_loop 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e28f0fffdaffee568375402ca313bf41c6ffabc9
-  data.tar.gz: c24a6b8dd934ee6ba2e09a269330f7e0b70df566
+  metadata.gz: be6623163af4dc2e54253b91dc9ac4009576ae25
+  data.tar.gz: 922198cf53cf9177a755e22468b4c857e486f520
 SHA512:
-  metadata.gz: c919337cd9929d26d299bba0bf06496c5167c56b83879450be35af542d0ed133ba03065211c9e0c7b0f30502f96304ca4f9acee975358c5fa1332da255738220
-  data.tar.gz: 939f9acca939d80c076e6cad7a473a421091d61cbfaa7803661118b01a311e9ffb507b3f64777be0d0b4d074708c6313b222aba9ee17f316c549b259aa7614c2
+  metadata.gz: dd0b3bd9704d93aa20438ffb7d39f402f2dc5406186f0f31c4ea04c4c88d09562670f8d700d6e6d85d24d3e2d4225c492178431e95bba8b728d926da67b5caea
+  data.tar.gz: 6aeb1107fd78c2f4bb2fe2c0bc155571cb0637bfe75bcb06022b51247f7ba4b5e574d1883a64e2f2e253e27a43710ce66c61abc1b39c8c81e94619a527fe4bcc

data/lib/run_loop/core.rb

@@ -30,16 +30,28 @@ module RunLoop
       File.join(scripts_path, SCRIPTS[key])
     end
 
+    def self.detect_connected_device
+      begin
+        Timeout::timeout(1, TimeoutError) do
+          return `#{File.join(scripts_path, 'udidetect')}`.chomp
+        end
+      rescue TimeoutError => e
+        `killall udidetect &> /dev/null`
+      end
+      nil
+    end
+
     def self.run_with_options(options)
+      before = Time.now
       ensure_instruments_not_running!
 
-      device = options[:device] || :iphone
-      udid = options[:udid]
-      timeout = options[:timeout] || 15
+      device_target = options[:udid] || options[:device_target] || detect_connected_device || 'simulator'
+      if device_target && device_target.to_s.downcase == 'device'
+        device_target = detect_connected_device
+      end
 
       log_file = options[:log_path]
-
-
+      timeout = options[:timeout] || 15
 
       results_dir = options[:results_dir] || Dir.mktmpdir("run_loop")
       results_dir_trace = File.join(results_dir, "trace")
@@ -64,15 +76,25 @@ module RunLoop
       File.open(script, "w") { |file| file.puts code }
 
 
-      bundle_dir_or_bundle_id = options[:app] || ENV['BUNDLE_ID']|| ENV['APP_BUNDLE_PATH']
+      bundle_dir_or_bundle_id = options[:app] || ENV['BUNDLE_ID']|| ENV['APP_BUNDLE_PATH'] || ENV['APP']
 
       unless bundle_dir_or_bundle_id
-        raise 'key :app or environment variable APP_BUNDLE_PATH or BUNDLE_ID must be specified as path to app bundle (simulator) or bundle id (device)'
+        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)'
       end
 
-      if File.exist?(bundle_dir_or_bundle_id)
-        #Assume simulator
-        udid = nil
+
+      udid = nil
+
+      if device_target == 'simulator'
+
+        unless File.exist?(bundle_dir_or_bundle_id)
+          raise "Unable to find app in directory #{bundle_dir_or_bundle_id} when trying to launch simulator"
+        end
+
+
+        device = options[:device] || :iphone
+        device = device && device.to_sym
+
         plistbuddy="/usr/libexec/PlistBuddy"
         plistfile="#{bundle_dir_or_bundle_id}/Info.plist"
         if device == :iphone
@@ -84,27 +106,33 @@ module RunLoop
         system("#{plistbuddy} -c 'Add :UIDeviceFamily array' '#{plistfile}'")
         system("#{plistbuddy} -c 'Add :UIDeviceFamily:0 integer #{uidevicefamily}' '#{plistfile}'")
       else
-        unless udid
-          begin
-            Timeout::timeout(3, TimeoutError) do
-              udid = `#{File.join(scripts_path, 'udidetect')}`.chomp
-            end
-          rescue TimeoutError => e
+        udid = device_target
+        bundle_dir_or_bundle_id = options[:bundle_id] if options[:bundle_id]
+      end
 
-          end
-          unless udid
-            raise "Unable to find connected device."
-          end
-        end
+      log_file ||= File.join(results_dir, 'run_loop.out')
 
+      if ENV['DEBUG']=='1'
+        p options
+        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}"
       end
 
-      log_file ||= File.join(results_dir, 'run_loop.out')
+      after = Time.now
+
+      if ENV['DEBUG']=='1'
+        puts "Preparation took #{after-before} seconds"
+
+      end
 
       cmd = instruments_command(udid, results_dir_trace, bundle_dir_or_bundle_id, results_dir, script, log_file)
 
+
       pid = fork do
-        log_header("Starting App: #{bundle_dir_or_bundle_id}")
+        log_header("Starting on #{device_target} App: #{bundle_dir_or_bundle_id}")
         cmd_str = cmd.join(" ")
         if ENV['DEBUG']
           log(cmd_str)
@@ -121,6 +149,7 @@ 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)
@@ -129,6 +158,12 @@ module RunLoop
         raise TimeoutError, "Time out waiting for UIAutomation run-loop to Start. \n Logfile #{log_file} \n #{File.read(log_file)}"
       end
 
+      after = Time.now()
+
+      if ENV['DEBUG']=='1'
+        puts "Launching took #{after-before} seconds"
+      end
+
       run_loop
     end
 
@@ -158,6 +193,7 @@ module RunLoop
     end
 
     def self.read_response(run_loop, expected_index)
+
       log_file = run_loop[:log_file]
       initial_offset = run_loop[:initial_offset] || 0
       offset = initial_offset
@@ -165,7 +201,7 @@ module RunLoop
       result = nil
       loop do
         unless File.exist?(log_file) && File.size?(log_file)
-          sleep(0.5)
+          sleep(0.2)
           next
         end
 
@@ -288,8 +324,10 @@ module RunLoop
 
     def self.ensure_instruments_not_running!
       if instruments_running?
-        puts "Killing instruments"
-        `killall -9 instruments`
+        if ENV['DEBUG']=='1'
+          puts "Killing instruments"
+        end
+        `killall -9 instruments > /dev/null 2>&1`
       end
     end
 

data/lib/run_loop/version.rb

@@ -1,3 +1,3 @@
 module RunLoop
-  VERSION = '0.0.19'
+  VERSION = '0.0.20'
 end

data/scripts/calabash_script_uia.js

@@ -21677,10 +21677,10 @@ calabash_script.core.calculate_swipe_to_offset = function calculate_swipe_to_off
   var base_movement = function() {
     var G__2931 = (new cljs.core.Keyword("\ufdd0'direction")).call(null, options);
     if(cljs.core._EQ_.call(null, "\ufdd0'down", G__2931)) {
-      return cljs.core.ObjMap.fromObject(["\ufdd0'x", "\ufdd0'y"], {"\ufdd0'x":x + cljs.core.get_in.call(null, calabash_script.core.swipe_delta, cljs.core.PersistentVector.fromArray(["\ufdd0'vertical", "\ufdd0'dx"], true)), "\ufdd0'y":y - cljs.core.get_in.call(null, calabash_script.core.swipe_delta, cljs.core.PersistentVector.fromArray(["\ufdd0'vertical", "\ufdd0'dy"], true))})
+      return cljs.core.ObjMap.fromObject(["\ufdd0'x", "\ufdd0'y"], {"\ufdd0'x":x + cljs.core.get_in.call(null, calabash_script.core.swipe_delta, cljs.core.PersistentVector.fromArray(["\ufdd0'vertical", "\ufdd0'dx"], true)), "\ufdd0'y":y + cljs.core.get_in.call(null, calabash_script.core.swipe_delta, cljs.core.PersistentVector.fromArray(["\ufdd0'vertical", "\ufdd0'dy"], true))})
     }else {
       if(cljs.core._EQ_.call(null, "\ufdd0'up", G__2931)) {
-        return cljs.core.ObjMap.fromObject(["\ufdd0'x", "\ufdd0'y"], {"\ufdd0'x":x + cljs.core.get_in.call(null, calabash_script.core.swipe_delta, cljs.core.PersistentVector.fromArray(["\ufdd0'vertical", "\ufdd0'dx"], true)), "\ufdd0'y":y + cljs.core.get_in.call(null, calabash_script.core.swipe_delta, cljs.core.PersistentVector.fromArray(["\ufdd0'vertical", "\ufdd0'dy"], true))})
+        return cljs.core.ObjMap.fromObject(["\ufdd0'x", "\ufdd0'y"], {"\ufdd0'x":x + cljs.core.get_in.call(null, calabash_script.core.swipe_delta, cljs.core.PersistentVector.fromArray(["\ufdd0'vertical", "\ufdd0'dx"], true)), "\ufdd0'y":y - cljs.core.get_in.call(null, calabash_script.core.swipe_delta, cljs.core.PersistentVector.fromArray(["\ufdd0'vertical", "\ufdd0'dy"], true))})
       }else {
         if(cljs.core._EQ_.call(null, "\ufdd0'right", G__2931)) {
           return cljs.core.ObjMap.fromObject(["\ufdd0'x", "\ufdd0'y"], {"\ufdd0'x":x + cljs.core.get_in.call(null, calabash_script.core.swipe_delta, cljs.core.PersistentVector.fromArray(["\ufdd0'horizontal", "\ufdd0'dx"], true)), "\ufdd0'y":y + cljs.core.get_in.call(null, calabash_script.core.swipe_delta, cljs.core.PersistentVector.fromArray(["\ufdd0'horizontal", "\ufdd0'dy"], true))})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor