[Checkins] SVN: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/te Changed tests to check the created files instead of output.
Christophe Combelles
ccomb at free.fr
Mon Mar 29 20:15:51 EDT 2010
Log message for revision 110287:
Changed tests to check the created files instead of output.
Also disabled the default verbosity
Changed:
U bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py
U bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/tests/bluebream.txt
-=-
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 23:45:52 UTC (rev 110286)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/template.py 2010-03-30 00:15:50 UTC (rev 110287)
@@ -62,14 +62,13 @@
def write_files(self, command, output_dir, vars):
"Add namespace packages and move the main package to the last level"
+ command.verbose = 0
templates.Template.write_files(self, command, output_dir, vars)
if len(self.ns_split) > 1:
- print 'Namespace package detected!'
target_dir = os.path.join(output_dir, 'src',
os.path.join(*self.ns_split[:-1]))
- print 'Creating directory %s' % target_dir
os.makedirs(target_dir)
ns_decl = "__import__('pkg_resources').declare_namespace(__name__)"
@@ -77,12 +76,10 @@
init_file = os.path.join(output_dir, 'src',
os.path.join(*self.ns_split[:i+1]),
'__init__.py')
- print 'Creating namespace-enabled %s' % init_file
open(init_file, 'w').write(ns_decl)
main_package_dir = os.path.join(output_dir,
'src',
vars['main_package'])
- print 'Moving %s to %s' % (main_package_dir, target_dir)
shutil.move(main_package_dir, target_dir)
Modified: bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/tests/bluebream.txt
===================================================================
--- bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/tests/bluebream.txt 2010-03-29 23:45:52 UTC (rev 110286)
+++ bluebream/branches/ccomb-merge-templates/src/bluebream/bluebream_base/tests/bluebream.txt 2010-03-30 00:15:50 UTC (rev 110287)
@@ -7,6 +7,13 @@
First try with a single flat package:
-------------------------------------
+>>> import os
+>>> def print_dir(d):
+... for a,b,c in os.walk(d):
+... print a
+... for f in c:
+... print os.path.join(a,f)
+
>>> from paste.script import command
>>> project = 'sample'
>>> commands = command.get_commands()
@@ -45,59 +52,59 @@
zip_safe: False
Creating template bluebream
Creating directory ./sample
- Copying bootstrap.py to ./sample/bootstrap.py
- Copying buildout.cfg_tmpl to ./sample/buildout.cfg
- Copying debug.ini_tmpl to ./sample/debug.ini
- Copying deploy.ini_tmpl to ./sample/deploy.ini
- Recursing into etc
- Creating ./sample/etc/
- Copying site.zcml_tmpl to ./sample/etc/site.zcml
- Copying setup.py_tmpl to ./sample/setup.py
- Recursing into src
- Creating ./sample/src/
- Recursing into +main_package+
- Creating ./sample/src/sample/
- Copying __init__.py to ./sample/src/sample/__init__.py
- Copying configure.zcml_tmpl to ./sample/src/sample/configure.zcml
- Copying debug.py to ./sample/src/sample/debug.py
- Copying securitypolicy.zcml_tmpl to ./sample/src/sample/securitypolicy.zcml
- Copying startup.py to ./sample/src/sample/startup.py
- Recursing into tests
- Creating ./sample/src/sample/tests/
- Copying __init__.py to ./sample/src/sample/tests/__init__.py
- Copying ftesting.zcml_tmpl to ./sample/src/sample/tests/ftesting.zcml
- Copying tests.py_tmpl to ./sample/src/sample/tests/tests.py
- Recursing into welcome
- Creating ./sample/src/sample/welcome/
- Copying __init__.py to ./sample/src/sample/welcome/__init__.py
- Copying app.py to ./sample/src/sample/welcome/app.py
- Copying configure.zcml_tmpl to ./sample/src/sample/welcome/configure.zcml
- Copying ftests.txt_tmpl to ./sample/src/sample/welcome/ftests.txt
- Copying index.pt to ./sample/src/sample/welcome/index.pt
- Copying interfaces.py to ./sample/src/sample/welcome/interfaces.py
- Recursing into static
- Creating ./sample/src/sample/welcome/static/
- Copying logo.png to ./sample/src/sample/welcome/static/logo.png
- Copying style.css to ./sample/src/sample/welcome/static/style.css
- Copying views.py to ./sample/src/sample/welcome/views.py
- Recursing into +package+.egg-info
- Creating ./sample/src/sample.egg-info/
- Copying PKG-INFO to ./sample/src/sample.egg-info/PKG-INFO
- Recursing into templates
- Creating ./sample/templates/
- Copying zope_conf.in to ./sample/templates/zope_conf.in
- Recursing into var
- Creating ./sample/var/
- Recursing into filestorage
- Creating ./sample/var/filestorage/
- Copying README.txt to ./sample/var/filestorage/README.txt
- Recursing into log
- Creating ./sample/var/log/
- Copying README.txt to ./sample/var/log/README.txt
- Copying versions.cfg to ./sample/versions.cfg
-Running python setup.py egg_info
+>>> print_dir('sample')
+sample
+sample/debug.ini
+sample/setup.py
+sample/bootstrap.py
+sample/versions.cfg
+sample/deploy.ini
+sample/buildout.cfg
+sample/etc
+sample/etc/site.zcml
+sample/templates
+sample/templates/zope_conf.in
+sample/var
+sample/var/filestorage
+sample/var/filestorage/README.txt
+sample/var/log
+sample/var/log/README.txt
+sample/src
+sample/src/sample.egg-info
+sample/src/sample.egg-info/entry_points.txt
+sample/src/sample.egg-info/requires.txt
+sample/src/sample.egg-info/top_level.txt
+sample/src/sample.egg-info/zip-safe
+sample/src/sample.egg-info/SOURCES.txt
+sample/src/sample.egg-info/dependency_links.txt
+sample/src/sample.egg-info/namespace_packages.txt
+sample/src/sample.egg-info/PKG-INFO
+sample/src/sample
+sample/src/sample/__init__.py
+sample/src/sample/configure.zcml
+sample/src/sample/securitypolicy.zcml
+sample/src/sample/startup.py
+sample/src/sample/debug.py
+sample/src/sample/tests
+sample/src/sample/tests/__init__.py
+sample/src/sample/tests/tests.py
+sample/src/sample/tests/ftesting.zcml
+sample/src/sample/welcome
+sample/src/sample/welcome/__init__.py
+sample/src/sample/welcome/ftests.txt
+sample/src/sample/welcome/interfaces.py
+sample/src/sample/welcome/configure.zcml
+sample/src/sample/welcome/views.py
+sample/src/sample/welcome/app.py
+sample/src/sample/welcome/index.pt
+sample/src/sample/welcome/static
+sample/src/sample/welcome/static/logo.png
+sample/src/sample/welcome/static/style.css
+
+
+
We can also create a project with a namespace:
----------------------------------------------
@@ -139,63 +146,61 @@
zip_safe: False
Creating template bluebream
Creating directory ./sample.main
- Copying bootstrap.py to ./sample.main/bootstrap.py
- Copying buildout.cfg_tmpl to ./sample.main/buildout.cfg
- Copying debug.ini_tmpl to ./sample.main/debug.ini
- Copying deploy.ini_tmpl to ./sample.main/deploy.ini
- Recursing into etc
- Creating ./sample.main/etc/
- Copying site.zcml_tmpl to ./sample.main/etc/site.zcml
- Copying setup.py_tmpl to ./sample.main/setup.py
- Recursing into src
- Creating ./sample.main/src/
- Recursing into +main_package+
- Creating ./sample.main/src/main/
- Copying __init__.py to ./sample.main/src/main/__init__.py
- Copying configure.zcml_tmpl to ./sample.main/src/main/configure.zcml
- Copying debug.py to ./sample.main/src/main/debug.py
- Copying securitypolicy.zcml_tmpl to ./sample.main/src/main/securitypolicy.zcml
- Copying startup.py to ./sample.main/src/main/startup.py
- Recursing into tests
- Creating ./sample.main/src/main/tests/
- Copying __init__.py to ./sample.main/src/main/tests/__init__.py
- Copying ftesting.zcml_tmpl to ./sample.main/src/main/tests/ftesting.zcml
- Copying tests.py_tmpl to ./sample.main/src/main/tests/tests.py
- Recursing into welcome
- Creating ./sample.main/src/main/welcome/
- Copying __init__.py to ./sample.main/src/main/welcome/__init__.py
- Copying app.py to ./sample.main/src/main/welcome/app.py
- Copying configure.zcml_tmpl to ./sample.main/src/main/welcome/configure.zcml
- Copying ftests.txt_tmpl to ./sample.main/src/main/welcome/ftests.txt
- Copying index.pt to ./sample.main/src/main/welcome/index.pt
- Copying interfaces.py to ./sample.main/src/main/welcome/interfaces.py
- Recursing into static
- Creating ./sample.main/src/main/welcome/static/
- Copying logo.png to ./sample.main/src/main/welcome/static/logo.png
- Copying style.css to ./sample.main/src/main/welcome/static/style.css
- Copying views.py to ./sample.main/src/main/welcome/views.py
- Recursing into +package+.egg-info
- Creating ./sample.main/src/samplemain.egg-info/
- Copying PKG-INFO to ./sample.main/src/samplemain.egg-info/PKG-INFO
- Recursing into templates
- Creating ./sample.main/templates/
- Copying zope_conf.in to ./sample.main/templates/zope_conf.in
- Recursing into var
- Creating ./sample.main/var/
- Recursing into filestorage
- Creating ./sample.main/var/filestorage/
- Copying README.txt to ./sample.main/var/filestorage/README.txt
- Recursing into log
- Creating ./sample.main/var/log/
- Copying README.txt to ./sample.main/var/log/README.txt
- Copying versions.cfg to ./sample.main/versions.cfg
-Namespace package detected!
-Creating directory ./sample.main/src/sample
-Creating namespace-enabled ./sample.main/src/sample/__init__.py
-Moving ./sample.main/src/main to ./sample.main/src/sample
-Running python setup.py egg_info
+>>> print_dir('sample.main')
+sample.main
+sample.main/debug.ini
+sample.main/setup.py
+sample.main/bootstrap.py
+sample.main/versions.cfg
+sample.main/deploy.ini
+sample.main/buildout.cfg
+sample.main/etc
+sample.main/etc/site.zcml
+sample.main/templates
+sample.main/templates/zope_conf.in
+sample.main/var
+sample.main/var/filestorage
+sample.main/var/filestorage/README.txt
+sample.main/var/log
+sample.main/var/log/README.txt
+sample.main/src
+sample.main/src/sample.main.egg-info
+sample.main/src/sample.main.egg-info/entry_points.txt
+sample.main/src/sample.main.egg-info/requires.txt
+sample.main/src/sample.main.egg-info/top_level.txt
+sample.main/src/sample.main.egg-info/zip-safe
+sample.main/src/sample.main.egg-info/SOURCES.txt
+sample.main/src/sample.main.egg-info/dependency_links.txt
+sample.main/src/sample.main.egg-info/namespace_packages.txt
+sample.main/src/sample.main.egg-info/PKG-INFO
+sample.main/src/sample
+sample.main/src/sample/__init__.py
+sample.main/src/sample/main
+sample.main/src/sample/main/__init__.py
+sample.main/src/sample/main/configure.zcml
+sample.main/src/sample/main/securitypolicy.zcml
+sample.main/src/sample/main/startup.py
+sample.main/src/sample/main/debug.py
+sample.main/src/sample/main/tests
+sample.main/src/sample/main/tests/__init__.py
+sample.main/src/sample/main/tests/tests.py
+sample.main/src/sample/main/tests/ftesting.zcml
+sample.main/src/sample/main/welcome
+sample.main/src/sample/main/welcome/__init__.py
+sample.main/src/sample/main/welcome/ftests.txt
+sample.main/src/sample/main/welcome/interfaces.py
+sample.main/src/sample/main/welcome/configure.zcml
+sample.main/src/sample/main/welcome/views.py
+sample.main/src/sample/main/welcome/app.py
+sample.main/src/sample/main/welcome/index.pt
+sample.main/src/sample/main/welcome/static
+sample.main/src/sample/main/welcome/static/logo.png
+sample.main/src/sample/main/welcome/static/style.css
+
+
+
Another project with two levels of namespace:
---------------------------------------------
@@ -237,61 +242,57 @@
zip_safe: False
Creating template bluebream
Creating directory ./sample.app.main
- Copying bootstrap.py to ./sample.app.main/bootstrap.py
- Copying buildout.cfg_tmpl to ./sample.app.main/buildout.cfg
- Copying debug.ini_tmpl to ./sample.app.main/debug.ini
- Copying deploy.ini_tmpl to ./sample.app.main/deploy.ini
- Recursing into etc
- Creating ./sample.app.main/etc/
- Copying site.zcml_tmpl to ./sample.app.main/etc/site.zcml
- Copying setup.py_tmpl to ./sample.app.main/setup.py
- Recursing into src
- Creating ./sample.app.main/src/
- Recursing into +main_package+
- Creating ./sample.app.main/src/main/
- Copying __init__.py to ./sample.app.main/src/main/__init__.py
- Copying configure.zcml_tmpl to ./sample.app.main/src/main/configure.zcml
- Copying debug.py to ./sample.app.main/src/main/debug.py
- Copying securitypolicy.zcml_tmpl to ./sample.app.main/src/main/securitypolicy.zcml
- Copying startup.py to ./sample.app.main/src/main/startup.py
- Recursing into tests
- Creating ./sample.app.main/src/main/tests/
- Copying __init__.py to ./sample.app.main/src/main/tests/__init__.py
- Copying ftesting.zcml_tmpl to ./sample.app.main/src/main/tests/ftesting.zcml
- Copying tests.py_tmpl to ./sample.app.main/src/main/tests/tests.py
- Recursing into welcome
- Creating ./sample.app.main/src/main/welcome/
- Copying __init__.py to ./sample.app.main/src/main/welcome/__init__.py
- Copying app.py to ./sample.app.main/src/main/welcome/app.py
- Copying configure.zcml_tmpl to ./sample.app.main/src/main/welcome/configure.zcml
- Copying ftests.txt_tmpl to ./sample.app.main/src/main/welcome/ftests.txt
- Copying index.pt to ./sample.app.main/src/main/welcome/index.pt
- Copying interfaces.py to ./sample.app.main/src/main/welcome/interfaces.py
- Recursing into static
- Creating ./sample.app.main/src/main/welcome/static/
- Copying logo.png to ./sample.app.main/src/main/welcome/static/logo.png
- Copying style.css to ./sample.app.main/src/main/welcome/static/style.css
- Copying views.py to ./sample.app.main/src/main/welcome/views.py
- Recursing into +package+.egg-info
- Creating ./sample.app.main/src/sampleappmain.egg-info/
- Copying PKG-INFO to ./sample.app.main/src/sampleappmain.egg-info/PKG-INFO
- Recursing into templates
- Creating ./sample.app.main/templates/
- Copying zope_conf.in to ./sample.app.main/templates/zope_conf.in
- Recursing into var
- Creating ./sample.app.main/var/
- Recursing into filestorage
- Creating ./sample.app.main/var/filestorage/
- Copying README.txt to ./sample.app.main/var/filestorage/README.txt
- Recursing into log
- Creating ./sample.app.main/var/log/
- Copying README.txt to ./sample.app.main/var/log/README.txt
- Copying versions.cfg to ./sample.app.main/versions.cfg
-Namespace package detected!
-Creating directory ./sample.app.main/src/sample/app
-Creating namespace-enabled ./sample.app.main/src/sample/__init__.py
-Creating namespace-enabled ./sample.app.main/src/sample/app/__init__.py
-Moving ./sample.app.main/src/main to ./sample.app.main/src/sample/app
-Running python setup.py egg_info
+>>> print_dir('sample.app.main')
+sample.app.main
+sample.app.main/debug.ini
+sample.app.main/setup.py
+sample.app.main/bootstrap.py
+sample.app.main/versions.cfg
+sample.app.main/deploy.ini
+sample.app.main/buildout.cfg
+sample.app.main/etc
+sample.app.main/etc/site.zcml
+sample.app.main/templates
+sample.app.main/templates/zope_conf.in
+sample.app.main/var
+sample.app.main/var/filestorage
+sample.app.main/var/filestorage/README.txt
+sample.app.main/var/log
+sample.app.main/var/log/README.txt
+sample.app.main/src
+sample.app.main/src/sample
+sample.app.main/src/sample/__init__.py
+sample.app.main/src/sample/app
+sample.app.main/src/sample/app/__init__.py
+sample.app.main/src/sample/app/main
+sample.app.main/src/sample/app/main/__init__.py
+sample.app.main/src/sample/app/main/configure.zcml
+sample.app.main/src/sample/app/main/securitypolicy.zcml
+sample.app.main/src/sample/app/main/startup.py
+sample.app.main/src/sample/app/main/debug.py
+sample.app.main/src/sample/app/main/tests
+sample.app.main/src/sample/app/main/tests/__init__.py
+sample.app.main/src/sample/app/main/tests/tests.py
+sample.app.main/src/sample/app/main/tests/ftesting.zcml
+sample.app.main/src/sample/app/main/welcome
+sample.app.main/src/sample/app/main/welcome/__init__.py
+sample.app.main/src/sample/app/main/welcome/ftests.txt
+sample.app.main/src/sample/app/main/welcome/interfaces.py
+sample.app.main/src/sample/app/main/welcome/configure.zcml
+sample.app.main/src/sample/app/main/welcome/views.py
+sample.app.main/src/sample/app/main/welcome/app.py
+sample.app.main/src/sample/app/main/welcome/index.pt
+sample.app.main/src/sample/app/main/welcome/static
+sample.app.main/src/sample/app/main/welcome/static/logo.png
+sample.app.main/src/sample/app/main/welcome/static/style.css
+sample.app.main/src/sample.app.main.egg-info
+sample.app.main/src/sample.app.main.egg-info/entry_points.txt
+sample.app.main/src/sample.app.main.egg-info/requires.txt
+sample.app.main/src/sample.app.main.egg-info/top_level.txt
+sample.app.main/src/sample.app.main.egg-info/zip-safe
+sample.app.main/src/sample.app.main.egg-info/SOURCES.txt
+sample.app.main/src/sample.app.main.egg-info/dependency_links.txt
+sample.app.main/src/sample.app.main.egg-info/namespace_packages.txt
+sample.app.main/src/sample.app.main.egg-info/PKG-INFO
More information about the checkins
mailing list