Author: zagy
Date: Thu Sep 18 16:32:09 2008
New Revision: 6635

Log:
added some tests


Added:
   buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt   (contents,
props changed)
   buildout-recipes/gocept.nginx/trunk/gocept/nginx/tests.py   (contents, props
changed)
Modified:
   buildout-recipes/gocept.nginx/trunk/buildout.cfg
   buildout-recipes/gocept.nginx/trunk/setup.py

Modified: buildout-recipes/gocept.nginx/trunk/buildout.cfg
==============================================================================
--- buildout-recipes/gocept.nginx/trunk/buildout.cfg	(original)
+++ buildout-recipes/gocept.nginx/trunk/buildout.cfg	Thu Sep 18 16:32:09 2008
(at)(at) -1 +1,8 (at)(at)
 [buildout]
+develop = .
+parts = test
+
+[test]
+recipe = zc.recipe.testrunner
+eggs = gocept.nginx[test]
+defaults = ["-v", "-s", "gocept.nginx"]

Added: buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt
==============================================================================
--- (empty file)
+++ buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt	Thu Sep 18
16:32:09 2008
(at)(at) -0,0 +1,77 (at)(at)
+==========================
+NGNIX configuration recipe
+==========================
+
+The gocept.nginx recipe allows to configure an nginx in buildout:
+
+>>> write("buildout.cfg", """
+... [buildout]
+... parts = frontend
+...
+... [frontend]
+... recipe = gocept.nginx
+... configuration = 
+...     worker_processes 1;
+...     events {
+...         worker_connections 1024;
+...     }
+...     http {}
+... """)
+
+>>> print system(buildout),
+Installing frontend.
+
+There is a script called ``frontend`` which is used to control nginx:
+
+>>> cat('bin', 'frontend')
+#!/bin/sh
+ARGV="$(at)"
+NGINX='.../_TEST_/sample-buildout/parts/nginx/sbin/nginx'
+PIDFILE='.../_TEST_/sample-buildout/parts/frontend/nginx.pid'
+CONFIGURATION='.../_TEST_/sample-buildout/parts/frontend/nginx.conf'
+<BLANKLINE>
+ERROR=0
+if [ "x$ARGV" = "x" ] ; then 
+    ARGV="-h"
+fi
+<BLANKLINE>
+case $ARGV in
+start)
+    echo "Starting nginx "
+    $NGINX -c $CONFIGURATION
+    error=$?
+    ;;
+stop)
+    echo "Stopping nginx "
+    kill `cat $PIDFILE`
+    error=$?
+    ;;
+reload)
+    echo "Reloading nginx "
+    kill -HUP `cat $PIDFILE`
+    error=$?
+    ;;
+configtest)
+    echo "Testing nginx configuration "
+    $NGINX -c $CONFIGURATION -t
+    ERROR=$?
+    ;;
+esac
+<BLANKLINE>
+exit $ERROR
+
+In the parts directory the configuration file is created. Note that the PID
+file location is prepended automatically:
+
+>>> ls('parts')
+d  frontend
+>>> ls('parts', 'frontend')
+-  nginx.conf
+>>> cat('parts', 'frontend', 'nginx.conf')
+pid .../_TEST_/sample-buildout/parts/frontend/nginx.pid;
+<BLANKLINE>
+worker_processes 1;
+events {
+worker_connections 1024;
+}
+http {}

Added: buildout-recipes/gocept.nginx/trunk/gocept/nginx/tests.py
==============================================================================
--- (empty file)
+++ buildout-recipes/gocept.nginx/trunk/gocept/nginx/tests.py	Thu Sep 18
16:32:09 2008
(at)(at) -0,0 +1,29 (at)(at)
+# Copyright (c) 2008 gocept gmbh & co. kg
+# See also LICENSE.txt
+
+import unittest
+
+import zope.testing.doctest
+
+import zc.buildout.testing
+
+
+flags = zope.testing.doctest.ELLIPSIS
+
+#zope.testing.doctest.NORMALIZE_WHITESPACE |
+
+
+def setUp(test):
+    zc.buildout.testing.buildoutSetUp(test)
+    zc.buildout.testing.install_develop("gocept.nginx", test)
+
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(zope.testing.doctest.DocFileSuite(
+        "README.txt",
+        setUp=setUp,
+        tearDown=zc.buildout.testing.buildoutTearDown,
+        package="gocept.nginx",
+        optionflags=flags))
+    return suite

Modified: buildout-recipes/gocept.nginx/trunk/setup.py
==============================================================================
--- buildout-recipes/gocept.nginx/trunk/setup.py	(original)
+++ buildout-recipes/gocept.nginx/trunk/setup.py	Thu Sep 18 16:32:09 2008
(at)(at) -18,7 +18,9 (at)(at)
     namespace_packages = ['gocept'],
     install_requires = [
         'setuptools',
+        'zc.buildout',
     ],
+    extras_require = {'test': ['zope.testing']},
     entry_points = {
         'zc.buildout': [
              'default = %s.recipe:Recipe' % name,

Author: zagy
Date: Thu Sep 18 16:32:33 2008
New Revision: 6636

Log:
ignores


Modified:
   buildout-recipes/gocept.nginx/trunk/   (props changed)

Author: zagy
Date: Fri Sep 19 08:43:21 2008
New Revision: 6637

Log:
added deployment support


Modified:
   buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt
   buildout-recipes/gocept.nginx/trunk/gocept/nginx/nginxctl.in
   buildout-recipes/gocept.nginx/trunk/gocept/nginx/recipe.py

Modified: buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt
==============================================================================
--- buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt	(original)
+++ buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt	Fri Sep 19
08:43:21 2008
(at)(at) -27,8 +27,8 (at)(at)
 #!/bin/sh
 ARGV="$(at)"
 NGINX='.../_TEST_/sample-buildout/parts/nginx/sbin/nginx'
-PIDFILE='.../_TEST_/sample-buildout/parts/frontend/nginx.pid'
-CONFIGURATION='.../_TEST_/sample-buildout/parts/frontend/nginx.conf'
+PIDFILE='.../_TEST_/sample-buildout/parts/frontend/frontend.pid'
+CONFIGURATION='.../_TEST_/sample-buildout/parts/frontend/frontend.conf'
 <BLANKLINE>
 ERROR=0
 if [ "x$ARGV" = "x" ] ; then 
(at)(at) -66,12 +66,77 (at)(at)
 >>> ls('parts')
 d  frontend
 >>> ls('parts', 'frontend')[...]

Author: zagy
Date: Fri Sep 19 08:45:13 2008
New Revision: 6638

Log:
added deployment support


Modified:
   buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt

Modified: buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt
==============================================================================
--- buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt	(original)
+++ buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt	Fri Sep 19
08:45:13 2008
(at)(at) -11,11 +11,15 (at)(at)
 ... [frontend]
 ... recipe = gocept.nginx
 ... configuration = 
+...     error_log = ${frontend:error_log}
 ...     worker_processes 1;
 ...     events {
 ...         worker_connections 1024;
 ...     }
-...     http {}
+...     http {
+...         access_log ${frontend:access_log};
+...         ...
+...     }
 ... """)
 
 >>> print system(buildout),
(at)(at) -78,6 +82,7 (at)(at)
 
 
 
+
 Deployment support
 ++++++++++++++++++

Author: zagy
Date: Fri Sep 19 09:25:03 2008
New Revision: 6639

Log:
added deployment support


Modified:
   buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt
   buildout-recipes/gocept.nginx/trunk/gocept/nginx/recipe.py

Modified: buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt
==============================================================================
--- buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt	(original)
+++ buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt	Fri Sep 19
09:25:03 2008
(at)(at) -11,14 +11,12 (at)(at)
 ... [frontend]
 ... recipe = gocept.nginx
 ... configuration = 
-...     error_log = ${frontend:error_log}
 ...     worker_processes 1;
 ...     events {
 ...         worker_connections 1024;
 ...     }
 ...     http {
-...         access_log ${frontend:access_log};
-...         ...
+...         # configuration
 ...     }
 ... """)
 
(at)(at) -65,7 +63,8 (at)(at)
 exit $ERROR
 
 In the parts directory the configuration file is created. Note that the PID
-file location is prepended automatically:
+file location is prepended automatically. Also there is a default for
+``access_log`` and ``error_log``
 
 >>> ls('parts')
 d  frontend
(at)(at) -73,14 +72,54 (at)(at)
 -  frontend.conf
 >>> cat('parts', 'frontend', 'frontend.conf')
 pid .../_TEST_/sample-buildout/parts/frontend/frontend.pid;
-<BLANKLINE>
+error_log .../_TEST_/sample-buildout/parts/frontend/frontend-error.log;
 worker_processes 1;
 events {
 worker_connections 1024;
 }
-http {}
+http {
+access_log .../_TEST_/sample-buildout/parts/frontend/frontend-access.log;
+# configuration
+}
+
 
+If an ``error_log`` or ``access_log`` statement is specified anywhere in the
+configuration the respective statement will not be added automatically:
 
+>>> write("buildout.cfg", """
+... [buildout]
+... parts = frontend
+...
+... [frontend]
+... recipe = gocept.nginx
+... configuration = 
+...     worker_processes 1;
+...     error_log /dev/null
+...     events {
+...         worker_connections 1024;
+...     }
+...     http {
+...         # configuration
+...         access_log /dev/null
+...     }
+... """)
+
+>>> print system(buildout),
+Uninstalling frontend.
+Installing frontend.
+
+>>> cat('parts', 'frontend', 'frontend.conf')
+pid .../_TEST_/sample-buildout/parts/frontend/frontend.pid;
+<BLANKLINE>
+worker_processes 1;
+error_log /dev/null
+events {
+worker_connections 1024;
+}
+http {
+# configuration
+access_log /dev/null
+}
 
 
 Deployment support

Modified: buildout-recipes/gocept.nginx/trunk/gocept/nginx/recipe.py
==============================================================================
--- buildout-recipes/gocept.nginx/trunk/gocept/nginx/recipe.py	(original)
+++ buildout-recipes/gocept.nginx/trunk/gocept/nginx/recipe.py	Fri Sep 19
09:25:03 2008
(at)(at) -3,6 +3,7 (at)(at)
 
 import os
 import os.path
+import re
 import stat
 
 import pkg_resources
(at)(at) -31,9 +32,10 (at)(at)
             options['etc-directory'] = buildout[deployment]['etc-directory']
             options['rc-directory'] = buildout[deployment]['rc-directory']
             options['run-directory'] = buildout[deployment]['run-directory']
+            options['log-directory'] = buildout[deployment]['log-directory']
             options['user'] = buildout[deployment]['user']
         else:
-            options['etc-directory'] = options["run-directory"] =
os.path.join(
+            options["run-directory"] = os.path.join(
                 buildout["buildout"]["parts-directory"], name)
             options['rc-directory'] = buildout['buildout']['bin-directory']
 
(at)(at) -42,42 +44,55 (at)(at)
             buildout["buildout"]["parts-directory"], options['nginx']))
 
     def install(self):
