ideviceinstaller.rb in luffa-1.1.0

- old
+ new

@@ -34,19 +34,19 @@
       uninstall(udid, merged_options)
       install_internal(udid, merged_options)
     end
 
     # Can only be called when RunLoop is available.
-    def self.physical_devices_for_testing(xcode_tools)
+    def self.physical_devices_for_testing(instruments)
       # Xcode 6 + iOS 8 - devices on the same network, whether development or
       # not, appear when calling $ xcrun instruments -s devices. For the
       # purposes of testing, we will only try to connect to devices that are
       # connected via USB.
       #
       # Also idevice_id, which ideviceinstaller relies on, will sometimes report
       # devices 2x which will cause ideviceinstaller to fail.
-      devices = xcode_tools.instruments(:devices)
+      devices = instruments.physical_devices
       if IDeviceInstaller.idevice_id_available?
         white_list = `#{self.idevice_id_bin_path} -l`.strip.split("\n")
         devices.select do | device |
           white_list.include?(device.udid) && white_list.count(device.udid) == 1
         end
@@ -79,12 +79,12 @@
 
       on = [Timeout::Error, RuntimeError]
       on_retry = Proc.new do |_, try, elapsed_time, next_interval|
         # Retriable 2.0
         if elapsed_time && next_interval
-          Luffa.log_info "LLDB: attempt #{try} failed in '#{elapsed_time}'; will retry in '#{next_interval}'"
+          Luffa.log_info "ideviceinstaller: attempt #{try} failed in '#{elapsed_time}'; will retry in '#{next_interval}'"
         else
-          Luffa.log_info "LLDB: attempt #{try} failed; will retry"
+          Luffa.log_info "ideviceinstaller: attempt #{try} failed; will retry"
         end
       end
 
       Retriable.retriable({tries: tries, on: on, on_retry: on_retry} ) do
         Timeout.timeout(timeout, TimeoutError) do