run_loop 2.6.6 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 859e2ab5bd1352f4d5b41267c7fb1d28c49c9607
-  data.tar.gz: 857468c645b8619b998bbf9c2f2e15f85eb4a81c
+SHA256:
+  metadata.gz: efa428373fed36e57c707789351dddb5c6019d52985b0f4503b32f857a3fb9a0
+  data.tar.gz: d20c552c8130a4921c0505f9f50a88079e9acd401680495c9d51fd6134ce819d
 SHA512:
-  metadata.gz: ad9097c29c97dddd9e3100a7c3e685820d6e3499a84cee13dac1c191ce255458157d5a372806b6803e77b04b4402beda1fb8bf895398db2fa7989a1be196dbf2
-  data.tar.gz: 47e7304ea46a8465781a8869f58d3ded32e606be6c691216d7d2368991863898b81198ade718216ee988a79fcf2a477ebc24473f27c89797d9847832025895e1
+  metadata.gz: 8b750e02559f0b0656c435c7a11e16b13ef5ef58f2dd54127a5a6ebabeb6318de80b130e6cb04b3166d24b6d7c9e284334a7dcfa4597019bde83ee120188fdd2
+  data.tar.gz: d441a636cb58d67099a59ad32fae2410b2aec38a8e41256d56821c4b9c6b2105ba4857601b546fcededf6420ba297f38cc2238a87472b13d72285f97d9400390

data/ThirdPartyNotices.txt

@@ -0,0 +1,119 @@
+run-loop incorporates third party material from the projects listed
+below. The original copyright notice and the license under which Microsoft
+received such third party material are set forth below.  Microsoft reserves all
+other rights not expressly granted, whether by implication, estoppel or
+otherwise.
+
+===
+
+The MIT License (MIT)
+
+For iOSDeviceManager software
+
+Copyright (c) 2016 Microsoft Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+===
+
+The MIT License (MIT)
+
+For DeviceAgent.iOS software
+
+Copyright (c) Microsoft Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+===
+
+BSD License
+
+For FBSimulatorControl software
+
+Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+ * Neither the name Facebook nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific prior
+   written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+===
+
+BSD License
+
+For CocoaLumberjack software
+
+Copyright (c) 2010-present, Deusty, LLC. All rights reserved.
+
+Redistribution and use of this software in source and binary forms, with or
+without modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Neither the name of Deusty nor the names of its contributors may be used to
+  endorse or promote products derived from this software without specific prior
+  written permission of Deusty, LLC.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/lib/run_loop/core.rb

@@ -320,7 +320,9 @@ Logfile: #{log_file}
     #  version.
     def self.default_simulator(xcode=RunLoop::Xcode.new)
 
-      if xcode.version_gte_93?
+      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)"

data/lib/run_loop/device.rb

@@ -228,6 +228,32 @@ version: #{version}
       !physical_device?
     end
 
+    # Is the iOS version installed on this device compatible with an Xcode
+    # version?
+    def compatible_with_xcode_version?(xcode_version)
+      ios_version = version
+
+      if ios_version.major < (xcode_version.major + 2)
+        if physical_device?
+          return true
+        else
+          # iOS 8 simulators are available in Xcode 9
+          # iOS 7 simulators are not available in Xcode 9
+          if ios_version.major <= (xcode_version.major - 2)
+            return false
+          else
+            return true
+          end
+        end
+      end
+
+      if ios_version.major == (xcode_version.major + 2)
+        return ios_version.minor <= xcode_version.minor
+      end
+
+      false
+    end
+
     # Return the instruction set for this device.
     #
     # **Simulator**

data/lib/run_loop/device_agent/bin/iOSDeviceManager.LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Microsoft Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/lib/run_loop/device_agent/client.rb

@@ -125,6 +125,15 @@ module RunLoop
           core_sim.install
         end
 