+        options = self.options
         if self.deployment:
             prefix = self.deployment + '-'
         else:
+            options['etc-directory'] = options["log-directory"] = \
+                options["run-directory"]
             prefix = ""
-            if not os.path.exists(self.options['run-directory']):
-                os.mkdir(self.options['run-directory'])
-                self.options.created(self.options['run-directory'])
+            if not os.path.exists(options['run-directory']):
+                os.mkdir(options['run-directory'])
+                options.created(options['run-directory'])
 
         config_path = os.path.join(
-            self.options['etc-directory'],
+            options['etc-directory'],
             prefix+self.name+'.conf')
-        ctl_path = os.path.join(self.options["rc-directory"],
+        ctl_path = os.path.join(options["rc-directory"],
                                 prefix+self.name)
         pid_path = os.path.join(
-            self.options['run-directory'], prefix+self.name+'.pid')
-
+            options['run-directory'], prefix+self.name+'.pid')
+        error_log_path = os.path.join(
+            options['log-directory'], prefix+self.name+'-error.log')
+        access_log_path = os.path.join(
+            options['log-directory'], prefix+self.name+'-access.log')
 
         # Write the configuration file
+        configuration = options['configuration']
         config_file = file(config_path, 'w')
         config_file.write('pid %s;\n' % pid_path)
         if self.deployment:
-            config_file.write('user %s;\n' % self.options['user'])
-        config_file.write(self.options['configuration'])
+            config_file.write('user %s;\n' % options['user'])
+        if re.search(r'^\s*error_log ', configuration, re.M) is None:
+            config_file.write('error_log %s;' % error_log_path)
+        if re.search(r'^\s*access_log ', configuration, re.M) is None:
+            pattern = re.compile(r'^(\s*http\s*{)$', re.M)
+            configuration = pattern.sub(
+                '\\1\naccess_log %s;' % access_log_path, configuration)
+        config_file.write(configuration)
         config_file.close()
-        self.options.created(config_path)
+        options.created(config_path)
 
         # files
         open(ctl_path, "w").write(read_resource("nginxctl.in") % dict(
-            nginx_location=self.options['nginx_location'],
+            nginx_location=options['nginx_location'],
             pid_file=pid_path,
             config_file=config_path))
 
         os.chmod(ctl_path, (os.stat(ctl_path).st_mode |
                             stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH))
-        self.options.created(ctl_path)
-        return self.options.created()
+        options.created(ctl_path)
+        return options.created()
 
     def update(self):
         pass

Author: zagy
Date: Fri Sep 19 09:26:44 2008
New Revision: 6640

Log:
added automatic logfile placement


Modified:
   buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt

Modified: buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt
==============================================================================
--- buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt	(original)
+++ buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt	Fri Sep 19
09:26:44 2008
(at)(at) -154,7 +154,9 (at)(at)
 ...     events {
 ...         worker_connections 1024;
 ...     }
-...     http {}
+...     http {
+...         # config
+...     }
 ... """)
 
 >>> print system(buildout),
(at)(at) -177,10 +179,12 (at)(at)
 >>> cat('etc', 'testdeploy-frontend.conf')
 pid run/testdeploy-frontend.pid;
 user testuser;
-<BLANKLINE>
+error_log logs/testdeploy-frontend-error.log;
 worker_processes 1;
 events {
 worker_connections 1024;
 }
-http {}
-
+http {
+access_log logs/testdeploy-frontend-access.log;
+# config
+}

Author: zagy
Date: Fri Sep 19 09:28:19 2008
New Revision: 6641

Log:
added automatic logfile placement


Modified:
   buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt

Modified: buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt
==============================================================================
--- buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt	(original)
+++ buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt	Fri Sep 19
09:28:19 2008
(at)(at) -188,3 +188,9 (at)(at)
 access_log logs/testdeploy-frontend-access.log;
 # config
 }
+
+
+If we're in deployment mode log-rotate files are also created:
+
+>>> cat('logrotate', 'deploy-frontend')
+

Author: zagy
Date: Fri Sep 19 09:41:06 2008
New Revision: 6642

Log:
added logrotate support


Modified:
   buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt
   buildout-recipes/gocept.nginx/trunk/gocept/nginx/nginxctl.in
   buildout-recipes/gocept.nginx/trunk/gocept/nginx/recipe.py

Modified: buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt
==============================================================================
--- buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt	(original)
+++ buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt	Fri Sep 19
09:41:06 2008
(at)(at) -53,6 +53,11 (at)(at)
     kill -HUP `cat $PIDFILE`
     error=$?
     ;;
+reopen_transcript)
+    echo "Reopening logfiles"
+    kill -USR1 `cat $PIDFILE`
+    error=$?
+    ;;
 configtest)
     echo "Testing nginx configuration "
     $NGINX -c $CONFIGURATION -t
(at)(at) -192,5 +197,60 (at)(at)
 
 If we're in deployment mode log-rotate files are also created:
 
->>> cat('logrotate', 'deploy-frontend')
+>>> cat('logrotate', 'testdeploy-frontend')
+logs/testdeploy-frontend-error.log {
+  rotate 5
+  weekly
+  postrotate
+    init.d/testdeploy-frontend reopen_transcript
+  endscript
+}
+logs/testdeploy-frontend-access.log {
+  rotate 5
+  weekly
+  postrotate
+    init.d/testdeploy-frontend reopen_transcript
+  endscript
+}
+
+When a log file is given by the user, no logrotate is created:
+
+>>> write("buildout.cfg", """
+... [buildout]
+... parts = frontend
+...
+... [deploy]
+... user = testuser
+... name = testdeploy
+... etc-directory = etc
+... rc-directory = init.d
+... log-directory = logs
+... run-directory = run
+... logrotate-directory = logrotate
+...
+... [frontend]
+... recipe = gocept.nginx
+... deployment = deploy
+... configuration = 
+...     worker_processes 1;
+...     events {
+...         worker_connections 1024;
+...     }
+...     http {
+...         # config
+...         access_log /dev/null
+...     }
+... """)
+
+>>> print system(buildout),
+Uninstalling frontend.
+Installing frontend.
 
+>>> cat('logrotate', 'testdeploy-frontend')
+logs/testdeploy-frontend-error.log {
+  rotate 5
+  weekly
+  postrotate
+    init.d/testdeploy-frontend reopen_transcript
+  endscript
+}

Modified: buildout-recipes/gocept.nginx/trunk/gocept/nginx/nginxctl.in
==============================================================================
--- buildout-recipes/gocept.nginx/trunk/gocept/nginx/nginxctl.in	(original)
+++ buildout-recipes/gocept.nginx/trunk/gocept/nginx/nginxctl.in	Fri Sep 19
09:41:06 2008
(at)(at) -25,6 +25,11 (at)(at)
     kill -HUP `cat $PIDFILE`
     error=$?
     ;;
+reopen_transcript)
+    echo "Reopening logfiles"
+    kill -USR1 `cat $PIDFILE`
+    error=$?
+    ;;
 configtest)
     echo "Testing nginx configuration "
     $NGINX -c $CONFIGURATION -t

Modified: buildout-recipes/gocept.nginx/trunk/gocept/nginx/recipe.py
==============================================================================
--- buildout-recipes/gocept.nginx/trunk/gocept/nginx/recipe.py	(original)
+++ buildout-recipes/gocept.nginx/trunk/gocept/nginx/recipe.py	Fri Sep 19
09:41:06 2008
(at)(at) -33,6 +33,9 (at)(at)
             options['rc-directory'] = buildout[deployment]['rc-directory']
             options['run-directory'] = buildout[deployment]['run-directory']
             options['log-directory'] = buildout[deployment]['log-directory']
+            options['logrotate'] = os.path.join(
+                buildout[deployment]['logrotate-directory'],
+                self.deployment + '-' + self.name)
             options['user'] = buildout[deployment]['user']
         else:
             options["run-directory"] = os.path.join(
(at)(at) -73,12 +76,15 (at)(at)
         config_file.write('pid %s;\n' % pid_path)
         if self.deployment:
             config_file.write('user %s;\n' % options['user'])
+        rotate_error_log = rotate_access_log = False
         if re.search(r'^\s*error_log ', configuration, re.M) is None:
             config_file.write('error_log %s;' % error_log_path)
+            rotate_error_log = True
         if re.search(r'^\s*access_log ', configuration, re.M) is None:
             pattern = re.compile(r'^(\s*http\s*{)$', re.M)
             configuration = pattern.sub(
                 '\\1\naccess_log %s;' % access_log_path, configuration)
+            rotate_access_log = True
         config_file.write(configuration)
         config_file.close()
         options.created(config_path)
(at)(at) -92,7 +98,32 (at)(at)
         os.chmod(ctl_path, (os.stat(ctl_path).st_mode |
                             stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH))
         options.created(ctl_path)
+
+        if self.deployment and (rotate_error_log or rotate_access_log):
+            logrotate_path = options['logrotate']
+            logrotate_file = open(logrotate_path, 'w')
+            if rotate_error_log:
+                logrotate_file.write(logrotate_template % dict(
+                    logfile=error_log_path,
+                    rc=ctl_path))
+            if rotate_access_log:
+                logrotate_file.write(logrotate_template % dict(
+                    logfile=access_log_path,
+                    rc=ctl_path))
+            logrotate_file.close()
+            options.created(logrotate_path)
+
         return options.created()
 
     def update(self):
         pass
+
+
+logrotate_template = """%(logfile)s {
+  rotate 5
+  weekly
+  postrotate
+    %(rc)s reopen_transcript
+  endscript
+}
+"""

Author: zagy
Date: Fri Sep 19 09:42:08 2008
New Revision: 6643

Log:
changelog


Modified:
   buildout-recipes/gocept.nginx/trunk/README.txt

Modified: buildout-recipes/gocept.nginx/trunk/README.txt
==============================================================================
--- buildout-recipes/gocept.nginx/trunk/README.txt	(original)
+++ buildout-recipes/gocept.nginx/trunk/README.txt	Fri Sep 19 09:42:08 2008
(at)(at) -26,6 +26,12 (at)(at)
 Changes
 =======
 
+0.9.3 (unreleased)
+------------------
+
+- Added support for zc.recipe.deployment / gocept.recipe.deploymentsandbox,
+  including logrotate.
+
 0.9.2 (2008-06-18)
 ------------------

Author: zagy
Date: Fri Sep 19 09:50:22 2008
New Revision: 6644

Log:
setting lock file


Modified:
   buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt
   buildout-recipes/gocept.nginx/trunk/gocept/nginx/recipe.py

Modified: buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt
==============================================================================
--- buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt	(original)
+++ buildout-recipes/gocept.nginx/trunk/gocept/nginx/README.txt	Fri Sep 19
09:50:22 2008
(at)(at) -77,6 +77,7 (at)(at)
 -  frontend.conf
 >>> cat('parts', 'frontend', 'frontend.conf')
 pid .../_TEST_/sample-buildout/parts/frontend/frontend.pid;
+lock_file .../_TEST_/sample-buildout/parts/frontend/frontend.lock;
 error_log .../_TEST_/sample-buildout/parts/frontend/frontend-error.log;
 worker_processes 1;
 events {
(at)(at) -115,6 +116,7 (at)(at)
 
 >>> cat('parts', 'frontend', 'frontend.conf')
 pid .../_TEST_/sample-buildout/parts/frontend/frontend.pid;
+lock_file .../_TEST_/sample-buildout/parts/frontend/frontend.lock;
 <BLANKLINE>
 worker_processes 1;
 error_log /dev/null
(at)(at) -183,6 +185,7 (at)(at)
 
 >>> cat('etc', 'testdeploy-frontend.conf')
 pid run/testdeploy-frontend.pid;
+lock_file run/testdeploy-frontend.lock;
 user testuser;
 error_log logs/testdeploy-frontend-error.log;
 worker_processes 1;

Modified: buildout-recipes/gocept.nginx/trunk/gocept/nginx/recipe.py
==============================================================================
--- buildout-recipes/gocept.nginx/trunk/gocept/nginx/recipe.py	(original)
+++ buildout-recipes/gocept.nginx/trunk/gocept/nginx/recipe.py	Fri Sep 19
09:50:22 2008
(at)(at) -65,6 +65,8 (at)(at)
                                 prefix+self.name)
         pid_path = os.path.join(
             options['run-directory'], prefix+self.name+'.pid')
+        lock_path = os.path.join(
+            options['run-directory'], prefix+self.name+'.lock')
         error_log_path = os.path.join(
             options['log-directory'], prefix+self.name+'-error.log')
         access_log_path = os.path.join(
(at)(at) -74,6 +76,7 (at)(at)
         configuration = options['configuration']
         config_file = file(config_path, 'w')
         config_file.write('pid %s;\n' % pid_path)
+        config_file.write('lock_file %s;\n' % lock_path)
         if self.deployment:
             config_file.write('user %s;\n' % options['user'])
         rotate_error_log = rotate_access_log = False

Author: zagy
Date: Fri Sep 19 09:58:11 2008
New Revision: 6645

Log:
preparing release


Modified:
   buildout-recipes/gocept.nginx/trunk/README.txt

Modified: buildout-recipes/gocept.nginx/trunk/README.txt
==============================================================================
--- buildout-recipes/gocept.nginx/trunk/README.txt	(original)
+++ buildout-recipes/gocept.nginx/trunk/README.txt	Fri Sep 19 09:58:11 2008
(at)(at) -26,7 +26,7 (at)(at)
 Changes
 =======
 
-0.9.3 (unreleased)
+0.9.3 (2008-09-19)
 ------------------
 
 - Added support for zc.recipe.deployment / gocept.recipe.deploymentsandbox,

Author: zagy
Date: Fri Sep 19 10:04:24 2008
New Revision: 6646

Log:
tagging 0.9.3




Added:
   buildout-recipes/gocept.nginx/tags/0.9.3/
      - copied from r6645, buildout-recipes/gocept.nginx/trunk/

Author: zagy
Date: Fri Sep 19 10:05:26 2008
New Revision: 6647

Log:
0.9.3


Modified:
   buildout-recipes/gocept.nginx/tags/0.9.3/setup.py

Modified: buildout-recipes/gocept.nginx/tags/0.9.3/setup.py
==============================================================================
--- buildout-recipes/gocept.nginx/tags/0.9.3/setup.py	(original)
+++ buildout-recipes/gocept.nginx/tags/0.9.3/setup.py	Fri Sep 19 10:05:26 2008
(at)(at) -3,7 +3,7 (at)(at)
 name = "gocept.nginx"
 setup(
     name = name,
-    version = "0.9.3dev",
+    version = "0.9.3",
     author = "Christian Theune",
     author_email = "ct(at)gocept.com",
     description = "zc.buildout recipe for configuring an nginx server",

Author: zagy
Date: Fri Sep 19 10:06:39 2008
New Revision: 6648

Log:
vb


Modified:
   buildout-recipes/gocept.nginx/trunk/README.txt
   buildout-recipes/gocept.nginx/trunk/setup.py

Modified: buildout-recipes/gocept.nginx/trunk/README.txt
==============================================================================
--- buildout-recipes/gocept.nginx/trunk/README.txt	(original)
+++ buildout-recipes/gocept.nginx/trunk/README.txt	Fri Sep 19 10:06:39 2008
(at)(at) -26,6 +26,9 (at)(at)
 Changes
 =======
 
+0.9.4 (unreleased)
+------------------
+
 0.9.3 (2008-09-19)
 ------------------
 

Modified: buildout-recipes/gocept.nginx/trunk/setup.py
==============================================================================
--- buildout-recipes/gocept.nginx/trunk/setup.py	(original)
+++ buildout-recipes/gocept.nginx/trunk/setup.py	Fri Sep 19 10:06:39 2008
(at)(at) -3,7 +3,7 (at)(at)
 name = "gocept.nginx"
 setup(
     name = name,
-    version = "0.9.3dev",
+    version = "0.9.4dev",
     author = "Christian Theune",
     author_email = "ct(at)gocept.com",
     description = "zc.buildout recipe for configuring an nginx server",

Author: zagy
Date: Fri Sep 19 15:47:47 2008
New Revision: 6654

Log:
- Table column width via <col/>



Modified:
   gocept.ooo2html/trunk/CHANGES.txt
   gocept.ooo2html/trunk/src/gocept/ooo2html/README.txt
   gocept.ooo2html/trunk/src/gocept/ooo2html/text.py

Modified: gocept.ooo2html/trunk/CHANGES.txt
==============================================================================
--- gocept.ooo2html/trunk/CHANGES.txt	(original)
+++ gocept.ooo2html/trunk/CHANGES.txt	Fri Sep 19 15:47:47 2008
(at)(at) -5,6 +5,8 (at)(at)
 0.4 (unreleased)
 ----------------
 
+- Table column width via <col/>
+
 0.3 (2008-09-12)
 ----------------
 

Modified: gocept.ooo2html/trunk/src/gocept/ooo2html/README.txt
==============================================================================
--- gocept.ooo2html/trunk/src/gocept/ooo2html/README.txt	(original)
+++ gocept.ooo2html/trunk/src/gocept/ooo2html/README.txt	Fri Sep 19 15:47:47
2008
(at)(at) -115,6 +115,11 (at)(at)
     <span class="T9"> </span>
   </p>
   <table class="Table1" style="border-collapse: separate; border-spacing:
0">
+    <col class="Table1.A"/>
+    <col class="Table1.B"/>
+    <col class="Table1.C"/>
+    <col class="Table1.D"/>
+    <col class="Table1.E"/>
     <tr>
       <td class="Table1.A1">
         <p class="Table_20_Heading">A</p>
(at)(at) -146,6 +151,9 (at)(at)
     <tr>
       <td colspan="4">
         <table style="border-collapse: separate; border-spacing: 0">
+         <col class="Table1.A"/>
+         <col class="Table1.B"/>
+         <col class="Table1.A3.3"/>
           <tr>
             <td class="Table1.A2">
               <p class="P13 Table_20_Contents"> </p>

Modified: gocept.ooo2html/trunk/src/gocept/ooo2html/text.py
==============================================================================
--- gocept.ooo2html/trunk/src/gocept/ooo2html/text.py	(original)
+++ gocept.ooo2html/trunk/src/gocept/ooo2html/text.py	Fri Sep 19 15:47:47 2008
(at)(at) -222,6 +222,17 (at)(at)
 add_processor(TableHeaderProcessor)
 
 
+class TableColumnProcessor(Processor):
+
+    html_tag = 'col'
+    odt_tag = ('{urn:oasis:names:tc:opendocument:xmlns:table:1.0}'
+               'table-column')
+    empty_tag = True
+
+
+add_processor(TableColumnProcessor)
+
+
 class LinkProcessor(Processor):
 
     html_tag = 'a'

Author: mac
Date: Sat Sep 20 13:53:00 2008
New Revision: 6660

Log:
preparing for public release


Added:
   gocept.pagelet/trunk/CHANGES.txt   (contents, props changed)
Modified:
   gocept.pagelet/trunk/setup.py
   gocept.pagelet/trunk/src/gocept/pagelet/README.txt

Added: gocept.pagelet/trunk/CHANGES.txt
==============================================================================
--- (empty file)
+++ gocept.pagelet/trunk/CHANGES.txt	Sat Sep 20 13:53:00 2008
(at)(at) -0,0 +1,17 (at)(at)
+=========
+ Changes
+=========
+
+0.1 (2008-09-20)
+----------------
+
+- first public release
+
+
+==============
+ Contributors
+==============
+
+- Michael Howitz <mh at gocept dot com>
+
+

Modified: gocept.pagelet/trunk/setup.py
==============================================================================
--- gocept.pagelet/trunk/setup.py	(original)
+++ gocept.pagelet/trunk/setup.py	Sat Sep 20 13:53:00 2008
(at)(at) -6,16 +6,21 (at)(at)
 
 from setuptools import setup, find_packages
 
+def read(*rel_path):
+    base_path = os.path.dirname(__file__)
+    path = (base_path,) + tuple(rel_path)
+    return file(os.path.join(*path)).read()
 
 setup(
     name = 'gocept.pagelet',
     version = "0.1dev",
     author = "Christian Zagrodnick",
     author_email = "cz(at)gocept.com",
-    description = "Easier pagelet handling",
-    long_description = file(os.path.join(os.path.dirname(__file__),
-                                         'src', 'gocept', 'pagelet',
-                                         'README.txt')).read(),
+    description = "Easier z3c.pagelet handling",
+    long_description = (
+        read('src', 'gocept', 'pagelet', 'README.txt') + '\n\n' +
+        read('CHANGES.txt')
+        ),
     license = "ZPL 2.1",
     url='http://pypi.python.org/pypi/gocept.pagelet',
 

Modified: gocept.pagelet/trunk/src/gocept/pagelet/README.txt
==============================================================================
--- gocept.pagelet/trunk/src/gocept/pagelet/README.txt	(original)
+++ gocept.pagelet/trunk/src/gocept/pagelet/README.txt	Sat Sep 20 13:53:00 2008
(at)(at) -1,9 +1,9 (at)(at)
-=========================
-Easy Pagelet Registration
-=========================
+=============================
+Easy z3c.pagelet registration
+=============================
 
-The `<gocept:pagelet>` directive allows easier registration of pagelets.
It
-behaves quite like `<browser:page>`.[1]_
+The `<gocept:pagelet>` directive allows easier registration of
+z3c.pagelets. It behaves quite like `<browser:page>`.[1]_
 
 .. [1] We need some zcml setup:
 
(at)(at) -13,7 +13,7 (at)(at)
     >>> context = xmlconfig.file('meta.zcml', gocept.pagelet)
 
 
-Template Only
+Template only
 =============
 
 It is possible to just use a template as pagelet. A class is not required:
(at)(at) -23,7 +23,7 (at)(at)
 ...     xmlns:gocept="http://namespaces.gocept.com/zcml">
 ...   <gocept:pagelet
 ...       name="index.html"
-...       for="*"  
+...       for="*"
 ...       permission="zope.Public"
 ...       template="test-template.pt"
 ...       />
(at)(at) -47,7 +47,7 (at)(at)
 u'Hello from the test template.\n'
 
 
-Class Only
+Class only
 ==========
 
 Of course it's also possible to register a class without a template. Create a
(at)(at) -81,7 +81,6 (at)(at)
 ... </configure>
 ... """, context)
 
-
 Get the pagelet:
 
 >>> pagelet = zope.component.getMultiAdapter(
(at)(at) -93,7 +92,7 (at)(at)
 
 
 
-Class and Template
+Class and template
 ==================
 
 It's for course also possible to specify both class and template. So create

Author: sweh
Date: Tue Sep 30 08:15:47 2008
New Revision: 6739

Log:
fixed namespace declaration



Modified:
   buildout-recipes/gocept.recipe.deploymentsandbox/trunk/setup.py

Modified: buildout-recipes/gocept.recipe.deploymentsandbox/trunk/setup.py
==============================================================================
--- buildout-recipes/gocept.recipe.deploymentsandbox/trunk/setup.py	(original)
+++ buildout-recipes/gocept.recipe.deploymentsandbox/trunk/setup.py	Tue Sep 30
08:15:47 2008
(at)(at) -52,7 +52,7 (at)(at)
       url='http://pypi.python.org/pypi/gocept.recipe.deploymentsandbox',
       license='ZPL',
       packages=find_packages(exclude=['ez_setup']),
-      namespace_packages=['gocept.recipe'],
+      namespace_packages=['gocept', 'gocept.recipe'],
       include_package_data=True,
       zip_safe=False,
       install_requires=['setuptools',