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

[Sergio Schvezov]

Do not infer a plugin from the part name

[John Lenton (chipaca)]

LGTM; a nit and a hint.

review: Approve

[John Lenton (chipaca)]

(not top-approving in case you want to address the nit&hint, but feel free to do so irrespectively.

[John Lenton (chipaca)]

)

[lp:~sergiusens/snapcraft/1501413]

223. By Sergio Schvezov on 2015-09-30

review fixes

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'integration-tests/data/assemble/snapcraft.yaml'
--- integration-tests/data/assemble/snapcraft.yaml	2015-09-21 05:04:31 +0000
+++ integration-tests/data/assemble/snapcraft.yaml	2015-09-30 19:44:37 +0000
@@ -16,4 +16,5 @@
 
 parts:
     make-project:
+      plugin: make-project
       source: .

=== modified file 'integration-tests/data/build-tools/snapcraft.yaml'
--- integration-tests/data/build-tools/snapcraft.yaml	2015-09-22 14:57:05 +0000
+++ integration-tests/data/build-tools/snapcraft.yaml	2015-09-30 19:44:37 +0000
@@ -7,6 +7,7 @@
 
 parts:
   make-project:
+    plugin: make-project
     source: .
     stage-packages:
       - libxml2-dev

=== modified file 'integration-tests/data/local-plugin/snapcraft.yaml'
--- integration-tests/data/local-plugin/snapcraft.yaml	2015-08-27 21:33:56 +0000
+++ integration-tests/data/local-plugin/snapcraft.yaml	2015-09-30 19:44:37 +0000
@@ -7,4 +7,5 @@
 
 parts:
     x-local-plugin:
+      plugin: x-local-plugin
       source: .

=== modified file 'integration-tests/data/local-source/snapcraft.yaml'
--- integration-tests/data/local-source/snapcraft.yaml	2015-08-27 21:33:56 +0000
+++ integration-tests/data/local-source/snapcraft.yaml	2015-09-30 19:44:37 +0000
@@ -7,4 +7,5 @@
 
 parts:
     make-project:
+        plugin: make-project
         source: .

=== modified file 'integration-tests/data/simple-cmake/snapcraft.yaml'
--- integration-tests/data/simple-cmake/snapcraft.yaml	2015-08-27 21:33:56 +0000
+++ integration-tests/data/simple-cmake/snapcraft.yaml	2015-09-30 19:44:37 +0000
@@ -7,4 +7,5 @@
 
 parts:
   cmake-project:
+    plugin: cmake-project
     source: .

=== modified file 'integration-tests/data/simple-make-filesets/snapcraft.yaml'
--- integration-tests/data/simple-make-filesets/snapcraft.yaml	2015-09-18 19:06:34 +0000
+++ integration-tests/data/simple-make-filesets/snapcraft.yaml	2015-09-30 19:44:37 +0000
@@ -7,6 +7,7 @@
 
 parts:
   make-project:
+    plugin: make-project
     filesets:
       files:
         - share/file1

=== modified file 'integration-tests/data/simple-make/snapcraft.yaml'
--- integration-tests/data/simple-make/snapcraft.yaml	2015-08-27 21:33:56 +0000
+++ integration-tests/data/simple-make/snapcraft.yaml	2015-09-30 19:44:37 +0000
@@ -7,4 +7,5 @@
 
 parts:
   make-project:
+    plugin: make-project
     source: .

=== modified file 'snapcraft/cmds.py'
--- snapcraft/cmds.py	2015-09-23 04:14:51 +0000
+++ snapcraft/cmds.py	2015-09-30 19:44:37 +0000
@@ -360,6 +360,11 @@
         msg = "Issues while validating snapcraft.yaml: {}".format(e.message)
         logger.error(msg)
         sys.exit(1)
+    except snapcraft.yaml.PluginNotDefinedError as e:
+        logger.error(
+            'Issues while validating snapcraft.yaml: the plugin keyword is '
+            'missing and wiki support for the feature is still in progress.')
+        sys.exit(1)
     except snapcraft.yaml.SnapcraftLogicError as e:
         logger.error('Issue detected while analyzing snapcraft.yaml: {}'.format(e.message))
         sys.exit(1)

=== modified file 'snapcraft/yaml.py'
--- snapcraft/yaml.py	2015-09-29 13:36:43 +0000
+++ snapcraft/yaml.py	2015-09-30 19:44:37 +0000
@@ -65,6 +65,10 @@
         self._message = message
 
 
+class PluginNotDefinedError(Exception):
+    pass
+
+
 class Config:
 
     def __init__(self):
@@ -80,9 +84,10 @@
         for part_name in self.data.get("parts", []):
             properties = self.data["parts"][part_name] or {}
 
-            plugin_name = properties.get("plugin", part_name)
-            if "plugin" in properties:
-                del properties["plugin"]
+            plugin_name = properties.pop("plugin", None)
+            # TODO search the wiki
+            if not plugin_name:
+                raise PluginNotDefinedError
 
             if "after" in properties:
                 after_requests[part_name] = properties["after"]