Merge lp:~sergiusens/snapcraft/1499424 into lp:~snappy-dev/snapcraft/core

[Sergio Schvezov]

Exit cleanly with an error when using the source keyword with a local file

[Leo Arias (elopio)]

Good. Now maybe we need a way to make it clearer that the local source must be a directory?

review: Approve

=== modified file 'snapcraft/__init__.py'
--- snapcraft/__init__.py	2015-10-09 17:43:20 +0000
+++ snapcraft/__init__.py	2015-10-14 20:02:31 +0000
@@ -131,9 +131,9 @@
                    source_branch=None):
         try:
             handler_class = _get_source_handler(source_type, source)
-        except ValueError:
-            logger.error("Unrecognized source '%s' for part '%s'.", source,
-                         self.name)
+        except ValueError as e:
+            logger.error('Unrecognized source %r for part %r: %s.', source,
+                         self.name, e)
             snapcraft.common.fatal()
 
         try:
@@ -209,6 +209,8 @@
     elif re.compile(r'.*\.((tar\.(xz|gz|bz2))|tgz)$').match(source):
         source_type = 'tar'
     elif snapcraft.common.isurl(source):
-        raise ValueError()
+        raise ValueError('No handler to manage source')
+    elif not os.path.isdir(source):
+        raise ValueError('Local source is not a directory')
 
     return source_type

=== modified file 'snapcraft/tests/test_base_plugin.py'
--- snapcraft/tests/test_base_plugin.py	2015-10-02 09:13:00 +0000
+++ snapcraft/tests/test_base_plugin.py	2015-10-14 20:02:31 +0000
@@ -17,6 +17,7 @@
 import fixtures
 import logging
 import os
+import unittest.mock
 
 import snapcraft
 from snapcraft import tests
@@ -43,7 +44,24 @@
         self.assertEqual(raised.exception.code, 1, 'Wrong exit code returned.')
         expected = (
             "Unrecognized source 'unrecognized://test_source' for part "
-            "'test_plugin'.\n")
+            "'test_plugin': No handler to manage source.\n")
+        self.assertEqual(expected, fake_logger.output)
+
+    @unittest.mock.patch('os.path.isdir')
+    def test_local_non_dir_source_path_must_raise_error(self, mock_isdir):
+        fake_logger = fixtures.FakeLogger(level=logging.ERROR)
+        self.useFixture(fake_logger)
+
+        mock_isdir.return_value = False
+        plugin = snapcraft.BasePlugin('test_plugin', 'dummy_options')
+        with self.assertRaises(SystemExit) as raised:
+            plugin.get_source('file')
+
+        mock_isdir.assert_called_once_with('file')
+        self.assertEqual(raised.exception.code, 1, 'Wrong exit code returned.')
+        expected = (
+            "Unrecognized source 'file' for part 'test_plugin': "
+            "Local source is not a directory.\n")
         self.assertEqual(expected, fake_logger.output)
 
     def test_makedirs_with_existing_dir(self):