+        if !RunLoop::Environment.xtc?
+          if device.physical_device? && app
+            if reset_options
+              idm = RunLoop::PhysicalDevice::IOSDeviceManager.new(device)
+              idm.reset_app_sandbox(app)
+            end
+          end
+        end
+
         cbx_launcher = Client.detect_cbx_launcher(merged_options, device)
 
         code_sign_identity = options[:code_sign_identity]

data/lib/run_loop/directory.rb

@@ -52,7 +52,7 @@ found '#{handle_errors_by}'
         raise ArgumentError, "Expected '#{path}' to be a directory"
       end
 
-      entries = self.recursive_glob_for_entries(path)
+      entries = self.recursive_glob_for_entries(path).sort
 
       if entries.empty?
         raise ArgumentError, "Expected a non-empty dir at '#{path}' found '#{entries}'"
@@ -60,11 +60,16 @@ found '#{handle_errors_by}'
 
       debug = RunLoop::Environment.debug?
 
-      sha = OpenSSL::Digest::SHA256.new
-      entries.each do |file|
-        unless self.skip_file?(file, 'SHA1', debug)
+      file_shas = []
+      cumulative = OpenSSL::Digest::SHA256.new
+      entries.each do |path|
+        if !self.skip_file?(path, "SHA256", debug)
           begin
-            sha << File.read(file)
+            file_sha = OpenSSL::Digest::SHA256.new
+            contents = File.read(path, {mode: "rb"})
+            file_sha << contents
+            cumulative << contents
+            file_shas << [file_sha.hexdigest]
           rescue => e
             case handle_errors_by
             when :logging
@@ -75,7 +80,7 @@ found '#{handle_errors_by}'
 
 while trying to find the SHA of this file:
 
-         #{file}
+         #{path}
 
 This is not a fatal error; it can be ignored.
 }
@@ -90,7 +95,13 @@ This is not a fatal error; it can be ignored.
           end
         end
       end
-      sha.hexdigest
+      digest_of_digests = OpenSSL::Digest::SHA256.new
+      digest_of_digests << file_shas.join("\n")
+      # We have at least one example where the cumulative digest has an
+      # unexpected value when computing the digest of an installed .app on an
+      # iOS Simulator.  I want return the cumulative.hexdigest in case there is
+      # a client (end user) who is using this method.
+      return digest_of_digests.hexdigest, cumulative.hexdigest
     end
 
     def self.size(path, format)

data/lib/run_loop/instruments.rb

@@ -218,8 +218,12 @@ module RunLoop
           udid = line[DEVICE_UDID_REGEX, 0]
           if udid
             version = line[VERSION_REGEX, 0]
-            name = line.split('(').first.strip
-            RunLoop::Device.new(name, version, udid)
+            if version
+              name = line.split('(').first.strip
+              if name
+                RunLoop::Device.new(name, version, udid)
+              end
+            end
           else
             nil
           end

data/lib/run_loop/ipa.rb

@@ -2,6 +2,20 @@ module RunLoop
   # A model of the an .ipa - a application binary for iOS devices.
   class Ipa
 
+    require "run_loop/shell"
+
+    # Return true if the path_to_ipa to a zip archive
+    def self.is_zip_archive?(path_to_ipa)
+      hash = RunLoop::Shell.run_shell_command(["file", path_to_ipa],
+                                              {log_cmd: true})
+      hash[:out][/Zip archive data/]
+    end
+
+    # Return true if the path_to_ipa is probably an .ipa
+    def self.is_ipa?(path_to_ipa)
+      path_to_ipa.end_with?('.ipa') || RunLoop::Ipa.is_zip_archive?(path_to_ipa)
+    end
+
     # The path to this .ipa.
     # @!attribute [r] path
     # @return [String] A path to this .ipa.
@@ -13,12 +27,12 @@ module RunLoop
     # @raise [RuntimeError] If the file does not exist.
     # @raise [RuntimeError] If the file does not end in .ipa.
     def initialize(path_to_ipa)
-      unless File.exist? path_to_ipa
+      if !File.exist? path_to_ipa
         raise "Expected an ipa at '#{path_to_ipa}'"
       end
 
