run_loop 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aabb5bbbc7bf6211a9e87b46baf7457d99cb09ec
-  data.tar.gz: eb013c7fc3fed7008ba09827dbe87aa9083c0ed1
+  metadata.gz: 0228cc12904b485c2498611ec2e0229bd0e37da9
+  data.tar.gz: 3272b5371b4eb5f0b855d73ed3f3a499ffd325fc
 SHA512:
-  metadata.gz: f74ac8bdf22e7dd2b2f90f20c975b12e351b546d891bd287fc0848bb35ad46315452fb8d3157e6fcb0bd05c3bad557c68f2bed1575a435cb35c11a38c12b1f29
-  data.tar.gz: 74c9a9cdba9ad1301d9e5f023cf1f221c835dfc905b5d6fb15ed585f1e8a55ef023c888f30e34502ff6fd7c96ee87ad699ba5873f5e6a3f7841e46e2a6c26388
+  metadata.gz: 2c75eac24772f687abd3d8667dab52064e32ce1c106f2087294bba6c3759ad4abe5c556254f5f4efa884c12a11b64f72e7727d719f45ab66318e2f3063a0f42e
+  data.tar.gz: 184c83415bf1613c72d42bec4691716422dbd8d9abde989d311f85b1c0d351eb3186f1102ed752aacfdc4ff5c712b5c188ce64f46e7eb6c0a713ef95fc673389

data/lib/run_loop/core.rb

@@ -31,10 +31,11 @@ module RunLoop
     end
 
     def self.run_with_options(options)
+      ensure_instruments_not_running!
 
       device = options[:device] || :iphone
       udid = options[:udid]
-      timeout = options[:timeout] || 30
+      timeout = options[:timeout] || 15
 
       log_file = options[:log_path]
 
@@ -258,7 +259,14 @@ module RunLoop
       cmd
     end
 
-    def self.automation_template
+    def self.automation_template(candidate = ENV['TRACE_TEMPLATE'])
+      unless candidate && File.exist?(candidate)
+        candidate = default_tracetemplate
+      end
+      candidate
+    end
+
+    def self.default_tracetemplate
       xcode_path = `xcode-select -print-path`.chomp
       automation_bundle = File.expand_path(File.join(xcode_path, "..", 'Applications', "Instruments.app", "Contents", "PlugIns", 'AutomationInstrument.bundle'))
       if not File.exist? automation_bundle
@@ -278,6 +286,22 @@ module RunLoop
       $stdout.flush
     end
 
+    def self.ensure_instruments_not_running!
+      if instruments_running?
+        puts "Killing instruments"
+        `killall -9 instruments`
+      end
+    end
+
+    def self.instruments_running?
+      instruments_pids.size > 0
+    end
+
+    def self.instruments_pids
+      pids_str = `ps x -o pid,command | grep -v grep | grep "instruments" | awk '{printf "%s,", $1}'`.strip
+      pids_str.split(",").map { |pid| pid.to_i }
+    end
+
   end
 
   def self.run(options={})

data/lib/run_loop/version.rb

@@ -1,3 +1,3 @@
 module RunLoop
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 end

data/scripts/calabash_script_uia.js

@@ -21595,12 +21595,6 @@ calabash_script.core.tap_mark = function tap_mark(mark) {
   return calabash_script.core.tap.call(null, cljs.core.PersistentVector.fromArray(["\ufdd0'view", cljs.core.ObjMap.fromObject(["\ufdd0'marked"], {"\ufdd0'marked":mark})], true))
 };
 calabash_script.core.tap_offset = function tap_offset(offset) {
-  var rect = calabash_script.utils.window.call(null).rect();
-  var center_x = rect["size"]["width"] / 2;
-  var center_y = rect["size"]["height"] / 2;
-  var x = cljs.core.int$.call(null, (new cljs.core.Keyword("\ufdd0'x")).call(null, offset)) - center_x;
-  var y = cljs.core.int$.call(null, (new cljs.core.Keyword("\ufdd0'y")).call(null, offset)) - center_y;
-  calabash_script.log.log.call(null, cljs.core.ObjMap.fromObject(["\ufdd0'tapOffset"], {"\ufdd0'tapOffset":cljs.core.ObjMap.fromObject(["\ufdd0'x", "\ufdd0'y"], {"\ufdd0'x":x, "\ufdd0'y":y})}));
   return calabash_script.utils.target.call(null).tapWithOptions(calabash_script.utils.clj__GT_js.call(null, offset))
 };
 calabash_script.core.element_exists_QMARK_ = function() {

metadata

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