Merge lp:~matiasb/click-toolbelt/enable-snap-uploads into lp:click-toolbelt

[Matias Bordese]

Enabled .snap packages upload.

[Natalia Bidart (nataliabidart)]

Looks good. Test is a bit mock abused but I understand previous tests marked the pattern.

review: Approve

=== modified file 'click_toolbelt/tests/test_upload.py'
--- click_toolbelt/tests/test_upload.py	2015-10-21 17:17:17 +0000
+++ click_toolbelt/tests/test_upload.py	2015-12-03 15:01:04 +0000
@@ -491,6 +491,23 @@
                 'Application uploaded successfully.'
             )
 
+    def test_take_action_works_for_snaps(self):
+        binary_filename = self.package_name + '_0.1_all.snap'
+        args = self.parsed_args(binary_filename, None)
+
+        with patch.multiple(self.command, upload_files=DEFAULT,
+                            upload_app=DEFAULT):
+
+            self.command.take_action(args)
+
+            self.command.upload_files.assert_called_once_with(binary_filename)
+            self.command.upload_app.assert_called_once_with(
+                self.package_name, self.command.upload_files.return_value,
+                metadata={})
+            self.mock_log.info.assert_any_call(
+                'Application uploaded successfully.'
+            )
+
     def test_take_action_with_metadata_file(self):
         mock_metadata_file = tempfile.NamedTemporaryFile()
         with open(mock_metadata_file.name, 'wb') as mock_file:

=== modified file 'click_toolbelt/upload.py'
--- click_toolbelt/upload.py	2015-10-21 17:17:17 +0000
+++ click_toolbelt/upload.py	2015-12-03 15:01:04 +0000
@@ -50,7 +50,7 @@
 
         # validate package filename
         pattern = (r'(.*/)?(?P<name>[\w\-_\.]+)_'
-                   '(?P<version>[\d\.]+)_(?P<arch>\w+)\.click')
+                   '(?P<version>[\d\.]+)_(?P<arch>\w+)\.(click|snap)')
         match = re.match(pattern, binary_filename)
         if not match:
             self.log.info('Invalid click package filename.')