-      unless path_to_ipa.end_with?('.ipa')
-        raise "Expected '#{path_to_ipa}' to be an .ipa"
+      if !RunLoop::Ipa.is_ipa?(path_to_ipa)
+        raise "Expected '#{path_to_ipa}' have extension .ipa or be a zip archive"
       end
       @path = path_to_ipa
     end

data/lib/run_loop/physical_device/ios_device_manager.rb

@@ -5,6 +5,17 @@ module RunLoop
     require "run_loop/physical_device/life_cycle"
     class IOSDeviceManager < RunLoop::PhysicalDevice::LifeCycle
 
+      require "fileutils"
+      require "run_loop/dot_dir"
+      require "run_loop/device_agent/frameworks"
+      require "run_loop/device_agent/ios_device_manager"
+
+      NOT_INSTALLED_EXIT_CODE = 2
+
+      DEFAULTS = {
+        install_timeout: RunLoop::Environment.ci? ? 240 : 120
+      }
+
       # Is the tool installed?
       def self.tool_is_installed?
         File.exist?(IOSDeviceManager.executable_path)
@@ -22,67 +33,148 @@ module RunLoop
         RunLoop::DeviceAgent::Frameworks.instance.install
       end
 
-      def app_installed?(bundle_id)
+      def raise_error_on_failure(error_klass, message, app, device, hash)
+        if hash[:exit_status] == 0
+          true
+        else
+          raise error_klass, %Q[
+          #{message}
+
+        app: #{app}
+     device: #{device}
+exit status: #{hash[:exit_status]}
+
+          #{hash[:out]}
+
+]
+        end
+      end
+
+      def app_installed?(app)
+        bundle_id = app
+        if is_ipa?(app) || is_app?(app)
+          bundle_id = app.bundle_identifier
+        end
+
         args = [
           IOSDeviceManager.executable_path,
-          "is_installed",
-          "-d", device.udid,
-          "-b", bundle_id
+          "is-installed",
+          bundle_id,
+          "-d", device.udid
         ]
 
         options = { :log_cmd => true }
         hash = run_shell_command(args, options)
 
-        # TODO: error reporting
-        hash[:exit_status] == 0
+        exit_status = hash[:exit_status]
+
+        if exit_status != 0 && exit_status != NOT_INSTALLED_EXIT_CODE
+          raise_error_on_failure(
+            RuntimeError,
+            "Encountered an error checking if app is installed on device",
+            app, device, hash
+          )
+        else
+          RunLoop::log_debug("Took #{hash[:seconds_elapsed]} seconds to check " +
+                               "app was installed")
+          hash[:exit_status] == 0
+        end
       end
 
       def install_app(app_or_ipa)
-        app = app_or_ipa
-        if is_ipa?(app)
-          app = app_or_ipa.app
-        end
+        install_app_internal(app_or_ipa, ["--force"])
+      end
 
-        code_sign_identity = RunLoop::Environment.code_sign_identity
-        if !code_sign_identity
-          code_sign_identity = "iPhone Developer"
+      def ensure_newest_installed(app_or_ipa)
+        install_app_internal(app_or_ipa)
+      end
+
+      def uninstall_app(app_or_ipa)
+        bundle_identifier = app_or_ipa.bundle_identifier
+        if !app_installed?(bundle_identifier)
+          return :was_not_installed
         end
 
         args = [
           IOSDeviceManager.executable_path,
-          "install",
-          "-d", device.udid,
-          "-a", app.path,
-          "-c", code_sign_identity
+          "uninstall",
+          bundle_identifier,
+          "-d", device.udid
         ]
 
         options = { :log_cmd => true }
         hash = run_shell_command(args, options)
 
