run_loop 2.1.1.pre2 → 2.1.1.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c874aaaaba2d83da288814e78328d8b663a4d44a
-  data.tar.gz: 32a4447b971655081d08d06684e974a907d1da8a
+  metadata.gz: b32b64f18fc3ecf44595683f3d6627093ecc5c75
+  data.tar.gz: 8f3b475ba5794cda548cbec873399ae16f377992
 SHA512:
-  metadata.gz: 518708e1ce2e1b5f305c2c0b337f85dd2ca86d62431052eba8837cf88b5834c37b56fc397ed5c67c0f8520b7430779b2e788180dac14aae5a6856c301b29eca1
-  data.tar.gz: 1899a1efbc4e93ee4bb37763e6a3cf5caacf7001b7cfdea350bc5c12f2c266b67b844c63791e3d5f6f1691695fb338310dfcda6ead233caf95b9229eaa8732d2
+  metadata.gz: be639927d12b83cc3b3ddad8c891ebe5115ede7a6db10b67ebf89d449efc954047251ba4d11c9497a14c94df722f540195abf6e66354b7125dc38266e8e72f89
+  data.tar.gz: fbe8b2b8af7d8acd600bd0186ea0c83d3906873dbea938adb863bb0d9450b19d03967cf952220202fa2f98286eabbda3e6ce63b5c9ff7b9ac2d17d01ded0c660

data/lib/run_loop/cli/instruments.rb

@@ -104,7 +104,7 @@ module RunLoop
           launch_options = {
                 :args => parse_app_launch_args(options),
                 :udid => detect_device_udid_from_options(options),
-                :bundle_dir_or_bundle_id => detect_bundle_id_or_bundle_path(options)
+                :app => detect_bundle_id_or_bundle_path(options)
           }
           run_loop = RunLoop.run(launch_options)
           puts JSON.generate(run_loop)

data/lib/run_loop/core_simulator.rb

@@ -404,20 +404,14 @@ $ bundle exec run-loop simctl manage-processes
 
     RunLoop.log_debug("Trying #{tries} times to launch #{app.bundle_identifier} on #{device}")
 
-    tries.times do
-      hash = launch_app_with_simctl
+    tries.times do |try|
+      # Terminates CoreSimulatorService on failures.
+      hash = attempt_to_launch_app_with_simctl
+
       exit_status = hash[:exit_status]
       if exit_status != 0
-        out = hash[:out]
-        RunLoop.log_debug("Failed to launch app.")
-        out.split($-0).each do |line|
-          RunLoop.log_debug("    #{line}")
-        end
-        # Simulator is probably in a bad state, but this will be super disruptive.
-        # Let's try a softer approach first - sleep.
-        # self.terminate_core_simulator_processes
-        sleep(0.5)
-        last_error = out
+        # Last argument is how long to sleep after an error.
+        last_error = handle_failed_app_launch(hash, try, tries, 0.5)
       else
         last_error = nil
         break
@@ -432,14 +426,17 @@ $ bundle exec run-loop simctl manage-processes
 ]
     end
 
+    wait_for_app_launch
+  end
+
+  # @!visibility private
+  def wait_for_app_launch
     options = {
       :timeout => 10,
       :raise_on_timeout => true
     }
-
     RunLoop::ProcessWaiter.new(app.executable_name, options).wait_for_any
     device.simulator_wait_for_stable_state
-
     true
   end
 
@@ -623,6 +620,39 @@ Command had no output
     xcrun.exec(args, log_cmd: true, timeout: timeout)
   end
 
+  # @!visibility private
+  def handle_failed_app_launch(hash, try, tries, wait_time)
+    out = hash[:out]
+    RunLoop.log_debug("Failed to launch app on try #{try + 1} of #{tries}.")
+    out.split($-0).each do |line|
+      RunLoop.log_debug("    #{line}")
+    end
+    # If we timed out on the launch, the CoreSimulator processes are quit
+    # (see above).  If at all possible, we want to avoid terminating
+    # CoreSimulatorService, because it takes a long time to launch.
+    sleep(wait_time) if wait_time > 0
+
+    out
+  end
+
+  # @!visibility private
+  def attempt_to_launch_app_with_simctl
+    begin
+      hash = launch_app_with_simctl
+    rescue RunLoop::Xcrun::TimeoutError => e
+      hash = {
+        :exit_status => 1,
+        :out => e.message
+      }
+      # Simulator is probably in a bad state.  Terminates the
+      # CoreSimulatorService.  Restarting this service is expensive!
+      RunLoop::CoreSimulator.terminate_core_simulator_processes
+      Kernel.sleep(0.5)
+      launch_simulator
+    end
+    hash
+  end
+
   # Required for support of iOS 7 CoreSimulators.  Can be removed when
   # Xcode support is dropped.
   def sdk_gte_8?

data/lib/run_loop/sim_control.rb

@@ -1146,7 +1146,10 @@ module RunLoop
           line[/Apple Watch/, 0],
           line[/watchOS/, 0],
           line[/Apple TV/, 0],
-          line[/tvOS/, 0]
+          line[/tvOS/, 0],
+          line[/Devices/, 0],
+          line[/CoreSimulatorService/, 0],
+          line[/simctl\[.+\]/, 0]
         ].any?
 
         if not_ios

data/lib/run_loop/simctl.rb

@@ -30,18 +30,18 @@ module RunLoop
     end
 
     # @!visibility private
-    attr_accessor :device
+    attr_reader :device
 
     # @!visibility private
-    #
-    # @param [RunLoop::Device] device Cannot be nil.
-    def initialize(device)
-      @device = device
+    def initialize
+      @ios_devices = []
+      @tvos_devices = []
+      @watchos_devices = []
     end
 
     # @!visibility private
     def to_s
