add PasteScript egg if it's not there to make sure it's installed

CHANGES.txt

@@ -5,6 +5,8 @@ CHANGES
 0.5.2dev (unreleased)
 ---------------------
 
+- Fix: add PasteScript egg if it's not there to make sure it's installed
+
 0.5.1 (2010-01-22)
 ------------------
 

src/z3c/recipe/paster/README.txt

@@ -115,7 +115,10 @@ generated script uses the ``paste.script.command.run`` for starting our server:
   <BLANKLINE>
   import sys
   sys.path[0:0] = [
-    '...demo',
+    '/sample-buildout/demo',
+    '/sample-pyN.N.egg',
+    ...
+    '/sample-pyN.N.egg',
     ]
   <BLANKLINE>
   import os
@@ -129,6 +132,8 @@ generated script uses the ``paste.script.command.run`` for starting our server:
     'serve', '...myapp.ini',
     ]+sys.argv[1:])
 
+Those ``sample-pyN.N.egg`` lines should be PasteScript and it's dependencies.
+
 Check the content of our new generated myapp.ini file:
 
   >>> cat('parts', 'myapp', 'myapp.ini')
@@ -170,4 +175,3 @@ your custom setup.py file like::
           main = z3c.recipe.paster.wsgi:application_factory
           """,
   )
-

src/z3c/recipe/paster/debug.txt

@@ -114,6 +114,9 @@ Check the content of our new generated script.
   import sys
   sys.path[0:0] = [
     '/sample-buildout/sample',
+    '/sample-pyN.N.egg',
+    ...
+    '/sample-pyN.N.egg',
     ]
   <BLANKLINE>
   import z3c.recipe.paster.debug

src/z3c/recipe/paster/paster.py

@@ -27,8 +27,10 @@ def __init__(self, buildout, name, options):
             raise zc.buildout.UserError(
                 'You have to define at least one egg for setup a paster.')
 
-        # add PasteScript egg
-        options['eggs'] = '%s\nPasteScript' % options.get('eggs')
+        if 'PasteScript' not in options.get('eggs'):
+            # add PasteScript egg
+            options['eggs'] = '%s\nPasteScript' % options.get('eggs')
+
         super(PasterSetup, self).__init__(buildout, name, options)
         self.egg = zc.recipe.egg.Egg(buildout, name, options)
 

src/z3c/recipe/paster/serve.py

@@ -31,16 +31,22 @@ def __init__(self, buildout, name, options):
         self.buildout = buildout
         self.name = name
         self.options = options
+
+        if options.get('eggs') is None:
+            raise zc.buildout.UserError(
+                'You have to define at least one egg for setup an application.')
+
+        if 'PasteScript' not in options.get('eggs'):
+            # add PasteScript egg
+            options['eggs'] = '%s\nPasteScript' % options.get('eggs')
+
         options['script'] = os.path.join(buildout['buildout']['bin-directory'],
                                          options.get('script', self.name),
                                          )
         if not options.get('working-directory', ''):
             options['location'] = os.path.join(
                 buildout['buildout']['parts-directory'], name)
 
-        if options.get('eggs') is None:
-            raise zc.buildout.UserError(
-                'You have to define at least one egg for setup an application.')
         self.egg = zc.recipe.egg.Egg(buildout, name, options)
 
     def install(self):