Merge lp:~frankban/juju-quickstart/jujubundlelib into lp:juju-quickstart

[Francesco Banconi]

Introduce jujubundlelib dependency.

Use the Reference model defined there.

https://codereview.appspot.com/228460043/

[Francesco Banconi (frankban)]

Reviewers: mp+256906_code.launchpad.net,

Message:
Please take a look.

Description:
Introduce jujubundlelib dependency.

Use the Reference model defined there.

https://code.launchpad.net/~frankban/juju-quickstart/jujubundlelib/+merge/256906

(do not edit description out of merge proposal)

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

Affected files (+29, -639 lines):
   A [revision details]
   M quickstart/app.py
   M quickstart/charmstore.py
   M quickstart/jujutools.py
   M quickstart/manage.py
   M quickstart/models/bundles.py
   D quickstart/models/references.py
   M quickstart/tests/models/test_bundles.py
   D quickstart/tests/models/test_references.py
   M quickstart/tests/test_app.py
   M quickstart/tests/test_charmstore.py
   M quickstart/tests/test_jujutools.py
   M quickstart/tests/test_manage.py
   M tox.ini

[Madison Scott-Clary (makyo)]

LGTM, thanks for the work - we'll need to update tox.ini with versions
as tasks shake out from jujubundlelib, but that's fine.

https://codereview.appspot.com/228460043/

[Francesco Banconi (frankban)]

On 2015/04/22 15:34:12, matthew.scott wrote:
> LGTM, thanks for the work - we'll need to update tox.ini with versions
as tasks
> shake out from jujubundlelib, but that's fine.

Indeed, I'll update the bundlelib version in follow up branches.
Thanks for the review Madison!

https://codereview.appspot.com/228460043/

[Francesco Banconi (frankban)]

*** Submitted:

Introduce jujubundlelib dependency.

Use the Reference model defined there.

R=matthew.scott
CC=
https://codereview.appspot.com/228460043

https://codereview.appspot.com/228460043/

=== modified file 'quickstart/app.py'
--- quickstart/app.py	2015-03-09 17:50:28 +0000
+++ quickstart/app.py	2015-04-21 10:32:19 +0000
@@ -411,7 +411,7 @@
     Return a tuple including the following values:
         - charm_ref: the entity reference of the charm that will be used to
           deploy the service, as an instance of
-          "quickstart.models.references.Reference";
+          "jujubundlelib.references.Reference";
         - machine: the machine where to deploy to (e.g. "0") or None if a new
           machine must be created;
         - service_data: the service info as returned by the mega-watcher for

=== modified file 'quickstart/charmstore.py'
--- quickstart/charmstore.py	2015-03-10 10:18:58 +0000
+++ quickstart/charmstore.py	2015-04-21 10:32:19 +0000
@@ -59,7 +59,7 @@
     """Retrieve the charm store contents for the given reference and path.
 
     The reference argument identifies a charm or bundle entity and must be an
-    instance of "quickstart.models.references.Reference".
+    instance of "jujubundlelib.references.Reference".
 
     For instance, to retrieve the hash of a charm reference, use the following:
 
@@ -101,7 +101,7 @@
 
     The bundle data is returned as a YAML decoded value.
     The reference argument identifies a bundle entity and must be an instance
-    of "quickstart.models.references.Reference".
+    of "jujubundlelib.references.Reference".
 
     Raise a ValueError if the returned content is not a valid YAML, or if the
     given reference does not represent a bundle.
@@ -119,7 +119,7 @@
     The bundle data is returned as a YAML decoded value and represents the
     legacy bundle with a top level bundle name node.
     The reference argument identifies a bundle entity and must be an instance
-    of "quickstart.models.references.Reference".
+    of "jujubundlelib.references.Reference".
 
     Raise a ValueError if the returned content is not a valid YAML, or if the
     given reference does not represent a bundle.

=== modified file 'quickstart/jujutools.py'
--- quickstart/jujutools.py	2015-02-26 11:02:57 +0000
+++ quickstart/jujutools.py	2015-04-21 10:32:19 +0000
@@ -23,11 +23,12 @@
 
 import logging
 
+from jujubundlelib import references
+
 from quickstart import (
     serializers,
     settings,
 )
-from quickstart.models import references
 
 
 def get_api_url(
@@ -40,8 +41,8 @@
     Optionally receive a prefix to be used in the path.
 
     Optionally also receive the Juju GUI charm reference as an instance of
-    "quickstart.models.references.Reference". If provided, the function checks
-    that the corresponding Juju GUI charm supports the new Juju API endpoint.
+    "jujubundlelib.references.Reference". If provided, the function checks that
+    the corresponding Juju GUI charm supports the new Juju API endpoint.
     If not supported, the old endpoint is returned.
 
     The environment UUID can be None, in which case the old-style API URL
@@ -104,7 +105,7 @@
     Print (to stdout or to logs) info and warnings about the charm URL.
 
     Return the parsed charm reference object as an instance of
-    "quickstart.models.references.Reference".
+    "jujubundlelib.references.Reference".
     """
     print('charm URL: {}'.format(charm_url))
     ref = references.Reference.from_fully_qualified_url(charm_url)

