Merge lp:~frankban/juju-quickstart/support-json into lp:juju-quickstart

[Francesco Banconi]

JSON support + minor fixes.

This branch includes official JSON
support for bundle deployments.

This branch also contains a number of
minor fixes/improvements:

- Added the possibility to provide a
  customized Juju GUI charm URL.

- Added support for providing a bundle
  directory (a dir containing a
  bundles.yaml file): fix bug 1247181.

- Some documentation clean up.

- Added an option to decline opening the
  browser.

- The Juju env is bootstrapped passing
  --debug when quickstart is run in debug
  mode.

- Bumped version up.

Tests: `make check`.

QA:
I uploaded a bundle JSON here:
http://pastebin.com/raw.php?i=4mDCcagp
So it is possible to check the new features
by running the following (expect a scary output):
.venv/bin/python juju-quickstart --debug --no-browser \
 --gui-charm-url cs:~juju-gui/precise/juju-gui-116 \
 -e ec2 http://pastebin.com/raw.php?i=4mDCcagp
At the end of the process, locate the GUI url
printed before the last debug messages, and check
the GUI is up, running and the bundle is deploying.
Remember to destroy your ec2 env.
Thank you!

https://codereview.appspot.com/22300044/

[Francesco Banconi (frankban)]

Reviewers: mp+194172_code.launchpad.net,

Message:
Please take a look.

Description:
JSON support + minor fixes.

This branch includes official JSON
support for bundle deployments.

This branch also contains a number of
minor fixes/improvements:

- Added the possibility to provide a
   customized Juju GUI charm URL.

- Added support for providing a bundle
   directory (a dir containing a
   bundles.yaml file): fix bug 1247181.

- Some documentation clean up.

- Added an option to decline opening the
   browser.

- The Juju env is bootstrapped passing
   --debug when quickstart is run in debug
   mode.

- Bumped version up.

Tests: `make check`.

QA:
I uploaded a bundle JSON here:
http://pastebin.com/raw.php?i=4mDCcagp
So it is possible to check the new features
by running the following (expect a scary output):
.venv/bin/python juju-quickstart --debug --no-browser \
 --gui-charm-url cs:~juju-gui/precise/juju-gui-116 \
 -e ec2 http://pastebin.com/raw.php?i=4mDCcagp
At the end of the process, locate the GUI url
printed before the last debug messages, and check
the GUI is up, running and the bundle is deploying.
Remember to destroy your ec2 env.
Thank you!

https://code.launchpad.net/~frankban/juju-quickstart/support-json/+merge/194172

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/22300044/

Affected files (+190, -50 lines):
   M .bzrignore
   M HACKING.rst
   M README.rst
   A [revision details]
   M quickstart/__init__.py
   M quickstart/app.py
   M quickstart/manage.py
   M quickstart/tests/helpers.py
   M quickstart/tests/test_app.py
   M quickstart/tests/test_manage.py
   M quickstart/tests/test_utils.py
   M quickstart/utils.py
   M setup.py

[Madison Scott-Clary (makyo)]

LGTM, QA Okay. Thanks!

https://codereview.appspot.com/22300044/

[Gary Poster (gary)]

LGTM with trivial. Thank you!

https://codereview.appspot.com/22300044/diff/1/quickstart/app.py
File quickstart/app.py (right):

https://codereview.appspot.com/22300044/diff/1/quickstart/app.py#newcode123
quickstart/app.py:123: and the optional Juju GUI charm URL. If the charm
URL is not provided, the
Maybe give an example of the expected format, e.g.
cs:~juju-gui/precise/juju-gui-116 ? Maybe that's more
valuable/important for the commandline help.

https://codereview.appspot.com/22300044/diff/1/quickstart/manage.py
File quickstart/manage.py (right):

https://codereview.appspot.com/22300044/diff/1/quickstart/manage.py#newcode181
quickstart/manage.py:181: 'provided, the last release of the GUI will be
deployed')
This would be the ideal place to include an example IMO, like mentioning
that you can get the dev charm by using cs:~juju-gui/precise/juju-gui

https://codereview.appspot.com/22300044/

[lp:~frankban/juju-quickstart/support-json]

16. By Francesco Banconi on 2013-11-06

Changes as per review.

[Francesco Banconi (frankban)]

