run_loop 2.1.1.pre4 → 2.1.1.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a58fe1295ca175dc597c3519289a362e94e3575
-  data.tar.gz: 190e2c88f05f9f849ec7214ca52b0657abfcb57c
+  metadata.gz: 5b472cf66aac006dfd7b64d604f69b2c1ba31e79
+  data.tar.gz: e3d19559460c6e3b9c9e584f03e7a1917b0dad6a
 SHA512:
-  metadata.gz: 787e8c752f4bc06d49e765e8c442eae0d47a60867fc3db85e0e39aef515c1a7fb4c568db743f4dfe968cd053c008107368bc9d1f8ecf9324b90107daf84c2911
-  data.tar.gz: 89dcc0de4027a620362d6e5e772719e7d30ca2b9335e6f2b832b9bccdffb04d5974fc91e4d91ec5722debb3834d8c160db16648679b4845570d73c2a5aaac7f1
+  metadata.gz: 49b295e9fc5e50857ff4ed8e68f678b849f7996d6348d1d192f42b6ee295bf442157d85429b18b1eac582e01fd373e4661b7e606a30da00328efaf7e20986df8
+  data.tar.gz: b82c8b081d6ba5c9adbc2203e5807cacdaf807dcec476fca6b263b792b9e2ff27fa9e55db95f5545f6ba8afdff06c27878538e9fdba9ae6d025ff914c729bd8e

data/lib/run_loop.rb

@@ -127,6 +127,10 @@ Please quit the Instruments.app and try again.)
         cloned_options[:sim_control] = options[:sim_control]
       end
 
+      if options[:simctl]
+        cloned_options[:simctl] = options[:simctl]
+      end
+
       Core.run_with_options(cloned_options)
     end
   end

data/lib/run_loop/cli/simctl.rb

@@ -6,7 +6,7 @@ module RunLoop
   module CLI
     class Simctl < Thor
 
-      attr_reader :sim_control
+      attr_reader :simctl
 
       desc 'tail', 'Tail the log file of the booted simulator'
       def tail
@@ -17,7 +17,7 @@ module RunLoop
         def tail_booted
           device = booted_device
           if device.nil?
-            version = Xcode.new.version
+            version = xcode.version
             puts "No simulator for active Xcode (version #{version}) is booted."
           else
             log_file = device.simulator_log_file_path
@@ -30,7 +30,7 @@ module RunLoop
       def booted
         device = booted_device
         if device.nil?
-          version = Xcode.new.version
+          version = xcode.version
           puts "No simulator for active Xcode (version #{version}) is booted."
         else
           puts device
@@ -73,7 +73,7 @@ module RunLoop
 
       no_commands do
         def erase_and_launch_each_simulator
-          sim_control.simulators.each do |simulator|
+          simctl.simulators.each do |simulator|
             RunLoop::CoreSimulator.erase(simulator)
             launch_simulator(simulator, xcode)
           end
@@ -81,7 +81,7 @@ module RunLoop
 
         def launch_simulator(simulator, xcode)
           core_sim = RunLoop::CoreSimulator.new(simulator, nil,
-                                                           {:xcode => xcode})
+                                                {:xcode => xcode})
           core_sim.launch_simulator
         end
       end
@@ -114,8 +114,8 @@ module RunLoop
       end
 
       no_commands do
-        def sim_control
-          @sim_control ||= RunLoop::SimControl.new
+        def simctl
+          @simctl ||= RunLoop::Simctl.new
         end
 
         def xcode
@@ -127,7 +127,7 @@ module RunLoop
         end
 
         def booted_device
-          sim_control.simulators.detect(nil) do |device|
+          simctl.simulators.detect(nil) do |device|
             device.state == 'Booted'
           end
         end
@@ -192,7 +192,7 @@ module RunLoop
       no_commands do
         def expect_device(options)
           device_from_options = options[:device]
-          simulators = sim_control.simulators
+          simulators = simctl.simulators
           if device_from_options.nil?
             default_name = RunLoop::Core.default_simulator
             device = simulators.find do |sim|

data/lib/run_loop/core.rb

@@ -63,12 +63,12 @@ module RunLoop
       self.prepare(options)
 
       logger = options[:logger]
-      sim_control = options[:sim_control] || options[:simctl] || RunLoop::SimControl.new
+      simctl = options[:sim_control] || options[:simctl] || RunLoop::Simctl.new
       xcode = options[:xcode] || RunLoop::Xcode.new
       instruments = options[:instruments] || RunLoop::Instruments.new
 
       # Find the Device under test, the App under test, UIA strategy, and reset options
