[Checkins] SVN: zc.buildout/trunk/zc.recipe.testrunner/src/zc/recipe/testrunner/ Reuse egg recipe for egg management.

[Jim Fulton]

Log message for revision 68920:
  Reuse egg recipe for egg management.
  

Changed:
  U   zc.buildout/trunk/zc.recipe.testrunner/src/zc/recipe/testrunner/README.txt
  U   zc.buildout/trunk/zc.recipe.testrunner/src/zc/recipe/testrunner/__init__.py
  U   zc.buildout/trunk/zc.recipe.testrunner/src/zc/recipe/testrunner/tests.py

-=-
Modified: zc.buildout/trunk/zc.recipe.testrunner/src/zc/recipe/testrunner/README.txt
===================================================================
--- zc.buildout/trunk/zc.recipe.testrunner/src/zc/recipe/testrunner/README.txt	2006-06-29 20:37:21 UTC (rev 68919)
+++ zc.buildout/trunk/zc.recipe.testrunner/src/zc/recipe/testrunner/README.txt	2006-06-29 20:37:25 UTC (rev 68920)
@@ -6,7 +6,6 @@
 
 The test-runner recipe has 2 options:
 
-
 eggs
     The eggs option specified a list of eggs to test given as one ore
     more setuptools requirement strings.  Each string must be given on

Modified: zc.buildout/trunk/zc.recipe.testrunner/src/zc/recipe/testrunner/__init__.py
===================================================================
--- zc.buildout/trunk/zc.recipe.testrunner/src/zc/recipe/testrunner/__init__.py	2006-06-29 20:37:21 UTC (rev 68919)
+++ zc.buildout/trunk/zc.recipe.testrunner/src/zc/recipe/testrunner/__init__.py	2006-06-29 20:37:25 UTC (rev 68920)
@@ -19,6 +19,7 @@
 import os, sys
 import pkg_resources
 import zc.buildout.easy_install
+import zc.recipe.egg
 
 class TestRunner:
 
@@ -29,22 +30,13 @@
         options['script'] = os.path.join(buildout['buildout']['bin-directory'],
                                          options.get('script', self.name),
                                          )
-        options['_e'] = buildout['buildout']['eggs-directory']
-        options['_d'] = buildout['buildout']['develop-eggs-directory']
-        python = options.get('python', buildout['buildout']['python'])
-        options['executable'] = buildout[python]['executable']
+        self.egg = zc.recipe.egg.Egg(buildout, name, options)
 
 
     def install(self):
         options = self.options
-        requirements = [r.strip()
-                        for r in options['eggs'].split('\n')
-                        if r.strip()]
-        ws = zc.buildout.easy_install.working_set(
-            requirements+['zope.testing'],
-            executable = options['executable'],
-            path=[options['_d'], options['_e']]
-            )
+        requirements, ws = self.egg.working_set(('zope.testing', ))
+
         path = [dist.location for dist in ws]
         project_names = [
             pkg_resources.Requirement.parse(r).project_name

Modified: zc.buildout/trunk/zc.recipe.testrunner/src/zc/recipe/testrunner/tests.py
===================================================================
--- zc.buildout/trunk/zc.recipe.testrunner/src/zc/recipe/testrunner/tests.py	2006-06-29 20:37:21 UTC (rev 68919)
+++ zc.buildout/trunk/zc.recipe.testrunner/src/zc/recipe/testrunner/tests.py	2006-06-29 20:37:25 UTC (rev 68920)
@@ -15,6 +15,7 @@
 import os, re, shutil, sys, tempfile
 import pkg_resources
 import zc.buildout.testing
+import zc.recipe.egg
 
 import unittest
 import zope.testing
@@ -30,6 +31,9 @@
     open(os.path.join(test.globs['sample_buildout'],
                       'eggs', 'zc.recipe.testrunner.egg-link'),
          'w').write(dirname(__file__, 4))
+    open(os.path.join(test.globs['sample_buildout'],
+                      'eggs', 'zc.recipe.egg.egg-link'),
+         'w').write(dirname(zc.recipe.egg.__file__, 4))
 
     # XXX assumes that zope.testing egg is a directory
     open(os.path.join(test.globs['sample_buildout'],