run_loop 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2de16f5cb3f91a4a5d0cf8f056a4a128d0cb906a
-  data.tar.gz: 58244f2475fa2ea431e18022545e02498d86dc4a
+  metadata.gz: 6b20bf3d2f01e6535a4ff815c863d8028fb6a4fe
+  data.tar.gz: 88633d7185f47b0775e926b6b584da840ef01195
 SHA512:
-  metadata.gz: 4bd98dcee58d56074c95ada808a4fe0b19a05bf8ece5f8c5fedfd9d55119bf8e5bdee8831b5f7b50471053aea2bc676af682cbabe18a653479b19677890a9f2f
-  data.tar.gz: da03c9b79b3435b11fc832268ddd8bb72e05e9e52f9b3a0bd3070b2470be53a32cb6ffa1fe41d32f59ab8ba48326054512f9a892475d4f9bc25fb16394b39a47
+  metadata.gz: 319d9b03f85ec315e71446a9a7ffbe4f82407f85c1e440995d9b79c5058074f66682a54623cb327b20eb3b323ca6d8f867f81cc0fce6cb03618a778d6e0b906f
+  data.tar.gz: f7efe08c5cd8655f2ca8352a6b45985bbe1dffc0263a18af8294120d93b0ff17ae10e1f44707778f7fa51700c376eac9bf592832aafe13efcec0d654c458b86c

data/lib/run_loop/core.rb

@@ -168,9 +168,9 @@ module RunLoop
 
       log_header("Starting on #{device_target} App: #{bundle_dir_or_bundle_id}")
       cmd_str = cmd.join(' ')
-      if ENV['DEBUG']
-        log(cmd_str)
-      end
+
+      log(cmd_str) if ENV['DEBUG'] == '1'
+
       if !jruby? && RUBY_VERSION && RUBY_VERSION.start_with?('1.8')
         pid = fork do
           exec(cmd_str)
@@ -251,7 +251,7 @@ module RunLoop
           end
         end
       rescue TimeoutError => e
-        if ENV['DEBUG']
+        if ENV['DEBUG'] == '1'
           puts "Failed to launch."
           puts "#{e}: #{e && e.message}"
           if raw_lldb_output
@@ -329,6 +329,21 @@ module RunLoop
       `/usr/libexec/PlistBuddy -c "Print :CFBundleExecutable" "#{info_plist}"`.strip
     end
 
+    # Returns the a default simulator to target.  This default needs to be one
+    # that installed by default in the current Xcode version.
+    #
+    # For historical reasons, the most recent non-64b SDK should be used.
+    #
+    # @param [RunLoop::XCTools] xcode_tools Used to detect the current xcode
+    #  version.
+    def self.default_simulator(xcode_tools=RunLoop::XCTools.new)
+      if xcode_tools.xcode_version_gte_6?
+        'iPhone 5 (8.0 Simulator)'
+      else
+        'iPhone Retina (4-inch) - Simulator - iOS 7.1'
+      end
+    end
+
     def self.udid_and_bundle_for_launcher(device_target, options, xctools=RunLoop::XCTools.new)
       bundle_dir_or_bundle_id = options[:app] || ENV['BUNDLE_ID']|| ENV['APP_BUNDLE_PATH'] || ENV['APP']
 
@@ -340,12 +355,7 @@ module RunLoop
 
       if xctools.xcode_version_gte_51?
         if device_target.nil? || device_target.empty? || device_target == 'simulator'
-          if xctools.xcode_version_gte_6?
-            # the simulator can be either the textual name or the UDID (directory name)
-            device_target = 'iPhone 5 (8.0 Simulator)'
-          else
-            device_target = 'iPhone Retina (4-inch) - Simulator - iOS 7.1'
-          end
+          device_target = self.default_simulator(xctools)
         end
         udid = device_target
 
@@ -382,7 +392,7 @@ module RunLoop
     end
 
     # @deprecated 1.0.0 replaced with Xctools#version
-    def self.xcode_version(xctools=XCTools.new)
+    def self.xcode_version(xctools=RunLoop::XCTools.new)
       xctools.xcode_version.to_s
     end
 
@@ -521,7 +531,7 @@ module RunLoop
     end
 
 
-    def self.instruments_command(options, xctools=XCTools.new)
+    def self.instruments_command(options, xctools=RunLoop::XCTools.new)
       udid = options[:udid]
       results_dir_trace = options[:results_dir_trace]
       bundle_dir_or_bundle_id = options[:bundle_dir_or_bundle_id]
@@ -552,7 +562,7 @@ module RunLoop
       candidate
     end
 