-      device = RunLoop::Device.detect_device(options, xcode, sim_control, instruments)
+      device = RunLoop::Device.detect_device(options, xcode, simctl, instruments)
       app_details = RunLoop::DetectAUT.detect_app_under_test(options)
       uia_strategy = self.detect_uia_strategy(options, device, xcode)
       reset_options = self.detect_reset_options(options)
@@ -142,7 +142,7 @@ module RunLoop
       merged_options = options.merge(discovered_options)
 
       if device.simulator?
-        self.prepare_simulator(app_details[:app], device, xcode, sim_control, reset_options)
+        self.prepare_simulator(app_details[:app], device, xcode, simctl, reset_options)
       end
 
       self.log_run_loop_options(merged_options, xcode)
@@ -552,9 +552,9 @@ Logfile: #{log_file}
       return false if value[DEVICE_UDID_REGEX, 0] != nil
 
       # Check for named simulators and Xcode >= 7.0 simulators.
-      sim_control = run_options[:sim_control] || RunLoop::SimControl.new
-      xcode = sim_control.xcode
-      simulator = sim_control.simulators.find do |sim|
+      simctl = run_options[:sim_control] || run_options[:simctl] || RunLoop::Simctl.new
+      xcode = run_options[:xcode] || RunLoop::Xcode.new
+      simulator = simctl.simulators.find do |sim|
         [
           sim.instruments_identifier(xcode) == value,
           sim.udid == value,
@@ -568,9 +568,9 @@ Logfile: #{log_file}
     # @deprecated 2.1.0
     #
     # Do not call this method.
-    def self.udid_and_bundle_for_launcher(device_target, options, sim_control=RunLoop::SimControl.new)
+    def self.udid_and_bundle_for_launcher(device_target, options, simctl=RunLoop::Simctl.new)
       RunLoop.deprecated("2.1.0", "No replacement")
-      xcode = sim_control.xcode
+      xcode = RunLoop::Xcode.new
 
       bundle_dir_or_bundle_id = options[:app] || RunLoop::Environment.bundle_id || RunLoop::Environment.path_to_app_bundle
 

data/lib/run_loop/device.rb

@@ -82,36 +82,34 @@ module RunLoop
     #  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
@@ -135,13 +133,13 @@ Please update your sources.))
     #
     # @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)
 
@@ -159,7 +157,8 @@ Please update your sources.))
       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
 
@@ -185,7 +184,7 @@ Please update your sources.))
     # @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
@@ -206,6 +205,17 @@ Please update your sources.))
     # 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
 
@@ -603,9 +613,6 @@ Please update your sources.))
     # @!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]

data/lib/run_loop/simctl.rb

@@ -86,6 +86,27 @@ module RunLoop
       end
     end
 
+    # @!visibility private
+    #
+    # SimControl compatibility
+    def ensure_accessibility(device)
+      sim_control.ensure_accessibility(device)
+    end
+
+    # @!visibility private
+    #
+    # SimControl compatibility
+    def ensure_software_keyboard(device)
+      sim_control.ensure_software_keyboard(device)
+    end
+
+    # @!visibility private
+    #
+    # TODO Make this private again; exposed for SimControl compatibility.
+    def xcode
+      @xcode ||= RunLoop::Xcode.new
+    end
+
     private
 
     # @!visibility private
@@ -244,11 +265,6 @@ is not an iOS, tvOS, or watchOS device"
       @xcrun ||= RunLoop::Xcrun.new
     end
 
-    # @!visibility private
-    def xcode
-      @xcode ||= RunLoop::Xcode.new
-    end
-
     # @!visibility private
     # Support for Xcode < 7 when trying to collect simulators.  Xcode 7 allows
     # a --json option which is much easier to parse.

data/lib/run_loop/version.rb

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

data/lib/run_loop/xcuitest.rb

@@ -16,7 +16,7 @@ module RunLoop
     # @!visibility private
     def self.run(options={})
       # logger = options[:logger]
-      simctl = options[:sim_control] || options[:simctl] || RunLoop::SimControl.new
+      simctl = options[:sim_control] || options[:simctl] || RunLoop::Simctl.new
       xcode = options[:xcode] || RunLoop::Xcode.new
       instruments = options[:instruments] || RunLoop::Instruments.new
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 2.1.1.pre4
+  version: 2.1.1.pre5
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-13 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json