=== modified file 'quickstart/manage.py'
--- quickstart/manage.py	2015-03-09 18:53:52 +0000
+++ quickstart/manage.py	2015-04-21 10:32:19 +0000
@@ -28,6 +28,8 @@
 import sys
 import webbrowser
 
+from jujubundlelib import references
+
 import quickstart
 from quickstart import (
     app,
@@ -45,7 +47,6 @@
     bundles,
     envs,
     jenv,
-    references,
 )
 
 

=== modified file 'quickstart/models/bundles.py'
--- quickstart/models/bundles.py	2015-03-10 13:13:42 +0000
+++ quickstart/models/bundles.py	2015-04-21 10:32:19 +0000
@@ -22,7 +22,7 @@
 
 Published bundles are identified by a charm store id and by the corresponding
 URL in jujucharms.com, just like regular charms. The reference object in
-"quickstart.models.references.Reference" can be used to identify a bundle.
+"jujubundlelib.references.Reference" can be used to identify a bundle.
 
 In this module, the Bundle class represents a bundle that may or may not have
 a specific reference id. For instance, a reference is not set on a bundle if
@@ -46,13 +46,14 @@
 import os
 import re
 
+from jujubundlelib import references
+
 from quickstart import (
     charmstore,
     netutils,
     serializers,
     settings,
 )
-from quickstart.models import references
 
 
 class Bundle(object):
@@ -63,7 +64,7 @@
 
         The data argument is the bundle YAML decoded content.
         An optional entity reference can be provided as an instance of