-    def self.default_tracetemplate(xctools=XCTools.new)
+    def self.default_tracetemplate(xctools=RunLoop::XCTools.new)
       templates = xctools.instruments :templates
       if xctools.xcode_version_gte_6?
         templates.delete_if do |name|

data/lib/run_loop/sim_control.rb

@@ -164,9 +164,14 @@ module RunLoop
       end
     end
 
-    # Resets the simulator content and settings.  It is analogous to touching
-    # the menu item _for every simulator_, regardless of SDK.
+    # Resets the simulator content and settings.
     #
+    # In Xcode < 6, it is analogous to touching the menu item _for every
+    #  simulator_, regardless of SDK.
+    #
+    # In Xcode 6, the default is the same; the content and settings for every
+    #  simulator is erased.  However, in Xcode 6 it is possible to pass
+    #  a `:sim_udid` as a option to erase an individual simulator.
     #
     # On Xcode 5, it works by deleting the following directories:
     #
@@ -190,10 +195,13 @@ module RunLoop
     #  gem features` that require the simulator be launched repeated and you are
     #  tired of your editor losing focus. :) **NOTE:** This option is ignored
     #  in Xcode 6.
+    # @option opts [String] :sim_udid (nil) The udid of the simulator to reset.
+    #  **NOTE:** This option is ignored in Xcode < 6.
     def reset_sim_content_and_settings(opts={})
       default_opts = {:post_quit_wait => 1.0,
                       :post_launch_wait => 3.0,
-                      :hide_after => false}
+                      :hide_after => false,
+                      :sim_udid => nil}
       merged_opts = default_opts.merge(opts)
 
       quit_sim(merged_opts)
@@ -202,7 +210,7 @@ module RunLoop
       # Very bad things will happen.  Unlike Xcode < 6, the re-launching the
       # simulator will _not_ recreate the SDK (aka Devices) directories.
       if xcode_version_gte_6?
-        simctl_reset
+        simctl_reset(merged_opts[:sim_udid])
       else
         sim_lib_path = File.join(sim_app_support_dir, 'Library')
         FileUtils.rm_rf(sim_lib_path)
@@ -783,21 +791,20 @@ module RunLoop
     end
 
     # @!visibility private
-    # Uses the `simctl erase` command to reset the content and settings on _all_
-    # simulators.
-    #
-    # @todo Should this reset _every_ simulator or just the targeted simulator?
-    #  It is very slow to reset every simulator and if we are trying to respond
-    #  to RESET_BETWEEN_SCENARIOS we probably want to erase just the current
-    #  simulator.
+    # Uses the `simctl erase` command to reset a simulator content and settings.
+    # If no `sim_udid` is nil, _all_ simulators are reset.
     #
-    # @note This is an Xcode 6 only method. Will raise an error if called on
+    # # @note This is an Xcode 6 only method. It will raise an error if called on
     #  Xcode < 6.
     #
     # @note This method will quit the simulator.
     #
+    # @param [String] sim_udid The udid of the simulator that will be reset.
+    #   If sim_udid is nil, _all_ simulators will be reset.
     # @raise [RuntimeError] If called on Xcode < 6.
-    def simctl_reset
+    # @raise [RuntimeError] If `sim_udid` is not a valid simulator udid.  Valid
+    #  simulator udids are determined by calling `simctl list`.
+    def simctl_reset(sim_udid = nil)
       unless xcode_version_gte_6?
         raise RuntimeError, 'this method is only available on Xcode >= 6'
       end
@@ -805,19 +812,33 @@ module RunLoop
       quit_sim
 
       sim_details = sim_details(:udid)
-      res = []
-      sim_details.each_key do |key|
-        cmd = "xcrun simctl erase #{key}"
-        Open3.popen3(cmd) do  |_, stdout,  stderr, _|
+
+      simctl_erase = lambda { |udid|
+        cmd = "xcrun simctl erase #{udid}"
+        Open3.popen3(cmd) do  |_, stdout,  stderr, wait_thr|
           out = stdout.read.strip
           err = stderr.read.strip
           if ENV['DEBUG_UNIX_CALLS'] == '1'
             puts "#{cmd} => stdout: '#{out}' | stderr: '#{err}'"
           end
-          res << err.empty?
+          wait_thr.value.success?
+        end
+      }
+
+      # Call erase on all simulators
+      if sim_udid.nil?
+        res = []
+        sim_details.each_key do |key|
+          res << simctl_erase.call(key)
+        end
+        res.all?
+      else
+        if sim_details[sim_udid]
+          simctl_erase.call(sim_udid)
+        else
+          raise "Could not find simulator with udid '#{sim_udid}'"
         end
       end
-      res.all?
     end
 
     # @!visibility private

data/lib/run_loop/version.rb

@@ -1,5 +1,5 @@
 module RunLoop
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 
   # 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: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor