run_loop 1.5.5 → 1.5.6.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2423db81abf3240a09a78b36e626e7fe9805e1b5
-  data.tar.gz: 2c121c18d79c9faaab075f94dea364042aed23d0
+  metadata.gz: 47569b6d831b193444445ef4c1df372e89c51ddb
+  data.tar.gz: 5bfa5312c3d512c6175a53dba49cd3ade7759b4e
 SHA512:
-  metadata.gz: 5be1f66ae222c299dd0bdd685c52c4860064fabe99f91610a166662a88adc5e52c7d61450a5abb96ecd2390fae7ee5116a31c7afc19a2592ca4cd804c7a0554c
-  data.tar.gz: 523a6ab61c1090605b802dd5701f280d5ab033343093b42684af40de6952b143a43e70508e1aafdf1d379831ef1f7b1a9e27ae38b77f35fd9190cda8525766ca
+  metadata.gz: f03b8e29911c15d68e10a2f63a422ff475193e316d28c33cd8cea9de705cf338440126674cd5c81151b9e88868ed3c3583f94fd56d3351cc0521283a743bde97
+  data.tar.gz: 2affeeb8e17db2f0d7e21b6dcb34098ec0d6d445732aae798ddadd4d36b1d5d4f7ada9c57f9ca7ee7ec29006870b738c6865c5dc15f7d27fa1f939e61918993f

data/lib/run_loop/cli/simctl.rb

@@ -57,23 +57,14 @@ module RunLoop
         device = options[:device]
 
         if device
-          device = expect_device(options)
-          if debug
-            RunLoop::Environment.with_debugging do
-              launch_simulator(device)
-            end
-          else
+          RunLoop::Environment.with_debugging(debug) do
             launch_simulator(device)
           end
         else
-          if debug
-            RunLoop::Environment.with_debugging do
-              launch_each_simulator
-            end
-          else
-            launch_each_simulator
-          end
+          launch_each_simulator
         end
+
+        manage_processes
       end
 
       no_commands do
@@ -120,6 +111,14 @@ module RunLoop
           @sim_control ||= RunLoop::SimControl.new
         end
 
+        def xcode
+          @xcode ||= RunLoop::Xcode.new
+        end
+
+        def xcrun
+          @xcrun ||= RunLoop::Xcrun.new
+        end
+
         def booted_device
           sim_control.simulators.detect(nil) do |device|
             device.state == 'Booted'
@@ -127,7 +126,7 @@ module RunLoop
         end
       end
 
-      desc 'install --app [OPTIONS]', 'Installs an app on a device'
+      desc 'install --app [OPTIONS]', 'Installs an app on a device.'
 
       method_option 'app',
                     :desc => 'Path to a .app bundle to launch on simulator.',
@@ -141,16 +140,22 @@ module RunLoop
                     :required => false,
                     :type => :string
 
-      method_option 'force',
-                    :desc => 'Force a re-install the existing app.',
-                    :aliases => '-f',
+      method_option 'debug',
+                    :desc => 'Enable debug logging.',
+                    :aliases => '-v',
                     :required => false,
                     :default => false,
                     :type => :boolean
 
-      method_option 'debug',
-                    :desc => 'Enable debug logging.',
-                    :aliases => '-v',
+      method_option 'reset-app-sandbox',
+                    :desc => 'If the app is already installed, erase the app data.',
+                    :aliases => '-r',
+                    :default => false,
+                    :type => :boolean
+
+      method_option 'force',
+                    :desc => 'Force a re-install the existing app. Deprecated 1.5.6.',
+                    :aliases => '-f',
                     :required => false,
                     :default => false,
                     :type => :boolean
@@ -158,72 +163,22 @@ module RunLoop
       def install
         debug = options[:debug]
 
-        if debug
-          ENV['DEBUG'] = '1'
-        end
-
-        debug_logging = RunLoop::Environment.debug?
-
         device = expect_device(options)
         app = expect_app(options, device)
 
-        bridge = RunLoop::Simctl::Bridge.new(device, app.path)
-
-        xcode = bridge.sim_control.xcode
-        if xcode.version >= RunLoop::Version.new('7.0')
-          puts "ERROR: Xcode #{xcode.version.to_s} detected."
-          puts "ERROR: Apple's simctl install/uninstall is broken for this version of Xcode."
-          puts "ERROR: See the following links for details:"
-          puts "ERROR: https://forums.developer.apple.com/message/51922"
-          puts "ERROR: https://github.com/calabash/run_loop/issues/235"
-          puts "ERROR: exiting 1"
-          exit 1
-        end
-
-        force_reinstall = options[:force]
+        core_sim = RunLoop::CoreSimulator.new(device, app)
 
-        before = Time.now
+        RunLoop::Environment.with_debugging(debug) do
+          if options['reset-app-sandbox']
 
-        if bridge.app_is_installed?
-          if debug_logging
-            puts "App with bundle id '#{app.bundle_identifier}' is already installed."
-          end
-
-          if force_reinstall
-            if debug_logging
-              puts 'Will force a re-install.'
-            end
-            bridge.uninstall
-            bridge.install
-          else
-            new_digest = RunLoop::Directory.directory_digest(app.path)
-            if debug_logging
-              puts "      New app has SHA: '#{new_digest}'."
-            end
-            installed_app_bundle = bridge.fetch_app_dir
-            old_digest = RunLoop::Directory.directory_digest(installed_app_bundle)
-            if debug_logging
-              puts "Installed app has SHA: '#{old_digest}'."
-            end
-            if new_digest != old_digest
-              if debug_logging
-                puts "Will re-install '#{app.bundle_identifier}' because the SHAs don't match."
-              end
-              bridge.uninstall
-              bridge.install
+            if core_sim.app_is_installed?
+              RunLoop.log_debug('Resetting the app sandbox')
+              core_sim.uninstall_app_and_sandbox
             else
-              if debug_logging
-                puts "Will not re-install '#{app.bundle_identifier}' because the SHAs match."
-              end
+              RunLoop.log_debug('App is not installed; skipping sandbox reset')
             end
           end
-        else
-          bridge.install
-        end
-
-        if debug_logging
-          "Launching took #{Time.now-before} seconds"
-          puts "Installed '#{app.bundle_identifier}' on #{device} in #{Time.now-before} seconds."
+          core_sim.install
         end
       end
 
@@ -233,8 +188,8 @@ module RunLoop
           simulators = sim_control.simulators
           if device_from_options.nil?
             default_name = RunLoop::Core.default_simulator
-            device = simulators.detect do |sim|
-              sim.instruments_identifier == default_name
+            device = simulators.find do |sim|
+              sim.instruments_identifier(xcode) == default_name
             end
 
             if device.nil?
@@ -242,9 +197,9 @@ module RunLoop
                     "Could not find a simulator with name that matches '#{device_from_options}'"
             end
           else
-            device = simulators.detect do |sim|
+            device = simulators.find do |sim|
               sim.udid == device_from_options ||
-                    sim.instruments_identifier == device_from_options
+                    sim.instruments_identifier(xcode) == device_from_options
             end
 
             if device.nil?

data/lib/run_loop/core.rb

@@ -138,22 +138,16 @@ module RunLoop
     #
     # 1. enabling accessibility and software keyboard
     # 2. installing / uninstalling apps
-    # 3. @todo resetting the app sandbox
-    #
-    # `Bridge#launch_simulator` launches the targeted iOS Simulator.  The
-    # simulator itself has several async tasks that must be completed before
-    # we start interacting with it.  If your simulator ends up in a bad state,
-    # you can increase the post-launch wait time by setting the
-    # `CAL_SIM_POST_LAUNCH_WAIT` environment variable.  The default wait time
-    # is 1.0.  This was arrived at through testing.
     def self.prepare_simulator(launch_options, sim_control)
 
+      xcode = sim_control.xcode
+
       # Respect option passed from Calabash
       if launch_options[:relaunch_simulator]
         sim_control.quit_sim
       end
 
-      if !sim_control.xcode_version_gte_6?
+      if !xcode.version_gte_6?
         # Xcode 5.1.1
 
         # Will quit the simulator!
@@ -175,7 +169,6 @@ module RunLoop
         end
 
         udid = launch_options[:udid]
-        xcode = sim_control.xcode
 
         device = sim_control.simulators.find do |sim|
           sim.udid == udid || sim.instruments_identifier(xcode) == udid
@@ -189,9 +182,10 @@ module RunLoop
         # Validate the architecture.
         self.expect_simulator_compatible_arch(device, app, xcode)
 
-        bridge = RunLoop::LifeCycle::CoreSimulator.new(app, device, sim_control)
+        # Quits the simulator.
+        core_sim = RunLoop::CoreSimulator.new(device, app)
 
-        bridge.ensure_app_same
+        core_sim.install
 
         # Will quit the simulator if it is running.
         # @todo fix accessibility_enabled? so we don't have to quit the sim
@@ -205,13 +199,12 @@ module RunLoop
         # https://github.com/calabash/run_loop/issues/167
         sim_control.ensure_software_keyboard(device)
 
-
         # Xcode 6.3 instruments cannot launch an app that is already installed on
         # iOS 8.3 Simulators. See: https://github.com/calabash/calabash-ios/issues/744
-        if sim_control.xcode.version_gte_63?
+        if xcode.version_gte_63?
 
-          if bridge.app_is_installed? && !sim_control.sim_is_running?
-            bridge.launch_simulator
+          if core_sim.app_is_installed? && !sim_control.sim_is_running?
+            core_sim.launch_simulator
           end
         end
       end
@@ -220,6 +213,8 @@ module RunLoop
     def self.run_with_options(options)
       before = Time.now
 
+      self.prepare(options)
+
       logger = options[:logger]
       sim_control ||= options[:sim_control] || RunLoop::SimControl.new
 
@@ -245,7 +240,7 @@ Please update your sources to pass an instance of RunLoop::Xcode))
       log_file = options[:log_path]
       timeout = options[:timeout] || 30
 
-      results_dir = options[:results_dir] || Dir.mktmpdir('run_loop')
+      results_dir = options[:results_dir] || RunLoop::DotDir.make_results_dir
       results_dir_trace = File.join(results_dir, 'trace')
       FileUtils.mkdir_p(results_dir_trace)
 
@@ -820,5 +815,13 @@ Please update your sources to pass an instance of RunLoop::Instruments))
     def self.pids_for_run_loop(run_loop, &block)
       RunLoop::Instruments.new.instruments_pids(&block)
     end
+
+    private
+
+    def self.prepare(run_options)
+      RunLoop::DotDir.rotate_result_directories
+      RunLoop::Instruments.rotate_cache_directories
+      true
+    end
   end
 end