run_loop 2.1.10 → 2.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1d5ec2c34563d9302dd2ea711a02542f391cdb1
-  data.tar.gz: 0559160c9bba7c824d069f8b1f90819328033691
+  metadata.gz: e9ebbfcb0e62aedb6823bf0d20769d04a655e231
+  data.tar.gz: 5e155942b7249c597f43aaa0eea71d571d325778
 SHA512:
-  metadata.gz: 46181f7467e976ef0f53d874b5145de368055be6d3fac52e6e872c1f28a1a39f9c04de92df0b4bcbfce270ef6b1438f1c1f590246cd51bc796c32acf54ec8c9b
-  data.tar.gz: e11a8e89c0a0ee501a961342d6e71705a3ebc9d1788d8ee23adc2fadeb4ac1ea321e44390df8517e753b81535eefe6332084ae63de9786ea24a9e613871a38b1
+  metadata.gz: e26d30623d4fd37530c2413032e27b8d23c497b1ff58564a338d2c764d927aff5b43fadfc3f0f09c8f6aa5bd82a4964508fbc9a582f30ef9fd6652aeea21670d
+  data.tar.gz: 4cad181f7d717ec8842b4bd0f64c6906597eefa2bd91a214625021eee0b2b6ed120e24e32efcf50095073ff08a16fea432e298959db7e9e825e0610fc3a0e7ba

data/lib/run_loop/core.rb

@@ -279,7 +279,7 @@ Logfile: #{log_file}
 
       RunLoop::Logging.log_debug(logger, "Launching took #{Time.now-before_instruments_launch} seconds")
 
-      dylib_path = self.dylib_path_from_options(merged_options)
+      dylib_path = RunLoop::DylibInjector.dylib_path_from_options(merged_options)
 
       if dylib_path
         if device.physical_device?
@@ -313,26 +313,6 @@ Logfile: #{log_file}
       true
     end
 
-    # Extracts the value of :inject_dylib from options Hash.
-    # @param options [Hash] arguments passed to {RunLoop.run}
-    # @return [String, nil] If the options contains :inject_dylibs and it is a
-    #  path to a dylib that exists, return the path.  Otherwise return nil or
-    #  raise an error.
-    # @raise [RuntimeError] If :inject_dylib points to a path that does not exist.
-    # @raise [ArgumentError] If :inject_dylib is not a String.
-    def self.dylib_path_from_options(options)
-      inject_dylib = options.fetch(:inject_dylib, nil)
-      return nil if inject_dylib.nil?
-      unless inject_dylib.is_a? String
-        raise ArgumentError, "Expected :inject_dylib to be a path to a dylib, but found '#{inject_dylib}'"
-      end
-      dylib_path = File.expand_path(inject_dylib)
-      unless File.exist?(dylib_path)
-        raise "Cannot load dylib.  The file '#{dylib_path}' does not exist."
-      end
-      dylib_path
-    end
-
     # Returns the a default simulator to target.  This default needs to be one
     # that installed by default in the current Xcode version.
     #
@@ -365,7 +345,6 @@ Logfile: #{log_file}
       end
     end
 
-
     def self.create_uia_pipe(repl_path)
       begin
         Timeout::timeout(5, RunLoop::TimeoutError) do

data/lib/run_loop/device_agent/client.rb

@@ -13,6 +13,7 @@ module RunLoop
       include RunLoop::Encoding
 
       require "run_loop/cache"
+      require "run_loop/dylib_injector"
 
       class HTTPError < RuntimeError; end
 
@@ -78,6 +79,11 @@ module RunLoop
         app = app_details[:app]
         bundle_id = app_details[:bundle_id]
 
+        # process name and dylib path
+        dylib_injection_details = Client.details_for_dylib_injection(device,
+                                                                     options,
+                                                                     app_details)
+
         if device.simulator? && app
           core_sim = RunLoop::CoreSimulator.new(device, app, :xcode => xcode)
           if reset_options
@@ -120,7 +126,8 @@ $ xcrun security find-identity -v -p codesigning
         launcher_options = {
             code_sign_identity: code_sign_identity,
             device_agent_install_timeout: install_timeout,
-            shutdown_device_agent_before_launch: shutdown_before_launch
+            shutdown_device_agent_before_launch: shutdown_before_launch,
+            dylib_injection_details: dylib_injection_details
         }
 
         xcuitest = RunLoop::DeviceAgent::Client.new(bundle_id, device,
@@ -135,7 +142,7 @@ $ xcrun security find-identity -v -p codesigning
             :code_sign_identity => code_sign_identity,
             :launcher => cbx_launcher.name,
             :launcher_pid => xcuitest.launcher_pid,
-            :launcher_options => launcher_options
+            :launcher_options => xcuitest.launcher_options
           }
           RunLoop::Cache.default.write(cache)
         end
@@ -168,6 +175,52 @@ $ xcrun security find-identity -v -p codesigning
         end
       end
 
