Updated detection implementation

lib/run_loop/detect_aut/xcode.rb

@@ -156,21 +156,23 @@ def xcode_preferences_plist
       end
 
       # @!visibility private
-      def pbuddy
+      def self.pbuddy
         @pbuddy ||= RunLoop::PlistBuddy.new
       end
 
       # @!visibility private
       def self.detect_selected_device
         file_name = find_user_state_file
-        selected_device = `/usr/libexec/PlistBuddy -c Print "#{file_name}"`
-                .encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
-                .split("\n")
-                .select { |v| v =~ /dvtdevice.*:/ }[0]
+        selected_device = @pbuddy.plist_find_device(file_name)
 
         udid = selected_device.split(':')[1]
-        RunLoop::Device.device_with_identifier(udid)
-
+        selected_device = RunLoop::Device.device_with_identifier(udid)
+        #TODO now only returning detected device if simulator detected
+        if selected_device.simulator?
+          selected_device
+        else
+          nil
+        end
       end
     end
   end

lib/run_loop/device.rb

@@ -142,7 +142,8 @@ def self.device_with_identifier(udid_or_name, options={})
     # @raise [ArgumentError] If DEVICE_TARGET or options specify an identifier
     #  that does not match an iOS Simulator or physical device.
     def self.detect_device(options, xcode, simctl, instruments)
-      device = self.device_from_opts_or_env(options)
+      device = RunLoop::DetectAUT::Xcode.detect_selected_device ||
+          self.device_from_opts_or_env(options)
 
       # Passed an instance of RunLoop::Device
       return device if device && device.is_a?(RunLoop::Device)

lib/run_loop/plist_buddy.rb

@@ -26,6 +26,16 @@ def plist_read(key, file, opts={})
       end
     end
 
+    # !!Experimental!! find device in xcuserstate file.
+    # @param [String] file the plist to read
+    # @return [String] the UDID of device
+    def plist_find_device(file)
+      `#{plist_buddy} -c Print "#{file}"`
+          .encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
+          .split("\n")
+          .select { |v| v =~ /dvtdevice.*:/ }[0]
+    end
+
     # Checks if the key exists in plist.
     # @param [String] key the key to inspect (may not be nil or empty)
     # @param [String] file the plist to read