*** Submitted:

JSON support + minor fixes.

This branch includes official JSON
support for bundle deployments.

This branch also contains a number of
minor fixes/improvements:

- Added the possibility to provide a
   customized Juju GUI charm URL.

- Added support for providing a bundle
   directory (a dir containing a
   bundles.yaml file): fix bug 1247181.

- Some documentation clean up.

- Added an option to decline opening the
   browser.

- The Juju env is bootstrapped passing
   --debug when quickstart is run in debug
   mode.

- Bumped version up.

Tests: `make check`.

QA:
I uploaded a bundle JSON here:
http://pastebin.com/raw.php?i=4mDCcagp
So it is possible to check the new features
by running the following (expect a scary output):
.venv/bin/python juju-quickstart --debug --no-browser \
 --gui-charm-url cs:~juju-gui/precise/juju-gui-116 \
 -e ec2 http://pastebin.com/raw.php?i=4mDCcagp
At the end of the process, locate the GUI url
printed before the last debug messages, and check
the GUI is up, running and the bundle is deploying.
Remember to destroy your ec2 env.
Thank you!

R=
CC=
https://codereview.appspot.com/22300044

https://codereview.appspot.com/22300044/diff/1/quickstart/app.py
File quickstart/app.py (right):

https://codereview.appspot.com/22300044/diff/1/quickstart/app.py#newcode123
quickstart/app.py:123: and the optional Juju GUI charm URL. If the charm
URL is not provided, the
On 2013/11/06 17:40:43, gary.poster wrote:
> Maybe give an example of the expected format, e.g.
> cs:~juju-gui/precise/juju-gui-116 ? Maybe that's more
valuable/important for
> the commandline help.

Done.

https://codereview.appspot.com/22300044/diff/1/quickstart/manage.py
File quickstart/manage.py (right):

https://codereview.appspot.com/22300044/diff/1/quickstart/manage.py#newcode181
quickstart/manage.py:181: 'provided, the last release of the GUI will be
deployed')
On 2013/11/06 17:40:43, gary.poster wrote:
> This would be the ideal place to include an example IMO, like
mentioning that
> you can get the dev charm by using cs:~juju-gui/precise/juju-gui

Done.

https://codereview.appspot.com/22300044/

[Francesco Banconi (frankban)]

Thank you both!

https://codereview.appspot.com/22300044/

=== modified file '.bzrignore'
--- .bzrignore	2013-10-14 15:54:00 +0000
+++ .bzrignore	2013-11-06 17:54:24 +0000
@@ -1,4 +1,5 @@
 .coverage
+.DS_Store
 .emacs*
 .venv
 build

=== modified file 'HACKING.rst'
--- HACKING.rst	2013-10-14 15:24:29 +0000
+++ HACKING.rst	2013-11-06 17:54:24 +0000
@@ -5,7 +5,7 @@
 environment in very few steps. The environment is bootstrapped and set up so
 that it can be managed using a Web interface (the Juju GUI).
 
-Bundle support is a planned feature, and will allow for setting up a complete
+Bundle deployments are also supported, and allow for setting up a complete
 topology of services in one simple command.
 
 Creating a development environment

=== modified file 'README.rst'
--- README.rst	2013-10-14 15:24:29 +0000
+++ README.rst	2013-11-06 17:54:24 +0000
@@ -5,5 +5,5 @@
 environment in very few steps. The environment is bootstrapped and set up so
 that it can be managed using a Web interface (the Juju GUI).
 
-Bundle support is a planned feature, and will allow for setting up a complete
+Bundle deployments are also supported, and allow for setting up a complete
 topology of services in one simple command.

=== modified file 'quickstart/__init__.py'
--- quickstart/__init__.py	2013-10-30 10:16:36 +0000
+++ quickstart/__init__.py	2013-11-06 17:54:24 +0000
@@ -19,7 +19,7 @@
 that it can be managed using a Web interface (the Juju GUI).
 """
 
-VERSION = (0, 2, 0)
+VERSION = (0, 3, 0)
 
 
 def get_version():

=== modified file 'quickstart/app.py'
--- quickstart/app.py	2013-10-30 17:37:46 +0000
+++ quickstart/app.py	2013-11-06 17:54:24 +0000
@@ -48,13 +48,18 @@
         return 'juju-quickstart: error: {}'.format(self.message)
 
 
-def bootstrap(env_name):
+def bootstrap(env_name, debug=False):
     """Bootstrap the Juju environment with the given name.
 
+    If debug is True, bootstrap the environment passing the --debug flag.
+
     Return when the bootstrap node is ready.
     Raise a ProgramExit if any error occurs in the bootstrap process.
     """
-    retcode, _, error = utils.call('juju', 'bootstrap', '-e', env_name)
+    cmd = ['juju', 'bootstrap', '-e', env_name]
+    if debug:
+        cmd.append('--debug')
+    retcode, _, error = utils.call(*cmd)
     if retcode:
         raise ProgramExit(error)
     # Call "juju status" multiple times until the bootstrap node is ready.
@@ -111,20 +116,25 @@
     return env
 
 
-def deploy_gui(env, service_name):
+def deploy_gui(env, service_name, charm_url=None):
     """Deploy and expose the given service, reusing the bootstrap node.
 
     Receive an authenticated Juju Environment instance, the name of the service
-    and the corresponding charm URL.
+    and the optional Juju GUI charm URL, e.g. cs:~juju-gui/precise/juju-gui-42.
+    If the charm URL is not provided, the function tries to retrieve it from
+    charmworld. In this case a default charm URL is used if charmworld is not
+    available.
 
     Raise a ProgramExit if the API server returns an error response.
     """
-    try:
-        charm_url = utils.get_charm_url()
-    except (IOError, ValueError) as err:
-        msg = 'unable to retrieve the Juju GUI charm URL from the API: {}'
-        logging.warn(msg.format(err))
-        charm_url = DEFAULT_CHARM_URL
+    if charm_url is None:
+        try:
+            charm_url = utils.get_charm_url()
+        except (IOError, ValueError) as err:
+            msg = 'unable to retrieve the Juju GUI charm URL from the API: {}'
+            logging.warn(msg.format(err))
+            charm_url = DEFAULT_CHARM_URL
+    print('charm URL: {}'.format(charm_url))
     try:
         env.deploy(service_name, charm_url, to=0)
         env.expose(service_name)

=== modified file 'quickstart/manage.py'
--- quickstart/manage.py	2013-10-30 17:37:46 +0000
+++ quickstart/manage.py	2013-11-06 17:54:24 +0000
@@ -62,6 +62,8 @@
     else:
         # Load the bundle file.
         bundle_file = os.path.abspath(os.path.expanduser(bundle))
+        if os.path.isdir(bundle_file):
+            bundle_file = os.path.join(bundle_file, 'bundles.yaml')
         try:
             bundle_yaml = open(bundle_file).read()
         except IOError as err:
@@ -131,9 +133,19 @@
 
     Return the options as a namespace containing the following attributes:
         - admin_secret: the password to use to access the Juju API;
+        - bundle: the optional bundle (path or URL) to be deployed;
+        - charm_url: the Juju GUI charm URL or None if not specified;
+        - debug: whether debug mode is activated;
         - env_file: the absolute path of the Juju environments.yaml file;
         - env_name: the name of the Juju environment to use;
-        - env_type: the provider type of the selected Juju environment.
+        - env_type: the provider type of the selected Juju environment;
+        - open_browser: whether the GUI browser must be opened.
+
+    The following attributes will also be included in the namespace if a bundle
+    deployment is requested:
+        - bundle_name: the name of the bundle to be deployed;
+        - bundle_services: a list of service names included in the bundle;
+        - bundle_yaml: the YAML encoded contents of the bundle.
 
     Exit with an error if the provided arguments are not valid.
     """