-        "quickstart.models.references.Reference".
+        "jujubundlelib.references.Reference".
         """
         self.data = data
         self.reference = reference

=== removed file 'quickstart/models/references.py'
--- quickstart/models/references.py	2015-03-06 17:55:40 +0000
+++ quickstart/models/references.py	1970-01-01 00:00:00 +0000
@@ -1,215 +0,0 @@
-# This file is part of the Juju Quickstart Plugin, which lets users set up a
-# Juju environment in very few steps (https://launchpad.net/juju-quickstart).
-# Copyright (C) 2013 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License version 3, as published by
-# the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-# SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Juju Quickstart charm and bundle references management."""
-
-from __future__ import unicode_literals
-
-import re
-
-from quickstart import settings
-
-
-# The following regular expressions are the same used in juju-core: see
-# http://bazaar.launchpad.net/~go-bot/juju-core/trunk/view/head:/charm/url.go.
-USER_PATTERN = r'[a-z0-9][a-zA-Z0-9+.-]+'
-SERIES_PATTERN = r'[a-z]+(?:[a-z-]+[a-z])?'
-NAME_PATTERN = r'[a-z][a-z0-9]*(?:-[a-z0-9]*[a-z][a-z0-9]*)*'
-
-# Define the callables used to check if entity reference components are valid.
-_valid_user = re.compile(r'^{}$'.format(USER_PATTERN)).match
-_valid_series = re.compile(r'^{}$'.format(SERIES_PATTERN)).match
-_valid_name = re.compile(r'^{}$'.format(NAME_PATTERN)).match
-
-# Compile the regular expression used to parse new jujucharms entity URLs.
-_jujucharms_url_expression = re.compile(r"""
-    ^  # Beginning of the line.
-    (?:
-        (?:{jujucharms})?  # Optional jujucharms.com URL.
-        |
-        /?  # Optional leading slash.
-    )?
-    (?:u/({user_pattern})/)?  # Optional user name.
-    ({name_pattern})  # Bundle name.
-    (?:/({series_pattern}))?  # Optional series.
-    (?:/(\d+))?  # Optional bundle revision number.
-    /?  # Optional trailing slash.
-    $  # End of the line.
-""".format(
-    jujucharms=settings.JUJUCHARMS_URL,
-    name_pattern=NAME_PATTERN,
-    series_pattern=SERIES_PATTERN,
-    user_pattern=USER_PATTERN,
-), re.VERBOSE)
-
-
-class Reference(object):
-    """Represent a charm or bundle URL reference."""
-
-    def __init__(self, schema, user, series, name, revision):
-        """Initialize the reference. Receives the URL fragments."""
-        self.schema = schema
-        self.user = user
-        self.series = series
-        self.name = name
-        if revision is not None:
-            revision = int(revision)
-        self.revision = revision
-        # XXX frankban 2015-02-26: remove the following attribute when
-        # switching to the new bundle format, and when we have a better way
-        # to increase bundle deployments count.
-        self.charmworld_id = None
-
-    @classmethod
-    def from_fully_qualified_url(cls, url):
-        """Given an entity URL as a string, create and return a Reference.
-
-        Fully qualified URLs represent the regular entity reference
-        representation in Juju, e.g.: "cs:`~who/vivid/django-42" or
-        "local:bundle/wordpress-0".
-
-        Raise a ValueError if the provided value is not a valid and fully
-        qualified URL, also including the schema and the revision.
-        """
-        return cls(*_parse_fully_qualified_url(url))
-
-    @classmethod
-    def from_jujucharms_url(cls, url):
-        """Create and return a Reference from the given jujucharms.com URL.
-
-        These are the preferred way to refer to a charm or bundle in Juju
-        Quickstart. They basically look like the URL paths in jujucharms.com,
-        e.g. "u/who/django", "mediawiki/42" or just "mediawiki". The full HTTP
-        URL can be also provided, for instance "https://jujucharms.com/django".
-
-        Raise a ValueError if the provided URL is not valid.
-        """
-        match = _jujucharms_url_expression.match(url)
-        if match is None:
-            msg = 'invalid bundle URL: {}'.format(url)
-            raise ValueError(msg.encode('utf-8'))
-        user, name, series, revision = match.groups()
-        return cls('cs', user, series or 'bundle', name, revision)
-
-    def __str__(self):
-        """The string representation of a reference is its URL string."""
-        return self.__unicode__().encode('utf-8')
-
-    def __unicode__(self):
-        """The unicode representation of a reference is its URL string."""
-        return self.id()
-
-    def __repr__(self):
-        return b'<Reference: {}>'.format(bytes(self))
-
-    def __eq__(self, other):
-        """Two refs are equal if they have the same string representation."""
-        return isinstance(other, self.__class__) and self.id() == other.id()
-
-    def path(self):
-        """Return the reference as a string without the schema."""
-        user_part = '~{}/'.format(self.user) if self.user else ''
-        revision_part = ''
-        if self.revision is not None:
-            revision_part = '-{}'.format(self.revision)
-        return '{}{}/{}{}'.format(
-            user_part, self.series, self.name, revision_part)
-
-    def id(self):
-        """Return the reference URL as a string."""
-        return '{}:{}'.format(self.schema, self.path())
-
-    def jujucharms_id(self):
-        """Return the identifier of this reference in jujucharms.com."""
-        user_part = 'u/{}/'.format(self.user) if self.user else ''
-        series_part = '' if self.is_bundle() else '/{}'.format(self.series)
-        revision_part = ''
-        if self.revision is not None:
-            revision_part = '/{}'.format(self.revision)
-        return '{}{}{}{}'.format(
-            user_part, self.name, series_part, revision_part)
-
-    def jujucharms_url(self):
-        """Return the URL where this entity lives in jujucharms.com."""
-        return settings.JUJUCHARMS_URL + self.jujucharms_id()
-
-    def is_bundle(self):
-        """Report whether this reference refers to a bundle entity."""
-        return self.series == 'bundle'
-
-    def is_local(self):
-        """Return True if this refers to a local entity, False otherwise."""
-        return self.schema == 'local'
-
-
-def _parse_fully_qualified_url(url):
-    """Parse the given charm or bundle URL, provided as a string.
-
-    Return a tuple containing the entity reference fragments: schema, user,
-    series, name and revision. Each fragment is a string except revision (int).
-
-    Raise a ValueError with a descriptive message if the given URL is not a
-    valid and fully qualified entity URL.
-    """
-    # Retrieve the schema.
-    try:
-        schema, remaining = url.split(':', 1)
-    except ValueError:
-        msg = 'URL has no schema: {}'.format(url)
-        raise ValueError(msg.encode('utf-8'))
-    if schema not in ('cs', 'local'):
-        msg = 'URL has invalid schema: {}'.format(schema)
-        raise ValueError(msg.encode('utf-8'))
-    # Retrieve the optional user, the series, name and revision.
-    parts = remaining.split('/')
-    parts_length = len(parts)
-    if parts_length == 3:
-        user, series, name_revision = parts
-        if not user.startswith('~'):
-            msg = 'URL has invalid user name form: {}'.format(user)
-            raise ValueError(msg.encode('utf-8'))
-        user = user[1:]
-        if not _valid_user(user):
-            msg = 'URL has invalid user name: {}'.format(user)
-            raise ValueError(msg.encode('utf-8'))
-        if schema == 'local':
-            msg = 'local entity URL with user name: {}'.format(url)
-            raise ValueError(msg.encode('utf-8'))
-    elif parts_length == 2:
-        user = ''
-        series, name_revision = parts
-    else:
-        msg = 'URL has invalid form: {}'.format(url)
-        raise ValueError(msg.encode('utf-8'))
-    # Validate the series.
-    if not _valid_series(series):
-        msg = 'URL has invalid series: {}'.format(series)
-        raise ValueError(msg.encode('utf-8'))
-    # Validate name and revision.
-    try:
-        name, revision = name_revision.rsplit('-', 1)
-    except ValueError:
-        msg = 'URL has no revision: {}'.format(url)
-        raise ValueError(msg.encode('utf-8'))
-    if not _valid_name(name):
-        msg = 'URL has invalid name: {}'.format(name)
-        raise ValueError(msg.encode('utf-8'))
-    try:
-        revision = int(revision)
-    except ValueError:
-        msg = 'URL has invalid revision: {}'.format(revision)
-        raise ValueError(msg.encode('utf-8'))
-    return schema, user, series, name, revision

