git repositories as templates & code cleanup

lib/python/moa/template/template.py

@@ -15,7 +15,6 @@
 """
 
 import os
-import copy
 
 import Yaco
 
@@ -28,7 +27,7 @@ class Template(Yaco.Yaco):
     Template extends Yaco
     """
 
-    def __init__(self, templateFile):
+    def __init__(self, wd):
         """
         Initialze the template object, which means:
 
@@ -46,7 +45,18 @@ def __init__(self, templateFile):
 
         super(Template, self).__init__(self)
 
-        self.templateFile = templateFile
+        templateFile1 = os.path.join('.moa', 'template.d', 'template')
+        templateFile2 = os.path.join('.moa', 'template')
+
+        self.metaFile = os.path.join('.moa', 'template.meta')
+        self.loadMeta()
+
+        if os.path.exists(templateFile1):
+            self.templateFile = templateFile1
+        elif os.path.exists(templateFile2):
+            self.templateFile = templateFile2
+        else:
+            self.templateFile = templateFile1
 
         #set a few defaults to be used by each template
         self.parameters = {}
@@ -102,6 +112,15 @@ def __init__(self, templateFile):
         if not self.name == 'nojob' and not self.modification_date:
             self.modification_date = os.path.getmtime(self.templateFile)
 
+    def loadMeta(self):
+        """
+        Load the template meta data for this job, based on what configuration
+        can be found
+        """
+        self.meta = Yaco.Yaco()
+        if os.path.exists(self.metaFile):
+            self.templateMeta.load(self.metaFile)
+
     def getRaw(self):
         """
         Return a Yaco representation of the yaml-template, without any