run_loop 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8451119a8e88cf2179b1b7a0bfc554a19459e9c5
-  data.tar.gz: 0b75d4af7f258d99780c624750dc3e3f241e5581
+  metadata.gz: edeacc3eddade4e3a26023d8b011b2fcea314f38
+  data.tar.gz: f8ab2b05bb26507c5a1029d583faab39edf3a1ba
 SHA512:
-  metadata.gz: ad70df268ab1bcd8001f71cb81499653ec67428be5e5fd78a7a6a89d83e527b7fe3e2da982be52bb0c1480eee57de119b40b2a1c3a4b290e6a5d5b5c9565afb2
-  data.tar.gz: d75408caf251d7b4a4ebf532adfe361697dc7cf46e4aab6f15c6447818622604c13205a764202ff5796079e2e28ec0fed871fbe73309d63cdbf1f99e63eaeed5
+  metadata.gz: 05c864c7ea5163367eaa0efa4e961a80e78b5b721d5392cc32592b18b292451496088b367e52a2a7a61713d5dd2f82443c8014f4b4fdf15236ed46d900b84113
+  data.tar.gz: 45a1cec5422e444c8155b038a7650949a756d719dbe451f17b036c04335878dffb542d908b9c443ba25024ad19502bd9d001e143bd015c488a07b2cc2f81d345

data/lib/run_loop/core_simulator.rb

@@ -100,7 +100,7 @@ class RunLoop::CoreSimulator
               # launchd_sim process.
               ['launchd_sim', false],
 
-              # Required for XCUITest termination; the simulator hangs otherwise.
+              # Required for DeviceAgent termination; the simulator hangs otherwise.
               ["xpcproxy", false],
 
               # Causes crash reports on Xcode < 7.0
@@ -246,8 +246,7 @@ class RunLoop::CoreSimulator
     end
 
     if simulator.physical_device?
-      raise ArgumentError,
-        "The language cannot be set on physical devices"
+      raise ArgumentError, "The language cannot be set on physical devices"
     end
 
     self.quit_simulator
@@ -255,6 +254,40 @@ class RunLoop::CoreSimulator
     simulator.simulator_set_language(lang_code)
   end
 
+  # @!visibility private
+  #
+  # @param [RunLoop::Device, String] device a simulator UDID, instruments-ready
+  #   name, or a RunLoop::Device
+  # @param [String] bundle_identifier the app to check for
+  #
+  # @raise [ArgumentError] if no device can be found matching the UDID or
+  #   instruments-ready name
+  # @raise [ArgumentError] if device is not a simulator
+  # @raise [ArgumentError] if language_code is invalid
+  #
+  # @return [Boolean] true if the app with the identifier is installed
+  def self.app_installed?(device, bundle_identifier, options={})
+    merged_options = {:xcode => RunLoop::Xcode.new}.merge(options)
+
+    if device.is_a?(RunLoop::Device)
+      simulator = device
+    else
+      simulator = RunLoop::Device.device_with_identifier(device, merged_options)
+    end
+
+    if simulator.physical_device?
+      raise ArgumentError, "The device must be a simulator"
+    end
+
+    start = Time.now
+
+    installed = self.send(:user_app_installed?, device, bundle_identifier) ||
+      self.send(:system_app_installed?, bundle_identifier, merged_options[:xcode])
+
+    RunLoop.log_debug("Took #{Time.now - start} seconds to check if app was installed")
+    installed
+  end
+
   # @!visibility private
   def self.simulator_pid
     @@simulator_pid
@@ -890,6 +923,46 @@ Command had no output
     end
   end
 
+  # @!visibility private
+  def self.system_applications_dir(xcode=RunLoop::Xcode.new)
+    base_dir = xcode.developer_dir
+    sim_apps_dir = "Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/Applications"
+    File.expand_path(File.join(base_dir, sim_apps_dir))
+  end
+
+  # @!visibility private
+  def self.system_app_installed?(bundle_identifier, xcode)
+    apps_dir = self.send(:system_applications_dir, xcode)
+
+    return false if !File.exist?(apps_dir)
+
+    black_list = ["Fitness.app", "Photo Booth.app", "ScreenSharingViewService.app"]
+
+    Dir.glob("#{apps_dir}/*.app").detect do |app_dir|
+      basename = File.basename(app_dir)
+      if black_list.include?(basename)
+        false
+      else
+        begin
+          RunLoop::App.new(app_dir).bundle_identifier == bundle_identifier
+        rescue ArgumentError => _
+          bundle_name = File.basename(app_dir)
+          RunLoop.log_debug("Could not create an App from simulator system app: #{bundle_name}")
+          nil
+        end
+      end
+    end
+  end
+
+  # @!visibility private
+  def self.user_app_installed?(device, bundle_identifier)
+    core_sim = self.new(device, bundle_identifier, {:quit_sim_on_init => false})
+    sim_apps_dir = core_sim.send(:device_applications_dir)
+    Dir.glob("#{sim_apps_dir}/**/*.app").find do |path|
+      RunLoop::App.new(path).bundle_identifier == bundle_identifier
+    end
+  end
+
   # Not yet.  Failing on Travis and this is not a feature yet.
   #
   # There is a spec that has been commented out.