-        # TODO: error reporting
-        if hash[:exit_status] == 0
-          true
-        else
-          puts hash[:out]
-          false
-        end
+        raise_error_on_failure(
+          UninstallError,
+          "Could not remove app from device",
+          app_or_ipa, device, hash
+        )
+        hash[:out]
+      end
+
+      def can_reset_app_sandbox?
+        true
+      end
+
+      def reset_app_sandbox(app_or_ipa)
+        args = [IOSDeviceManager.executable_path,
+                "clear-app-data",
+                app_or_ipa.path,
+                device.udid]
+
+        options = { :log_cmd => true }
+        hash = run_shell_command(args, options)
+
+        raise_error_on_failure(
+          ResetAppSandboxError,
+          "Could not clear app data",
+          app_or_ipa, device, hash
+        )
+
+        hash[:out]
       end
 
-      def uninstall_app(bundle_id)
-        return true if !app_installed?(bundle_id)
+=begin
+Private Methods
+=end
+
+      private
 
+      def install_app_internal(app_or_ipa, additional_args=[])
         args = [
           IOSDeviceManager.executable_path,
-          "uninstall",
-          "-d", device.udid,
-          "-b", bundle_id
+          "install",
+          app_or_ipa.path,
+          "-d", device.udid
         ]
 
-        options = { :log_cmd => true }
+        args = args + additional_args
+
+        code_sign_identity = RunLoop::Environment.code_sign_identity
+        if code_sign_identity
+          args = args + ["-c", code_sign_identity]
+        end
+
+        provisioning_profile = RunLoop::Environment.provisioning_profile
+        if provisioning_profile
+          args = args + ["-p", provisioning_profile]
+        end
+
+        options = {
+          :log_cmd => true,
+          timeout: DEFAULTS[:install_timeout]
+        }
         hash = run_shell_command(args, options)
 
-        # TODO: error reporting
-        hash[:exit_status] == 0
+        raise_error_on_failure(
+          InstallError,
+          "Could not install app on device",
+          app_or_ipa, device, hash
+        )
+
+        RunLoop::log_debug("Took #{hash[:seconds_elapsed]} seconds to install app")
+        hash[:out]
       end
     end
   end

data/lib/run_loop/physical_device/life_cycle.rb

@@ -8,6 +8,9 @@ module RunLoop
     # Raised when uninstall fails.
     class UninstallError < RuntimeError; end
 
+    # Raised when clear app data fails
+    class ResetAppSandboxError < RuntimeError; end
+
     # Raised when tool cannot perform task.
     class NotImplementedError < StandardError; end
 
@@ -65,37 +68,31 @@ must be a physical device.]
 
       # Is the app installed?
       #
-      # @param [String] bundle_id The CFBundleIdentifier of an app.
+      # @param [RunLoop::Ipa, RunLoop::App, String] app an App, Ipa, or a bundle
+      #  identifier.
       # @return [Boolean] true or false
-      def app_installed?(bundle_id)
+      def app_installed?(app)
         abstract_method!
       end
 
       # Install the app or ipa.
       #
       # If the app is already installed, it will be reinstalled from disk;
-      # no version check is performed.
+      # no version check is performed.  This is a force reinstall.
       #
       # App data is never preserved.  If you want to preserve the app data,
       # call `ensure_newest_installed`.
       #
-      # Possible return values:
-      #
-      # * :reinstalled => app was installed, but app data was not preserved.
-      # * :installed => app was not installed.
-      #
-      # @param [RunLoop::Ipa, RunLoop::App] app_or_ipa The ipa to install.
-      #   The caller is responsible for validating the ipa for the device by
-      #   checking that the codesign and instruction set is correct.
+      # @param [RunLoop::Ipa, RunLoop::App] app The ipa to install.
       #
       # @raise [InstallError] If app was not installed.
       #
-      # @return [Symbol] A keyword describing the action that was performed.
-      def install_app(app_or_ipa)
+      # @return [Boolean] true or false
+      def install_app(app)
         abstract_method!
       end
 
-      # Uninstall the app with bundle_id.
+      # Uninstall the app.
       #
       # App data is never preserved.  If you want to install a new version of
       # an app and preserve app data (upgrade testing), call
@@ -103,16 +100,12 @@ must be a physical device.]
       #
       # Possible return values:
       #
