run_loop 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2912f8769ebd18c671989ea3db4dcf73e22522d0
-  data.tar.gz: f1463e434006a9cab612ff2a574169806c992842
+  metadata.gz: 2423db81abf3240a09a78b36e626e7fe9805e1b5
+  data.tar.gz: 2c121c18d79c9faaab075f94dea364042aed23d0
 SHA512:
-  metadata.gz: f1a1a854eab024c26b38a9db6d5c9b6ee5c000acfcd9858cc6a82cf27f0acddc1566749fc2d0981778e34312568cf42f2559902846800980dc3bcb5b86a84b4a
-  data.tar.gz: ebd998b3cfbdd5a10ecd1d053bf7ff7a79ff8fb15088b760fe75e83da4b63738e69ccfccab4ce1d088fdfdd84c22b938f77d5a56ffd9976afeb3cadabe3fb307
+  metadata.gz: 5be1f66ae222c299dd0bdd685c52c4860064fabe99f91610a166662a88adc5e52c7d61450a5abb96ecd2390fae7ee5116a31c7afc19a2592ca4cd804c7a0554c
+  data.tar.gz: 523a6ab61c1090605b802dd5701f280d5ab033343093b42684af40de6952b143a43e70508e1aafdf1d379831ef1f7b1a9e27ae38b77f35fd9190cda8525766ca

data/lib/run_loop.rb

@@ -24,6 +24,7 @@ require 'run_loop/cache/cache'
 require 'run_loop/host_cache'
 require 'run_loop/patches/awesome_print'
 require 'run_loop/patches/retriable'
+require 'run_loop/life_cycle/simulator'
 require 'run_loop/life_cycle/core_simulator'
 require 'run_loop/simctl/bridge'
 require 'run_loop/simctl/plists'

data/lib/run_loop/cli/simctl.rb

@@ -109,7 +109,7 @@ module RunLoop
 
         begin
           RunLoop::SimControl.terminate_all_sims
-          terminate_core_simulator_processes
+          RunLoop::LifeCycle::Simulator.new.terminate_core_simulator_processes
         ensure
           ENV['DEBUG'] = original_value if debug
         end
@@ -125,33 +125,6 @@ module RunLoop
             device.state == 'Booted'
           end
         end
-
-        # TODO this is duplicated code; extract!
-        # https://github.com/calabash/run_loop/issues/225
-        def terminate_core_simulator_processes
-          to_manage = RunLoop::LifeCycle::CoreSimulator::MANAGED_PROCESSES
-          to_manage << ['com.apple.CoreSimulator.CoreSimulatorService', false]
-
-          to_manage.each do |pair|
-            name = pair[0]
-            send_term = pair[1]
-            pids = RunLoop::ProcessWaiter.new(name).pids
-            pids.each do |pid|
-
-              if send_term
-                term = RunLoop::ProcessTerminator.new(pid, 'TERM', name)
-                killed = term.kill_process
-              else
-                killed = false
-              end
-
-              unless killed
-                term = RunLoop::ProcessTerminator.new(pid, 'KILL', name)
-                term.kill_process
-              end
-            end
-          end
-        end
       end
 
       desc 'install --app [OPTIONS]', 'Installs an app on a device'

data/lib/run_loop/core.rb

@@ -443,8 +443,11 @@ Logfile: #{log_file}
       xcode = sim_control.xcode
       if xcode.version_gte_6?
         simulator = sim_control.simulators.find do |sim|
-          sim.instruments_identifier(xcode) == value ||
-                sim.udid == value
+          [
+                sim.instruments_identifier(xcode) == value,
+                sim.udid == value,
+                sim.name == value
+          ].any?
         end
         !simulator.nil?
       else

data/lib/run_loop/device.rb

@@ -282,23 +282,27 @@ Please update your sources to pass an instance of RunLoop::Xcode))
     #
     # 1. The SHA sum of the simulator data/ directory to be stable.
     # 2. No more log messages are begin generated
-    # 3. 1 and 2 must hold for 2 seconds.
+    # 3. 1 and 2 must hold for 1 seconds.
     #
     # When the simulator version is >= iOS 9 _and_ it is the first launch of
     # the simulator after a reset or a new simulator install, a fourth condition
     # is added:
     #
     # 4. The first three conditions must be met a second time.
+    #
+    # and the quiet time is increased to 2.0.
     def simulator_wait_for_stable_state
       require 'securerandom'
 
-      quiet_time = 2
       delay = 0.5
 
       first_launch = false
 
       if version >= RunLoop::Version.new('9.0')
         first_launch = simulator_data_dir_size < 20
+        quiet_time = 2
+      else
+        quiet_time = 1
       end
 
       now = Time.now

