Merge lp:~matiasb/click-toolbelt/add-framework-param into lp:click-toolbelt

[Matias Bordese]

Added framework param to upload command.

[lp:~matiasb/click-toolbelt/add-framework-param]

15. By Matias Bordese on 2014-02-27

Framework is optional, again.

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

=== modified file 'click_toolbelt/tests/test_upload.py'
--- click_toolbelt/tests/test_upload.py	2014-02-24 12:50:25 +0000
+++ click_toolbelt/tests/test_upload.py	2014-02-27 17:23:32 +0000
@@ -26,6 +26,7 @@
         super(BaseUploadCommandTestCase, self).setUp()
         self.app_name = 'namespace.package_name'
         self.app_archs = ['all']
+        self.app_framework = 'ubuntu-sdk-13.10'
         self.app_version = '1'
         self.app_changelog = 'Initial version.'
         self.uploaded_callback_url = MYAPPS_API_ROOT_URL + 'click-uploaded/1/'
@@ -76,7 +77,8 @@
         data = self.command.get_upload_data(self.app_name,
                                             self.app_version,
                                             self.app_changelog,
-                                            self.app_archs)
+                                            self.app_archs,
+                                            self.app_framework)
         self.assertEqual(data, expected)
 
     def test_get_upload_data_for_unknown_app(self):
@@ -89,7 +91,8 @@
         data = self.command.get_upload_data(self.app_name,
                                             self.app_version,
                                             self.app_changelog,
-                                            self.app_archs)
+                                            self.app_archs,
+                                            self.app_framework)
         self.assertEqual(data, {
             'success': False,
             'errors': ['The requested Click Package could not be found.']})
@@ -100,7 +103,8 @@
         data = self.command.get_upload_data(self.app_name,
                                             self.app_version,
                                             self.app_changelog,
-                                            self.app_archs)
+                                            self.app_archs,
+                                            self.app_framework)
         self.assertEqual(data, {'success': False,
                                 'errors': ['some http error']})
 
@@ -109,22 +113,24 @@
             self.app_name,)
         self.command.get_upload_data(
             self.app_name, self.app_version, self.app_changelog,
-            self.app_archs)
+            self.app_archs, self.app_framework)
         self.mock_post.assert_called_once_with(
             upload_url, data={'version': self.app_version,
                               'architectures': self.app_archs,
-                              'changelog': self.app_changelog})
+                              'changelog': self.app_changelog,
+                              'framework': self.app_framework})
 
     def test_get_upload_data_uses_environment_variable(self):
         upload_url = MYAPPS_API_ROOT_URL + "click-upload/%s/" % (
             self.app_name,)
         self.command.get_upload_data(
             self.app_name, self.app_version, self.app_changelog,
-            self.app_archs)
+            self.app_archs, self.app_framework)
         self.mock_post.assert_called_once_with(
             upload_url, data={'version': self.app_version,
                               'architectures': self.app_archs,
-                              'changelog': self.app_changelog})
+                              'changelog': self.app_changelog,
+                              'framework': self.app_framework})
 
     @patch('click_toolbelt.upload.Upload.get_oauth_session')
     def test_get_upload_data_with_invalid_session(self,
@@ -132,7 +138,7 @@
         mock_get_oauth_session.return_value = None
         result = self.command.get_upload_data(
             self.app_name, self.app_version, self.app_changelog,
-            self.app_archs)
+            self.app_archs, self.app_framework)
         self.assertEqual(result, {'success': False,
                                   'errors': ['No valid credentials found.']})
         self.assertFalse(self.mock_post.called)
@@ -243,12 +249,12 @@
 
         parsed_args = namedtuple(
             'parsed_args',
-            'application_name, version, filename, changelog, arch')
+            'application_name, version, filename, changelog, arch, framework')
 
         filename = 'package.click'
         self.args = parsed_args(
             self.app_name, self.app_version, filename, self.app_changelog,
-            self.app_archs)
+            self.app_archs, self.app_framework)
 
     def test_parser(self):
         parser = self.command.get_parser(__namespace__)
@@ -258,6 +264,9 @@
             # start comparing from first extra argument
             self.assertEqual(parser._actions[i + 1].dest, name)
             self.assertTrue(parser._actions[i + 1].required)
+        # framework is optional
+        self.assertEqual(parser._actions[-2].dest, 'framework')
+        self.assertFalse(parser._actions[-2].required)
         # arch is optional, and last param
         self.assertEqual(parser._actions[-1].dest, 'arch')
         self.assertFalse(parser._actions[-1].required)
@@ -278,7 +287,7 @@
         # followed by an updown upload request
         self.mock_get_upload_data.assert_called_once_with(
             self.app_name, self.app_version, self.app_changelog,
-            self.app_archs)
+            self.app_archs, self.app_framework)
         self.mock_post.assert_called_with(
             CLICK_UPDOWN_UPLOAD_URL,
             files={'binary': self.mock_open.return_value},

=== modified file 'click_toolbelt/upload.py'
--- click_toolbelt/upload.py	2014-02-24 12:50:25 +0000
+++ click_toolbelt/upload.py	2014-02-27 17:23:32 +0000
@@ -23,12 +23,14 @@
         parser.add_argument('version')
         parser.add_argument('filename')
         parser.add_argument('changelog')
+        parser.add_argument('framework', nargs='?')
         parser.add_argument(
             'arch', nargs='*', default='all',
             choices=['armhf', 'i386', 'amd64', 'all'])
         return parser
 
-    def get_upload_data(self, name, version, changelog, architectures):
+    def get_upload_data(
+            self, name, version, changelog, architectures, framework):
         myapps_url = os.environ.get('MYAPPS_API_ROOT_URL', MYAPPS_API_ROOT_URL)
         myapps_url = urljoin(myapps_url, 'click-upload/%s/' % name)
 
@@ -43,7 +45,7 @@
             response = session.post(
                 myapps_url,
                 data={'version': version, 'changelog': changelog,
-                      'architectures': architectures})
+                      'architectures': architectures, 'framework': framework})
             if response.ok:
                 result.update(response.json())
             else:
@@ -87,9 +89,10 @@
         filename = parsed_args.filename
         changelog = parsed_args.changelog
         architectures = parsed_args.arch
+        framework = parsed_args.framework
 
         data = self.get_upload_data(
-            application_name, version, changelog, architectures)
+            application_name, version, changelog, architectures, framework)
         if not data.get('success', False):
             errors = data.get('errors', ['Unknown error'])
             self.log.error(