From e69f6562eda00921aa3420d5f9b211ce7da22dee Mon Sep 17 00:00:00 2001
From: Yegor Jbanov <yjbanov@google.com>
Date: Thu, 3 Mar 2016 12:49:35 -0800
Subject: [PATCH] [ios] use xcrun to launch simulator instead of hardcoded path

---
 .../flutter_tools/lib/src/ios/simulators.dart | 52 +++++++++----------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/packages/flutter_tools/lib/src/ios/simulators.dart b/packages/flutter_tools/lib/src/ios/simulators.dart
index fae2bda441..0cb5e540a4 100644
--- a/packages/flutter_tools/lib/src/ios/simulators.dart
+++ b/packages/flutter_tools/lib/src/ios/simulators.dart
@@ -21,9 +21,6 @@ import 'mac.dart';
 
 const String _xcrunPath = '/usr/bin/xcrun';
 
-const String _simulatorPath =
-  '/Applications/Xcode.app/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator';
-
 class IOSSimulators extends PollingDeviceDiscovery {
   IOSSimulators() : super('IOSSimulators');
 
@@ -56,33 +53,34 @@ class SimControl {
     if (_isAnyConnected())
       return true;
 
-    if (deviceId == null) {
-      runDetached([_simulatorPath]);
-      Future<bool> checkConnection([int attempts = 20]) async {
-        if (attempts == 0) {
-          printStatus('Timed out waiting for iOS Simulator to boot.');
-          return false;
-        }
-        if (!_isAnyConnected()) {
-          printStatus('Waiting for iOS Simulator to boot...');
-          return await new Future.delayed(new Duration(milliseconds: 500),
-            () => checkConnection(attempts - 1)
-          );
-        }
-        return true;
-      }
-      return await checkConnection();
-    } else {
-      try {
-        runCheckedSync([_xcrunPath, 'simctl', 'boot', deviceId]);
-        return true;
-      } catch (e) {
-        printError('Unable to boot iOS Simulator $deviceId: ', e);
-        return false;
+    if (deviceId == null)
+      deviceId = 'iPhone 6 (9.2)';
+
+    // `xcrun instruments` requires a template (-t). @yjbanov has no idea what
+    // "template" is but the built-in 'Blank' seems to work.
+    List<String> args = [_xcrunPath, 'instruments', '-w', deviceId, '-t', 'Blank'];
+    printTrace(args.join(' '));
+    runDetached(args);
+    printStatus('Waiting for iOS Simulator to boot...');
+
+    bool connected = false;
+    int attempted = 0;
+    while (!connected && attempted < 20) {
+      connected = await _isAnyConnected();
+      if (!connected) {
+        printStatus('Still waiting for iOS Simulator to boot...');
+        await new Future.delayed(new Duration(seconds: 1));
       }
+      attempted++;
     }
 
-    return false;
+    if (connected) {
+      printStatus('Connected to iOS Simulator.');
+      return true;
+    } else {
+      printStatus('Timed out waiting for iOS Simulator to boot.');
+      return false;
+    }
   }
 
   /// Returns a list of all available devices, both potential and connected.