data/lib/run_loop/instruments.rb

@@ -9,6 +9,10 @@ module RunLoop
 
     attr_reader :xcode
 
+    def pbuddy
+      @pbuddy ||= RunLoop::PlistBuddy.new
+    end
+
     def xcode
       @xcode ||= RunLoop::Xcode.new
     end
@@ -110,10 +114,9 @@ Please update your sources to pass an instance of RunLoop::Xcode))
     # @return [RunLoop::Version] A version object.
     def version
       @instruments_version ||= lambda do
-        args = ['instruments']
-        hash = xcrun.exec(args, log_cmd: true)
-        version_str = hash[:err][VERSION_REGEX, 0]
-        RunLoop::Version.new(version_str)
+        version_string = pbuddy.plist_read('CFBundleShortVersionString',
+                                           path_to_instruments_app_plist)
+        RunLoop::Version.new(version_string)
       end.call
     end
 
@@ -398,5 +401,16 @@ Please update your sources to pass an instance of RunLoop::Xcode))
     def line_is_simulator_paired_with_watch?(line)
       line[CORE_SIMULATOR_UDID_REGEX, 0] && line[/Apple Watch/, 0]
     end
+
+    # @!visibility private
+    def path_to_instruments_app_plist
+      @path_to_instruments_app_plist ||=
+            File.expand_path(File.join(xcode.developer_dir,
+                                 '..',
+                                 'Applications',
+                                 'Instruments.app',
+                                 'Contents',
+                                 'Info.plist'))
+    end
   end
 end

data/lib/run_loop/life_cycle/core_simulator.rb

@@ -1,7 +1,7 @@
 module RunLoop
   module LifeCycle
 
-    class CoreSimulator
+    class CoreSimulator < Simulator
 
       require 'securerandom'
 
@@ -11,36 +11,6 @@ module RunLoop
       # @!visibility private
       CORE_SIMULATOR_DEVICE_DIR = File.expand_path('~/Library/Developer/CoreSimulator/Devices')
 
-      # @!visibility private
-      # Pattern.
-      # [ '< process name >', < send term first > ]
-      MANAGED_PROCESSES =
-            [
-                  # This process is a daemon, and requires 'KILL' to terminate.
-                  # Killing the process is fast, but it takes a long time to
-                  # restart.
-                  # ['com.apple.CoreSimulator.CoreSimulatorService', false],
-
-                  # Probably do not need to quit this, but it is tempting to do so.
-                  #['com.apple.CoreSimulator.SimVerificationService', false],
-
-                  # Started by Xamarin Studio, this is the parent process of the
-                  # processes launched by Xamarin's interaction with
-                  # CoreSimulatorBridge.
-                  ['csproxy', true],
-
-                  # Yes.
-                  ['SimulatorBridge', true],
-                  ['configd_sim', true],
-                  ['launchd_sim', true],
-
-                  # Does not always appear.
-                  ['CoreSimulatorBridge', true],
-
-                  # Xcode 7
-                  ['ids_simd', true]
-            ]
-
       # @!visibility private
       # How long to wait after the simulator has launched.
       SIM_POST_LAUNCH_WAIT = RunLoop::Environment.sim_post_launch_wait || 1.0
@@ -409,29 +379,6 @@ module RunLoop
         end
       end
 
-      # @!visibility private
-      def terminate_core_simulator_processes
-        MANAGED_PROCESSES.each do |pair|
-          name = pair[0]
-          send_term = pair[1]
-          pids = RunLoop::ProcessWaiter.new(name).pids
-          pids.each do |pid|
-
-            if send_term
-              term = RunLoop::ProcessTerminator.new(pid, 'TERM', name)
-              killed = term.kill_process
-            else
-              killed = false
-            end
-
-            unless killed
-              term = RunLoop::ProcessTerminator.new(pid, 'KILL', name)
-              term.kill_process
-            end
-          end
-        end
-      end
-
       # @!visibility private
       def wait_for_device_state(target_state)
         now = Time.now
@@ -537,9 +484,13 @@ module RunLoop
       # For testing.
       def launch
 
-        install
         launch_simulator
 
+        args = ['simctl', 'install', device.udid, app.path]
+        RunLoop::Xcrun.new.exec(args, log_cmd: true, timeout: 10)
+
+        device.simulator_wait_for_stable_state
+
         args = ['simctl', 'launch', device.udid, app.bundle_identifier]
         hash = RunLoop::Xcrun.new.exec(args, log_cmd: true, timeout: 20)
 
@@ -551,7 +502,12 @@ module RunLoop
           raise RuntimeError, "Could not launch #{app.bundle_identifier} on #{device}"
         end
 
