Improved the generated "py" scripts. These let you start Python with

the path set to include a set of distributions and their
dependeoncies. Now, you can also pass a script and arguments.  This
gives me a handy way of invoking setup.py scripts that require
setuptools without having to install setuptools into my system
python. :)


git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@68860 62d5b8a3-27da-0310-9561-8e5933582275

eggrecipe/src/zc/recipe/egg/selecting-python.txt

@@ -88,15 +88,24 @@ And the generated scripts invoke Python 2.3:
         eggrecipedemo.main()
 
     >>> f = open(os.path.join(sample_buildout, 'bin', 'py_demo'))
-    >>> f.readline().strip() == '#!' + python2_3_executable + ' -i'
+    >>> f.readline().strip() == '#!' + python2_3_executable
     True
     >>> print f.read(),
-    <BLANKLINE>
     import sys
+    <BLANKLINE>
+    if len(sys.argv) == 1:
+        import os
+        # Restart with -i
+        os.execl(sys.executable, sys.executable, '-i', sys.argv[0], '')
+    <BLANKLINE>
     sys.path[0:0] = [
-      '/tmp/tmpOBTxDMsample-buildout/eggs/demo-0.2-py2.3.egg',
-      '/tmp/tmpOBTxDMsample-buildout/eggs/demoneeded-1.1-py2.3.egg'
+      '/tmp/tmpiIJY3Ysample-buildout/eggs/demo-0.2-py2.3.egg',
+      '/tmp/tmpiIJY3Ysample-buildout/eggs/demoneeded-1.1-py2.3.egg'
       ]
+    <BLANKLINE>
+    if len(sys.argv) > 1 and sys.argv[1:] != ['']:
+        sys.argv[:] = sys.argv[1:]
+        execfile(sys.argv[0])
 
 If we change the Python version to 2.4, we'll use Python 2.4 eggs:
 
@@ -139,14 +148,21 @@ If we change the Python version to 2.4, we'll use Python 2.4 eggs:
         eggrecipedemo.main()
 
     >>> f = open(os.path.join(sample_buildout, 'bin', 'py_demo'))
-    >>> f.readline().strip() == '#!' + python2_4_executable + ' -i'
+    >>> f.readline().strip() == '#!' + python2_4_executable
     True
     >>> print f.read(),
-    <BLANKLINE>
     import sys
+    <BLANKLINE>
+    if len(sys.argv) == 1:
+        import os
+        # Restart with -i
+        os.execl(sys.executable, sys.executable, '-i', sys.argv[0], '')
+    <BLANKLINE>
     sys.path[0:0] = [
-      '/tmp/tmpOBTxDMsample-buildout/eggs/demo-0.2-py2.4.egg',
-      '/tmp/tmpOBTxDMsample-buildout/eggs/demoneeded-1.1-py2.4.egg'
+      '/tmp/tmpiIJY3Ysample-buildout/eggs/demo-0.2-py2.4.egg',
+      '/tmp/tmpiIJY3Ysample-buildout/eggs/demoneeded-1.1-py2.4.egg'
       ]
-
-
+    <BLANKLINE>
+    if len(sys.argv) > 1 and sys.argv[1:] != ['']:
+        sys.argv[:] = sys.argv[1:]
+        execfile(sys.argv[0])

src/zc/buildout/easy_install.py

@@ -309,10 +309,19 @@ def _pyscript(path, dest, executable):
         pass
 
 py_script_template = '''\
-#!%(python)s -i
-
+#!%(python)s
 import sys
+
+if len(sys.argv) == 1:
+    import os
+    # Restart with -i
+    os.execl(sys.executable, sys.executable, '-i', sys.argv[0], '')
+    
 sys.path[0:0] = [
   '%(path)s'
   ]
+
+if len(sys.argv) > 1 and sys.argv[1:] != ['']:
+    sys.argv[:] = sys.argv[1:]
+    execfile(sys.argv[0])
 '''

src/zc/buildout/easy_install.txt

@@ -238,13 +238,24 @@ The py_demo script simply run the Python interactive interpreter with
 the path set:
 
     >>> cat(bin, 'py_demo')
-    #!/usr/local/bin/python2.3 -i
-    <BLANKLINE>
+    #!/usr/local/bin/python2.4
     import sys
+    <BLANKLINE>
+    if len(sys.argv) == 1:
+        import os
+        # Restart with -i
+        os.execl(sys.executable, sys.executable, '-i', sys.argv[0], '')
+    <BLANKLINE>
     sys.path[0:0] = [
-      '/tmp/xyzsample-install/demo-0.3-py2.3.egg',
-      '/tmp/xyzsample-install/demoneeded-1.1-py2.3.egg'
+      '/tmp/tmp5zS2Afsample-install/demo-0.3-py2.4.egg',
+      '/tmp/tmp5zS2Afsample-install/demoneeded-1.1-py2.4.egg'
       ]
+    <BLANKLINE>
+    if len(sys.argv) > 1 and sys.argv[1:] != ['']:
+        sys.argv[:] = sys.argv[1:]
+        execfile(sys.argv[0])
+
+If invoked with a script name and arguments, it will run that script, instead.
 
 An additional argumnet can be passed to define which scripts to install
 and to provie script names. The argument is a dictionary mapping

src/zc/buildout/tests.py

@@ -150,6 +150,7 @@ def test_suite():
                (re.compile('\S+sample-(\w+)'), r'/sample-\1'),
                (re.compile('executable = \S+python\S*'),
                 'executable = python'),
+               (re.compile('setuptools-\S+[.]egg'), 'setuptools.egg'),
                ])
             ),