=== modified file 'quickstart/tests/models/test_bundles.py'
--- quickstart/tests/models/test_bundles.py	2015-03-10 13:13:42 +0000
+++ quickstart/tests/models/test_bundles.py	2015-04-21 10:32:19 +0000
@@ -21,6 +21,7 @@
 import json
 import unittest
 
+from jujubundlelib import references
 import mock
 import yaml
 
@@ -28,10 +29,7 @@
     netutils,
     settings,
 )
-from quickstart.models import (
-    bundles,
-    references,
-)
+from quickstart.models import bundles
 from quickstart.tests import helpers
 
 

=== removed file 'quickstart/tests/models/test_references.py'
--- quickstart/tests/models/test_references.py	2015-03-09 17:50:28 +0000
+++ quickstart/tests/models/test_references.py	1970-01-01 00:00:00 +0000
@@ -1,400 +0,0 @@
-# This file is part of the Juju Quickstart Plugin, which lets users set up a
-# Juju environment in very few steps (https://launchpad.net/juju-quickstart).
-# Copyright (C) 2013 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License version 3, as published by
-# the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
-# SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Tests for the Juju Quickstart charm and bundle references management."""
-
-from __future__ import unicode_literals
-
-import unittest
-
-from quickstart import settings
-from quickstart.models import references
-from quickstart.tests import helpers
-
-
-def make_reference(
-        schema='cs', user='myuser', series='precise', name='juju-gui',
-        revision=42):
-    """Create and return a Reference instance."""
-    return references.Reference(schema, user, series, name, revision)
-
-
-class TestReference(unittest.TestCase):
-
-    def test_attributes(self):
-        # All reference attributes are correctly stored.
-        ref = make_reference()
-        self.assertEqual('cs', ref.schema)
-        self.assertEqual('myuser', ref.user)
-        self.assertEqual('precise', ref.series)
-        self.assertEqual('juju-gui', ref.name)
-        self.assertEqual(42, ref.revision)
-
-    def test_revision_as_string(self):
-        # The reference revision is converted to an int.
-        ref = make_reference(revision='47')
-        self.assertEqual(47, ref.revision)
-
-    def test_string(self):
-        # The string representation of a reference is its URL.
-        tests = (
-            (make_reference(),
-             'cs:~myuser/precise/juju-gui-42'),
-            (make_reference(schema='local'),
-             'local:~myuser/precise/juju-gui-42'),
-            (make_reference(user=''),
-             'cs:precise/juju-gui-42'),
-            (make_reference(user='dalek', revision=None, series='bundle'),
-             'cs:~dalek/bundle/juju-gui'),
-            (make_reference(name='django', series='vivid', revision=0),
-             'cs:~myuser/vivid/django-0'),
-            (make_reference(user='', revision=None),
-             'cs:precise/juju-gui'),
-        )
-        for ref, expected_value in tests:
-            self.assertEqual(expected_value, bytes(ref))
-
-    def test_repr(self):
-        # A reference is correctly represented.
-        tests = (
-            (make_reference(),
-             '<Reference: cs:~myuser/precise/juju-gui-42>'),
-            (make_reference(schema='local'),
-             '<Reference: local:~myuser/precise/juju-gui-42>'),
-            (make_reference(user=''),
-             '<Reference: cs:precise/juju-gui-42>'),
-            (make_reference(user='dalek', revision=None, series='bundle'),
-             '<Reference: cs:~dalek/bundle/juju-gui>'),
-            (make_reference(name='django', series='vivid', revision=0),
-             '<Reference: cs:~myuser/vivid/django-0>'),
-            (make_reference(user='', revision=None),
-             '<Reference: cs:precise/juju-gui>'),
-        )
-        for ref, expected_value in tests:
-            self.assertEqual(expected_value, repr(ref))
-
-    def test_path(self):
-        # The reference path is properly returned as a URL string without the
-        # schema.
-        tests = (
-            (make_reference(),
-             '~myuser/precise/juju-gui-42'),
-            (make_reference(schema='local'),
-             '~myuser/precise/juju-gui-42'),
-            (make_reference(user=''),
-             'precise/juju-gui-42'),
-            (make_reference(user='dalek', revision=None, series='bundle'),
-             '~dalek/bundle/juju-gui'),
-            (make_reference(name='django', series='vivid', revision=0),
-             '~myuser/vivid/django-0'),
-            (make_reference(user='', revision=None),
-             'precise/juju-gui'),
-        )
-        for ref, expected_value in tests:
-            self.assertEqual(expected_value, ref.path())
-
-    def test_id(self):
-        # The reference id is correctly returned.
-        tests = (
-            (make_reference(),
-             'cs:~myuser/precise/juju-gui-42'),
-            (make_reference(schema='local'),
-             'local:~myuser/precise/juju-gui-42'),
-            (make_reference(user=''),
-             'cs:precise/juju-gui-42'),
-            (make_reference(user='dalek', revision=None, series='bundle'),
-             'cs:~dalek/bundle/juju-gui'),
-            (make_reference(name='django', series='vivid', revision=0),
-             'cs:~myuser/vivid/django-0'),
-            (make_reference(user='', revision=None),
-             'cs:precise/juju-gui'),
-        )
-        for ref, expected_value in tests:
-            self.assertEqual(expected_value, ref.id())
-
-    def test_jujucharms_id(self):
-        # It is possible to return the reference identifier in jujucharms.com.
-        tests = (
-            (make_reference(),
-             'u/myuser/juju-gui/precise/42'),
-            (make_reference(schema='local'),
-             'u/myuser/juju-gui/precise/42'),
-            (make_reference(user=''),
-             'juju-gui/precise/42'),
-            (make_reference(user='dalek', revision=None, series='bundle'),
-             'u/dalek/juju-gui'),
-            (make_reference(name='django', series='vivid', revision=0),
-             'u/myuser/django/vivid/0'),
-            (make_reference(user='', revision=None),
-             'juju-gui/precise'),
-            (make_reference(user='', series='bundle', revision=None),
-             'juju-gui'),
-        )
-        for ref, expected_value in tests:
-            self.assertEqual(expected_value, ref.jujucharms_id())
-
-    def test_jujucharms_url(self):
-        # The corresponding charm or bundle page in jujucharms.com is correctly
-        # returned.
-        tests = (
-            (make_reference(),
-             'u/myuser/juju-gui/precise/42'),
-            (make_reference(schema='local'),
-             'u/myuser/juju-gui/precise/42'),
-            (make_reference(user=''),
-             'juju-gui/precise/42'),
-            (make_reference(user='dalek', revision=None, series='bundle'),
-             'u/dalek/juju-gui'),
-            (make_reference(name='django', series='vivid', revision=0),
-             'u/myuser/django/vivid/0'),
-            (make_reference(user='', revision=None),
-             'juju-gui/precise'),
-            (make_reference(user='', series='bundle', revision=None),
-             'juju-gui'),
-        )
-        for ref, expected_value in tests:
-            expected_url = settings.JUJUCHARMS_URL + expected_value
-            self.assertEqual(expected_url, ref.jujucharms_url())
-
-    def test_charm_entity(self):
-        # The is_bundle method returns False for charm references.
-        ref = make_reference(series='vivid')
-        self.assertFalse(ref.is_bundle())
-
-    def test_bundle_entity(self):
-        # The is_bundle method returns True for bundle references.
-        ref = make_reference(series='bundle')
-        self.assertTrue(ref.is_bundle())
-
-    def test_charm_store_entity(self):
-        # The is_local method returns False for charm store references.
-        ref = make_reference(schema='cs')
-        self.assertFalse(ref.is_local())
-
-    def test_local_entity(self):
-        # The is_local method returns True for local references.
-        ref = make_reference(schema='local')
-        self.assertTrue(ref.is_local())
-
-    def test_equality(self):
-        # Two references are equal if they have the same URL.
-        self.assertEqual(make_reference(), make_reference())
-        self.assertEqual(make_reference(user=''), make_reference(user=''))
-        self.assertEqual(
-            make_reference(revision=None), make_reference(revision=None))
-
-    def test_equality_different_references(self):
-        # Two references with different attributes are not equal.
-        tests = (
-            (make_reference(schema='cs'),
-             make_reference(schema='local')),
-            (make_reference(user=''),
-             make_reference(user='who')),
-            (make_reference(series='trusty'),
-             make_reference(series='vivid')),
-            (make_reference(name='django'),
-             make_reference(name='rails')),
-            (make_reference(revision=0),
-             make_reference(revision=1)),
-            (make_reference(revision=None),
-             make_reference(revision=42)),
-        )
-        for ref1, ref2 in tests:
-            self.assertNotEqual(ref1, ref2)
-
-    def test_equality_different_types(self):
-        # A reference never equals a non-reference object.
-        self.assertNotEqual(make_reference(), 42)
-        self.assertNotEqual(make_reference(), True)
-        self.assertNotEqual(make_reference(), 'oranges')
-
-    def test_charmworld_id(self):
-        # By default, the reference id in charmworld is set to None.
-        # XXX frankban 2015-02-26: remove this test once we get rid of the
-        # charmworld id concept.
-        ref = make_reference()
-        self.assertIsNone(ref.charmworld_id)
-
-
-class TestReferenceFromFullyQualifiedUrl(
-        helpers.ValueErrorTestsMixin, unittest.TestCase):
-
-    def test_no_schema_error(self):
-        # A ValueError is raised if the URL schema is missing.
-        expected_error = 'URL has no schema: precise/juju-gui'
-        with self.assert_value_error(expected_error):
-            references.Reference.from_fully_qualified_url('precise/juju-gui')
-
-    def test_invalid_schema_error(self):
-        # A ValueError is raised if the URL schema is not valid.
-        expected_error = 'URL has invalid schema: http'
-        with self.assert_value_error(expected_error):
-            references.Reference.from_fully_qualified_url(
-                'http:precise/juju-gui')
-
-    def test_invalid_user_form_error(self):
-        # A ValueError is raised if the user form is not valid.
-        expected_error = 'URL has invalid user name form: jean-luc'
-        with self.assert_value_error(expected_error):
-            references.Reference.from_fully_qualified_url(
-                'cs:jean-luc/precise/juju-gui')
-
-    def test_invalid_user_name_error(self):
-        # A ValueError is raised if the user name is not valid.
-        expected_error = 'URL has invalid user name: jean:luc'
-        with self.assert_value_error(expected_error):
-            references.Reference.from_fully_qualified_url(
-                'cs:~jean:luc/precise/juju-gui')
-
-    def test_local_user_name_error(self):
-        # A ValueError is raised if a user is specified on a local entity.
-        expected_error = (
-            'local entity URL with user name: '
-            'local:~jean-luc/precise/juju-gui')
-        with self.assert_value_error(expected_error):
-            references.Reference.from_fully_qualified_url(
-                'local:~jean-luc/precise/juju-gui')
-
-    def test_invalid_form_error(self):
-        # A ValueError is raised if the URL is not valid.
-        expected_error = 'URL has invalid form: cs:~user/series/name/what-?'
-        with self.assert_value_error(expected_error):
-            references.Reference.from_fully_qualified_url(
-                'cs:~user/series/name/what-?')
-
-    def test_invalid_series_error(self):
-        # A ValueError is raised if the series is not valid.
-        expected_error = 'URL has invalid series: boo!'
-        with self.assert_value_error(expected_error):
-            references.Reference.from_fully_qualified_url(
-                'cs:boo!/juju-gui-42')
-
-    def test_no_revision_error(self):
-        # A ValueError is raised if the entity revision is missing.
-        expected_error = 'URL has no revision: cs:series/name'
-        with self.assert_value_error(expected_error):
-            references.Reference.from_fully_qualified_url('cs:series/name')
-
-    def test_invalid_revision_error(self):
-        # A ValueError is raised if the charm or bundle revision is not valid.
-        expected_error = 'URL has invalid revision: revision'
-        with self.assert_value_error(expected_error):
-            references.Reference.from_fully_qualified_url(
-                'cs:series/name-revision')
-
-    def test_invalid_name_error(self):
-        # A ValueError is raised if the entity name is not valid.
-        expected_error = 'URL has invalid name: not:valid'
-        with self.assert_value_error(expected_error):
-            references.Reference.from_fully_qualified_url(
-                'cs:precise/not:valid-42')
-
-    def test_success(self):
-        # References are correctly instantiated by parsing the fully qualified
-        # URL.
-        tests = (
-            ('cs:~myuser/precise/juju-gui-42',
-             make_reference()),
-            ('cs:trusty/juju-gui-42',
-             make_reference(user='', series='trusty')),
-            ('local:precise/juju-gui-42',
-             make_reference(schema='local', user='')),
-        )
-        for url, expected_ref in tests:
-            ref = references.Reference.from_fully_qualified_url(url)
-            self.assertEqual(expected_ref, ref)
-
-
-class TestReferenceFromJujucharmsUrl(
-        helpers.ValueErrorTestsMixin, unittest.TestCase):
-
-    def test_invalid_form(self):
-        # A ValueError is raised if the URL is not valid.
-        expected_error = 'invalid bundle URL: bad wolf'
-        with self.assert_value_error(expected_error):
-            references.Reference.from_jujucharms_url('bad wolf')
-
-    def test_success(self):
-        # A reference is correctly created from a jujucharms.com identifier or
-        # complete URL.
-        tests = (
-            # Check with both user and revision.
-            ('u/myuser/mediawiki/42',
-             make_reference(series='bundle', name='mediawiki')),
-            ('/u/myuser/mediawiki/42',
-             make_reference(series='bundle', name='mediawiki')),
-            ('u/myuser/django-scalable/42/',
-             make_reference(series='bundle', name='django-scalable')),
-            ('{}u/myuser/mediawiki/42'.format(settings.JUJUCHARMS_URL),
-             make_reference(series='bundle', name='mediawiki')),
-            ('{}u/myuser/mediawiki/42/'.format(settings.JUJUCHARMS_URL),
-             make_reference(series='bundle', name='mediawiki')),
-
-            # Check without revision.
-            ('u/myuser/mediawiki',
-             make_reference(series='bundle', name='mediawiki', revision=None)),
-            ('/u/myuser/wordpress',
-             make_reference(series='bundle', name='wordpress', revision=None)),
-            ('u/myuser/mediawiki/',
-             make_reference(series='bundle', name='mediawiki', revision=None)),
-            ('{}u/myuser/django'.format(settings.JUJUCHARMS_URL),
-             make_reference(series='bundle', name='django', revision=None)),
-            ('{}u/myuser/mediawiki/'.format(settings.JUJUCHARMS_URL),
-             make_reference(series='bundle', name='mediawiki', revision=None)),
-
-            # Check without the user.
-            ('rails-single/42',
-             make_reference(user='', series='bundle', name='rails-single')),
-            ('/mediawiki/42',
-             make_reference(user='', series='bundle', name='mediawiki')),
-            ('rails-scalable/42/',
-             make_reference(user='', series='bundle', name='rails-scalable')),
-            ('{}mediawiki/42'.format(settings.JUJUCHARMS_URL),
-             make_reference(user='', series='bundle', name='mediawiki')),
-            ('{}django/42/'.format(settings.JUJUCHARMS_URL),
-             make_reference(user='', series='bundle', name='django')),
-
-            # Check without user and revision.
-            ('mediawiki',
-             make_reference(user='', series='bundle', name='mediawiki',
-                            revision=None)),
-            ('/wordpress',
-             make_reference(user='', series='bundle', name='wordpress',
-                            revision=None)),
-            ('mediawiki/',
-             make_reference(user='', series='bundle', name='mediawiki',
-                            revision=None)),
-            ('{}django'.format(settings.JUJUCHARMS_URL),
-             make_reference(user='', series='bundle', name='django',
-                            revision=None)),
-            ('{}mediawiki/'.format(settings.JUJUCHARMS_URL),
-             make_reference(user='', series='bundle', name='mediawiki',
-                            revision=None)),
-
-            # Check charm entities.
-            ('mediawiki/trusty/0',
-             make_reference(user='', series='trusty', name='mediawiki',
-                            revision=0)),
-            ('/wordpress/precise',
-             make_reference(user='', series='precise', name='wordpress',
-                            revision=None)),
-            ('u/who/rails/vivid',
-             make_reference(user='who', series='vivid', name='rails',
-                            revision=None)),
-        )
-        for url, expected_ref in tests:
-            ref = references.Reference.from_jujucharms_url(url)
-            self.assertEqual(expected_ref, ref)

