[Checkins] SVN: zc.zdaemonrecipe/trunk/ - Added support for the deployment recipe ``name`` option.

[Christian Zagrodnick]

Log message for revision 90940:
  - Added support for the deployment recipe ``name`` option. 
  
  

Changed:
  U   zc.zdaemonrecipe/trunk/README.txt
  U   zc.zdaemonrecipe/trunk/setup.py
  U   zc.zdaemonrecipe/trunk/zc/zdaemonrecipe/README.txt
  U   zc.zdaemonrecipe/trunk/zc/zdaemonrecipe/__init__.py

-=-
Modified: zc.zdaemonrecipe/trunk/README.txt
===================================================================
--- zc.zdaemonrecipe/trunk/README.txt	2008-09-08 09:20:16 UTC (rev 90939)
+++ zc.zdaemonrecipe/trunk/README.txt	2008-09-08 10:56:54 UTC (rev 90940)
@@ -10,6 +10,11 @@
 Releases
 ********
 
+0.2 (unreleased)
+================
+
+- Added support for the deployment recipe ``name`` option. 
+
 0.1 (2008-05-01)
 ================
 

Modified: zc.zdaemonrecipe/trunk/setup.py
===================================================================
--- zc.zdaemonrecipe/trunk/setup.py	2008-09-08 09:20:16 UTC (rev 90939)
+++ zc.zdaemonrecipe/trunk/setup.py	2008-09-08 10:56:54 UTC (rev 90940)
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 name = 'zc.zdaemonrecipe'
-version = '0.1.0'
+version = '0.2dev'
 
 import os
 from setuptools import setup, find_packages

Modified: zc.zdaemonrecipe/trunk/zc/zdaemonrecipe/README.txt
===================================================================
--- zc.zdaemonrecipe/trunk/zc/zdaemonrecipe/README.txt	2008-09-08 09:20:16 UTC (rev 90939)
+++ zc.zdaemonrecipe/trunk/zc/zdaemonrecipe/README.txt	2008-09-08 10:56:54 UTC (rev 90940)
@@ -108,6 +108,7 @@
     ... deployment = deploy
     ...
     ... [deploy]
+    ... name = test-deploy
     ... etc-directory = etc
     ... rc-directory = init.d
     ... log-directory = logs
@@ -119,7 +120,7 @@
     >>> print system(buildout),
     Uninstalling run.
     Installing run.
-    Generated script '/sample-buildout/init.d/deploy-run'.
+    Generated script '/sample-buildout/init.d/test-deploy-run'.
 
     >>> import os
     >>> os.path.exists('parts/run')
@@ -144,7 +145,7 @@
       </logfile>
     </eventlog>
 
-    >>> cat('init.d', 'deploy-run')
+    >>> cat('init.d', 'test-deploy-run')
     #!/usr/local/bin/python2.4
     <BLANKLINE>
     import sys
@@ -161,12 +162,12 @@
             ]+sys.argv[1:]
             )
 
-    >>> cat('logrotate', 'deploy-run')
+    >>> cat('logrotate', 'test-deploy-run')
     logs/run.log {
       rotate 5
       weekly
       postrotate
-        init.d/deploy-run -C etc/run-zdaemon.conf reopen_transcript
+        init.d/test-deploy-run -C etc/run-zdaemon.conf reopen_transcript
       endscript
     }
 

Modified: zc.zdaemonrecipe/trunk/zc/zdaemonrecipe/__init__.py
===================================================================
--- zc.zdaemonrecipe/trunk/zc/zdaemonrecipe/__init__.py	2008-09-08 09:20:16 UTC (rev 90939)
+++ zc.zdaemonrecipe/trunk/zc/zdaemonrecipe/__init__.py	2008-09-08 10:56:54 UTC (rev 90940)
@@ -24,13 +24,16 @@
 
         deployment = self.deployment = options.get('deployment')
         if deployment:
+            # Note we use get below to work with old zc.recipe.deployment eggs.
+            self.deployment = buildout[deployment].get('name', deployment)
+
             options['rc-directory'] = buildout[deployment]['rc-directory']
             options['run-directory'] = buildout[deployment]['run-directory']
             options['log-directory'] = buildout[deployment]['log-directory']
             options['etc-directory'] = buildout[deployment]['etc-directory']
             options['logrotate'] = os.path.join(
                 buildout[deployment]['logrotate-directory'],
-                deployment + '-' + name)
+                self.deployment + '-' + name)
             options['user'] = buildout[deployment]['user']
         else:
             options['rc-directory'] = buildout['buildout']['bin-directory']