-      # * :nothing => app was not installed
-      # * :uninstall => app was uninstalled
-      #
-      # @param [String] bundle_id The CFBundleIdentifier of an app.
+      # @param [RunLoop::Ipa, RunLoop::App] app the App or Ipa
       #
       # @raise [UninstallError] If the app cannot be uninstalled, usually
       #   because it is a system app.
-      #
-      # @return [Symbol] A keyword that describes what action was performed.
-      def uninstall_app(bundle_id)
+      # @return [String] Output from the shell command
+      def uninstall_app(app)
         abstract_method!
       end
 
@@ -124,26 +117,15 @@ must be a physical device.]
       # the CFBundleShortVersionString.  If either are different, then the
       # app should be reinstalled.
       #
-      # If possible, the app data should be preserved across reinstallation.
-      #
-      # Possible return values:
+      # If possible, the app data should be preserved across re-installation.
       #
-      # * :nothing => app was already installed and versions matched.
-      # * :upgraded => app was stale; newer version from disk was installed and
-      #                app data was preserved.
-      # * :reinstalled => app was stale; newer version from disk was installed,
-      #                   but app data was not preserved.
-      # * :installed => app was not installed.
-      #
-      # @param [RunLoop::Ipa, RunLoop::App] app_or_ipa The ipa to install.
-      #   The caller is responsible for validating the ipa for the device by
-      #   checking that the codesign and instruction set is correct.
+      # @param [RunLoop::Ipa, RunLoop::App] app The App or Ipa to install.
       #
       # @raise [InstallError] If the app could not be installed.
       # @raise [UninstallError] If the app could not be uninstalled.
       #
-      # @return [Symbol] A keyword that describes the action that was taken.
-      def ensure_newest_installed(app_or_ipa)
+      # @return [String] Output from the shell command
+      def ensure_newest_installed(app)
         abstract_method!
       end
 
@@ -153,12 +135,10 @@ must be a physical device.]
       # the CFBundleShortVersionString. If either are different, then this
       # method returns false.
       #
-      # @param [RunLoop::Ipa, RunLoop::App] app_or_ipa The ipa to install.
-      #   The caller is responsible for validating the ipa for the device by
-      #   checking that the codesign and instruction set is correct.
+      # @param [RunLoop::Ipa, RunLoop::App] app The Ipa or App to install.
       #
       # @raise [RuntimeError] If app is not already installed.
-      def installed_app_same_as?(app_or_ipa)
+      def installed_app_same_as?(app)
         abstract_method!
       end
 
@@ -176,11 +156,11 @@ must be a physical device.]
       #
       # Does not clear Keychain.  Use the Calabash iOS Keychain API.
       #
-      # @param [String] bundle_id The CFBundleIdentifier of an app.
+      # @param [RunLoop::Ipa, RunLoop::App] app The App or Ipa
       #
       # @raise [RunLoop::PhysicalDevice::NotImplementedError] If this tool
-      #   cannot reset the app sandbox without unintalling the app.
-      def reset_app_sandbox(bundle_id)
+      #   cannot reset the app sandbox without uninstalling the app.
+      def reset_app_sandbox(app)
         abstract_method!
       end
 
@@ -190,7 +170,9 @@ must be a physical device.]
       end
 
       # Is the app or ipa compatible with the architecture of the device?
-      def app_has_compatible_architecture?(app_or_ipa)
+      #
+      # @param [RunLoop::Ipa, RunLoop::App] app The App or Ipa
+      def app_has_compatible_architecture?(app)
         abstract_method!
       end
 
@@ -199,7 +181,7 @@ must be a physical device.]
         abstract_method!
       end
 
-      # Return false if the device is an iPad.
+      # Return true if the device is an iPad.
       def ipad?
         abstract_method!
       end
@@ -209,7 +191,7 @@ must be a physical device.]
         abstract_method!
       end
 
-      # Sideload data into the app's sandbox.
+      # Side-load data into the app's sandbox.
       #
       # These directories exist in the application sandbox.
       #