=== modified file 'quickstart/tests/test_app.py'
--- quickstart/tests/test_app.py	2015-03-10 11:08:00 +0000
+++ quickstart/tests/test_app.py	2015-04-21 10:32:19 +0000
@@ -23,6 +23,7 @@
 import os
 import unittest
 
+from jujubundlelib import references
 import jujuclient
 import mock
 import yaml
@@ -32,10 +33,7 @@
     platform_support,
     settings,
 )
-from quickstart.models import (
-    bundles,
-    references,
-)
+from quickstart.models import bundles
 from quickstart.tests import helpers
 
 

=== modified file 'quickstart/tests/test_charmstore.py'
--- quickstart/tests/test_charmstore.py	2015-03-10 10:18:58 +0000
+++ quickstart/tests/test_charmstore.py	2015-04-21 10:32:19 +0000
@@ -18,16 +18,16 @@
 
 from __future__ import unicode_literals
 
+import json
 import unittest
 
-import json
+from jujubundlelib import references
 
 from quickstart import (
     charmstore,
     netutils,
     settings,
 )
-from quickstart.models import references
 from quickstart.tests import helpers
 
 

=== modified file 'quickstart/tests/test_jujutools.py'
--- quickstart/tests/test_jujutools.py	2015-02-26 18:57:25 +0000
+++ quickstart/tests/test_jujutools.py	2015-04-21 10:32:19 +0000
@@ -20,11 +20,11 @@
 
 import unittest
 