-        RunLoop::ProcessWaiter.new(app.executable_name, WAIT_FOR_APP_LAUNCH_OPTS).wait_for_any
+        RunLoop::ProcessWaiter.new(app.executable_name, {:timeout => 10,
+                                                         :raise_on_timeout => true}).wait_for_any
+
+
+        device.simulator_wait_for_stable_state
+
         true
       end
     end

data/lib/run_loop/life_cycle/simulator.rb

@@ -0,0 +1,73 @@
+module RunLoop
+
+  # @!visibility private
+  module LifeCycle
+
+    # @!visibility private
+    #
+    # Defines a Life Cycle interface for Simulators.
+    class Simulator
+
+      # @!visibility private
+      # Pattern.
+      # [ '< process name >', < send term first > ]
+      MANAGED_PROCESSES =
+            [
+                  # This process is a daemon, and requires 'KILL' to terminate.
+                  # Killing the process is fast, but it takes a long time to
+                  # restart.
+                  # ['com.apple.CoreSimulator.CoreSimulatorService', false],
+
+                  # Probably do not need to quit this, but it is tempting to do so.
+                  #['com.apple.CoreSimulator.SimVerificationService', false],
+
+                  # Started by Xamarin Studio, this is the parent process of the
+                  # processes launched by Xamarin's interaction with
+                  # CoreSimulatorBridge.
+                  ['csproxy', true],
+
+                  # Yes.
+                  ['SimulatorBridge', true],
+                  ['configd_sim', true],
+                  ['launchd_sim', true],
+
+                  # Does not always appear.
+                  ['CoreSimulatorBridge', true],
+
+                  # assetsd instances clobber each other and are not properly
+                  # killed when quiting the simulator.
+                  ['assetsd', true],
+
+                  # iproxy is started by UITest.  It is not necessary to send
+                  # TERM first.
+                  ['iproxy', false],
+
+                  # Xcode 7
+                  ['ids_simd', true]
+            ]
+
+      # @!visibility private
+      def terminate_core_simulator_processes
+        MANAGED_PROCESSES.each do |pair|
+          name = pair[0]
+          send_term = pair[1]
+          pids = RunLoop::ProcessWaiter.new(name).pids
+          pids.each do |pid|
+
+            if send_term
+              term = RunLoop::ProcessTerminator.new(pid, 'TERM', name)
+              killed = term.kill_process
+            else
+              killed = false
+            end
+
+            unless killed
+              term = RunLoop::ProcessTerminator.new(pid, 'KILL', name)
+              term.kill_process
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/run_loop/simctl/bridge.rb

@@ -15,7 +15,7 @@ module RunLoop::Simctl
   # TODO Reinstall if checksum does not match.
   # TODO Analyze terminate_core_simulator_processes.
   # TODO Figure out when CoreSimulator appears and does not appear.
-  class Bridge
+  class Bridge < RunLoop::LifeCycle::CoreSimulator
 
     attr_reader :device
     attr_reader :app
@@ -186,54 +186,6 @@ module RunLoop::Simctl
       @device.state
     end
 
-    def terminate_core_simulator_processes
-      [
-            # Pattern.
-            # [ '< process name >', < send term first > ]
-
-            # No. This process is a daemon, and requires 'KILL' to terminate.
-            # Killing the process is fast, but it takes a long time to restart.
-            # ['com.apple.CoreSimulator.CoreSimulatorService', false],
-
-            # Probably do not need to quit this, but it is tempting to do so.
-            #['com.apple.CoreSimulator.SimVerificationService', false],
-
-            # Started by Xamarin Studio, this is the parent process of the
-            # processes launched by Xamarin's interaction with
-            # CoreSimulatorBridge
-            ['csproxy', true],
-
-            # Yes.
-            ['SimulatorBridge', true],
-            ['configd_sim', true],
-            ['launchd_sim', true],
-
-            # Yes, but does not always appear.
-            ['CoreSimulatorBridge', true],
-
-            # Xcode 7
-            ['ids_simd', true],
-      ].each do |pair|
-        name = pair[0]
-        send_term = pair[1]
-        pids = RunLoop::ProcessWaiter.new(name).pids
-        pids.each do |pid|
-
-          if send_term
-            term = RunLoop::ProcessTerminator.new(pid, 'TERM', name)
-            killed = term.kill_process
-          else
-            killed = false
-          end
-
-          unless killed
-            term = RunLoop::ProcessTerminator.new(pid, 'KILL', name)
-            term.kill_process
-          end
-        end
-      end
-    end
-
     def wait_for_device_state(target_state)
       return true if update_device_state == target_state
 

data/lib/run_loop/version.rb

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

data/lib/run_loop/xcrun.rb

@@ -1,20 +1,23 @@
 module RunLoop
   class Xcrun
 
