Changeset 1281

Timestamp:

09/17/08 13:07:50

Author:

mylan

Message:

Implement saving template vars in generated theme-product egg-info dir

Files:

• qtheme.template/trunk/qthemetemplate/__init__.py (modified) (1 diff)
• qtheme.template/trunk/qthemetemplate/localcommands/__init__.py (modified) (5 diffs)
• qtheme.template/trunk/qthemetemplate/templates/qplone3_theme/setup.py_tmpl (modified) (1 diff)
• qtheme.template/trunk/setup.py (modified) (1 diff)

qtheme.template/trunk/qthemetemplate/__init__.py

@@ -1 +1 @@
-#
+import os,types
+from StringIO import StringIO
+from ConfigParser import SafeConfigParser
+
-from qthemetemplate.qplone3_theme import qPlone3Theme
+
+def write_map(cmd, basename, filename, force=False):
+    argname = os.path.splitext(basename)[0]
+    value = getattr(cmd.distribution, argname, None)
+
+    if value:
+        config = SafeConfigParser()
+        config.add_section('qplone3_theme')
+        for name, val in value.items():
+            val = val and str(val) or ''
+            config.set('qplone3_theme', name, val)
+
+        strvalue = StringIO()
+        config.write(strvalue)
+        value = strvalue.getvalue()
+
+    cmd.write_or_delete_file(argname, filename, value, force)
+
+
+def assert_dict(dist, attr, value):
+    """Verify that value is a dict or None"""
+    try:
+        assert type(value) == types.DictType
+        print 'success assert'
+    except (TypeError,ValueError,AttributeError,AssertionError):
+        raise DistutilsSetupError(
+            "%r must be a dict (got %r)" % (attr,value)
+        )

qtheme.template/trunk/qthemetemplate/localcommands/__init__.py

@@ -3 +3 @@
-"""
-import os
+from ConfigParser import SafeConfigParser
+from paste.script import pluginlib
+
-from zopeskel.base import var
-from zopeskel.localcommands import ZopeSkelLocalTemplate
@@ -16 +19 @@
-    # (compotemplate_name, compo marker), for ex.:
-    compo_template_markers = []
+    # list vars names to add in theme_vars egg_info file
+    shared_vars = []
-
-    def template_dir(self):
@@ -26 +31 @@
-        return super(QThemeSubTemplate, self).template_dir()
-
+    def pre(self, command, output_dir, vars):
+        """ Get all previous template vars
+        """
+        for k, v in self.get_template_vars(output_dir, vars).items():
+            if not k in vars.keys():
+                vars[k] = v
+        super(QThemeSubTemplate, self).pre(command, output_dir, vars)
+
-    def post(self, command, output_dir, vars):
-        """ Call write_files function for every subtemplate,
@@ -31 +44 @@
-             - set compose prop for change subtemplate path calculation
-        """
-
-        if self.compo_template_markers:
-            for cname, cmarker in self.compo_template_markers:
@@ -40 +52 @@
-                self._template_dir = original_template_dir
-
+        self.add_template_vars(output_dir, vars)
-        super(QThemeSubTemplate, self).post(command, output_dir, vars)
-
+    def get_template_vars(self, output_dir, vars):
+
+        res = {}
+        egg_info = pluginlib.find_egg_info_dir(output_dir)
+        theme_vars_fp = os.path.join(egg_info, 'theme_vars.txt')
+
+        if egg_info and os.path.exists(theme_vars_fp):
+            config = SafeConfigParser()
+            config.read(theme_vars_fp)
+            
+            for section in config.sections():
+                for option in config.options(section):
+                    key = section + '.' + option
+                    val = config.get(section, option)
+                    if section == 'multiple_templates':
+                        val = val.split(',')
+                    res[key] = val
+
+        return res
+
+    def add_template_vars(self, output_dir, vars):
+
+        if not self.shared_vars:
+            return
+
+        egg_info = pluginlib.find_egg_info_dir(output_dir)
+        theme_vars_fp = os.path.join(egg_info, 'theme_vars.txt')
+
+        if egg_info and os.path.exists(theme_vars_fp):
+            config = SafeConfigParser()
+            config.read(theme_vars_fp)
+
+            thesection = self.name
+            if config.has_section(thesection):
+                msection = 'multiple_templates'
+                moption = self.name
+
+                if not config.has_section(msection):
+                    config.add_section(msection)
+
+                val = []
+                if config.has_option(msection, moption):
+                    val = config.get(msection, moption).split(',')
+                else:
+                    val.append(moption)
+                thesection = "%s_%d"%(moption,len(val))
+                val.append(thesection)
+
+                config.set(msection, moption, ','.join(val))
+
+            config.add_section(thesection)
+            for k in self.shared_vars:
+                config.set(thesection, k, vars[k])
+
+            theme_file = file(theme_vars_fp,'w')
+            config.write(theme_file)
+            theme_file.close()

qtheme.template/trunk/qthemetemplate/templates/qplone3_theme/setup.py_tmpl

@@ -48 +48 @@
-      [distutils.setup_keywords]
-      paster_plugins = setuptools.dist:assert_string_list
+      theme_vars = qthemetemplate:assert_dict
-
-      [egg_info.writers]
-      paster_plugins.txt = setuptools.command.egg_info:write_arg
+      theme_vars.txt = qthemetemplate:write_map
+
-      """,
-      paster_plugins = ["ZopeSkel", "PasteScript"],
-
+
+
+
+
+
+
+
+
-      )

qtheme.template/trunk/setup.py

@@ -33 +33 @@
-          viewlet_hidden = qthemetemplate.localcommands.subtemplates:ViewletHiddenSubTemplate
-
+          [distutils.setup_keywords]
+          theme_vars = qthemetemplate:assert_dict
+
+          [egg_info.writers]
+          theme_vars.txt = qthemetemplate:write_map
+
-      # -*- Entry points: -*-
-      """,