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

[Sergio Schvezov]

Remove modules from plugins and infer it from the file name to follow the spec

[Leo Arias (elopio)]

lgtm, all tests pass.

review: Approve

=== modified file 'integration-tests/data/local-plugin/parts/plugins/x-local-plugin.yaml'
--- integration-tests/data/local-plugin/parts/plugins/x-local-plugin.yaml	2015-07-21 18:18:10 +0000
+++ integration-tests/data/local-plugin/parts/plugins/x-local-plugin.yaml	2015-09-22 03:09:51 +0000
@@ -1,1 +0,0 @@
-module: local_plugin

=== renamed file 'integration-tests/data/local-plugin/parts/plugins/local_plugin.py' => 'integration-tests/data/local-plugin/parts/plugins/x_local_plugin.py'
=== modified file 'plugins/ant-project.yaml'
--- plugins/ant-project.yaml	2015-09-18 14:53:03 +0000
+++ plugins/ant-project.yaml	2015-09-22 03:09:51 +0000
@@ -1,4 +1,3 @@
-module: ant_project
 requires:
   - jdk
 options:

=== modified file 'plugins/autotools-project.yaml'
--- plugins/autotools-project.yaml	2015-09-18 14:53:03 +0000
+++ plugins/autotools-project.yaml	2015-09-22 03:09:51 +0000
@@ -1,4 +1,3 @@
-module: autotools_project
 build-packages: [autoconf, automake, autopoint]
 options:
   source:

=== modified file 'plugins/cmake-project.yaml'
--- plugins/cmake-project.yaml	2015-09-18 14:53:03 +0000
+++ plugins/cmake-project.yaml	2015-09-22 03:09:51 +0000
@@ -1,4 +1,3 @@
-module: cmake_project
 build-packages: [cmake]
 options:
   source:

=== modified file 'plugins/go-project.yaml'
--- plugins/go-project.yaml	2015-09-08 18:06:03 +0000
+++ plugins/go-project.yaml	2015-09-22 03:09:51 +0000
@@ -1,4 +1,3 @@
-module: go_project
 requires:
   - go
 options:

=== modified file 'plugins/make-project.yaml'
--- plugins/make-project.yaml	2015-09-18 14:53:03 +0000
+++ plugins/make-project.yaml	2015-09-22 03:09:51 +0000
@@ -1,4 +1,3 @@
-module: make_project
 build-packages: [make]
 options:
   source:

=== modified file 'plugins/maven-project.yaml'
--- plugins/maven-project.yaml	2015-09-18 14:53:03 +0000
+++ plugins/maven-project.yaml	2015-09-22 03:09:51 +0000
@@ -1,4 +1,3 @@
-module: maven_project
 build-packages:
   - maven
 requires:

=== modified file 'plugins/python2-project.yaml'
--- plugins/python2-project.yaml	2015-09-17 15:00:52 +0000
+++ plugins/python2-project.yaml	2015-09-22 03:09:51 +0000
@@ -1,4 +1,3 @@
-module: python2_project
 requires:
   - python2
 options:

=== modified file 'plugins/python3-project.yaml'
--- plugins/python3-project.yaml	2015-09-08 18:06:03 +0000
+++ plugins/python3-project.yaml	2015-09-22 03:09:51 +0000
@@ -1,4 +1,3 @@
-module: python3_project
 requires:
   - python3
 options:

=== modified file 'plugins/tar-content.yaml'
--- plugins/tar-content.yaml	2015-09-08 18:06:03 +0000
+++ plugins/tar-content.yaml	2015-09-22 03:09:51 +0000
@@ -1,4 +1,3 @@
-module: tar_content
 options:
   source:
     required: true

=== modified file 'snapcraft/plugin.py'
--- snapcraft/plugin.py	2015-09-18 21:02:50 +0000
+++ snapcraft/plugin.py	2015-09-22 03:09:51 +0000
@@ -119,20 +119,20 @@
 
     def _load_code(self, name, part_name, properties):
         options = self._make_options(name, properties)
-        moduleName = self.config.get('module', name)
+        module_name = name.replace('-', '_')
 
         # Load code from local plugin dir if it is there
         if is_local_plugin(name):
             sys.path = [plugindir(name)] + sys.path
         else:
-            moduleName = 'snapcraft.plugins.' + moduleName
+            module_name = 'snapcraft.plugins.' + module_name
 
-        module = importlib.import_module(moduleName)
+        module = importlib.import_module(module_name)
         if is_local_plugin(name):
             sys.path.pop(0)
 
-        for propName in dir(module):
-            prop = getattr(module, propName)
+        for prop_name in dir(module):
+            prop = getattr(module, prop_name)
             if issubclass(prop, snapcraft.BasePlugin):
                 self.code = prop(part_name, options)
                 break

=== modified file 'snapcraft/tests/test_plugin.py'
--- snapcraft/tests/test_plugin.py	2015-09-17 04:52:11 +0000
+++ snapcraft/tests/test_plugin.py	2015-09-22 03:09:51 +0000
@@ -214,7 +214,7 @@
         """Ensure local plugins are loaded from parts/plugins"""
         def mock_import_modules(module_name):
             # called with the name only and sys.path set
-            self.assertEqual(module_name, "x-mock")
+            self.assertEqual(module_name, "x_mock")
             self.assertTrue(sys.path[0].endswith("parts/plugins"))
             return mock_plugin
         with patch("importlib.import_module", side_effect=mock_import_modules):