-      "#<Simctl: #{device.name} #{device.udid}>"
+      "#<Simctl: #{xcode.version}>"
     end
 
     # @!visibility private
@@ -49,6 +49,15 @@ module RunLoop
       to_s
     end
 
+    # @!visibility private
+    def simulators
+      simulators = ios_devices
+      if simulators.empty?
+       simulators = fetch_devices![:ios]
+      end
+      simulators
+    end
+
     # @!visibility private
     #
     # This method is not supported on Xcode < 7 - returns nil.
@@ -62,8 +71,9 @@ module RunLoop
     # TODO ensure a booted state.
     #
     # @param [String] bundle_id The CFBundleIdentifier of the app.
+    # @param [RunLoop::Device] device The device under test.
     # @return [String] The path to the .app bundle if it exists; nil otherwise.
-    def app_container(bundle_id)
+    def app_container(device, bundle_id)
       return nil if !xcode.version_gte_7?
       cmd = ["simctl", "get_app_container", device.udid, bundle_id]
       hash = execute(cmd, DEFAULTS)
@@ -78,12 +88,157 @@ module RunLoop
 
     private
 
+    # @!visibility private
+    attr_reader :ios_devices, :tvos_devices, :watchos_devices
+
     # @!visibility private
     def execute(array, options)
       merged = DEFAULTS.merge(options)
       xcrun.exec(array, merged)
     end
 
+    # @!visibility private
+    #
+    # Starting in Xcode 7, simctl allows a --json option for listing devices.
+    #
+    # On Xcode 6, we will fall back to SimControl which does a line-by-line
+    # processing of `simctl list devices`. tvOS and watchOS devices are not
+    # available on Xcode < 7.
+    #
+    # This is a destructive operation on `@ios_devices`, `@tvos_devices`, and
+    # `@watchos_devices`.  Callers should check for existing devices to avoid
+    # the overhead of calling `simctl list devices --json`.
+    def fetch_devices!
+      if !xcode.version_gte_7?
+        return {
+          :ios => sim_control.simulators,
+          :tvos => [],
+          :watchos => []
+        }
+      end
+
+      @ios_devices = []
+      @tvos_devices = []
+      @watchos_devices = []
+
+      cmd = ["simctl", "list", "devices", "--json"]
+      hash = execute(cmd, DEFAULTS)
+
+      out = hash[:out]
+      exit_status = hash[:exit_status]
+      if exit_status != 0
+        raise RuntimeError, %Q[simctl exited #{exit_status}:
+
+#{out}
+
+while trying to list devices.
+]
+      end
+
+      devices = json_to_hash(out)["devices"]
+
+      devices.each do |key, device_list|
+        version = device_key_to_version(key)
+        bucket = bucket_for_key(key)
+
+        device_list.each do |record|
+          if device_available?(record)
+            bucket << device_from_record(record, version)
+          end
+        end
+      end
+      {
+        :ios => ios_devices,
+        :tvos => tvos_devices,
+        :watchos => watchos_devices
+      }
+    end
+
+    # @!visibility private
+    #
+    # command_runner_ng combines stderr and stdout and starting in Xcode 7.3,
+    # simctl has started generating stderr output.  This must be filtered out
+    # so that we can parse the JSON response.
+    def filter_stderr(out)
+      out.split($-0).map do |line|
+        if stderr_line?(line)
+          nil
+        else
+          line
+        end
+      end.compact.join($-0)
+    end
+
+    # @!visibility private
+    def stderr_line?(line)
+      line[/CoreSimulatorService/, 0] || line[/simctl\[.+\]/, 0]
+    end
+
+    # @!visibility private
+    def json_to_hash(json)
+      filtered = filter_stderr(json)
+      begin
+        JSON.parse(filtered)
+      rescue TypeError, JSON::ParserError => e
+        raise RuntimeError, %Q[Could not parse simctl JSON response:
+
+#{e}
+]
+      end
+    end
+
+    # @!visibility private
+    def device_key_is_ios?(key)
+      key[/iOS/, 0]
+    end
+
+    # @!visibility private
+    def device_key_is_tvos?(key)
+      key[/tvOS/, 0]
+    end
+
+    # @!visibility private
+    def device_key_is_watchos?(key)
+      key[/watchOS/, 0]
+    end
+
+    # @!visibility private
+    def device_key_to_version(key)
+      str = key.split(" ").last
+      RunLoop::Version.new(str)
+    end
+
+    # @!visibility private
+    def device_available?(record)
+      record["availability"] == "(available)"
+    end
+
+    # @!visibility private
+    def device_from_record(record, version)
+      RunLoop::Device.new(record["name"],
+                          version,
+                          record["udid"],
+                          record["state"])
+    end
+
+    # @!visibility private
+    def bucket_for_key(key)
+      if device_key_is_ios?(key)
+        bin = @ios_devices
+      elsif device_key_is_tvos?(key)
+        bin = @tvos_devices
+      elsif device_key_is_watchos?(key)
+        bin = @watchos_devices
+      else
+        raise RuntimeError, "Unexpected key while processing simctl output:
+
+key = #{key}
+
+is not an iOS, tvOS, or watchOS device"
+      end
+      bin
+    end
+
     # @!visibility private
     def xcrun
       @xcrun ||= RunLoop::Xcrun.new
@@ -93,5 +248,12 @@ module RunLoop
     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.
+    def sim_control
+      @sim_control ||= RunLoop::SimControl.new
+    end
   end
 end

data/lib/run_loop/version.rb

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

metadata

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