+from jujubundlelib import references
 import mock
 import yaml
 
 from quickstart import jujutools
-from quickstart.models import references
 from quickstart.tests import helpers
 
 

=== modified file 'quickstart/tests/test_manage.py'
--- quickstart/tests/test_manage.py	2015-02-26 19:12:17 +0000
+++ quickstart/tests/test_manage.py	2015-04-21 10:32:19 +0000
@@ -26,6 +26,7 @@
 import StringIO as io
 import unittest
 
+from jujubundlelib import references
 import mock
 import yaml
 
@@ -42,7 +43,6 @@
     bundles,
     envs,
     jenv,
-    references,
 )
 from quickstart.tests import helpers
 

=== modified file 'tox.ini'
--- tox.ini	2015-02-27 10:30:20 +0000
+++ tox.ini	2015-04-21 10:32:19 +0000
@@ -72,6 +72,7 @@
     # See https://launchpad.net/~juju/+archive/ubuntu/stable.
     websocket-client==0.18.0
     jujuclient==0.50.1
+    jujubundlelib==0.1.1
     urwid==1.2.1
     # The distribution PyYAML requirement is used in this case.
 
@@ -81,6 +82,7 @@
     # Ubuntu 14.04 (trusty) distro dependencies.
     websocket-client==0.12.0
     jujuclient==0.17.5
+    jujubundlelib==0.1.1
     PyYAML==3.10
     urwid==1.1.1
 
@@ -90,6 +92,7 @@
     # Ubuntu 14.10 (utopic) distro dependencies.
     websocket-client==0.12.0
     jujuclient==0.17.5
+    jujubundlelib==0.1.1
     PyYAML==3.11
     urwid==1.2.1
 
@@ -99,6 +102,7 @@
     # Ubuntu 15.04 (vivid) distro dependencies.
     websocket-client==0.18.0
     jujuclient==0.18.5
+    jujubundlelib==0.1.1
     PyYAML==3.11
     urwid==1.2.1