Merge lp:~bac/codetree/channels into lp:codetree

[Brad Crittenden]

Recently the names of the channels supported by the charmstore changed to match those used by the snap store. They are now unpublished, edge, beta, candidate, and stable (in order of maturity).

This branch updates codetree to reflect those new names.

[Barry Price (barryprice)]

+1

review: Approve

=== modified file 'README.md'
--- README.md	2016-08-05 20:55:01 +0000
+++ README.md	2016-09-09 19:05:37 +0000
@@ -26,7 +26,7 @@
     app2                    git+ssh://[e-mail]/me/app2.git
     app3                    git+https://github.com/me/my3rdapp.git
     mycharm                 cs:trusty/mycharm
-    othercharm              cs:trusty/othercharm;channel=development
+    othercharm              cs:trusty/othercharm;channel=edge
 
 Taking that line-by-line:
 
@@ -38,7 +38,7 @@
 * app/mytag is a git checkout of the git repository from github at the tag 'mytag'
 * app2 is also a git checkout but using a different format for the git url
 * app3 is another git checkout but using the https style git url understood by codetree
-* mycharm is a Juju charm from the [charm store](https://jujucharms.com/) 
+* mycharm is a Juju charm from the [charm store](https://jujucharms.com/)
 
 ### Source URLs
 
@@ -76,4 +76,5 @@
 **Charm Store Only**
 base_url: By default it is assumed to be the public store 'https://api.jujucharms.com/charmstore/v5' so few will need to modify this. Note only https is always supported.
 
-channel: By default it is assumed to be the stable channel, you can specify 'stable', 'development', or unpublished. Note that because there is no charmstore auth at the moment they must be granted read access to everyone.
+channel: By default it is assumed to be the stable channel, you can specify 'unpublished', 'edge', 'beta', 'candidate', or 'stable'. Note that because there is no charmstore auth at the moment they must be granted read access to everyone.
+

=== modified file 'codetree/handlers/charm.py'
--- codetree/handlers/charm.py	2016-08-29 04:51:36 +0000
+++ codetree/handlers/charm.py	2016-09-09 19:05:37 +0000
@@ -11,6 +11,9 @@
 from exceptions import InvalidOption, NoSuchCharm
 
 
+SUPPORTED_CHANNELS = ('unpublished', 'edge', 'beta', 'candidate', 'stable')
+
+
 class CharmStoreHandler(SourceHandler):
     """Download plain files via https"""
 
@@ -62,8 +65,11 @@
             if urlparse(self.base_url).scheme != 'https':
                 raise InvalidOption('Only https is supported for Charm Store base_url')
         channel = options.get("channel", "stable")
-        if channel not in ['stable', 'development', 'unpublished']:
-            raise InvalidOption('Only stable/development/unpublished is supported for Charm Store channel')
+        if channel not in SUPPORTED_CHANNELS:
+            channel_list = ', '.join(SUPPORTED_CHANNELS)
+            msg = 'Channel "{}" is invalid. Must be one of: {}.'.format(
+                channel, channel_list)
+            raise InvalidOption(msg)
         if os.path.exists(dest):
             if options.get("overwrite"):
                 # Remove the directory even if it was previously a bzr or git

=== modified file 'tests/test_charm_handler.py'
--- tests/test_charm_handler.py	2016-08-29 04:45:23 +0000
+++ tests/test_charm_handler.py	2016-09-09 19:05:37 +0000
@@ -133,9 +133,9 @@
         dest = os.path.join(self.tdir, 'test_download')
         _get.return_value = MockedReq()
 
-        assert self.cs.get(dest, {'channel': 'development'})
+        assert self.cs.get(dest, {'channel': 'edge'})
         assert _get.call_count == 2
-        expected_request_args = [call('{}/trusty/charm/meta/id?channel=development'.format(self.cs.base_url)),
+        expected_request_args = [call('{}/trusty/charm/meta/id?channel=edge'.format(self.cs.base_url)),
                                  call('{}/trusty/charm/archive'.format(self.cs.base_url))]
         assert _get.call_args_list == expected_request_args
         expected_logging = [call("Downloading {} from charm store to {}".format(self.cs.source, dest)),