run_loop 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cccd2b346e9cf04b773256ff464776244f9f0cf3
-  data.tar.gz: 5671b7936e49ab9fdf2d4b01d1dd4bf4c88436b2
+  metadata.gz: 554b2d4bd16ba7167682bbf0fed420a025891bd5
+  data.tar.gz: 007adf5ed0d635d2dc992061fe0d88e3c155bd18
 SHA512:
-  metadata.gz: 04783915dfab3e7f116577d755d3ff259d065de769fa24de9c6bea21c269914ecbb67e1a9f713e236a0b6ae21a95769af89da95db8613a9c14665dfbdcecd7de
-  data.tar.gz: 5860bc671dc8ea4a89f8fcf4446feb2d0b083253e2ef0e7ce629069c7c1aee28f560e53fe20174b99c63b9bd0e9df7e35568cc60c3c2ed82115075287de45a20
+  metadata.gz: e0b0cdf8084fe02fa929eeff7dc5d995ea8d1083479705e4147aa90b600102b73302922090be7f3f03b9bddb694f49dcd2e2b0f7f96c565d4a710336eae088d8
+  data.tar.gz: 08c478594dcd4d7bfaccec0217ff38c68e10e1346ff60bf6fc3c1c10ef43cad6c8d897a9b6a5314a5065c69931b1288124010f96f82682513c17f99afc7624a6

data/lib/run_loop.rb

@@ -4,3 +4,4 @@ require 'run_loop/xctools'
 require 'run_loop/plist_buddy'
 require 'run_loop/sim_control'
 require 'run_loop/device'
+require 'run_loop/instruments'

data/lib/run_loop/core.rb

@@ -84,11 +84,12 @@ module RunLoop
 
     def self.run_with_options(options)
       before = Time.now
-      ensure_instruments_not_running!
 
       sim_control ||= options[:sim_control] || RunLoop::SimControl.new
       xctools ||= options[:xctools] || sim_control.xctools
 
+      RunLoop::Instruments.new.kill_instruments(xctools)
+
       if self.simulator_target?(options, sim_control)
         # @todo only enable accessibility on the targeted simulator
         sim_control.enable_accessibility_on_sims({:verbose => true})
@@ -505,20 +506,9 @@ module RunLoop
 
     end
 
+    # @deprecated 1.0.5
     def self.pids_for_run_loop(run_loop, &block)
-      results_dir = run_loop[:results_dir]
-      udid = run_loop[:udid]
-      instruments_prefix = instruments_command_prefix(udid, results_dir)
-
-      pids_str = `ps x -o pid,command | grep -v grep | grep "#{instruments_prefix.gsub(%Q["], %Q[\\"])}" | awk '{printf "%s,", $1}'`
-      pids = pids_str.split(',').map { |pid| pid.to_i }
-      if block_given?
-        pids.each do |pid|
-          block.call(pid)
-        end
-      else
-        pids
-      end
+      RunLoop::Instruments.new.instruments_pids(&block)
     end
 
     def self.instruments_command_prefix(udid, results_dir_trace)
@@ -591,22 +581,18 @@ module RunLoop
       end
     end
 
+    # @deprecated 1.0.5
     def self.ensure_instruments_not_running!
-      instruments_pids.each do |pid|
-        if ENV['DEBUG']=='1'
-          puts "Found instruments #{pid}. Killing..."
-        end
-        `kill -9 #{pid} && wait #{pid} &> /dev/null`
-      end
+      RunLoop::Instruments.new.kill_instruments
     end
 
     def self.instruments_running?
-      instruments_pids.size > 0
+      RunLoop::Instruments.new.instruments_running?
     end
 
+    # @deprecated 1.0.5
     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 }
+      RunLoop::Instruments.new.instruments_pids
     end
 
     # @todo This is a WIP
@@ -700,17 +686,11 @@ module RunLoop
   def self.stop(run_loop, out=Dir.pwd)
     return if run_loop.nil?
     results_dir = run_loop[:results_dir]
-
     dest = out
 
-
-    Core.pids_for_run_loop(run_loop) do |pid|
-      Process.kill('TERM', pid.to_i)
-    end
-
+    RunLoop::Instruments.new.kill_instruments
 
     FileUtils.mkdir_p(dest)
-
     if results_dir
       pngs = Dir.glob(File.join(results_dir, 'Run 1', '*.png'))
     else

data/lib/run_loop/instruments.rb

@@ -0,0 +1,57 @@
+module RunLoop
+
+  # A class for interacting with the instruments command-line tool
+  #
+  # @note All instruments commands are run in the context of `xcrun`.
+  #
+  # @todo Detect Instruments.app is running and pop an alert.
+  # @todo Needs tests.
+  class Instruments
+
+    # @!visibility private
+    #  $ ps x -o pid,command | grep -v grep | grep instruments
+    #   98081 sh -c xcrun instruments -w "43be3f89d9587e9468c24672777ff6241bd91124" < args >
+    #   98082 /Xcode/6.0.1/Xcode.app/Contents/Developer/usr/bin/instruments -w < args >
+    FIND_PIDS_CMD = 'ps x -o pid,comm | grep -v grep | grep instruments'
+
+    def grep_for_instruments_pids
+      ps_output = `#{FIND_PIDS_CMD}`.strip
+      lines = ps_output.lines("\n").map { |line| line.strip }
+      lines.map do |line|
+        tokens = line.strip.split(' ').map { |token| token.strip }
+        pid = tokens.fetch(0, nil)
+        process = tokens.fetch(1, nil)
+        if process and process[/\/usr\/bin\/instruments/, 0]
+          pid.to_i
+        else
+          nil
+        end
+      end.compact
+    end
+
+    def instruments_pids(&block)
+      pids = grep_for_instruments_pids
+      if block_given?
+        pids.each do |pid|
+          block.call(pid)
+        end
+      else
+        pids
+      end
+    end
+
+    def instruments_running?
+      instruments_pids.count > 0
+    end
+
+    def kill_instruments(xcode_tools = RunLoop::XCTools.new)
+      kill_signal = xcode_tools.xcode_version_gte_6? ? 'QUIT' : 'TERM'
+      instruments_pids do |pid|
+        if ENV['DEBUG'] == '1'
+          puts "Sending '#{kill_signal}' to instruments process '#{pid}'"
+        end
+        Process.kill(kill_signal, pid.to_i)
+      end
+    end
+  end
+end

data/lib/run_loop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Karl Krukow
@@ -14,182 +14,182 @@ dependencies:
   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
@@ -207,11 +207,11 @@ files:
 - lib/run_loop/cli.rb
 - lib/run_loop/core.rb
 - lib/run_loop/device.rb
+- lib/run_loop/instruments.rb
 - lib/run_loop/plist_buddy.rb
 - 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 +232,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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.3.0
 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()}})();