Merge lp:~frankban/juju-quickstart/bundle-urls into lp:juju-quickstart

[Francesco Banconi]

Improve bundle URLs support.

Add support for promulgated bundle short names.
Add support for jujucharms bundle URLs.
Improve help messages.

Tests: `make check`.

QA:

Run `.venv/bin/python juju-quickstart -h`
and please check the spelling of the whole
help message. Also ensure it is nicely
printed on a small terminal (e.g. 80x24).

Now let's check bundle errors: all the commands
below should return a pertinent error message:

.venv/bin/python juju-quickstart bundle:
.venv/bin/python juju-quickstart https://jujucharms.com/bundle/mediawiki/single/wtf
.venv/bin/python juju-quickstart https://jujucharms.com/bundle/mediawiki/double
.venv/bin/python juju-quickstart https://jujucharms.com/charms/mediawiki/single
.venv/bin/python juju-quickstart bundle:mediawiki/42/single
.venv/bin/python juju-quickstart bundle:~frankban/mediawiki/single

Deploy bundles, destroy the environment after each command.

Deploy the promulgated mediawiki single bundle:
.venv/bin/python juju-quickstart bundle:~charmers/mediawiki/6/single

Deploy the mediawiki scalable bundle:
.venv/bin/python juju-quickstart bundle:mediawiki/scalable

Deploy a bundle using its jujucharms URLs:
.venv/bin/python juju-quickstart https://jujucharms.com/bundle/~bac/charmworld-demo/charmworld-minimal/

Deploy a bundle using direct HTTPS:
.venv/bin/python juju-quickstart https://raw.github.com/castrojo/mongodb-bundle/master/bundles.yaml

https://codereview.appspot.com/75830045/

[Francesco Banconi (frankban)]

Reviewers: mp+211057_code.launchpad.net,

Message:
Please take a look.

Description:
Improve bundle URLs support.

Add support for promulgated bundle short names.
Add support for jujucharms bundle URLs.
Improve help messages.

Tests: `make check`.

QA:

Run `.venv/bin/python juju-quickstart -h`
and please check the spelling of the whole
help message. Also ensure it is nicely
printed on a small terminal (e.g. 80x24).

Now let's check bundle errors: all the commands
below should return a pertinent error message:

.venv/bin/python juju-quickstart bundle:
.venv/bin/python juju-quickstart
https://jujucharms.com/bundle/mediawiki/single/wtf
.venv/bin/python juju-quickstart
https://jujucharms.com/bundle/mediawiki/double
.venv/bin/python juju-quickstart
https://jujucharms.com/charms/mediawiki/single
.venv/bin/python juju-quickstart bundle:mediawiki/42/single
.venv/bin/python juju-quickstart bundle:~frankban/mediawiki/single

Deploy bundles, destroy the environment after each command.

Deploy the promulgated mediawiki single bundle:
.venv/bin/python juju-quickstart bundle:~charmers/mediawiki/6/single

Deploy the mediawiki scalable bundle:
.venv/bin/python juju-quickstart bundle:mediawiki/scalable

Deploy a bundle using its jujucharms URLs:
.venv/bin/python juju-quickstart
https://jujucharms.com/bundle/~bac/charmworld-demo/charmworld-minimal/

Deploy a bundle using direct HTTPS:
.venv/bin/python juju-quickstart
https://raw.github.com/castrojo/mongodb-bundle/master/bundles.yaml

https://code.launchpad.net/~frankban/juju-quickstart/bundle-urls/+merge/211057

(do not edit description out of merge proposal)

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

Affected files (+229, -46 lines):
   M README.rst
   A [revision details]
   M quickstart/__init__.py
   M quickstart/manage.py
   M quickstart/settings.py
   M quickstart/tests/test_manage.py
   M quickstart/tests/test_utils.py
   M quickstart/utils.py

[Richard Harding (rharding)]

Thanks for this, mainly reviewed the docs. A couple of suggestions. Let
me know if any of the comments are unclear.

https://codereview.appspot.com/75830045/diff/1/quickstart/__init__.py
File quickstart/__init__.py (right):

https://codereview.appspot.com/75830045/diff/1/quickstart/__init__.py#newcode34
quickstart/__init__.py:34: * Bundles can be deployed, from local files,
HTTP(S) URLs or the charm store,
URLs <comma>

