run_loop 2.7.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1989b341a39a627304c44e4b912659b994186853eea0f29fa0a1a8ff0a9e90d
-  data.tar.gz: e093957dfc2a9e06b19db6087c712ca028c6fc1649c40d4277bbb821e17ecda1
+  metadata.gz: 2a3873b92b4c8568a495fcc27d0941944c51c970c9bad153a633b7968ea21434
+  data.tar.gz: 7cb0715ea157c79ab0f134611eb119d0fa1bedfa271d8fbbf7a09ac35a1810ed
 SHA512:
-  metadata.gz: d1ae59bba8863b365a444bb7192768cce5a9792bbbc5e2b74aa5bcdea1e8382f17d3718e1bab0b8133b5dbad6e7a012ea3d2417758b3eb6354e6441aed83d36c
-  data.tar.gz: 6607359f51ea568f3f582f37abaaa720c1236650655c0451813dd35a71a8070c17d9d2c98cacbb3902c19d6dadda8889a07b858f1b5de493a7bcd4843d69634f
+  metadata.gz: 29d727bad338610ce8d3e3cb28e6a3c5f0fbfd75a537768b016463970b934b987d977e6f707366d6a76797a0887db3c5a5c0567c6f20944874657915d5b77ec7
+  data.tar.gz: 824e82af5b89ba3b00f4aba551e63cd7e576576c282ee10119196e3d744efde52376fba4f8fb2705be5cce06ada5d1299734243baee873cc63dcca1b6d075ff9

data/lib/run_loop.rb

@@ -34,7 +34,6 @@ require "run_loop/detect_aut/errors"
 require "run_loop/detect_aut/xamarin_studio"
 require "run_loop/detect_aut/xcode"
 require "run_loop/detect_aut/detect"
-require 'run_loop/sim_control'
 require 'run_loop/device'
 require 'run_loop/instruments'
 require 'run_loop/lipo'
@@ -202,43 +201,6 @@ Please quit the Instruments.app and try again.)
     FileUtils.cp(pngs, dest) if pngs and pngs.length > 0
   end
 
-  # @!visibility private
-  #
-  # @deprecated since 2.1.2
-  def self.default_script_for_uia_strategy(uia_strategy)
-    self.deprecated("2.1.2", "Replaced by methods in RunLoop::Core")
-    case uia_strategy
-      when :preferences
-        Core.script_for_key(:run_loop_fast_uia)
-      when :host
-        Core.script_for_key(:run_loop_host)
-      when :shared_element
-        Core.script_for_key(:run_loop_shared_element)
-      else
-        Core.script_for_key(:run_loop_basic)
-    end
-  end
-
-  # @!visibility private
-  #
-  # @deprecated since 2.1.2
-  def self.validate_script(script)
-    self.deprecated("2.1.2", "Replaced by methods in RunLoop::Core")
-    if script.is_a?(String)
-      unless File.exist?(script)
-        raise "Unable to find file: #{script}"
-      end
-    elsif script.is_a?(Symbol)
-      script = Core.script_for_key(script)
-      unless script
-        raise "Unknown script for symbol: #{script}. Options: #{Core::SCRIPTS.keys.join(', ')}"
-      end
-    else
-      raise "Script must be a symbol or path: #{script}"
-    end
-    script
-  end
-
   def self.log_info(*args)
     RunLoop::Logging.log_info(*args)
   end

data/lib/run_loop/app.rb

@@ -16,7 +16,21 @@ module RunLoop
       @path = File.expand_path(app_bundle_path)
 
       if !App.valid?(app_bundle_path)
-        raise ArgumentError,
+        if App.cached_app_on_simulator?(app_bundle_path)
+          raise RuntimeError, %Q{
+App is "cached" on the simulator.
+
+#{app_bundle_path}
+
+This can happen if there was an incomplete install or uninstall.
+
+Try manually deleting the application data container and relaunching the simulator.
+
+$ rm -r #{File.dirname(app_bundle_path)}
+$ run-loop simctl manage-processes
+}
+        else
+          raise ArgumentError,
 %Q{App does not exist at path or is not an app bundle.
 
 #{app_bundle_path}
@@ -28,6 +42,7 @@ Bundle must:
 3. contain an Info.plist,
 4. and the app binary (CFBundleExecutable) must exist
 }
