Merge lp:~frankban/juju-quickstart/bundlelib-03 into lp:juju-quickstart

[Francesco Banconi]

Update to use jujubundlelib 0.3.0.

[Jay R. Wren (evarlast)]

review: Approve

=== modified file 'quickstart/__init__.py'
--- quickstart/__init__.py	2015-10-27 10:14:10 +0000
+++ quickstart/__init__.py	2015-11-23 14:58:55 +0000
@@ -45,7 +45,7 @@
 Once Juju has been installed, the command can also be run as a juju plugin,
 without the hyphen ("juju quickstart").
 """
-VERSION = (2, 2, 2)
+VERSION = (2, 2, 3)
 
 
 def get_version():

=== modified file 'quickstart/models/bundles.py'
--- quickstart/models/bundles.py	2015-08-11 09:06:56 +0000
+++ quickstart/models/bundles.py	2015-11-23 14:58:55 +0000
@@ -239,15 +239,14 @@
     # For this reason, we cannot infer the new bundle identifier from a
     # charmworld URL: we instead need to try to fetch both references.
     fullname = '{}-{}'.format(basket, name)
-    reference = references.Reference('cs', user, 'bundle', fullname, revision)
+    reference = _reference_from_data(user, fullname, revision)
     try:
         data = charmstore.get_bundle_data(reference)
     except charmstore.NotFoundError:
         # Also try the case in which a single bundle was included in the
         # legacy YAML. In this case, validating that the name was included
         # in the original YAML is also required.
-        reference = references.Reference(
-            'cs', user, 'bundle', basket, revision)
+        reference = _reference_from_data(user, basket, revision)
         # Validate the bundle name is included in the legacy data.
         _flatten_data(charmstore.get_legacy_bundle_data(reference), name)
         # Retrieve the new bundle data corresponding to the shorter reference.
@@ -265,6 +264,19 @@
     return Bundle(data, reference=reference)
 
 
+def _reference_from_data(user, name, revision):
+    """Instantiate a "jujubundlelib.references.Reference" from the given data.
+
+    Provide a backward compatibility layer between jujubundlelib 0.2.1 and
+    0.3.0.
+    """
+    try:
+        # Try old version without channel.
+        return references.Reference('cs', user, 'bundle', name, revision)
+    except TypeError:
+        return references.Reference('cs', user, '', 'bundle', name, revision)
+
+
 def _retrieve_from_url(url):
     """Retrieve bundle YAML content from the given URL.
 

=== modified file 'tox.ini'
--- tox.ini	2015-11-05 10:46:10 +0000
+++ tox.ini	2015-11-23 14:58:55 +0000
@@ -72,7 +72,7 @@
     # See https://launchpad.net/~juju/+archive/ubuntu/stable.
     websocket-client==0.18.0
     jujuclient==0.50.3
-    jujubundlelib==0.2.1
+    jujubundlelib==0.3.0
     urwid==1.2.1
     # The distribution PyYAML requirement is used in this case.
 
@@ -82,7 +82,7 @@
     # Ubuntu 14.04 (trusty) distro dependencies.
     websocket-client==0.12.0
     jujuclient==0.17.5
-    jujubundlelib==0.2.0
+    jujubundlelib==0.3.0
     PyYAML==3.10
     urwid==1.1.1
 
@@ -92,7 +92,7 @@
     # Ubuntu 15.04 (vivid) distro dependencies.
     websocket-client==0.18.0
     jujuclient==0.18.5
-    jujubundlelib==0.2.0
+    jujubundlelib==0.3.0
     PyYAML==3.11
     urwid==1.2.1
 
@@ -102,7 +102,7 @@
     # Ubuntu 15.10 (wily) distro dependencies.
     websocket-client==0.18.0
     jujuclient==0.50.1
-    jujubundlelib==0.2.0
+    jujubundlelib==0.3.0
     PyYAML==3.11
     urwid==1.2.1