Make sky_tool work again after mojom package

sky/sdk/lib/sky_tool

 #!/usr/bin/env python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import argparse
 import json
 import logging
 import os
 import re
 import signal
 import socket
 import subprocess
 import sys
 import urlparse
 import time
 
 # TODO(eseidel): This should be BIN_DIR.
 LIB_DIR = os.path.realpath(os.path.dirname(os.path.abspath(__file__)))
 SKY_PACKAGE_ROOT = os.path.realpath(os.path.dirname(LIB_DIR))
 
 SKY_SERVER_PORT = 9888
 APK_NAME = 'SkyDemo.apk'
 ANDROID_PACKAGE = "org.domokit.sky.demo"
 # FIXME: This assumes adb is in $PATH, we could look for ANDROID_HOME, etc?
 ADB_PATH = 'adb'
+# FIXME: Do we need to look in $DART_SDK?
+DART_PATH = 'dart'

[Cutch, 2015/06/23 18:29:47]

We probably will need to check in $DART_SDK (someday)

 
 PID_FILE_PATH = "/tmp/sky_tool.pids"
 PID_FILE_KEYS = frozenset([
     'remote_sky_server_port',
     'sky_server_pid',
     'sky_server_port',
     'sky_server_root',
     'build_dir',
 ])
 
@@ skipping 83 matching lines @@
             default='main.dart')
         start_parser.set_defaults(func=self.run)
 
     def _is_package_installed(self, package_name):
         pm_path_cmd = [ADB_PATH, 'shell', 'pm', 'path', package_name]
         return subprocess.check_output(pm_path_cmd).strip() != ''
 
     def run(self, args, pids):
         StopSky().run(args, pids)
 
+        project_or_path = os.path.abspath(args.project_or_path)
+
+        if os.path.isdir(project_or_path):
+            sky_server_root = project_or_path
+            main_dart = os.path.join(project_or_path, 'main.dart')
+            missing_msg = "Missing main.dart in project: %s" % sky_server_root
+        else:
+            # FIXME: This assumes the path is at the root of the project!
+            # Instead we should walk up looking for a pubspec.yaml
+            sky_server_root = os.path.dirname(project_or_path)
+            main_dart = project_or_path
+            missing_msg = "%s does not exist." % main_dart
+
+        if not os.path.isfile(main_dart):
+            print missing_msg
+            return 2
+
+        package_root = os.path.join(sky_server_root, 'packages')
+        if not os.path.isdir(package_root):
+            print "%s is not a valid packages path." % package_root
+            return 2
+
+        subprocess.check_call([
+            DART_PATH,
+            '--package-root=%s' % package_root,
+            'packages/mojom/generate.dart'
+        ])
+
         if not self._is_package_installed(ANDROID_PACKAGE):
             print '%s is not installed, installing.' % APK_NAME
             args.install = True
 
         if args.install:
             apk_path = os.path.join(SKY_PACKAGE_ROOT, 'apks', APK_NAME)
             if not os.path.exists(apk_path):
                 print "'%s' does not exist?" % apk_path
                 return 2
 
             subprocess.check_call([ADB_PATH, 'install', '-r', apk_path])
 
-        project_or_path = os.path.abspath(args.project_or_path)
-
-        if os.path.isdir(project_or_path):
-            sky_server_root = project_or_path
-            main_sky = os.path.join(project_or_path, 'main.dart')
-            missing_msg = "Missing main.dart in project: %s" % sky_server_root
-        else:
-            sky_server_root = os.path.dirname(project_or_path)
-            main_sky = project_or_path
-            missing_msg = "%s does not exist." % main_sky
-
-        if not os.path.isfile(main_sky):
-            print missing_msg
-            return 2
-
         sky_server_port = SKY_SERVER_PORT
         pids['sky_server_port'] = sky_server_port
         if _port_in_use(sky_server_port):
             logging.warn(('Port %s already in use. '
             ' Not starting server for %s') % (sky_server_port, sky_server_root))
         else:
             sky_server_pid = _start_http_server(sky_server_port, sky_server_root)
             pids['sky_server_pid'] = sky_server_pid
             pids['sky_server_root'] = sky_server_root
 
         port_string = 'tcp:%s' % sky_server_port
         subprocess.check_call([
             ADB_PATH, 'reverse', port_string, port_string
         ])
         pids['remote_sky_server_port'] = sky_server_port
 
         # The load happens on the remote device, use the remote port.
         sky_url = _url_for_path(pids['remote_sky_server_port'], sky_server_root,
-            main_sky)
+            main_dart)
 
         subprocess.check_call([ADB_PATH, 'shell',
             'am', 'start',
             '-a', 'android.intent.action.VIEW',
             '-d', sky_url])
 
 
 class StopSky(object):
     def add_subparser(self, subparsers):
         stop_parser = subparsers.add_parser('stop',
@@ skipping 71 matching lines @@
 
 class SkyShellRunner(object):
     def _check_for_adb(self):
         try:
             subprocess.check_output([ADB_PATH, 'devices'])
         except OSError:
             print "'adb' (from the Android SDK) not in $PATH, can't continue."
             return False
         return True
 
+    def _check_for_dart(self):
+        try:
+            subprocess.check_output([DART_PATH, '--version'])
+        except OSError:
+            print "'dart' (from the Dart SDK) not in $PATH, can't continue."
+            return False
+        return True
+
     def main(self):
         logging.basicConfig(level=logging.WARNING)
-        if not self._check_for_adb():
+        if not self._check_for_adb() or not self._check_for_dart():
             sys.exit(2)
 
         parser = argparse.ArgumentParser(description='Sky Demo Runner')
         subparsers = parser.add_subparsers(help='sub-command help')
 
         for command in [StartSky(), StopSky(), StartTracing(), StopTracing()]:
             command.add_subparser(subparsers)
 
         args = parser.parse_args()
         pids = Pids.read_from(PID_FILE_PATH, PID_FILE_KEYS)
         exit_code = args.func(args, pids)
         # We could do this with an at-exit handler instead?
         pids.write_to(PID_FILE_PATH)
         sys.exit(exit_code)
 
 
 if __name__ == '__main__':
     SkyShellRunner().main()