data/lib/run_loop/device_agent/bin/CLI.json

@@ -0,0 +1,125 @@
+{
+    "start_test" : {
+        "-d" : {
+            "longFlag" : "--device-id",
+            "optionName" : "device-identifier",
+            "info" : "iOS Simulator GUID or 40-digit physical device ID",
+            "required" : true
+        },
+        "-b" : {
+            "longFlag" : "--test-runner-bundle-id",
+            "optionName" : "test_runner_bundle_id",
+            "info" : "BundleID of the Test Runner application (DeviceAgent)",
+            "required" : false,
+            "default" : "com.apple.test.DeviceAgent-Runner"
+        },
+        "-s" : {
+            "longFlag" : "--session-id",
+            "optionName" : "session_id",
+            "info" : "Session ID for the XCUITest",
+            "required" : false,
+            "default" : "BEEFBABE-FEED-BABE-BEEF-CAFEBEEFFACE"
+        },
+        "-k" : {
+            "longFlag" : "--keep-alive",
+            "optionName" : "true-or-false",
+            "info" : "Only set to false for smoke testing/debugging this tool",
+            "required" : false,
+            "default" : true
+        }        
+    },
+    "is_installed" : {
+        "-b" : {
+            "longFlag" : "--bundle-identifier",
+            "optionName" : "bundle-id",
+            "info" : "bundle identifier (e.g. com.my.app)",
+            "required" : true
+        },
+        "-d" : {
+            "longFlag" : "--device-id",
+            "optionName" : "device-identifier",
+            "info" : "iOS Simulator GUID or 40-digit physical device ID",
+            "required" : true
+        }
+    },
+    "install" : {
+        "-d" : {
+            "longFlag" : "--device-id",
+            "optionName" : "device-identifier",
+            "info" : "iOS Simulator GUID or 40-digit physical device ID",
+            "required" : true
+        },
+        "-a" : {
+            "longFlag" : "--app-bundle",
+            "optionName" : "path/to/app-bundle.app",
+            "info" : "Path .app bundle (for .ipas, unzip and look inside of 'Payload')",
+            "required" : true
+        },
+        "-c" : {
+            "longFlag" : "--codesign-identity",
+            "optionName" : "codesign-identity",
+            "info" : "Identity used to codesign app bundle [device only]",
+            "required" : false,
+            "default" : ""
+        },
+        "-u" : {
+            "longFlag" : "--update-app",
+            "optionName" : "true-or-false",
+            "info" : "When true, will reinstall the app if the device contains an older version than the bundle specified",
+            "required" : false,
+            "default" : true
+        }
+    },
+    "kill_simulator" : {
+        "-d" : {
+            "longFlag" : "--device-id",
+            "optionName" : "device-identifier",
+            "info" : "iOS Simulator GUID",
+            "required" : true
+        }
+    },
+    "launch_simulator" : {
+        "-d" : {
+            "longFlag" : "--device-id",
+            "optionName" : "device-identifier",
+            "info" : "iOS Simulator GUID",
+            "required" : true
+        }
+    },
+    "uninstall" : {
+        "-d" : {
+            "longFlag" : "--device-id",
+            "optionName" : "device-identifier",
+            "info" : "iOS Simulator GUID or 40-digit physical device ID",
+            "required" : true
+        },
+        "-b" : {
+            "longFlag" : "--bundle-identifier",
+            "optionName" : "bundle-id",
+            "info" : "bundle identifier (e.g. com.my.app)",
+            "required" : true
+        }
+    },
+    "set_location" : {
+        "-d" : {
+            "longFlag" : "--device-id",
+            "optionName" : "device-identifier",
+            "info" : "iOS Simulator GUID or 40-digit physical device ID",
+            "required" : true
+        },
+        "-l" : {
+            "longFlag" : "--location",
+            "optionName" : "lat,lng",
+            "info" : "latitude and longitude separated by a single comma",
+            "required" : true
+        }
+    },
+    "stop_simulating_location" : {
+        "-d" : {
+            "longFlag" : "--device-id",
+            "optionName" : "device-identifier",
+            "info" : "40-digit physical device ID",
+            "required" : true
+        }
+    }
+}