3 files changed, 91 insertions, 2 deletions
diff --git a/src/lib/Server/Plugins/Git.py b/src/lib/Server/Plugins/Git.py
new file mode 100644
index 000000000..1c17c8e47
--- /dev/null
+++ b/src/lib/Server/Plugins/Git.py
@@ -0,0 +1,45 @@
+import os
+import Bcfg2.Server.Plugin
+
+# for debugging output only
+import logging
+logger = logging.getLogger('Bcfg2.Plugins.Git')
+
+class Git(Bcfg2.Server.Plugin.Plugin,
+          Bcfg2.Server.Plugin.Version):
+    name = 'Git'
+    __version__ = '$Id$'
+    __author__ = 'bcfg-dev@mcs.anl.gov'
+
+    def __init__(self, core, datastore):
+        Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
+        self.core = core
+        self.datastore = datastore
+
+        # path to git directory for bcfg2 repo
+        git_dir = "%s/.git" % datastore
+
+        # Read revision from bcfg2 repo
+        if os.path.isdir(git_dir):
+            self.get_revision()
+        else:
+            logger.error("%s is not a directory" % git_dir)
+            raise Bcfg2.Server.Plugin.PluginInitError
+
+        logger.debug("Initialized git plugin with git directory = %s" % git_dir)
+
+    def get_revision(self):
+        '''Read git revision information for the bcfg2 repository'''
+        try:
+            data = os.popen("env LC_ALL=C git ls-remote %s" %
+                            (self.datastore)).readlines()
+            revline = [line.split('\t')[0].strip() for line in data if \
+                       line.split('\t')[1].strip() == 'refs/heads/master'][-1]
+            revision = revline
+        except IndexError:
+            logger.error("Failed to read git ls-remote; disabling git support")
+            logger.error('''Ran command "git ls-remote %s"''' % \
+                            (self.datastore))
+            logger.error("Got output: %s" % data)
+            raise Bcfg2.Server.Plugin.PluginInitError
+        return revision
diff --git a/src/lib/Server/Plugins/Svn.py b/src/lib/Server/Plugins/Svn.py
new file mode 100644
index 000000000..269c3173b
--- /dev/null
+++ b/src/lib/Server/Plugins/Svn.py
@@ -0,0 +1,44 @@
+import os
+import Bcfg2.Server.Plugin
+
+# for debugging output only
+import logging
+logger = logging.getLogger('Bcfg2.Plugins.Svn')
+
+class Svn(Bcfg2.Server.Plugin.Plugin,
+          Bcfg2.Server.Plugin.Version):
+    name = 'Svn'
+    __version__ = '$Id$'
+    __author__ = 'bcfg-dev@mcs.anl.gov'
+
+    def __init__(self, core, datastore):
+        Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
+        self.core = core
+        self.datastore = datastore
+
+        # path to svn directory for bcfg2 repo
+        svn_dir = "%s/.svn" % datastore
+
+        # Read revision from bcfg2 repo
+        if os.path.isdir(svn_dir):
+            self.get_revision()
+        else:
+            logger.error("%s is not a directory" % svn_dir)
+            raise Bcfg2.Server.Plugin.PluginInitError
+
+        logger.debug("Initialized svn plugin with svn directory = %s" % svn_dir)
+
+    def get_revision(self):
+        '''Read svn revision information for the bcfg2 repository'''
+        try:
+            data = os.popen("env LC_ALL=C svn info %s" \
+                            % (self.datastore)).readlines()
+            revline = [line.split(': ')[1].strip() for line in data \
+                       if line[:9] == 'Revision:'][-1]
+            revision = revline
+        except IndexError:
+            logger.error("Failed to read svn info; disabling svn support")
+            logger.error('''Ran command "svn info %s"''' % (self.datastore))
+            logger.error("Got output: %s" % data)
+            raise Bcfg2.Server.Plugin.PluginInitError
+        return revision
diff --git a/src/lib/Server/Plugins/__init__.py b/src/lib/Server/Plugins/__init__.py
index 1e5c122c8..6382adbaf 100644
--- a/src/lib/Server/Plugins/__init__.py
+++ b/src/lib/Server/Plugins/__init__.py
@@ -1,7 +1,7 @@
 '''imports for Bcfg2.Server.Plugins'''
 __revision__ = '$Revision$'
 
-__all__ = ['Account', 'Base', 'Bundler', 'Cfg', 'Decisions', 'GBundler',
+__all__ = ['Account', 'Base', 'Bundler', 'Cfg', 'Decisions', 'GBundler', 'Git',
            'Hostbase', 'Metadata', 'NagiosGen', 'Packages', 'Properties',
            'Probes', 'Pkgmgr', 'Rules', 'SSHbase', 'Statistics', 'Svcmgr',
-           'TCheetah', 'SGenshi', 'TGenshi', 'Vhost']
+           'Svn', 'TCheetah', 'SGenshi', 'TGenshi', 'Vhost']