lib/run_loop/device.rb in run_loop-2.1.1.pre4 vs lib/run_loop/device.rb in run_loop-2.1.1.pre5

@@ -80,40 +80,38 @@
     #
     # @param [String] udid_or_name A name or udid that identifies the device you
     #  are looking for.
     # @param [Hash] options Allows callers to pass runtime models that might
     #  optimize performance (via memoization).
-    # @option options [RunLoop::SimControl] :sim_control An instance of
-    #  SimControl.
+    # @option options [RunLoop::Simctl] :simctl An instance of
+    #  Simctl.
     # @option options [RunLoop::Instruments] :instruments An instance of
     #  Instruments.
+    # @option options [RunLoop::Xcode] :xcode An instance of Xcode
     #
     # @return [RunLoop::Device] A device that matches `udid_or_name`.
     # @raise [ArgumentError] If no matching device can be found.
     def self.device_with_identifier(udid_or_name, options={})
       if options.is_a?(RunLoop::SimControl)
-        RunLoop.deprecated('1.5.0', %q(
-The 'sim_control' argument has been deprecated.  It has been replaced by an
-options hash with two keys: :sim_control and :instruments.
-Please update your sources.))
-        merged_options = {
-              :sim_control => options,
-              :instruments => RunLoop::Instruments.new
-        }
-      else
-        default_options = {
-              :sim_control => RunLoop::SimControl.new,
-              :instruments => RunLoop::Instruments.new
-        }
-        merged_options = default_options.merge(options)
+        raise ArgumentError, %q[Support for the 'sim_control' argument has been
+removed (1.5.0).  It has been replaced by an options hash with two keys:
+:simctl and :instruments. Please update your sources.))]
       end
 
+      default_options = {
+        :simctl => RunLoop::Simctl.new,
+        :instruments => RunLoop::Instruments.new,
+        :xcode => RunLoop::Xcode.new
+      }
+
+      merged_options = default_options.merge(options)
+
       instruments = merged_options[:instruments]
-      sim_control = merged_options[:sim_control]
+      simctl = merged_options[:simctl]
 
-      xcode = sim_control.xcode
-      simulator = sim_control.simulators.detect do |sim|
+      xcode = RunLoop::Xcode.new
+      simulator = simctl.simulators.detect do |sim|
         sim.instruments_identifier(xcode) == udid_or_name ||
               sim.udid == udid_or_name
       end
 
       return simulator if !simulator.nil?
@@ -133,17 +131,17 @@
     # Please don't call this method.  It is for internal use only.  The behavior
     # may change at any time!  You have been warned.
     #
     # @param [Hash] options The launch options passed to RunLoop::Core
     # @param [RunLoop::Xcode] xcode An Xcode instance
-    # @param [RunLoop::SimControl] simctl A SimControl instance
+    # @param [RunLoop::Simctl] simctl A SimControl instance
     # @param [RunLoop::Instruments] instruments An Instruments instance
     #
     # @raise [ArgumentError] If "device" is detected as the device target and
     #  there is no matching device.
     # @raise [ArgumentError] If DEVICE_TARGET or options specify an identifier
-    #  that does not match an iOS Simulator or phyiscal device.
+    #  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)
 
       # Passed an instance of RunLoop::Device
       return device if device && device.is_a?(RunLoop::Device)
@@ -157,11 +155,12 @@
       else
         identifier = device
       end
 
       # Raises ArgumentError if no matching device can be found.
-      self.device_with_identifier(identifier, sim_control: simctl,
+      self.device_with_identifier(identifier,
+                                  simctl: simctl,
                                   instruments: instruments)
     end
 
     # @!visibility private
     def to_s
@@ -183,11 +182,11 @@
     # @param [RunLoop::Xcode] xcode The version of the active
     #  Xcode.
     # @return [String] An instruments-ready device identifier.
     # @raise [RuntimeError] If trying to obtain a instruments-ready identifier
     #  for a simulator when Xcode < 6.
-    def instruments_identifier(xcode=SIM_CONTROL.xcode)
+    def instruments_identifier(xcode)
       if physical_device?
         udid
       else
         if version == RunLoop::Version.new('7.0.3')
           version_part = version.to_s
@@ -204,10 +203,21 @@
     end
 
     # Is this a physical device?
     # @return [Boolean] Returns true if this is a device.
     def physical_device?
+      if udid.nil?
+        stack = Kernel.caller(0, 6)[0..-1].join("\n")
+        raise RuntimeError,
+          %Q[udid is nil
+
+#{stack}
+
+   name: #{name}
+version: #{version}
+]
+      end
       !udid[DEVICE_UDID_REGEX, 0].nil?
     end
 
     # Is this a simulator?
     # @return [Boolean] Returns true if this is a simulator.
@@ -600,12 +610,9 @@
     # @!visibility private
     CORE_SIMULATOR_DEVICE_DIR = File.expand_path('~/Library/Developer/CoreSimulator/Devices')
 
     # @!visibility private
     CORE_SIMULATOR_LOGS_DIR = File.expand_path('~/Library/Logs/CoreSimulator')
-
-    # TODO Is this a good idea?  It speeds up rspec tests by a factor of ~2x...
-    SIM_CONTROL = RunLoop::SimControl.new
 
     # @!visibility private
     def self.device_from_options(options)
       options[:device] || options[:device_target] || options[:udid]
     end