@@ -146,24 +158,39 @@
     parser = argparse.ArgumentParser(description=quickstart.__doc__)
     parser.add_argument(
         'bundle', default=None, nargs='?',
-        help='The bundle URL or the path to the bundle file to deploy')
+        help='The optional bundle to be deployed. The bundle can be '
+             '1) a path to a YAML/JSON file or '
+             '2) a path to a directory containing a bundles.yaml file or '
+             '3) a URL (starting with http:// or https://) to a YAML/JSON')
     parser.add_argument(
         '-e', '--environment', default=default_env_name, dest='env_name',
         help=env_help)
     parser.add_argument(
         '-n', '--bundle-name', default=None, dest='bundle_name',
         help='The name of the bundle to use. This must be included in the '
-             'provided bundle file. Specifying the bundle name is not '
-             'required if the bundle file only contains one bundle. This '
+             'provided bundle YAML/JSON. Specifying the bundle name is not '
+             'required if the bundle YAML/JSON only contains one bundle. This '
              'option is ignored if the bundle file is not specified')
     parser.add_argument(
         '--environments-file',
         default=os.path.join(juju_home, 'environments.yaml'), dest='env_file',
         help='The path to the Juju environments YAML file (%(default)s)')
     parser.add_argument(
+        '--gui-charm-url', dest='charm_url',
+        help='The Juju GUI charm URL to deploy in the environment. If not '
+             'provided, the last release of the GUI will be deployed. The '
+             'charm URL must include the charm version, e.g. '
+             'cs:~juju-gui/precise/juju-gui-116')
+    parser.add_argument(
+        '--no-browser', action='store_false', dest='open_browser',
+        help='Avoid opening the browser to the GUI at the end of the process')
+    parser.add_argument(
         '--version', action='version', version='%(prog)s {}'.format(version))
     parser.add_argument(
-        '--debug', action='store_true', help='Turn debug mode on')
+        '--debug', action='store_true',
+        help='Turn debug mode on. When enabled, all the subcommands and API '
+             'calls are logged to stdout, and the Juju environment is '
+             'bootstrapped passing --debug')
     # This is required by juju-core: see "juju help plugins".
     parser.add_argument(
         '--description', action=_DescriptionAction, default=argparse.SUPPRESS,
@@ -184,13 +211,13 @@
     print('juju quickstart v{}'.format(version))
     print('bootstrapping the {} environment (type: {})'.format(
         options.env_name, options.env_type))
-    app.bootstrap(options.env_name)
+    app.bootstrap(options.env_name, debug=options.debug)
     print('retrieving the Juju API address')
     api_url = app.get_api_url(options.env_name)
     print('connecting to {}'.format(api_url))
     env = app.connect(api_url, options.admin_secret)
     print('requesting Juju GUI deployment')
-    app.deploy_gui(env, 'juju-gui')
+    app.deploy_gui(env, 'juju-gui', charm_url=options.charm_url)
     print('Juju GUI deployment request accepted')
     address = app.watch(env, 'juju-gui')
     url = 'https://{}'.format(address)
@@ -208,7 +235,6 @@
             gui_api_url, options.admin_secret,
             options.bundle_yaml, options.bundle_name)
 
-    # XXX 2013-10-18 frankban:
-        # Add a command line option to decline opening the browser.
-    webbrowser.open(url)
+    if options.open_browser:
+        webbrowser.open(url)
     print('done!')

=== modified file 'quickstart/tests/helpers.py'
--- quickstart/tests/helpers.py	2013-10-30 17:37:46 +0000
+++ quickstart/tests/helpers.py	2013-11-06 17:54:24 +0000
@@ -18,6 +18,7 @@
 
 from contextlib import contextmanager
 import os
+import shutil
 import tempfile
 
 import mock
@@ -45,6 +46,14 @@
         'bundle2': {'services': {'django': {}, 'nodejs': {}}},
     })
 
+    def _write_bundle_file(self, bundle_file, contents):
+        """Parse and write contents into the given bundle file object."""
+        if contents is None:
+            contents = self.valid_bundle
+        elif isinstance(contents, dict):
+            contents = yaml.safe_dump(contents)
+        bundle_file.write(contents)
+
     def make_bundle_file(self, contents=None):
         """Create a Juju bundle file containing the given contents.
 
@@ -52,16 +61,28 @@
         self.valid_bundle.
         Return the bundle file path.
         """
-        if contents is None:
-            contents = self.valid_bundle
-        elif isinstance(contents, dict):
-            contents = yaml.safe_dump(contents)
         bundle_file = tempfile.NamedTemporaryFile(delete=False)
         self.addCleanup(os.remove, bundle_file.name)
-        bundle_file.write(contents)
+        self._write_bundle_file(bundle_file, contents)
         bundle_file.close()
         return bundle_file.name
 