data/lib/run_loop/shell.rb

@@ -63,11 +63,14 @@ IO.popen requires all arguments to be Strings.
       RunLoop.log_unix_cmd(cmd) if merged_options[:log_cmd]
 
       hash = {}
+      shell_start_time = Time.now
 
-      begin
+      environment = options.fetch(:environment, {})
 
-        start_time = Time.now
-        command_output = CommandRunner.run(args, timeout: timeout)
+      begin
+        command_output = CommandRunner.run(args,
+                                           timeout: timeout,
+                                           environment: environment)
 
         out = ensure_command_output_utf8(command_output[:out], cmd)
         process_status = command_output[:status]
@@ -83,7 +86,7 @@ IO.popen requires all arguments to be Strings.
       rescue RunLoop::Encoding::UTF8Error => e
         raise e
       rescue => e
-        elapsed = "%0.2f" % (Time.now - start_time)
+        elapsed = "%0.2f" % (Time.now - shell_start_time)
         raise Error,
 %Q{Encountered an error after #{elapsed} seconds:
 
@@ -93,14 +96,14 @@ executing this command:
 
 #{cmd}
 }
+      ensure
+        hash[:seconds_elapsed] = Time.now - shell_start_time
       end
 
-      now = Time.now
-
       if hash[:exit_status].nil?
-        elapsed = "%0.2f" % (now - start_time)
+        elapsed = "%0.2f" % (hash[:seconds_elapsed])
 
-        if timeout_exceeded?(start_time, timeout)
+        if timeout_exceeded?(shell_start_time, timeout)
           raise TimeoutError,
 %Q[
 Timed out after #{elapsed} seconds executing
@@ -123,7 +126,6 @@ The command generated this output:
 
         end
       end
-
       hash
     end
 
@@ -134,4 +136,3 @@ The command generated this output:
     end
   end
 end
-

data/lib/run_loop/version.rb

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

data/lib/run_loop/xcode.rb

@@ -26,6 +26,14 @@ module RunLoop
       to_s
     end
 
+    # Returns a version instance for Xcode 9.4; used to check for the
+    # availability of features and paths to various items on the filesystem
+    #
+    # @return [RunLoop::Version] 9.4
+    def v94
+      fetch_version(:v94)
+    end
+
     # Returns a version instance for Xcode 9.3; used to check for the
     # availability of features and paths to various items on the filesystem
     #
@@ -177,6 +185,14 @@ module RunLoop
     def v50
       fetch_version(:v50)
     end
+
+    # Is the active Xcode version 9.3 or above?
+    #
+    # @return [Boolean] `true` if the current Xcode version is >= 9.3
+    def version_gte_94?
+      version >= v94
+    end
+
     # Is the active Xcode version 9.3 or above?
     #
     # @return [Boolean] `true` if the current Xcode version is >= 9.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.7.0
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -133,14 +133,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: luffa
   requirement: !ruby/object:Gem::Requirement
@@ -203,28 +203,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier
+  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: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
@@ -317,6 +331,7 @@ files:
 - "./vendor-licenses/Facebook-WebDriverAgent.LICENSE"
 - "./vendor-licenses/RoutingHTTPServer.LICENSE"
 - LICENSE
+- ThirdPartyNotices.txt
 - bin/run-loop
 - lib/run_loop.rb
 - lib/run_loop/abstract.rb
@@ -339,6 +354,7 @@ files:
 - lib/run_loop/device_agent/Frameworks.zip
 - lib/run_loop/device_agent/app/DeviceAgent-Runner.app.zip
 - lib/run_loop/device_agent/bin/iOSDeviceManager
+- lib/run_loop/device_agent/bin/iOSDeviceManager.LICENSE
 - lib/run_loop/device_agent/client.rb
 - lib/run_loop/device_agent/frameworks.rb
 - lib/run_loop/device_agent/ios_device_manager.rb
@@ -415,7 +431,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: The bridge between Calabash iOS and Xcode command-line tools like instruments