https://codereview.appspot.com/75830045/diff/1/quickstart/__init__.py#newcode37
quickstart/__init__.py:37: into the GUI, to observe and manage the
environment visually.
into the Juju GUI. (I'd drop the rest)

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

https://codereview.appspot.com/75830045/diff/1/quickstart/manage.py#newcode332
quickstart/manage.py:332: '1) a fully qualified bundle URL, starting
with "bundle:"\n'
Can we word this to start with the easy example that's recommended by
moving the promulgated bundle up here.

Then word it more that "You can also specify a user bundle, and a
specific revision...

This way we push the promoted and simple case and fall back to any
person's work.

https://codereview.appspot.com/75830045/

[Brad Crittenden (bac)]

Code LGTM

https://codereview.appspot.com/75830045/diff/1/quickstart/__init__.py
File quickstart/__init__.py (right):

https://codereview.appspot.com/75830045/diff/1/quickstart/__init__.py#newcode33
quickstart/__init__.py:33: (installing on an existing state server when
possible).
When not possible isn't there an additional machine?

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

https://codereview.appspot.com/75830045/diff/1/quickstart/manage.py#newcode72
quickstart/manage.py:72: # remote location.
I'd move this second comment to the actual location it happens.

https://codereview.appspot.com/75830045/diff/1/quickstart/tests/test_manage.py
File quickstart/tests/test_manage.py (right):

https://codereview.appspot.com/75830045/diff/1/quickstart/tests/test_manage.py#newcode112
quickstart/tests/test_manage.py:112: # The options object is correctly
set up when a jujucharms bumdle URL
typo: bundle

https://codereview.appspot.com/75830045/

[lp:~frankban/juju-quickstart/bundle-urls]

64. By Francesco Banconi on 2014-03-14

Changes as per review.

[Francesco Banconi (frankban)]

Please take a look.

https://codereview.appspot.com/75830045/diff/1/quickstart/__init__.py
File quickstart/__init__.py (right):

https://codereview.appspot.com/75830045/diff/1/quickstart/__init__.py#newcode33
quickstart/__init__.py:33: (installing on an existing state server when
possible).
On 2014/03/14 14:51:20, bac wrote:
> When not possible isn't there an additional machine?

Yes, when using local envs a new machine is created. Not sure if we
should specify it in this context.

https://codereview.appspot.com/75830045/diff/1/quickstart/__init__.py#newcode34
quickstart/__init__.py:34: * Bundles can be deployed, from local files,
HTTP(S) URLs or the charm store,
On 2014/03/14 14:37:08, rharding wrote:
> URLs <comma>

Done.

https://codereview.appspot.com/75830045/diff/1/quickstart/__init__.py#newcode37
quickstart/__init__.py:37: into the GUI, to observe and manage the
environment visually.
On 2014/03/14 14:37:08, rharding wrote:
> into the Juju GUI. (I'd drop the rest)

Done.

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

https://codereview.appspot.com/75830045/diff/1/quickstart/manage.py#newcode72
quickstart/manage.py:72: # remote location.
On 2014/03/14 14:51:20, bac wrote:
> I'd move this second comment to the actual location it happens.

Done.

https://codereview.appspot.com/75830045/diff/1/quickstart/manage.py#newcode332
quickstart/manage.py:332: '1) a fully qualified bundle URL, starting
with "bundle:"\n'
On 2014/03/14 14:37:08, rharding wrote:
> Can we word this to start with the easy example that's recommended by
moving the
> promulgated bundle up here.

> Then word it more that "You can also specify a user bundle, and a
specific
> revision...

> This way we push the promoted and simple case and fall back to any
person's
> work.

Done.

https://codereview.appspot.com/75830045/diff/1/quickstart/tests/test_manage.py
File quickstart/tests/test_manage.py (right):

https://codereview.appspot.com/75830045/diff/1/quickstart/tests/test_manage.py#newcode112
quickstart/tests/test_manage.py:112: # The options object is correctly
set up when a jujucharms bumdle URL
On 2014/03/14 14:51:20, bac wrote:
> typo: bundle

Done.

https://codereview.appspot.com/75830045/

[Brad Crittenden (bac)]

QA good. Thanks.

https://codereview.appspot.com/75830045/

[Francesco Banconi (frankban)]

*** Submitted:

Improve bundle URLs support.

Add support for promulgated bundle short names.
Add support for jujucharms bundle URLs.
Improve help messages.

Tests: `make check`.

QA:

Run `.venv/bin/python juju-quickstart -h`
and please check the spelling of the whole
help message. Also ensure it is nicely
printed on a small terminal (e.g. 80x24).

Now let's check bundle errors: all the commands
below should return a pertinent error message:

.venv/bin/python juju-quickstart bundle:
.venv/bin/python juju-quickstart
https://jujucharms.com/bundle/mediawiki/single/wtf
.venv/bin/python juju-quickstart
https://jujucharms.com/bundle/mediawiki/double
.venv/bin/python juju-quickstart
https://jujucharms.com/charms/mediawiki/single
.venv/bin/python juju-quickstart bundle:mediawiki/42/single
.venv/bin/python juju-quickstart bundle:~frankban/mediawiki/single

Deploy bundles, destroy the environment after each command.

Deploy the promulgated mediawiki single bundle:
.venv/bin/python juju-quickstart bundle:~charmers/mediawiki/6/single

Deploy the mediawiki scalable bundle:
.venv/bin/python juju-quickstart bundle:mediawiki/scalable

Deploy a bundle using its jujucharms URLs:
.venv/bin/python juju-quickstart
https://jujucharms.com/bundle/~bac/charmworld-demo/charmworld-minimal/

Deploy a bundle using direct HTTPS:
.venv/bin/python juju-quickstart
https://raw.github.com/castrojo/mongodb-bundle/master/bundles.yaml

R=rharding, bac
CC=
https://codereview.appspot.com/75830045

https://codereview.appspot.com/75830045/

[Francesco Banconi (frankban)]

Thank you Rick and Brad!

https://codereview.appspot.com/75830045/

=== modified file 'README.rst'
--- README.rst	2014-01-29 15:25:06 +0000
+++ README.rst	2014-03-14 18:27:29 +0000
@@ -13,14 +13,14 @@
   session.
 * The Juju GUI is automatically installed, adding no additional machines
   (installing on an existing state server when possible).
-* Bundles can be deployed, from local files, HTTP(S) URLs or the charm store,
+* Bundles can be deployed, from local files, HTTP(S) URLs, or the charm store,
   so that a complete topology of services can be set up in one simple command.
 * Quickstart ends by opening the browser and automatically logging the user
   into the GUI, to observe and manage the environment visually.
 * Users with a running Juju environment can run the quickstart command again to
   simply re-open the GUI without having to find the proper URL and password.
 
-To install and start Juju Quickstart, run the following::
+To start Juju Quickstart, run the following::
 
     juju-quickstart [-i]
 

=== modified file 'quickstart/__init__.py'
--- quickstart/__init__.py	2014-03-13 11:56:58 +0000
+++ quickstart/__init__.py	2014-03-14 18:27:29 +0000
@@ -22,7 +22,30 @@
 from __future__ import unicode_literals
 
 
-VERSION = (1, 1, 3)
+FEATURES = """
+Features include the following:
+
+* New users are guided, as needed, to install Juju, set up SSH keys, and
+  configure it for first use.
+* Juju environments can be created and managed from a command line interactive
+  session.
+* The Juju GUI is automatically installed, adding no additional machines
+  (installing on an existing state server when possible).
+* Bundles can be deployed, from local files, HTTP(S) URLs, or the charm store,
+  so that a complete topology of services can be set up in one simple command.
+* Quickstart ends by opening the browser and automatically logging the user
+  into the Juju GUI.
+* Users with a running Juju environment can run the quickstart command again to
+  simply re-open the GUI without having to find the proper URL and password.
+
+To start Juju Quickstart, run the following:
+
+    juju-quickstart [-i]
+
+Once Juju has been installed, the command can also be run as a juju plugin,
+without the hyphen ("juju quickstart").
+"""
+VERSION = (1, 2, 0)
 
 
 def get_version():

=== modified file 'quickstart/manage.py'
--- quickstart/manage.py	2014-03-11 12:47:44 +0000
+++ quickstart/manage.py	2014-03-14 18:27:29 +0000
@@ -65,13 +65,15 @@
     """
     bundle = options.bundle
     bundle_id = None
-    if bundle.startswith('bundle:'):
-        # Convert "bundle:" URLs into HTTPS ones. The next if block below will
-        # then load the bundle contents from the remote location.
+    jujucharms_prefix = settings.JUJUCHARMS_BUNDLE_URL
+    if bundle.startswith('bundle:') or bundle.startswith(jujucharms_prefix):
+        # Convert "bundle:" or jujucharms.com URLs into Charmworld HTTPS ones.
         try:
             bundle, bundle_id = utils.convert_bundle_url(bundle)
         except ValueError as err:
             return parser.error('unable to open the bundle: {}'.format(err))
+        # The next if block below will then load the bundle contents from the
+        # remote location.
     if bundle.startswith('http://') or bundle.startswith('https://'):
         # Load the bundle from a remote URL.
         try:
@@ -319,47 +321,66 @@
     if default_env_name is not None:
         env_help = '{} (%(default)s)'.format(env_help)
     # Create and set up the arguments parser.
-    parser = argparse.ArgumentParser(description=quickstart.__doc__)
+    parser = argparse.ArgumentParser(
+        description=quickstart.__doc__, epilog=quickstart.FEATURES,
+        formatter_class=argparse.RawTextHelpFormatter)
+    # Note: since we use the RawTextHelpFormatter, when adding/changing options
+    # make sure the help text is nicely displayed on small 80 columns terms.
     parser.add_argument(
         'bundle', default=None, nargs='?',
-        help='The optional bundle to be deployed. The bundle can be '
-             '1) a fully qualified bundle URL (starting with "bundle:"), '
-             '2) a URL ("http:" or "https:") to a YAML/JSON, '
-             '3) a path to a YAML/JSON file, or '
-             '4) a path to a directory containing a "bundles.yaml" file')
+        help='The optional bundle to be deployed. The bundle can be:\n'
+             '1) a fully qualified bundle URL, starting with "bundle:"\n'
+             '   e.g. "bundle:mediawiki/single".\n'
+             '   Non promulgated bundles can be requested providing\n'
+             '   the user, e.g. "bundle:~user/mediawiki/single".\n'
+             '   A specific bundle revision can also be requested,\n'
+             '   e.g. "bundle:~myuser/mediawiki/42/single".\n'
+             '   If not specified, the last bundle revision is used;\n'
+             '2) a jujucharms bundle URL, starting with\n'
+             '   "{jujucharm}", e.g.\n'
+             '   "{jujucharm}~user/wiki/1/simple/".\n'
+             '   As seen above, jujucharms bundle URLs can also be\n'
+             '   shortened, e.g.\n'
+             '   "{jujucharm}mediawiki/scalable/";\n'
+             '3) a URL ("http:" or "https:") to a YAML/JSON, e.g.\n'
+             '   "https://raw.github.com/user/my/master/bundles.yaml";\n'
+             '4) a local path to a YAML/JSON file;\n'
+             '5) a path to a directory containing a "bundles.yaml"\n'
+             '   file'.format(jujucharm=settings.JUJUCHARMS_BUNDLE_URL))
     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 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')
+        help='The name of the bundle to use.\n'
+             'This must be included in the provided bundle YAML/JSON.\n'
+             'Specifying the bundle name is not required if the\n'
+             'bundle YAML/JSON only contains one bundle. This option\n'
+             'is ignored if the bundle file is not specified')
     parser.add_argument(
         '-i', '--interactive', action='store_true', dest='interactive',
         help='Start the environments management interactive session')
     parser.add_argument(
         '--environments-file', dest='env_file',
         default=os.path.join(settings.JUJU_HOME, 'environments.yaml'),
-        help='The path to the Juju environments YAML file (%(default)s)')
+        help='The path to the Juju environments YAML file\n(%(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. This option is ignored if '
-             'Juju GUI is already present in the environment')
+        help='The Juju GUI charm URL to deploy in the environment.\n'
+             'If not provided, the last release of the GUI will be\n'
+             'deployed. The charm URL must include the charm version,\n'
+             'e.g. "cs:~juju-gui/precise/juju-gui-162". This option is\n'
+             'ignored if the GUI is already present in the environment')
     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')
+        help='Avoid opening the browser to the GUI at the end of the\nprocess')
     parser.add_argument(
         '--version', action='version', version='%(prog)s {}'.format(version))
     parser.add_argument(
         '--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')
+        help='Turn debug mode on. When enabled, all the subcommands\n'
+             'and API calls are logged to stdout, and the Juju\n'
+             'environment is bootstrapped passing --debug')
     # This is required by juju-core: see "juju help plugins".
     parser.add_argument(
         '--description', action=_DescriptionAction, default=argparse.SUPPRESS,
@@ -382,6 +403,10 @@
 def run(options):
     """Run the application."""
     print('juju quickstart v{}'.format(version))
+    if options.bundle is not None:
+        print('contents loaded for bundle {} (services: {})'.format(
+            options.bundle_name, len(options.bundle_services)))
+
     logging.debug('ensuring juju and lxc are installed')
     juju_version = app.ensure_dependencies()
 
@@ -431,7 +456,7 @@
     address = app.watch(env, unit_name)
     env.close()
     url = 'https://{}'.format(address)
-    print('url: {}\npassword: {}'.format(url, admin_secret))
+    print('\nJuju GUI URL: {}\npassword: {}\n'.format(url, admin_secret))
     gui_api_url = 'wss://{}:443/ws'.format(address)
     print('connecting to the Juju GUI server')
     gui_env = app.connect(gui_api_url, admin_secret)
@@ -447,7 +472,8 @@
         app.deploy_bundle(
             gui_env, options.bundle_yaml, options.bundle_name,
             options.bundle_id)
-        print('bundle deployment request accepted')
+        print('bundle deployment request accepted\n'
+              'use the GUI to check the bundle deployment progress')
 
     if options.open_browser:
         token = app.create_auth_token(gui_env)

=== modified file 'quickstart/settings.py'
--- quickstart/settings.py	2014-03-12 10:31:34 +0000
+++ quickstart/settings.py	2014-03-14 18:27:29 +0000
@@ -26,11 +26,14 @@
 
 # The default Juju GUI charm URL to use when it is not possible to retrieve it
 # from the charmworld API, e.g. due to temporary connection/charmworld errors.
-DEFAULT_CHARM_URL = 'cs:precise/juju-gui-85'
+DEFAULT_CHARM_URL = 'cs:precise/juju-gui-86'
 
 # The quickstart app short description.
 DESCRIPTION = 'set up a Juju environment (including the GUI) in very few steps'
 
+# The URL namespace for bundles in jujucharms.com.
+JUJUCHARMS_BUNDLE_URL = 'https://jujucharms.com/bundle/'
+
 # The path to the Juju command.
 JUJU_CMD = '/usr/bin/juju'
 

=== modified file 'quickstart/tests/test_manage.py'
--- quickstart/tests/test_manage.py	2014-03-11 12:34:06 +0000
+++ quickstart/tests/test_manage.py	2014-03-14 18:27:29 +0000
@@ -108,6 +108,21 @@
             ['mysql', 'wordpress'], sorted(options.bundle_services))
         self.assertEqual(open(bundle_file).read(), options.bundle_yaml)
 
+    def test_resulting_options_from_jujucharms_url(self):
+        # The options object is correctly set up when a jujucharms bundle URL
+        # is passed.
+        bundle_file = self.make_bundle_file()
+        url = settings.JUJUCHARMS_BUNDLE_URL + 'my/bundle/'
+        options = self.make_options(url, bundle_name='bundle1')
+        with self.patch_urlread(contents=self.valid_bundle) as mock_urlread:
+            manage._validate_bundle(options, self.parser)
+        mock_urlread.assert_called_once_with(
+            'https://manage.jujucharms.com/bundle/~charmers/my/bundle/json')
+        self.assertEqual('bundle1', options.bundle_name)
+        self.assertEqual(
+            ['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()
@@ -175,6 +190,14 @@
         self.parser.error.assert_called_once_with(
             'unable to open the bundle: invalid bundle URL: bundle:')
 
+    def test_jujucharms_url_error(self):
+        # A parser error is invoked if an invalid jujucharms URL is provided.
+        url = settings.JUJUCHARMS_BUNDLE_URL + 'no-such'
+        options = self.make_options(url)
+        manage._validate_bundle(options, self.parser)
+        self.parser.error.assert_called_once_with(
+            'unable to open the bundle: invalid bundle URL: {}'.format(url))
+
     def test_error_parsing_bundle_contents(self):
         # A parser error is invoked if an error occurs parsing the bundle YAML.
         bundle_file = self.make_bundle_file()

=== modified file 'quickstart/tests/test_utils.py'
--- quickstart/tests/test_utils.py	2014-03-11 12:34:06 +0000
+++ quickstart/tests/test_utils.py	2014-03-14 18:27:29 +0000
@@ -189,28 +189,115 @@
 
 class TestConvertBundleUrl(helpers.ValueErrorTestsMixin, unittest.TestCase):
 
-    def test_conversion(self):
-        # The HTTPS location to the YAML contents are correctly returned.
+    def test_full_bundle_url(self):
+        # The HTTPS location to the YAML contents is correctly returned.
         bundle_url = 'bundle:~myuser/wiki-bundle/42/wiki'
-        expected = (
-            'https://manage.jujucharms.com/bundle/'
-            '~myuser/wiki-bundle/42/wiki/json',
-            '~myuser/wiki-bundle/42/wiki',
-        )
-        self.assertEqual(expected, utils.convert_bundle_url(bundle_url))
+        url, bundle_id = utils.convert_bundle_url(bundle_url)
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~myuser/wiki-bundle/42/wiki/json', url)
+        self.assertEqual('~myuser/wiki-bundle/42/wiki', bundle_id)
 
-    def test_right_strip(self):
+    def test_bundle_url_right_strip(self):
         # The trailing slash in the bundle URL is removed.
         bundle_url = 'bundle:~myuser/wiki-bundle/42/wiki/'
-        expected = ('https://manage.jujucharms.com'
-                    '/bundle/~myuser/wiki-bundle/42/wiki/json',
-                    '~myuser/wiki-bundle/42/wiki')
-        self.assertEqual(expected, utils.convert_bundle_url(bundle_url))
+        url, bundle_id = utils.convert_bundle_url(bundle_url)
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~myuser/wiki-bundle/42/wiki/json', url)
+        self.assertEqual('~myuser/wiki-bundle/42/wiki', bundle_id)
+
+    def test_bundle_url_no_revision(self):
+        # The bundle revision is optional.
+        bundle_url = 'bundle:~myuser/wiki-bundle/wiki-simple'
+        url, bundle_id = utils.convert_bundle_url(bundle_url)
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~myuser/wiki-bundle/wiki-simple/json', url)
+        self.assertEqual('~myuser/wiki-bundle/wiki-simple', bundle_id)
+
+    def test_bundle_url_no_user(self):
+        # If the bundle user is not specified, the bundle is assumed to be
+        # promulgated and owned by "charmers".
+        bundle_url = 'bundle:wiki-bundle/1/wiki'
+        url, bundle_id = utils.convert_bundle_url(bundle_url)
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~charmers/wiki-bundle/1/wiki/json', url)
+        self.assertEqual('~charmers/wiki-bundle/1/wiki', bundle_id)
+
+    def test_bundle_url_short_form(self):
+        # A promulgated bundle URL can just include the basket and the name.
+        bundle_url = 'bundle:wiki-bundle/wiki'
+        url, bundle_id = utils.convert_bundle_url(bundle_url)
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~charmers/wiki-bundle/wiki/json', url)
+        self.assertEqual('~charmers/wiki-bundle/wiki', bundle_id)
+
+    def test_full_jujucharms_url(self):
+        # The HTTPS location to the YAML contents is correctly returned.
+        url, bundle_id = utils.convert_bundle_url(
+            settings.JUJUCHARMS_BUNDLE_URL + '~myuser/wiki-bundle/42/wiki')
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~myuser/wiki-bundle/42/wiki/json', url)
+        self.assertEqual('~myuser/wiki-bundle/42/wiki', bundle_id)
+
+    def test_jujucharms_url_right_strip(self):
+        # The trailing slash in the jujucharms URL is removed.
+        url, bundle_id = utils.convert_bundle_url(
+            settings.JUJUCHARMS_BUNDLE_URL + '~charmers/mediawiki/6/scalable/')
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~charmers/mediawiki/6/scalable/json', url)
+        self.assertEqual('~charmers/mediawiki/6/scalable', bundle_id)
+
+    def test_jujucharms_url_no_revision(self):
+        # The bundle revision is optional.
+        url, bundle_id = utils.convert_bundle_url(
+            settings.JUJUCHARMS_BUNDLE_URL + '~myuser/wiki/wiki-simple/')
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~myuser/wiki/wiki-simple/json', url)
+        self.assertEqual('~myuser/wiki/wiki-simple', bundle_id)
+
+    def test_jujucharms_url_no_user(self):
+        # If the bundle user is not specified, the bundle is assumed to be
+        # promulgated and owned by "charmers".
+        url, bundle_id = utils.convert_bundle_url(
+            settings.JUJUCHARMS_BUNDLE_URL + 'mediawiki/42/single/')
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~charmers/mediawiki/42/single/json', url)
+        self.assertEqual('~charmers/mediawiki/42/single', bundle_id)
+
+    def test_jujucharms_url_short_form(self):
+        # A jujucharms URL for a promulgated bundle can just include the basket
+        # and the name.
+        url, bundle_id = utils.convert_bundle_url(
+            settings.JUJUCHARMS_BUNDLE_URL + 'wiki-bundle/wiki/')
+        self.assertEqual(
+            'https://manage.jujucharms.com'
+            '/bundle/~charmers/wiki-bundle/wiki/json', url)
+        self.assertEqual('~charmers/wiki-bundle/wiki', bundle_id)
 
     def test_error(self):
-        # A ValueError is raised if the given bundle URL is not valid.
-        with self.assert_value_error('invalid bundle URL: bundle:'):
-            utils.convert_bundle_url('bundle:')
+        # A ValueError is raised if the bundle/jujucharms URL is not valid.
+        bad_urls = (
+            'bad', 'bundle:', 'bundle:~user', 'bundle:no-such',
+            'bundle:~user/name', 'bundle:~user/basket/revision/name',
+            'bundle:basket/name//', 'bundle:basket.name/bundle.name',
+            settings.JUJUCHARMS_BUNDLE_URL,
+            settings.JUJUCHARMS_BUNDLE_URL + 'bad',
+            settings.JUJUCHARMS_BUNDLE_URL + '~user/no-such',
+            settings.JUJUCHARMS_BUNDLE_URL + '~user/basket/revision/name/',
+            settings.JUJUCHARMS_BUNDLE_URL + '~user/basket/42/name/error',
+            'https://jujucharms.com/charms/mediawiki/simple/',
+        )
+        for url in bad_urls:
+            with self.assert_value_error('invalid bundle URL: {}'.format(url)):
+                utils.convert_bundle_url(url)
 
 
 class TestGetCharmUrl(helpers.UrlReadTestsMixin, unittest.TestCase):

=== modified file 'quickstart/utils.py'
--- quickstart/utils.py	2014-03-11 12:34:06 +0000
+++ quickstart/utils.py	2014-03-14 18:27:29 +0000
@@ -30,6 +30,7 @@
 import logging
 import os
 import pipes
+import re
 import socket
 import subprocess
 import urllib2
@@ -42,6 +43,18 @@
 from quickstart.models import charms
 
 
+# Compile the regular expression used to parse bundle URLs.
+_bundle_expression = re.compile(r"""
+    # Bundle schema or bundle URL namespace on jujucharms.com.
+    ^(?:bundle:|{})
+    (?:~([-\w]+)/)?  # Optional user name.
+    ([-\w]+)/  # Basket name.
+    (?:(\d+)/)?  # Optional bundle revision number.
+    ([-\w]+)  # Bundle name.
+    /?$  # Optional trailing slash.
+""".format(settings.JUJUCHARMS_BUNDLE_URL), re.VERBOSE)
+
+
 def add_apt_repository(repository):
     """Add the given APT repository to the current list of APT sources.
 
@@ -117,10 +130,14 @@
 
     Raise a ValueError if the given URL is not a valid bundle URL.
     """
-    bundle_id = bundle_url.split(':', 1)[1].rstrip('/')
-    if not bundle_id:
+    match = _bundle_expression.match(bundle_url)
+    if match is None:
         msg = 'invalid bundle URL: {}'.format(bundle_url)
         raise ValueError(msg.encode('utf-8'))
+    user, basket, revision, name = match.groups()
+    user_part = '~charmers/' if user is None else '~{}/'.format(user)
+    revision_part = '' if revision is None else '{}/'.format(revision)
+    bundle_id = '{}{}/{}{}'.format(user_part, basket, revision_part, name)
     return ('https://manage.jujucharms.com/bundle/{}/json'.format(bundle_id),
             bundle_id)