+    def make_bundle_dir(self, contents=None):
+        """Create a Juju bundle directory including a bundles.yaml file.
+
+        The file will contain the given contents.
+
+        If contents is None, use the valid bundle contents defined in
+        self.valid_bundle.
+        Return the bundle directory path.
+        """
+        bundle_dir = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, bundle_dir)
+        bundle_path = os.path.join(bundle_dir, 'bundles.yaml')
+        with open(bundle_path, 'w') as bundle_file:
+            self._write_bundle_file(bundle_file, contents)
+        return bundle_dir
+
 
 class CallTestsMixin(object):
     """Easily use the quickstart.utils.call function."""

=== modified file 'quickstart/tests/test_app.py'
--- quickstart/tests/test_app.py	2013-10-30 17:37:46 +0000
+++ quickstart/tests/test_app.py	2013-11-06 17:54:24 +0000
@@ -28,6 +28,9 @@
 from quickstart.tests import helpers
 
 
+mock_print = mock.patch('__builtin__.print')
+
+
 class TestProgramExit(unittest.TestCase):
 
     def test_string_representation(self):
@@ -72,6 +75,13 @@
             'juju', 'status', '-e', self.env_name, '--format', 'yaml')
         return [call for _ in range(number)]
 
+    def make_side_effects(self):
+        """Return the minimum number of side effects for a successful call."""
+        return [
+            (0, '', ''),  # Add a bootstrap call.
+            (0, self.make_status_output('started'), ''),  # Add a status call.
+        ]
+
     def assert_status_retried(self, side_effects):
         """Ensure the "juju status" command is retried several times.
 
@@ -85,16 +95,20 @@
 
     def test_success(self):
         # The environment is successfully bootstrapped.
-        side_effects = [
-            (0, '', ''),  # Add a bootstrap call.
-            (0, self.make_status_output('started'), ''),  # Add a status call.
-        ]
-        with self.patch_multiple_calls(side_effects) as mock_call:
+        with self.patch_multiple_calls(self.make_side_effects()) as mock_call:
             app.bootstrap(self.env_name)
         mock_call.assert_has_calls([
             mock.call('juju', 'bootstrap', '-e', self.env_name),
         ] + self.make_status_calls(1))
 
+    def test_success_debug(self):
+        # The environment is successfully bootstrapped in debug mode.
+        with self.patch_multiple_calls(self.make_side_effects()) as mock_call:
+            app.bootstrap(self.env_name, debug=True)
+        mock_call.assert_has_calls([
+            mock.call('juju', 'bootstrap', '-e', self.env_name, '--debug'),
+        ] + self.make_status_calls(1))
+
     def test_bootstrap_failure(self):
         # A ProgramExit is raised if an error occurs while bootstrapping.
         with self.patch_call(1, error='bad wolf') as mock_call:
@@ -233,6 +247,7 @@
         self.assertIs(error, context_manager.exception)
 
 
+@mock_print
 class TestDeployGui(ProgramExitTestsMixin, unittest.TestCase):
 
     charm_url = 'cs:precise/juju-gui-42'
@@ -244,18 +259,20 @@
         mock_get_charm_url = mock.Mock(side_effect=side_effect)
         return mock.patch('quickstart.utils.get_charm_url', mock_get_charm_url)
 
-    def test_deployment(self):
+    def test_deployment(self, mock_print):
         # The function correctly deploys and exposes the service, retrieving
         # the charm URL from the charmworld API.
         env = mock.Mock()
         with self.patch_get_charm_url():
             app.deploy_gui(env, 'my-gui')
         env.assert_has_calls([
-            mock.call.deploy('my-gui', 'cs:precise/juju-gui-42', to=0),
+            mock.call.deploy('my-gui', self.charm_url, to=0),
             mock.call.expose('my-gui')
         ])
+        mock_print.assert_called_once_with(
+            'charm URL: {}'.format(self.charm_url))
 
-    def test_deployment_default_charm_url(self):
+    def test_deployment_default_charm_url(self, mock_print):
         # The function correctly deploys and exposes the service, even if it is
         # not able to retrieve the charm URL from the charmworld API.
         env = mock.Mock()
@@ -268,8 +285,22 @@
             mock.call.deploy('my-gui', app.DEFAULT_CHARM_URL, to=0),
             mock.call.expose('my-gui')
         ])
-
-    def test_api_error(self):
+        mock_print.assert_called_once_with(
+            'charm URL: {}'.format(app.DEFAULT_CHARM_URL))
+
+    def test_deployment_provided_charm_url(self, mock_print):
+        # The function correctly deploys and exposes the service using a user
+        # provided Juju GUI charm URL.
+        env = mock.Mock()
+        charm_url = 'cs:~juju-gui/precise/juju-gui-116'
+        app.deploy_gui(env, 'my-gui', charm_url=charm_url)
+        env.assert_has_calls([
+            mock.call.deploy('my-gui', charm_url, to=0),
+            mock.call.expose('my-gui')
+        ])
+        mock_print.assert_called_once_with('charm URL: {}'.format(charm_url))
+
+    def test_api_error(self, mock_print):
         # A ProgramExit is raised if an error occurs in one of the API calls.
         env = mock.Mock()
         env.deploy.side_effect = self.make_env_error('service already exists')
@@ -280,7 +311,7 @@
         env.deploy.assert_called_once_with(
             'another-gui', 'cs:precise/juju-gui-42', to=0)
 
-    def test_other_errors(self):
+    def test_other_errors(self, mock_print):
         # Any other errors occurred during the process are not trapped.
         error = ValueError('explode!')
         env = mock.Mock()
@@ -294,7 +325,7 @@
         self.assertIs(error, context_manager.exception)
 
 
[e-mail]('__builtin__.print')
+@mock_print
 class TestWatch(ProgramExitTestsMixin, unittest.TestCase):
 
     address = 'unit.example.com'

=== modified file 'quickstart/tests/test_manage.py'
--- quickstart/tests/test_manage.py	2013-10-30 17:37:46 +0000
+++ quickstart/tests/test_manage.py	2013-11-06 17:54:24 +0000
@@ -19,6 +19,8 @@
 import argparse
 import logging
 import os
+import shutil
+import tempfile
 import unittest
 
 import mock
@@ -80,6 +82,17 @@
             ['mysql', 'wordpress'], sorted(options.bundle_services))
         self.assertEqual(open(bundle_file).read(), options.bundle_yaml)
 
+    def test_resulting_options_from_dir(self):
+        # The options object is correctly set up when a bundle dir is passed.
+        bundle_dir = self.make_bundle_dir()
+        options = self.make_options(bundle_dir, bundle_name='bundle1')
+        manage._validate_bundle(options, self.parser)
+        self.assertEqual('bundle1', options.bundle_name)
+        self.assertEqual(
+            ['mysql', 'wordpress'], sorted(options.bundle_services))
+        expected = open(os.path.join(bundle_dir, 'bundles.yaml')).read()
+        self.assertEqual(expected, options.bundle_yaml)
+
     def test_expand_user(self):
         # The ~ construct is correctly expanded in the validation process.
         bundle_file = self.make_bundle_file()
@@ -104,6 +117,19 @@
         )
         self.parser.error.assert_called_once_with(expected)
 
+    def test_bundle_dir_not_valid(self):
+        # A parser error is invoked if the bundle dir does not contain the
+        # bundles.yaml file.
+        bundle_dir = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, bundle_dir)
+        options = self.make_options(bundle_dir)
+        manage._validate_bundle(options, self.parser)
+        expected = (
+            'unable to open bundle file: '
+            "[Errno 2] No such file or directory: '{}/bundles.yaml'"
+        ).format(bundle_dir)
+        self.parser.error.assert_called_once_with(expected)
+
     def test_url_error(self):
         # A parser error is invoked if the bundle cannot be fetched from the
         # provided URL.
@@ -283,9 +309,12 @@
         """Set up the options to be passed to the run function."""
         options = {
             'admin_secret': 'Secret!',
+            'debug': False,
+            'charm_url': None,
             'bundle': None,
             'env_name': 'aws',
             'env_type': 'ec2',
+            'open_browser': True,
         }
         options.update(kwargs)
         return mock.Mock(**options)
@@ -294,12 +323,13 @@
         # The application runs correctly if no bundle is provided.
         options = self.make_options()
         manage.run(options)
-        mock_app.bootstrap.assert_called_once_with(options.env_name)
+        mock_app.bootstrap.assert_called_once_with(
+            options.env_name, debug=options.debug)
         mock_app.get_api_url.assert_called_once_with(options.env_name)
         mock_app.connect.assert_called_once_with(
             mock_app.get_api_url(), options.admin_secret)
         mock_app.deploy_gui.assert_called_once_with(
-            mock_app.connect(), 'juju-gui')
+            mock_app.connect(), 'juju-gui', charm_url=options.charm_url)
         mock_app.watch.assert_called_once_with(mock_app.connect(), 'juju-gui')
         mock_open.assert_called_once_with(
             'https://{}'.format(mock_app.watch()))
@@ -315,3 +345,9 @@
         mock_app.deploy_bundle.assert_called_once_with(
             'wss://gui.example.com:443/ws', options.admin_secret,
             'mybundle: contents', 'mybundle')
+
+    def test_no_browser(self, mock_app, mock_open):
+        # It is possible to avoid opening the GUI in the browser.
+        options = self.make_options(open_browser=False)
+        manage.run(options)
+        self.assertFalse(mock_open.called)

=== modified file 'quickstart/tests/test_utils.py'
--- quickstart/tests/test_utils.py	2013-10-31 08:33:49 +0000
+++ quickstart/tests/test_utils.py	2013-11-06 17:54:24 +0000
@@ -157,6 +157,14 @@
         helpers.BundleFileTestsMixin, helpers.ValueErrorTestsMixin,
         unittest.TestCase):
 
+    def assert_bundle(
+            self, expected_name, expected_services, contents,
+            bundle_name=None):
+        """Ensure parsing the given contents returns the expected values."""
+        name, services = utils.parse_bundle(contents, bundle_name=bundle_name)
+        self.assertEqual(expected_name, name)
+        self.assertEqual(set(expected_services), set(services))
+
     def test_invalid_yaml(self):
         # A ValueError is raised if the bundle contents are not a valid YAML.
         with self.assertRaises(ValueError) as context_manager:
@@ -230,15 +238,20 @@
         contents = yaml.safe_dump({
             'mybundle': {'services': {'wordpress': {}, 'mysql': {}}},
         })
-        name, services = utils.parse_bundle(contents)
-        self.assertEqual('mybundle', name)
-        self.assertEqual(['mysql', 'wordpress'], sorted(services))
+        self.assert_bundle('mybundle', ['mysql', 'wordpress'], contents)
 
     def test_success_multiple_bundles(self):
         # The function succeeds with multiple bundles.
-        name, services = utils.parse_bundle(self.valid_bundle, 'bundle2')
-        self.assertEqual('bundle2', name)
-        self.assertEqual(['django', 'nodejs'], sorted(services))
+        self.assert_bundle(
+            'bundle2', ['django', 'nodejs'], self.valid_bundle, 'bundle2')
+
+    def test_success_json(self):
+        # Since JSON is a subset of YAML, the function also support JSON
+        # encoded bundles.
+        contents = json.dumps({
+            'mybundle': {'services': {'wordpress': {}, 'mysql': {}}},
+        })
+        self.assert_bundle('mybundle', ['mysql', 'wordpress'], contents)
 
 
 class TestParseEnvFile(

=== modified file 'quickstart/utils.py'
--- quickstart/utils.py	2013-10-31 08:33:49 +0000
+++ quickstart/utils.py	2013-11-06 17:54:24 +0000
@@ -101,7 +101,10 @@
 
 
 def parse_bundle(bundle_yaml, bundle_name=None):
-    """Parse the provided bundle YAML decoded contents.
+    """Parse the provided bundle YAML encoded contents.
+
+    Since a valid JSON is a subset of YAML this function can be used also to
+    parse JSON encoded contents.
 
     Return a tuple containing the bundle name and the list of services included
     in the bundle.

=== modified file 'setup.py'
--- setup.py	2013-10-30 10:16:36 +0000
+++ setup.py	2013-11-06 17:54:24 +0000
@@ -57,7 +57,7 @@
     long_description=open(description_path).read(),
     author='The Juju GUI team',
     author_email='[e-mail]',
-    url='https://launchpad.net/juju-gui/juju-quickstart',
+    url='https://launchpad.net/juju-quickstart',
     keywords='juju quickstart plugin',
     packages=find_packages(),
     package_data={PROJECT_NAME: data_files},