Move CheckedInSdkPath helpers to utils

tools/observatory_tool.py

 #!/usr/bin/env python
 # Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 """Helper for building and deploying Observatory"""
 
 import argparse
 import os
 import platform
 import shutil
 import subprocess
 import sys
+import utils
 
 SCRIPT_DIR = os.path.dirname(sys.argv[0])
 DART_ROOT = os.path.realpath(os.path.join(SCRIPT_DIR, '..'))
 RUN_PUB = os.path.join(DART_ROOT, 'tools/run_pub.py')
 IGNORE_PATTERNS = shutil.ignore_patterns(
     '*.map',
     '*.concat.js',
     '*.scriptUrls',
     '*.precompiled.js',
     'main.*',
     'unittest*',
     '*_buildLogs*',
     '*.log',
     '*~')
 
 usage = """obs_tool.py [options]"""
 
-def GetDartSdkPubExecutablePath():
-  osdict = {'Darwin':'mac', 'Linux':'linux', 'Windows':'win'}
-  system = platform.system()
-  executable_name = 'pub'
-  if system == 'Windows':
-    executable_name = 'pub.bat'
-  try:
-    osname = osdict[system]
-  except KeyError:
-    print >>sys.stderr, ('WARNING: platform "%s" not supported') % (system)
-    return None;
-  return os.path.join(DART_ROOT,
-                      'tools',
-                      'sdks',
-                      osname,
-                      'dart-sdk',
-                      'bin',
-                      executable_name)
-
 def BuildArguments():
   result = argparse.ArgumentParser(usage=usage)
   result.add_argument("--package-root", help="package root", default=None)
   result.add_argument("--dart-executable", help="dart executable", default=None)
   result.add_argument("--pub-executable", help="pub executable", default=None)
   result.add_argument("--directory", help="observatory root", default=None)
   result.add_argument("--command", help="[get, build, deploy]", default=None)
   result.add_argument("--silent", help="silence all output", default=False)
   result.add_argument("--sdk", help="Use prebuilt sdk", default=False)
   return result
 
 def ProcessOptions(options, args):
   # Required options.
   if (options.command == None) or (options.directory == None):
     return False
   # If we have a pub executable, we are running from the dart-sdk.
   if (options.pub_executable != None):
     return True
   if (options.sdk != None):
     # Use the checked in pub executable by default.
-    options.pub_executable = GetDartSdkPubExecutablePath()
+    options.pub_executable = utils.CheckedInPubPath()
     return True
   # Otherwise, we need a dart executable and a package root.
   return ((options.package_root != None) and
           (options.dart_executable != None))
 
 def ChangeDirectory(directory):
   os.chdir(directory);
 
 def PubGet(dart_executable, pub_executable, pkg_root, silent):
   # Always remove pubspec.lock before running 'pub get'.
@@ skipping 90 matching lines @@
   if (options.pub_executable != None):
     options.pub_executable = os.path.abspath(options.pub_executable)
   if len(args) == 1:
     args[0] = os.path.abspath(args[0])
   # Pub must be run from the project's root directory.
   ChangeDirectory(options.directory)
   return ExecuteCommand(options, args)
 
 if __name__ == '__main__':
   sys.exit(main());