Merge lp:~matiasb/click-toolbelt/revno-is-back into lp:click-toolbelt

[Matias Bordese]

Updated upload command to expect revision instead of sequence.

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

=== modified file 'click_toolbelt/tests/test_upload.py'
--- click_toolbelt/tests/test_upload.py	2015-12-03 14:45:57 +0000
+++ click_toolbelt/tests/test_upload.py	2015-12-07 19:43:17 +0000
@@ -150,7 +150,7 @@
             'success': False,
             'errors': ['No valid credentials found.'],
             'application_url': '',
-            'sequence': None,
+            'revision': None,
         })
 
     def test_upload_app_uses_environment_variables(self):
@@ -179,7 +179,7 @@
         mock_status_response.ok = True
         mock_status_response.json.return_value = {
             'completed': True,
-            'sequence': 15,
+            'revision': 15,
         }
 
         response = self.command.upload_app(self.package_name, self.data)
@@ -187,7 +187,7 @@
             'success': True,
             'errors': [],
             'application_url': '',
-            'sequence': 15,
+            'revision': 15,
         })
 
     def test_upload_app_error_response(self):
@@ -201,7 +201,7 @@
             'success': False,
             'errors': ['server failure'],
             'application_url': '',
-            'sequence': None,
+            'revision': None,
         })
 
     def test_upload_app_handle_malformed_response(self):
@@ -215,7 +215,7 @@
             'success': False,
             'errors': [str(err)],
             'application_url': '',
-            'sequence': None,
+            'revision': None,
         })
 
     def test_upload_app_with_errors_during_scan(self):
@@ -239,7 +239,7 @@
             'success': False,
             'errors': ['some error'],
             'application_url': 'http://example.com/myapp',
-            'sequence': None,
+            'revision': None,
         })
 
     def test_upload_app_poll_status(self):
@@ -259,7 +259,7 @@
         response_completed.status_code = 200
         response_completed.encoding = 'utf-8'
         response_completed._content = json.dumps(
-            {'completed': True, 'sequence': 14,
+            {'completed': True, 'revision': 14,
              'application_url': 'http://example.org'}).encode('utf-8')
         self.mock_get.side_effect = [
             response_not_completed,
@@ -271,7 +271,7 @@
             'success': True,
             'errors': [],
             'application_url': 'http://example.org',
-            'sequence': 14,
+            'revision': 14,
         })
         self.assertEqual(self.mock_get.call_count, 3)
 
@@ -287,7 +287,7 @@
         ok_response.status_code = 200
         ok_response.encoding = 'utf-8'
         ok_response._content = json.dumps(
-            {'completed': True, 'sequence': 14}).encode('utf-8')
+            {'completed': True, 'revision': 14}).encode('utf-8')
         nok_response = Response()
         nok_response.status_code = 503
 
@@ -297,7 +297,7 @@
             'success': True,
             'errors': [],
             'application_url': '',
-            'sequence': 14,
+            'revision': 14,
         })
         self.assertEqual(self.mock_get.call_count, 3)
 
@@ -324,7 +324,7 @@
                 'http://example.com/status-web/.',
             ],
             'application_url': '',
-            'sequence': None,
+            'revision': None,
         })
 
     def test_upload_app_abort_polling_without_web_status_url(self):
@@ -347,7 +347,7 @@
                 'Package scan took too long.',
             ],
             'application_url': '',
-            'sequence': None,
+            'revision': None,
         })
 
     def test_upload_app_with_metadata(self):

=== modified file 'click_toolbelt/upload.py'
--- click_toolbelt/upload.py	2015-12-03 14:45:57 +0000
+++ click_toolbelt/upload.py	2015-12-07 19:43:17 +0000
@@ -71,12 +71,12 @@
         success = result.get('success', False)
         errors = result.get('errors', [])
         app_url = result.get('application_url', '')
-        sequence = result.get('sequence')
+        revision = result.get('revision')
 
         if success:
             self.log.info('Application uploaded successfully.')
-            if sequence:
-                self.log.info('Uploaded as sequence %s.', sequence)
+            if revision:
+                self.log.info('Uploaded as revision %s.', revision)
         else:
             self.log.info('Upload did not complete.')
 
@@ -147,7 +147,7 @@
         upload_url = self.get_upload_url(name)
 
         result = {'success': False, 'errors': [],
-                  'application_url': '', 'sequence': None}
+                  'application_url': '', 'revision': None}
 
         session = self.get_oauth_session()
         if session is None:
@@ -173,7 +173,7 @@
                     message = data.get('message', '')
                     if not message:
                         result['success'] = True
-                        result['sequence'] = data.get('sequence')
+                        result['revision'] = data.get('revision')
                     else:
                         result['errors'] = [message]
                 else: