Merge lp:~matiasb/click-toolbelt/info-channels into lp:click-toolbelt

[Matias Bordese]

Added channel info command.

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~matiasb/click-toolbelt/info-channels into lp:click-toolbelt failed. Below is the output from the failed tests.

New python executable in .env/bin/python
Installing distribute.............................................................................................................................................................................................done.
Installing pip...............done.
Downloading/unpacking cliff (from -r requirements.txt (line 1))
  Running setup.py egg_info for package cliff

    Installed /mnt/tarmac/cache/click-toolbelt/trunk/.env/build/cliff/pbr-1.8.1-py2.7.egg
    [pbr] Processing SOURCES.txt
    warning: LocalManifestMaker: standard file '-c' not found

    warning: no previously-included files found matching '.gitignore'
    warning: no previously-included files found matching '.gitreview'
    warning: no previously-included files matching '*.pyc' found anywhere in distribution
    warning: no files found matching '*.rst' under directory 'docs'
    warning: no files found matching '*.py' under directory 'docs'
    warning: no files found matching '*.html' under directory 'docs'
    warning: no files found matching '*.css' under directory 'docs'
    warning: no files found matching '*.js' under directory 'docs'
    warning: no files found matching '*.png' under directory 'docs'
    warning: no files found matching '*.txt' under directory 'docs'
    warning: no files found matching '*.py' under directory 'tests'
Downloading/unpacking pyxdg (from -r requirements.txt (line 2))
  Running setup.py egg_info for package pyxdg

Downloading/unpacking requests (from -r requirements.txt (line 3))
  Running setup.py egg_info for package requests

Downloading/unpacking requests-oauthlib (from -r requirements.txt (line 4))
  Running setup.py egg_info for package requests-oauthlib

Downloading/unpacking ssoclient (from -r requirements.txt (line 5))
  Downloading ssoclient-2.1.tar.gz
  Running setup.py egg_info for package ssoclient

Downloading/unpacking mock (from -r requirements.txt (line 6))
  Running setup.py egg_info for package mock
    mock requires setuptools>=17.1. Aborting installation
    Complete output from command python setup.py egg_info:
    mock requires setuptools>=17.1. Aborting installation

----------------------------------------
Command python setup.py egg_info failed with error code 1 in /mnt/tarmac/cache/click-toolbelt/trunk/.env/build/mock
Storing complete log in /mnt/tarmac/.pip/pip.log

make: *** [env] Error 1

=== modified file 'README'
--- README	2015-09-23 12:40:58 +0000
+++ README	2015-10-21 16:21:36 +0000
@@ -48,6 +48,7 @@
 
 - tagline: A one line summary for the app
 - department: The app's category name (see `Department`_)
+- channel: The upload target channel name (see `Channel`_). If omitted, 'stable' is assumed.
 - support_url: A URL users can go to for support for this application. Allows http(s): and mailto: schemes
 - license: The license under which the app will be released (see `License`_)
 - icon_256 (or icon): The path to a local file to be uploaded as the icon for the application; the icon must be 256x256 px in size
@@ -62,6 +63,7 @@
 
 For a new version upload, the ``metadata_file`` file will only be scanned for the following fields:
 
+- channel: The upload target channel name (see `Channel`_). If omitted, 'stable' is assumed.
 - changelog: A description of the changes included since the last upload
 
 
@@ -96,6 +98,12 @@
     $ click-toolbelt info country
 
 
+Get the list of valid channels
+::
+
+    $ click-toolbelt info channel
+
+
 Get the list of valid departments
 ::
 
@@ -150,3 +158,16 @@
     - "GB" (United Kingdom)
     - "US" (United States)
     - "UY" (Uruguay)
+
+
+Channel
+-------
+
+Valid values can be obtained via the ``info`` command (or it's equivalent api call).
+
+Examples
+........
+
+    - "stable"
+    - "proposed"
+    - "alpha"

=== modified file 'click_toolbelt/info.py'
--- click_toolbelt/info.py	2015-04-20 16:18:01 +0000
+++ click_toolbelt/info.py	2015-10-21 16:21:36 +0000
@@ -14,7 +14,7 @@
 
 class Info(Command):
     log = logging.getLogger(__name__)
-    topics = ['version', 'department', 'license', 'country']
+    topics = ['version', 'department', 'license', 'country', 'channel']
 
     def get_parser(self, prog_name):
         parser = super(Info, self).get_parser(prog_name)
@@ -45,6 +45,9 @@
     def get_country_info(self, data):
         return data.get('country')
 
+    def get_channel_info(self, data):
+        return data.get('channel')
+
     def get_topic_data(self, api_data, topic):
         method = getattr(self, 'get_{}_info'.format(topic))
         return method(api_data)

=== modified file 'click_toolbelt/tests/test_info.py'
--- click_toolbelt/tests/test_info.py	2015-04-20 16:18:01 +0000
+++ click_toolbelt/tests/test_info.py	2015-10-21 16:21:36 +0000
@@ -111,6 +111,11 @@
         data = {'country': expected}
         self._test_take_action_with_topic(data, 'country', expected)
 
+    def test_take_action_with_channel(self):
+        expected = ['stable', 'beta']
+        data = {'channel': expected}
+        self._test_take_action_with_topic(data, 'channel', expected)
+
     def test_take_action_with_error(self):
         with patch.object(self.command, 'get_info') as mock_get_info:
             mock_get_info.return_value = {