Merge lp:~frankban/juju-quickstart/new-bundle-lib-no-bundle into lp:juju-quickstart

[Francesco Banconi]

Update to juju-bundlelib 0.4.1.

[Fabrice Matrat (fabricematrat)]

LGTM

review: Approve

=== modified file 'quickstart/__init__.py'
--- quickstart/__init__.py	2015-11-23 14:57:26 +0000
+++ quickstart/__init__.py	2015-12-03 09:56:35 +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, 3)
+VERSION = (2, 2, 4)
 
 
 def get_version():
 
=== modified file 'quickstart/charmstore.py'
--- quickstart/charmstore.py	2015-04-21 10:22:46 +0000
+++ quickstart/charmstore.py	2015-12-03 09:56:35 +0000
@@ -142,7 +142,7 @@
     Raise an IOError if any other problems occur while communicating with the
     charm store.
     """
-    if not reference.is_bundle():
+    if reference.series and not reference.is_bundle():
         raise ValueError(
             b'expected a bundle, provided charm {}'.format(reference))
     content = get_reference(reference, path)
 
=== modified file 'quickstart/models/bundles.py'
--- quickstart/models/bundles.py	2015-11-30 11:18:19 +0000
+++ quickstart/models/bundles.py	2015-12-03 09:56:35 +0000
@@ -176,6 +176,8 @@
         raise
 
     # The source refers to a bundle URL in jujucharms.com.
+    if not reference.series:
+        reference.series = 'bundle'
     try:
         data = charmstore.get_bundle_data(reference)
     except charmstore.NotFoundError as err:
@@ -252,7 +254,7 @@
     reference.charmworld_id = url[len('bundle:'):]
     logging.warn(
         'this bundle URL is deprecated: please use the new format: '
-        '{}'.format(reference.jujucharms_id()))
+        '{}'.format(reference.copy(series='').jujucharms_id()))
     return Bundle(data, reference=reference)
 
 
 
=== modified file 'quickstart/tests/models/test_bundles.py'
--- quickstart/tests/models/test_bundles.py	2015-11-30 11:18:19 +0000
+++ quickstart/tests/models/test_bundles.py	2015-12-03 09:56:35 +0000
@@ -344,7 +344,8 @@
     def test_jujucharms_bundle_invalid_url(self):
         # A ValueError is raised if the provided jujucharms.com identifier is
         # not valid.
-        with self.assert_value_error('invalid bundle URL: u/no/such/bundle/!'):
+        expected_error = 'invalid charm or bundle URL: u/no/such/bundle/!'
+        with self.assert_value_error(expected_error):
             bundles.from_source('u/no/such/bundle/!')
 
     def test_jujucharms_bundle_invalid_content(self):
 
=== modified file 'quickstart/tests/test_charmstore.py'
--- quickstart/tests/test_charmstore.py	2015-04-21 10:22:46 +0000
+++ quickstart/tests/test_charmstore.py	2015-12-03 09:56:35 +0000
@@ -88,7 +88,17 @@
             content = charmstore.get_reference(ref, '/meta/hash')
         self.assertEqual('hash', content)
         mock_urlread.assert_called_once_with(
-            settings.CHARMSTORE_API + 'bundle/mediawiki-single/meta/hash')
+            settings.CHARMSTORE_API + 'mediawiki-single/meta/hash')
+
+    def test_success_bundle(self):
+        # A GET request to the charm store is correctly performed using the
+        # given bundle reference.
+        ref = references.Reference.from_jujucharms_url('django/bundle')
+        with self.patch_urlread(contents='hash') as mock_urlread:
+            content = charmstore.get_reference(ref, '/meta/hash')
+        self.assertEqual('hash', content)
+        mock_urlread.assert_called_once_with(
+            settings.CHARMSTORE_API + 'bundle/django/meta/hash')
 
     def test_success_without_leading_slash(self):
         # The resulting URL is correctly formatted when the static path does
@@ -120,8 +130,7 @@
             with self.assertRaises(charmstore.NotFoundError) as ctx:
                 charmstore.get_reference(ref, '/no/such')
         expected_error = (
-            'charm store resource not found at '
-            '{}bundle/django/no/such: '
+            'charm store resource not found at {}django/no/such: '
             'bad wolf'.format(settings.CHARMSTORE_API))
         self.assertEqual(expected_error, bytes(ctx.exception))
 
@@ -190,7 +199,7 @@
 
     def test_data_retrieved(self):
         # The bundle data is correctly retrieved and parsed.
-        ref = references.Reference.from_jujucharms_url('django/42')
+        ref = references.Reference.from_jujucharms_url('django/bundle/42')
         with self.patch_urlread(contents=self.bundle_content) as mock_urlread:
             data = charmstore.get_bundle_data(ref)
         self.assertEqual(self.bundle_data, data)
@@ -205,7 +214,7 @@
                 charmstore.get_bundle_data(ref)
         expected_error = (
             'cannot communicate with the charm store at '
-            '{}bundle/mediawiki-single/archive/bundle.yaml: '
+            '{}mediawiki-single/archive/bundle.yaml: '
             'bad wolf'.format(settings.CHARMSTORE_API))
         self.assertEqual(expected_error, bytes(ctx.exception))
 
@@ -217,7 +226,7 @@
                 charmstore.get_bundle_data(ref)
         expected_error = (
             'charm store resource not found at '
-            '{}bundle/no-such/archive/bundle.yaml: '
+            '{}no-such/archive/bundle.yaml: '
             'bad wolf'.format(settings.CHARMSTORE_API))
         self.assertEqual(expected_error, bytes(ctx.exception))
 
@@ -246,7 +255,8 @@
 
     def test_data_retrieved(self):
         # The legacy bundle data is correctly retrieved and parsed.
-        ref = references.Reference.from_jujucharms_url('u/who/django/42')
+        ref = references.Reference.from_jujucharms_url(
+            'u/who/django/bundle/42')
         contents = self.legacy_bundle_content
         with self.patch_urlread(contents=contents) as mock_urlread:
             data = charmstore.get_legacy_bundle_data(ref)
@@ -263,13 +273,13 @@
                 charmstore.get_legacy_bundle_data(ref)
         expected_error = (
             'cannot communicate with the charm store at '
-            '{}bundle/mediawiki-single/archive/bundles.yaml.orig: '
+            '{}mediawiki-single/archive/bundles.yaml.orig: '
             'bad wolf'.format(settings.CHARMSTORE_API))
         self.assertEqual(expected_error, bytes(ctx.exception))
 
     def test_not_found_error(self):
         # Not found errors are properly propagated.
-        ref = references.Reference.from_jujucharms_url('no-such')
+        ref = references.Reference.from_jujucharms_url('no-such/bundle')
         with self.patch_urlread(error=netutils.NotFoundError('bad wolf')):
             with self.assertRaises(charmstore.NotFoundError) as ctx:
                 charmstore.get_legacy_bundle_data(ref)
 
=== modified file 'quickstart/tests/test_manage.py'
--- quickstart/tests/test_manage.py	2015-10-28 16:45:58 +0000
+++ quickstart/tests/test_manage.py	2015-12-03 09:56:35 +0000
@@ -661,7 +661,7 @@
         with mock.patch('sys.stderr', new_callable=io.StringIO) as mock_stderr:
             self.call_setup(['invalid/bundle!'], exit_called=False)
         expected_error = (
-            'error: unable to open the bundle: invalid bundle URL: '
+            'error: unable to open the bundle: invalid charm or bundle URL: '
             'invalid/bundle!')
         self.assertIn(expected_error, mock_stderr.getvalue())
 
 
=== modified file 'tox.ini'
--- tox.ini	2015-11-30 09:18:47 +0000
+++ tox.ini	2015-12-03 09:56:35 +0000
@@ -72,7 +72,7 @@
     # See https://launchpad.net/~juju/+archive/ubuntu/stable.
     websocket-client==0.18.0
     jujuclient==0.50.3
-    jujubundlelib==0.3.2
+    jujubundlelib==0.4.1
     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.3.2
+    jujubundlelib==0.4.1
     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.3.2
+    jujubundlelib==0.4.1
     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.3.2
+    jujubundlelib==0.4.1
     PyYAML==3.11
     urwid==1.2.1