+        end
       end
     end
 
@@ -71,6 +86,19 @@ Bundle must:
       true
     end
 
+    # @!visibility private
+    #
+    # Starting in Xcode 10 betas, this can happen if there was an incomplete
+    # install or uninstall.
+    def self.cached_app_on_simulator?(app_bundle_path)
+      return false if Dir[File.join(app_bundle_path, "**/*")].length != 2
+      return false if !app_bundle_path[RunLoop::Regex::CORE_SIMULATOR_UDID_REGEX]
+      [File.join(app_bundle_path, "Info.plist"),
+       File.join(app_bundle_path, "Icon.png")].all? do |file|
+        File.exist?(file)
+      end
+    end
+
     # Returns the Info.plist path.
     # @raise [RuntimeError] If there is no Info.plist.
     def info_plist_path
@@ -128,6 +156,14 @@ Bundle must:
       version
     end
 
+    # @!visibility private
+    # Return the fingerprint of the linked server
+    def calabash_server_id
+      name = plist_buddy.plist_read("CFBundleExecutable", info_plist_path)
+      app_executable = File.join(self.path, name)
+      strings(app_executable).server_id
+    end
+
     # @!visibility private
     def codesign_info
       RunLoop::Codesign.info(path)

data/lib/run_loop/cli/idm.rb

@@ -0,0 +1,71 @@
+
+module RunLoop
+  module CLI
+
+    require 'thor'
+    class IDM < Thor
+
+      require "run_loop"
+      require "run_loop/cli/errors"
+      require "run_loop/shell"
+      include RunLoop::Shell
+
+      require "run_loop/regex"
+
+      desc "install app [OPTIONS]", "Installs an app on a device."
+
+      method_option "device",
+                    :desc => 'The simulator UDID or name.',
+                    :aliases => "-d",
+                    :required => false,
+                    :type => :string
+
+      method_option "debug",
+                    :desc => "Enable debug logging.",
+                    :aliases => "-v",
+                    :required => false,
+                    :default => false,
+                    :type => :boolean
+
+      method_option "force",
+                    :desc => "Force a re-install the existing app",
+                    :aliases => "-f",
+                    :required => false,
+                    :default => false,
+                    :type => :boolean
+
+      def install(app)
+        extension =  File.extname(app)
+        if extension == ".app"
+          app_instance = RunLoop::App.new(app)
+        else
+          app_instance = RunLoop::Ipa.new(app)
+        end
+
+        xcode = RunLoop::Xcode.new
+        simctl = RunLoop::Simctl.new
+        instruments = RunLoop::Instruments.new
+
+        detect_options = {}
+
+        device = options[:device]
+        if !device
+          detect_options[:device] = "device"
+        else
+          detect_options[:device] = device
+        end
+
+        device = RunLoop::Device.detect_device(detect_options, xcode,
+                                               simctl, instruments)
+
+        idm = RunLoop::PhysicalDevice::IOSDeviceManager.new(device)
+
+        if options[:force]
+          idm.install_app(app_instance)
+        else
+          idm.ensure_newest_installed(app_instance)
+        end
+      end
+    end
+  end
+end

data/lib/run_loop/cli/simctl.rb

@@ -250,7 +250,7 @@ module RunLoop
           if device_from_options.nil?
             default_name = RunLoop::Core.default_simulator
             device = simulators.find do |sim|
-              sim.instruments_identifier(xcode) == default_name
+              sim.instruments_identifier == default_name
             end
 
             if device.nil?
@@ -260,7 +260,7 @@ module RunLoop
           else
             device = simulators.find do |sim|
               sim.udid == device_from_options ||
-                    sim.instruments_identifier(xcode) == device_from_options
+                    sim.instruments_identifier == device_from_options
             end
 
             if device.nil?

data/lib/run_loop/core.rb

@@ -319,44 +319,20 @@ Logfile: #{log_file}
     # @param [RunLoop::Xcode] xcode Used to detect the current xcode
     #  version.
     def self.default_simulator(xcode=RunLoop::Xcode.new)