+    require 'command_runner' if RUBY_VERSION >= '2.0'
+
     DEFAULT_OPTIONS =
           {
-                :timeout => 10,
+                :timeout => 30,
                 :log_cmd => false
           }
 
-    DEFAULT_TIMEOUT = 10
-
     # Raised when Xcrun fails.
-    class XcrunError < RuntimeError; end
+    class Error < RuntimeError; end
 
-    attr_reader :stdin, :stdout, :stderr, :pid
+
+    # Raised when Xcrun times out.
+    class TimeoutError < RuntimeError; end
 
     def exec(args, options={})
+
       merged_options = DEFAULT_OPTIONS.merge(options)
 
       timeout = merged_options[:timeout]
@@ -24,7 +27,13 @@ module RunLoop
               "Expected args '#{args}' to be an Array, but found '#{args.class}'"
       end
 
-      @stdin, @stdout, out, @stderr, err, process_status, @pid, exit_status = nil
+      args.each do |arg|
+        unless arg.is_a?(String)
+          raise ArgumentError,
+%Q{Expected arg '#{arg}' to be a String, but found '#{arg.class}'
+               IO.popen requires all arguments to be Strings.}
+        end
+      end
 
       cmd = "xcrun #{args.join(' ')}"
 
@@ -32,8 +41,61 @@ module RunLoop
       # Commands are only logged when debugging.
       RunLoop.log_unix_cmd(cmd) if merged_options[:log_cmd]
 
+      # Ruby < 2.0 support
+      return exec_ruby19(args, merged_options) if RUBY_VERSION < '2.0'
+
+      hash = {}
+
+      begin
+
+        start_time = Time.now
+        command_output = CommandRunner.run(['xcrun'] + args, timeout: timeout)
+
+        if command_output[:out]
+          out = command_output[:out].force_encoding('utf-8').chomp
+        else
+          out = ''
+        end
+
+        process_status = command_output[:status]
+
+        hash =
+              {
+                    :out => out,
+                    :pid => process_status.pid,
+                    # nil if process was killed before completion
+                    :exit_status => process_status.exitstatus
+              }
+
+      rescue => e
+        elapsed = "%0.2f" % (Time.now - start_time)
+        raise Error, "Xcrun encountered an error after #{elapsed} seconds: #{e}"
+      end
+
+      if hash[:exit_status].nil?
+        elapsed = "%0.2f" % (Time.now - start_time)
+        raise TimeoutError,
+              "Xcrun timed out after #{elapsed} seconds executing '#{cmd}' with a timeout of #{timeout}"
+      end
+
+      hash
+    end
+
+    private
+
+    attr_reader :stdin, :stdout, :stderr, :pid
+
+    def exec_ruby19(args, options)
+
+      timeout = options[:timeout]
+
+      cmd = "xcrun #{args.join(' ')}"
+
+      err, out, pid, exit_status, process_status = nil
+
+      hash = nil
       begin
-        Timeout.timeout(timeout, TimeoutError) do
+        Timeout.timeout(timeout, Timeout::Error) do
           @stdin, @stdout, @stderr, process_status = Open3.popen3('xcrun', *args)
 
           @pid = process_status.pid
@@ -45,14 +107,17 @@ module RunLoop
           out = @stdout.read.force_encoding('utf-8').chomp
         end
 
-        {
-              :err => err,
-              :out => out,
-              :pid => pid,
-              :exit_status => exit_status
-        }
+        hash =
+              {
+                    :err => err,
+                    :out => out,
+                    :pid => pid,
+                    :exit_status => exit_status
+              }
+      rescue Timeout::Error => _
+        raise TimeoutError, "Xcrun.exec timed out after #{timeout} running '#{cmd}'"
       rescue StandardError => e
-        raise XcrunError, e
+        raise Error, e
       ensure
         stdin.close if stdin && !stdin.closed?
         stdout.close if stdout && !stdout.closed?
@@ -70,6 +135,7 @@ module RunLoop
           process_status.join
         end
       end
+      hash
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -92,6 +92,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: command_runner_ng
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: luffa
   requirement: !ruby/object:Gem::Requirement
@@ -286,6 +300,7 @@ files:
 - lib/run_loop/ipa.rb
 - lib/run_loop/l10n.rb
 - lib/run_loop/life_cycle/core_simulator.rb
+- lib/run_loop/life_cycle/simulator.rb
 - lib/run_loop/lipo.rb
 - lib/run_loop/lldb.rb
 - lib/run_loop/logging.rb
@@ -341,3 +356,4 @@ specification_version: 4
 summary: The bridge between Calabash iOS and Xcode command-line tools like instruments
   and simctl.
 test_files: []
+has_rdoc: