[Checkins] SVN: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/ simplify the code

[Christophe Combelles]

Log message for revision 110286:
  simplify the code
  

Changed:
  U   bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/etc/site.zcml_tmpl
  U   bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/setup.py_tmpl
  U   bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/src/+main_package+/tests/ftesting.zcml_tmpl
  U   bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/src/+main_package+/tests/tests.py_tmpl
  U   bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py

-=-
Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/etc/site.zcml_tmpl
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/etc/site.zcml_tmpl	2010-03-29 20:44:28 UTC (rev 110285)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/etc/site.zcml_tmpl	2010-03-29 23:45:52 UTC (rev 110286)
@@ -44,6 +44,6 @@
   <include package="zope.traversing.browser" />
   <include package="zope.app.pagetemplate" />
 
-  <include package="${'.'.join(ns_packages)}${ns_packages and '.' or None}${main_package}" />
+  <include package="${ns_prefix}${main_package}" />
 
 </configure>

Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/setup.py_tmpl
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/setup.py_tmpl	2010-03-29 20:44:28 UTC (rev 110285)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/setup.py_tmpl	2010-03-29 23:45:52 UTC (rev 110286)
@@ -7,7 +7,7 @@
       long_description="""\
 ${long_description|nothing}""",
       # Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers
-      classifiers=[], 
+      classifiers=[],
       keywords=${repr(keywords)|empty},
       author=${repr(author)|empty},
       author_email=${repr(author_email)|empty},
@@ -15,7 +15,7 @@
       license=${repr(license_name)|empty},
       package_dir={'': 'src'},
       packages=find_packages('src'),
-      ${ns_packages and 'namespace_packages=%s,' % repr(['.'.join(ns_packages[:i+1]) for i in range(len(ns_packages))]) or None}
+      namespace_packages=${repr(namespace_packages)},
       include_package_data=True,
       zip_safe=${repr(bool(zip_safe))|False},
       install_requires=['setuptools',
@@ -57,9 +57,9 @@
                         ],
       entry_points = """
       [paste.app_factory]
-      main = ${'.'.join(ns_packages)}${ns_packages and '.' or None}${main_package}.startup:application_factory
+      main = ${ns_prefix}${main_package}.startup:application_factory
 
       [paste.global_paster_command]
-      shell = ${'.'.join(ns_packages)}${ns_packages and '.' or None}${main_package}.debug:Shell
+      shell = ${ns_prefix}${main_package}.debug:Shell
       """,
       )

Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/src/+main_package+/tests/ftesting.zcml_tmpl
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/src/+main_package+/tests/ftesting.zcml_tmpl	2010-03-29 20:44:28 UTC (rev 110285)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/src/+main_package+/tests/ftesting.zcml_tmpl	2010-03-29 23:45:52 UTC (rev 110286)
@@ -48,6 +48,6 @@
   <grantAll role="zope.Manager" />
   <grant role="zope.Manager" principal="zope.mgr" />
 
-  <include package="${'.'.join(ns_packages)}${ns_packages and '.' or None}${main_package}" />
+  <include package="${ns_prefix}${main_package}" />
 
 </configure>

Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/src/+main_package+/tests/tests.py_tmpl
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/src/+main_package+/tests/tests.py_tmpl	2010-03-29 20:44:28 UTC (rev 110285)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/project_template/src/+main_package+/tests/tests.py_tmpl	2010-03-29 23:45:52 UTC (rev 110286)
@@ -1,3 +1,3 @@
 import z3c.testsetup
 
-test_suite = z3c.testsetup.register_all_tests('${'.'.join(ns_packages)}${ns_packages and '.' or None}${main_package}')
+test_suite = z3c.testsetup.register_all_tests('${ns_prefix}${main_package}')

Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py	2010-03-29 20:44:28 UTC (rev 110285)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py	2010-03-29 23:45:52 UTC (rev 110286)
@@ -11,7 +11,8 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-import os, sys, shutil
+import re, os, sys, shutil
+import pkg_resources
 from paste.script import templates
 from paste.script.templates import var
 
@@ -22,10 +23,6 @@
     summary = "A BlueBream project, base template"
 
     vars = [
-#        var('namespace_package', 'Namespace package name'),
-#        var('main_package',
-#            'Main package name (under the namespace)',
-#            default='main'),
         var('interpreter',
             'Name of custom Python interpreter',
             default='breampy'),
@@ -51,19 +48,18 @@
             sys.exit(1)
 
         # detect namespaces in the project name
-        vars['main_package'] = vars['project'].split('.')[-1]
+        vars['package'] = re.sub('[^A-Za-z0-9.]+', '_', vars['project']).lower()
+        vars['main_package'] = vars['package'].split('.')[-1]
         self.ns_split = vars['project'].split('.')
-        vars['ns_packages'] = self.ns_split[:-1]
-        vars['packages'] = vars['project']
+        vars['namespace_packages'] = [
+                    vars['package'].rsplit('.', i)[0]
+                    for i in range(1,len(self.ns_split))]
+        vars['ns_prefix'] = '.'.join(self.ns_split[:-1])
+        if len(self.ns_split) == 0:
+            vars['ns_prefix'] = ''
 
-        for var in self.vars:
-            if var.name == 'namespace_package':
-                var.default = vars['package']
+        return templates.Template.check_vars(self, vars, cmd)
 
-        self._vars = vars = templates.Template.check_vars(self, vars, cmd)
-
-        return vars
-
     def write_files(self, command, output_dir, vars):
         "Add namespace packages and move the main package to the last level"
         templates.Template.write_files(self, command, output_dir, vars)