From fa5326a3a3346680ce6d7197bcc0b4ac3443b5c3 Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@chromium.org>
Date: Mon, 27 Jul 2015 15:38:42 -0700
Subject: [PATCH] Break the dependency on Go-based sky_server

We now use the Dart sky_server in shelldb.
---
 DEPS                                |  1 -
 sky/packages/workbench/pubspec.yaml |  7 +-----
 sky/tools/skypy/skyserver.py        | 38 ++++++-----------------------
 3 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/DEPS b/DEPS
index 97a3a420b12..55d9a6ae9a4 100644
--- a/DEPS
+++ b/DEPS
@@ -306,7 +306,6 @@ hooks = [
                 '--repository-root', '../../../..',
                 '--dart-sdk-directory',
                 '../../../../third_party/dart-sdk/dart-sdk',
-                '--dirs-to-ignore', 'sky/packages/workbench',
     ],
   },
   {
diff --git a/sky/packages/workbench/pubspec.yaml b/sky/packages/workbench/pubspec.yaml
index 0a4d2393f02..aa07df07c26 100644
--- a/sky/packages/workbench/pubspec.yaml
+++ b/sky/packages/workbench/pubspec.yaml
@@ -5,16 +5,11 @@ description: A workspace to host pub packages
 homepage: https://github.com/domokit/sky_engine/tree/master/sky/packages/workbench
 dependencies:
   sky: any
-dev_dependencies:
-  sky_tools: ^0.0.4
+  sky_tools: any
 dependency_overrides:
   material_design_icons:
     path: ../material_design_icons
   sky:
     path: ../../sdk
-  sky_engine:
-    path: ../../../out/Debug/gen/dart-pkg/sky_engine
-  sky_services:
-    path: ../../../out/Debug/gen/dart-pkg/sky_services
 environment:
   sdk: '>=1.8.0 <2.0.0'
diff --git a/sky/tools/skypy/skyserver.py b/sky/tools/skypy/skyserver.py
index 499d334dbf7..f0a82d8489d 100644
--- a/sky/tools/skypy/skyserver.py
+++ b/sky/tools/skypy/skyserver.py
@@ -6,14 +6,13 @@ import socket
 import subprocess
 import logging
 import os.path
-import stat
-import platform
 
 SKYPY_PATH = os.path.dirname(os.path.abspath(__file__))
-SKY_TOOLS_PATH = os.path.dirname(SKYPY_PATH)
-SKYGO_PATH = os.path.join(SKY_TOOLS_PATH, 'skygo')
-SKY_ROOT = os.path.dirname(SKY_TOOLS_PATH)
-SRC_ROOT = os.path.dirname(SKY_ROOT)
+SRC_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(SKYPY_PATH)))
+
+WORKBENCH_ROOT = os.path.join(SRC_ROOT, 'sky', 'packages', 'workbench')
+DART_SDK = os.path.join(SRC_ROOT, 'third_party', 'dart-sdk', 'dart-sdk', 'bin')
+PUB = os.path.join(DART_SDK, 'pub')
 
 class SkyServer(object):
     def __init__(self, port, root, package_root):
@@ -27,18 +26,6 @@ class SkyServer(object):
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         return sock.connect_ex(('localhost', port)) == 0
 
-    @staticmethod
-    def sky_server_path():
-
-        if platform.system() == 'Linux':
-            platform_dir = 'linux64'
-        elif platform.system() == 'Darwin':
-            platform_dir = 'mac'
-        else:
-            assert False, 'No sky_server binary for this platform: ' + platform.system()
-
-        return os.path.join(SKYGO_PATH, platform_dir, 'sky_server')
-
     def start(self):
         if self._port_in_use(self.port):
             logging.warn(
@@ -46,18 +33,9 @@ class SkyServer(object):
                 self.port)
             return
 
-        server_path = self.sky_server_path()
-        st = os.stat(self.sky_server_path())
-        if not (stat.S_IXUSR & st[stat.ST_MODE]):
-            logging.warn('Changing the permissions of %s to be executable.', self.sky_server_path())
-            os.chmod(self.sky_server_path(), st[stat.ST_MODE] | stat.S_IEXEC)
-        server_command = [
-            server_path,
-            '-p', str(self.port),
-            self.root,
-            self.package_root,
-        ]
-        self.server = subprocess.Popen(server_command)
+        subprocess.check_call([PUB, 'run', 'sky:init'], cwd=WORKBENCH_ROOT)
+        args = [PUB, 'run', 'sky_tools:sky_server', str(self.port)]
+        self.server = subprocess.Popen(args, cwd=WORKBENCH_ROOT)
         return self.server.pid
 
     def stop(self):