Merge branch 'options-rewrite'

Conflicts:
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Init.py
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/MultiprocessingCore.py
	src/lib/Bcfg2/Server/Plugin/base.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
	src/lib/Bcfg2/Server/SSLServer.py
	src/lib/Bcfg2/Utils.py
	src/lib/Bcfg2/settings.py
	src/sbin/bcfg2-crypt
	src/sbin/bcfg2-info
	src/sbin/bcfg2-lint
	src/sbin/bcfg2-test
	src/sbin/bcfg2-yum-helper
	tools/bcfg2-profile-templates.py

1 files changed, 55 insertions, 0 deletions

diff --git a/src/lib/Bcfg2/Server/Lint/Bundler.py b/src/lib/Bcfg2/Server/Lint/Bundler.py
new file mode 100644
index 000000000..b41313349
--- /dev/null
+++ b/src/lib/Bcfg2/Server/Lint/Bundler.py
@@ -0,0 +1,55 @@
+from Bcfg2.Server.Lint import ServerPlugin
+
+
+class Bundler(ServerPlugin):
+    """ Perform various :ref:`Bundler
+    <server-plugins-structures-bundler-index>` checks. """
+
+    def Run(self):
+        self.missing_bundles()
+        for bundle in self.core.plugins['Bundler'].entries.values():
+            if self.HandlesFile(bundle.name):
+                self.bundle_names(bundle)
+
+    @classmethod
+    def Errors(cls):
+        return {"bundle-not-found": "error",
+                "unused-bundle": "warning",
+                "explicit-bundle-name": "error",
+                "genshi-extension-bundle": "error"}
+
+    def missing_bundles(self):
+        """ Find bundles listed in Metadata but not implemented in
+        Bundler. """
+        if self.files is None:
+            # when given a list of files on stdin, this check is
+            # useless, so skip it
+            groupdata = self.metadata.groups_xml.xdata
+            ref_bundles = set([b.get("name")
+                               for b in groupdata.findall("//Bundle")])
+
+            allbundles = self.core.plugins['Bundler'].bundles.keys()
+            for bundle in ref_bundles:
+                if bundle not in allbundles:
+                    self.LintError("bundle-not-found",
+                                   "Bundle %s referenced, but does not exist" %
+                                   bundle)
+
+            for bundle in allbundles:
+                if bundle not in ref_bundles:
+                    self.LintError("unused-bundle",
+                                   "Bundle %s defined, but is not referenced "
+                                   "in Metadata" % bundle)
+
+    def bundle_names(self, bundle):
+        """ Verify that deprecated bundle .genshi bundles and explicit
+        bundle names aren't used """
+        if bundle.xdata.get('name'):
+            self.LintError("explicit-bundle-name",
+                           "Deprecated explicit bundle name in %s" %
+                           bundle.name)
+
+        if bundle.name.endswith(".genshi"):
+            self.LintError("genshi-extension-bundle",
+                           "Bundle %s uses deprecated .genshi extension" %
+                           bundle.name)