-
-      if xcode.version_gte_94?
-        "iPhone 8 (11.4)"
-      elsif xcode.version_gte_93?
-        "iPhone 8 (11.3)"
-      elsif xcode.version_gte_92?
-        "iPhone 8 (11.2)"
-      elsif xcode.version_gte_91?
-        "iPhone 8 (11.1)"
-      elsif xcode.version_gte_90?
-        "iPhone 8 (11.0)"
-      elsif xcode.version_gte_83?
-        "iPhone 7 (10.3)"
-      elsif xcode.version_gte_82?
-        "iPhone 7 (10.2)"
-      elsif xcode.version_gte_81?
-        "iPhone 7 (10.1)"
-      elsif xcode.version_gte_8?
-        "iPhone 7 (10.0)"
-      elsif xcode.version_gte_73?
-        "iPhone 6s (9.3)"
-      elsif xcode.version_gte_72?
-        "iPhone 6s (9.2)"
-      elsif xcode.version_gte_71?
-        "iPhone 6s (9.1)"
-      elsif xcode.version_gte_7?
-        "iPhone 5s (9.0)"
-      elsif xcode.version_gte_64?
-        "iPhone 5s (8.4 Simulator)"
-      elsif xcode.version_gte_63?
-        "iPhone 5s (8.3 Simulator)"
-      elsif xcode.version_gte_62?
-        "iPhone 5s (8.2 Simulator)"
-      elsif xcode.version_gte_61?
-        "iPhone 5s (8.1 Simulator)"
+      version = xcode.version
+      xcode_major = version.major
+      xcode_minor = version.minor
+      major = xcode_major + 2
+      minor = xcode_minor
+
+      # Early major Xcode beta releases do not have new hardware model numbers
+      if xcode.beta? && xcode_major == 10
+        model = xcode_major - 2
       else
-        "iPhone 5s (8.0 Simulator)"
+        model = xcode_major - 1
       end
+
+      "iPhone #{model} (#{major}.#{minor})"
     end
 
     def self.create_uia_pipe(repl_path)
@@ -574,125 +550,10 @@ $ xcrun instruments -s templates
 ])
     end
 
-    # @deprecated 2.1.0
-    # Replaced with Device.detect_physical_device_on_usb
-    def self.detect_connected_device
-      begin
-        Timeout::timeout(1, RunLoop::TimeoutError) do
-          return `#{File.join(SCRIPTS_PATH, 'udidetect')}`.chomp
-        end
-      rescue RunLoop::TimeoutError => _
-        `killall udidetect &> /dev/null`
-      end
-      nil
-    end
-
-    # @deprecated 2.1.0
-    # @!visibility private
-    # Are we targeting a simulator?
-    #
-    # @note  The behavior of this method is different than the corresponding
-    #   method in Calabash::Cucumber::Launcher method.  If
-    #   `:device_target => {nil | ''}`, then the calabash-ios method returns
-    #   _false_.  I am basing run-loop's behavior off the behavior in
-    #   `self.udid_and_bundle_for_launcher`
-    #
-    # @see {Core::RunLoop.udid_and_bundle_for_launcher}
-    #
-    # @todo sim_control argument is no longer necessary and can be removed.
-    def self.simulator_target?(run_options, sim_control=nil)
-      # TODO Enable deprecation warning
-      # RunLoop.deprecated("2.1.0", "No replacement")
-      value = run_options[:device_target]
-
-      # Match the behavior of udid_and_bundle_for_launcher.
-      return true if value.nil? or value == ''
-
-      # 5.1 <= Xcode < 7.0
-      return true if value.downcase.include?('simulator')
-
-      # Not a physical device.
-      return false if value[DEVICE_UDID_REGEX, 0] != nil
-
-      # Check for named simulators and Xcode >= 7.0 simulators.
-      simctl = run_options[:sim_control] || run_options[:simctl] || RunLoop::Simctl.new
-      xcode = run_options[:xcode] || RunLoop::Xcode.new
-      simulator = simctl.simulators.find do |sim|
-        [
-          sim.instruments_identifier(xcode) == value,
-          sim.udid == value,
-          sim.name == value
-        ].any?
-      end
-      !simulator.nil?
-    end
-
-    # @!visibility private
-    # @deprecated 2.1.0
-    #
-    # Do not call this method.
-    def self.udid_and_bundle_for_launcher(device_target, options, simctl=RunLoop::Simctl.new)
-      RunLoop.deprecated("2.1.0", "No replacement")
-      xcode = RunLoop::Xcode.new
-
-      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)'
-      end
-
-      if device_target.nil? || device_target.empty? || device_target == 'simulator'
-        device_target = self.default_simulator(xcode)
-      end
-      udid = device_target
-
-      unless self.simulator_target?(options)
-        bundle_dir_or_bundle_id = options[:bundle_id] if options[:bundle_id]
-      end
-      return udid, bundle_dir_or_bundle_id
-    end
-
-    # @deprecated 1.0.5
-    def self.ensure_instruments_not_running!
-      RunLoop::Instruments.new.kill_instruments
-    end
-
     def self.instruments_running?
       RunLoop::Instruments.new.instruments_running?
     end
 
