Support dev servers defined in a mojoconfig file.

mojo/devtools/common/devtoolslib/shell_arguments.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.
 
 """Produces configured shell abstractions.
 
 This module knows how to produce a configured shell abstraction based on
 shell_config.ShellConfig.
 """
 
 import os.path
 import sys
 import urlparse
 
 from devtoolslib.android_shell import AndroidShell
 from devtoolslib.linux_shell import LinuxShell
+from devtoolslib.shell_config import ShellConfigurationException
 
 # When spinning up servers for local origins, we want to use predictable ports
 # so that caching works between subsequent runs with the same command line.
 _LOCAL_ORIGIN_PORT = 31840
 _MAPPINGS_BASE_PORT = 31841
 
 
-class ShellConfigurationException(Exception):
-  """Represents an error preventing creating a functional shell abstraction."""
-  pass
-
-
 def _is_web_url(dest):
   return True if urlparse.urlparse(dest).scheme else False
 
 
 def _host_local_url_destination(shell, dest_file, port):
   """Starts a local server to host |dest_file|.
 
   Returns:
     Url of the hosted file.
   """
@@ skipping 124 matching lines @@
     if not argument.startswith(key):
       continue
     arguments[i] = argument + delimiter + value
     break
   else:
     arguments.append(key + value)
 
   return arguments
 
 
+def _configure_dev_server(shell, shell_args, dev_server_config):
+  """Sets up a dev server on the host according to |dev_server_config|.
+
+  Args:
+    shell: The shell that is being configured.
+    shell_arguments: Current list of shell arguments.
+    dev_server_config: Instance of shell_config.DevServerConfig describing the
+        dev server to be set up.
+
+  Returns:
+    The updated argument list.
+  """
+  server_url = shell.serve_local_directories(dev_server_config.mappings)
+  shell_args.append('--map-origin=%s=%s' % (dev_server_config.host, server_url))
+  print "Configured %s locally as %s" % (dev_server_config.host, server_url)
+  for mapping_prefix, mapping_path in dev_server_config.mappings:
+    print "  /%s -> %s" % (mapping_prefix, mapping_path)
+  return shell_args

[qsr, 2015/08/05 08:11:13]

Why do you both update the reference you are given and returns it? This is kind
of strange.

[ppi, 2015/08/05 10:54:01]

This matches what all other functions do. I'm happy to fix them (probably going
for modifying the passed list and not returning anything), but would prefer not
to make this change in this cl.

+
+
 def get_shell(shell_config, shell_args):
   """
   Produces a shell abstraction configured according to |shell_config|.
 
   Args:
     shell_config: Instance of shell_config.ShellConfig.
     shell_args: Additional raw shell arguments to be passed to the shell. We
         need to take these into account as some parameters need to appear only
         once on the argument list (e.g. url-mappings) so we need to coalesce any
         overrides and the existing value into just one argument.
@@ skipping 31 matching lines @@
   if shell_config.origin:
     if _is_web_url(shell_config.origin):
       shell_args.append('--origin=' + shell_config.origin)
     else:
       shell_args.extend(configure_local_origin(shell, shell_config.origin,
                                                fixed_port=True))
 
   if shell_config.sky:
     shell_args = _configure_sky(shell_args)
 
+  for dev_server_config in shell_config.dev_servers:
+    shell_args = _configure_dev_server(shell, shell_args, dev_server_config)
+
   return shell, shell_args