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

[Sergio Schvezov]

regex for binary and service names

[Michael Vogt (mvo)]

LTGM

review: Approve

=== modified file 'schema/snapcraft.yaml'
--- schema/snapcraft.yaml	2015-09-01 19:04:49 +0000
+++ schema/snapcraft.yaml	2015-09-14 19:23:59 +0000
@@ -45,6 +45,7 @@
         properties:
           name:
             type: string
+            pattern: "^[A-Za-z0-9/.:-]*$"
           start:
             type: string
             description: command executed to start the service
@@ -61,6 +62,7 @@
         properties:
           name:
             type: string
+            pattern: "^[A-Za-z0-9/.:-]*$"
           exec:
             type: string
             description: command executed to start the service

=== modified file 'snapcraft/tests/test_yaml.py'
--- snapcraft/tests/test_yaml.py	2015-09-08 18:06:03 +0000
+++ snapcraft/tests/test_yaml.py	2015-09-14 19:23:59 +0000
@@ -355,6 +355,44 @@
 
         snapcraft.yaml._validate_snapcraft_yaml(self.data)
 
+    def test_invalid_binary_names(self):
+        invalid_names = {
+            '#': {'name': 'qwe#rty', 'exec': '1'},
+            '_': {'name': 'qwe_rty', 'exec': '1'},
+            'space': {'name': 'qwe rty', 'exec': '1'},
+            'spaces': {'name': 'qwe  rty', 'exec': '1'},
+        }
+
+        for t in invalid_names:
+            data = self.data.copy()
+            with self.subTest(key=t):
+                data['binaries'] = [invalid_names[t]]
+
+                with self.assertRaises(snapcraft.yaml.SnapcraftSchemaError) as raised:
+                    snapcraft.yaml._validate_snapcraft_yaml(data)
+
+                expected_message = '\'{}\' does not match \'^[A-Za-z0-9/.:-]*$\''.format(invalid_names[t]['name'])
+                self.assertEqual(raised.exception.message, expected_message, msg=data)
+
+    def test_invalid_service_names(self):
+        invalid_names = {
+            '#': {'name': 'qwe#rty', 'start': '1'},
+            '_': {'name': 'qwe_rty', 'start': '1'},
+            'space': {'name': 'qwe rty', 'start': '1'},
+            'spaces': {'name': 'qwe  rty', 'start': '1'},
+        }
+
+        for t in invalid_names:
+            data = self.data.copy()
+            with self.subTest(key=t):
+                data['services'] = [invalid_names[t]]
+
+                with self.assertRaises(snapcraft.yaml.SnapcraftSchemaError) as raised:
+                    snapcraft.yaml._validate_snapcraft_yaml(data)
+
+                expected_message = '\'{}\' does not match \'^[A-Za-z0-9/.:-]*$\''.format(invalid_names[t]['name'])
+                self.assertEqual(raised.exception.message, expected_message, msg=data)
+
     def test_services_required_properties(self):
         self.data['services'] = [
             {