devtools: download shell binaries and set origin when run w/ --mojo-version.

mojo/devtools/common/devtoolslib/shell_config.py

 # 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.
 
 """Configuration for the shell abstraction.
 
 This module declares ShellConfig and knows how to compute it from command-line
 arguments, applying any default paths inferred from the checkout, configuration
 file, etc.
 """
 
 import ast
 
 from devtoolslib import paths
 
 
 class ShellConfigurationException(Exception):
   """Represents an error preventing creating a functional shell abstraction."""
   pass
 
 
 class ShellConfig(object):
   """Configuration for the shell abstraction."""
 
   def __init__(self):
     self.android = None
+    self.mojo_version = None
     self.shell_path = None
     self.origin = None
     self.map_url_list = []
     self.map_origin_list = []
     self.dev_servers = []
     self.reuse_servers = False
     self.content_handlers = dict()
     self.verbose = None
 
     # Android-only.
@@ skipping 15 matching lines @@
     self.mappings = None
 
 
 def add_shell_arguments(parser):
   """Adds argparse arguments allowing to configure shell abstraction using
   configure_shell() below.
   """
   # Arguments configuring the shell run.
   parser.add_argument('--android', help='Run on Android',
                       action='store_true')
+  parser.add_argument('--mojo-version', help='Version of the Mojo to use. '
+                      'This will set the origin and download the shell binary '
+                      'at the given version')
   parser.add_argument('--shell-path', help='Path of the Mojo shell binary.')
   parser.add_argument('--origin', help='Origin for mojo: URLs. This can be a '
                       'web url or a local directory path. If MOJO_VERSION file '
                       'is among ancestors of this file, by default the origin '
                       'will point to mojo services prebuilt at the '
                       'specified version in Google Storage')
   parser.add_argument('--map-url', action='append',
                       help='Define a mapping for a url in the format '
                       '<url>=<url-or-local-file-path>')
   parser.add_argument('--map-origin', action='append',
@@ skipping 65 matching lines @@
   return ast.literal_eval(spec)
 
 
 def get_shell_config(script_args):
   """Processes command-line options defined in add_shell_arguments(), applying
   any inferred default paths and produces an instance of ShellConfig.
 
   Returns:
     An instance of ShellConfig.
   """
-  # Infer paths based on the Chromium configuration options
-  # (--debug/--release, etc.), if running within a Chromium-like checkout.
-  inferred_params = paths.infer_params(script_args.android, script_args.debug,
-                                       script_args.target_cpu)
-  inferred_origin = None
-  if inferred_params['mojo_version']:
-    inferred_origin = "https://storage.googleapis.com/mojo/services"
-    if script_args.android:
-      inferred_origin += "/android-arm"
-    else:
-      inferred_origin += "/linux-x64"
-    # Get the versions that were built against Modular's version of the SDK.
-    inferred_origin += "/%s" % inferred_params['mojo_version']
-    if script_args.verbose:
-      print('Inferring origin from `MOJO_VERSION` as: ' +
-            inferred_origin)
 
   shell_config = ShellConfig()
   shell_config.android = script_args.android
-  shell_config.shell_path = (script_args.shell_path or
-                             inferred_params['shell_path'])
-  shell_config.origin = script_args.origin or inferred_origin
+  shell_config.mojo_version = script_args.mojo_version
+  shell_config.shell_path = script_args.shell_path
+  shell_config.origin = script_args.origin
   shell_config.map_url_list = script_args.map_url
   shell_config.map_origin_list = script_args.map_origin
   shell_config.reuse_servers = script_args.reuse_servers
   shell_config.verbose = script_args.verbose
 
+  # Infer paths based on the Chromium configuration options
+  # (--debug/--release, etc.), if running within a Chromium-like checkout.
+  inferred_params = paths.infer_params(script_args.android, script_args.debug,
+                                       script_args.target_cpu)
+  # Infer |mojo_version| if the client sets it in a MOJO_VERSION file.
+  shell_config.mojo_version = (shell_config.mojo_version or
+                               inferred_params['mojo_version'])
+  # Use the shell binary and mojo: apps from the build directory, unless
+  # |mojo_version| is set.
+  if not shell_config.mojo_version:
+    shell_config.shell_path = (shell_config.shell_path or
+                               inferred_params['shell_path'])
+    if shell_config.android:
+      shell_config.origin = (shell_config.origin or
+                             inferred_params['build_dir_path'])
+
   # Android-only.
   shell_config.adb_path = (script_args.adb_path or inferred_params['adb_path']
                            or 'adb')
   shell_config.target_device = script_args.target_device
   shell_config.logcat_tags = script_args.logcat_tags
 
   # Desktop-only.
   shell_config.use_osmesa = script_args.use_osmesa
 
-  if (shell_config.android and not shell_config.origin and
-      inferred_params['build_dir_path']):
-    shell_config.origin = inferred_params['build_dir_path']
-
   # Read the mojoconfig file.
   config_file = script_args.config_file
   if not script_args.no_config_file:
     config_file = config_file or _discover_config_file()
 
   if config_file:
     with config_file:
       config_file_aliases = []
       if script_args.config_aliases:
         for alias_spec in script_args.config_aliases:
@@ skipping 29 matching lines @@
 
     if 'content_handlers' in config:
       try:
         for (mime_type,
              content_handler_url) in config['content_handlers'].iteritems():
           shell_config.content_handlers[mime_type] = content_handler_url
       except (ValueError, KeyError):
         raise ShellConfigurationException('Failed to parse content_handlers in '
                                           'the config file.')
   return shell_config