-    # @deprecated 1.0.5
-    def self.instruments_pids
-      RunLoop::Instruments.new.instruments_pids
-    end
-
-    # @deprecated 1.0.0 replaced with Xctools#version
-    def self.xcode_version(xcode=RunLoop::Xcode.new)
-      xcode.version
-    end
-
-    # @deprecated since 1.0.0
-    # still used extensively in calabash-ios launcher
-    def self.above_or_eql_version?(target_version, xcode_version)
-      if target_version.is_a?(RunLoop::Version)
-        target = target_version
-      else
-        target = RunLoop::Version.new(target_version)
-      end
-
-      if xcode_version.is_a?(RunLoop::Version)
-        xcode = xcode_version
-      else
-        xcode = RunLoop::Version.new(xcode_version)
-      end
-      target >= xcode
-    end
-
-    # @deprecated 1.0.5
-    def self.pids_for_run_loop(run_loop, &block)
-      RunLoop::Instruments.new.instruments_pids(&block)
-    end
-
     private
 
     # @!visibility private
@@ -828,11 +689,6 @@ $ xcrun instruments -s templates
         core_sim.reset_app_sandbox
       end
 
-      # @todo fix accessibility_enabled? so we don't have to quit the sim
-      # SimControl#accessibility_enabled? is always false during Core#prepare_simulator
-      # https://github.com/calabash/run_loop/issues/167
-      simctl.ensure_accessibility(device)
-
       # Launches the simulator if the app is not installed.
       core_sim.install
 

data/lib/run_loop/core_simulator.rb

@@ -122,7 +122,13 @@ class RunLoop::CoreSimulator
               ["pkd", false],
               ["KeychainSyncingOverIDSProxy", false],
               ["CloudKeychainProxy", false],
-              ["aslmanager", false]
+              ["aslmanager", false],
+
+              # Processes from Xcode 10
+              ["diagnosticd", false],
+              ["syslogd", false],
+              ["mobiletimerd", false],
+              ["carkitd", false]
         ]
 
   # @!visibility private
@@ -424,6 +430,9 @@ class RunLoop::CoreSimulator
             '-CurrentDeviceUDID', device.udid,
             "-ConnectHardwareKeyboard", "0",
             "-DeviceBootTimeout", "120",
+            # Yes, this is the argument even though it is not spelled correctly
+            "-DetatchOnAppQuit", "0",
+            "-DetachOnWindowClose", "0",
             "LAUNCHED_BY_RUN_LOOP"]
 
     RunLoop.log_debug("Launching #{device} with:")
@@ -518,7 +527,12 @@ Could not launch #{app.bundle_identifier} on #{device} after trying #{tries} tim
 
   # Is this app installed?
   def app_is_installed?
-    !installed_app_bundle_dir.nil?
+    if installed_app_bundle_dir ||
+      simctl.app_container(device, app.bundle_identifier)
+      true
+    else
+      false
+    end
   end
 
   # Resets the app sandbox.
@@ -600,13 +614,7 @@ Could not launch #{app.bundle_identifier} on #{device} after trying #{tries} tim
   # @return [String] A String suitable for searching for a pid, quitting, or
   #  launching the current simulator.
   def sim_name
-    @sim_name ||= begin
-      if xcode.version_gte_7?
-        "Simulator"
-      else
-        "iOS Simulator"
-      end
-    end
+    @sim_name ||= "Simulator"
   end
 
   # @!visibility private