+      def self.details_for_dylib_injection(device, options, app_details)
+        dylib_path = RunLoop::DylibInjector.dylib_path_from_options(options)
+
+        return nil if !dylib_path
+
+        if device.physical_device?
+          raise ArgumentError, %Q[
+
+Detected :inject_dylib option when targeting a physical device:
+
+  #{device}
+
+Injecting the Calabash iOS Server is not supported on physical devices.
+
+]
+        end
+
+        app = app_details[:app]
+        bundle_id = app_details[:bundle_id]
+
+        details = { dylib_path: dylib_path }
+
+        if !app
+          # Special case handling of the Settings.app
+          if bundle_id == "com.apple.Preferences"
+            details[:process_name] = "Preferences"
+          else
+            raise ArgumentError, %Q[
+
+Detected :inject_dylib option, but the target application is a bundle identifier:
+
+  app: #{bundle_id}
+
+To use dylib injection, you must provide a path to an .app bundle.
+
+]
+          end
+        else
+          details[:process_name] = app.executable_name
+        end
+        details
+      end
+
+=begin
+INSTANCE METHODS
+=end
       attr_reader :bundle_id, :device, :cbx_launcher, :launcher_options, :launcher_pid
 
       # @!visibility private
@@ -461,8 +514,8 @@ Query must contain at least one of these keys:
       end
 
       # @!visibility private
-      def spring_board_alert
-        request = request("springBoardAlert")
+      def springboard_alert
+        request = request("springboard-alert")
         client = http_client(http_options)
         response = client.get(request)
         hash = expect_300_response(response)
@@ -470,8 +523,8 @@ Query must contain at least one of these keys:
       end
 
       # @!visibility private
-      def spring_board_alert_visible?
-        !spring_board_alert.empty?
+      def springboard_alert_visible?
+        !springboard_alert.empty?
       end
 
       # @!visibility private
@@ -1146,9 +1199,6 @@ $ tail -1000 -F #{cbx_launcher.class.log_file}
 
       # @!visibility private
       def launch_aut(bundle_id = @bundle_id)
-        client = http_client(http_options)
-        request = request("session", {:bundleID => bundle_id})
-
         # This check needs to be done _before_ the DeviceAgent is launched.
         if device.simulator?
           # Yes, we could use iOSDeviceManager to check, I dont understand the
@@ -1181,6 +1231,8 @@ Please install it.
         end
 
         retries = 5
+        client = http_client(http_options)
+        request = request("session", {:bundleID => bundle_id})
 
         begin
           response = client.post(request)
@@ -1188,6 +1240,15 @@ Please install it.
           RunLoop.log_debug("#{response.body}")
 
           expect_300_response(response)
+
+          # Dylib injection.  DeviceAgent.run checks the arguments.
+          dylib_injection_details = launcher_options[:dylib_injection_details]
+          if dylib_injection_details
+            process_name = dylib_injection_details[:process_name]
+            dylib_path = dylib_injection_details[:dylib_path]
+            injector = RunLoop::DylibInjector.new(process_name, dylib_path)
+            injector.retriable_inject_dylib
+          end
         rescue => e
           retries = retries - 1
           if !RunLoop::Environment.xtc?
@@ -1271,7 +1332,7 @@ Expected JSON response with no error, but found
           raise ArgumentError, %Q[
 Expected #{position} to be a Symbol or Fixnum but found #{position.class}
 
-          ]
+]
         end
       end
 
@@ -1293,9 +1354,19 @@ Expected #{position} to be a Symbol or Fixnum but found #{position.class}
 Could not coerce '#{position}' into a valid orientation.
 
 Valid values are: :down, :up, :right, :left, :bottom, :top
+
 ]
         end
       end
+
+      # @!visibility private
+      # Private method.  Do not call.
+      def _dismiss_springboard_alerts
+        request = request("dismiss-springboard-alerts")
+        client = http_client(http_options)
+        response = client.post(request)
+        expect_300_response(response)
+      end
     end
   end
 end

data/lib/run_loop/dylib_injector.rb

@@ -26,6 +26,30 @@ module RunLoop
       :timeout => RunLoop::Environment.ci? ? 40 : 20
     }
 
+    # Extracts the value of :inject_dylib from options Hash.
+    # @param options [Hash] arguments passed to {RunLoop.run}
+    # @return [String, nil] If the options contains :inject_dylibs and it is a
+    #  path to a dylib that exists, return the path.  Otherwise return nil or
+    #  raise an error.
+    # @raise [RuntimeError] If :inject_dylib points to a path that does not exist.
+    # @raise [ArgumentError] If :inject_dylib is not a String.
+    def self.dylib_path_from_options(options)
+      inject_dylib = options.fetch(:inject_dylib, nil)
+      return nil if inject_dylib.nil?
+      if !inject_dylib.is_a? String
+        raise ArgumentError, %Q[
+
+Expected :inject_dylib to be a path to a dylib, but found '#{inject_dylib}'
+
+]
+      end
+      dylib_path = File.expand_path(inject_dylib)
+      unless File.exist?(dylib_path)
+        raise "Cannot load dylib.  The file '#{dylib_path}' does not exist."
+      end
+      dylib_path
+    end
+
     # @!attribute [r] process_name
     # The name of the process to inject the dylib into.  This should be obtained
     #  by inspecting the Info.plist in the app bundle.

data/lib/run_loop/version.rb

@@ -1,5 +1,5 @@
 module RunLoop
-  VERSION = "2.1.10"
+  VERSION = "2.1.11"
 
   # 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: 2.1.10
+  version: 2.1.11
 platform: ruby
 authors:
 - Karl Krukow
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json