[Checkins] SVN: zc.zope3recipes/trunk/zc/zope3recipes/ update to reflect output changes from zc.buildout

Fred L. Drake, Jr. fdrake at gmail.com
Thu Jun 21 13:41:15 EDT 2007


Log message for revision 76906:
  update to reflect output changes from zc.buildout

Changed:
  U   zc.zope3recipes/trunk/zc/zope3recipes/README.txt
  U   zc.zope3recipes/trunk/zc/zope3recipes/tests.py

-=-
Modified: zc.zope3recipes/trunk/zc/zope3recipes/README.txt
===================================================================
--- zc.zope3recipes/trunk/zc/zope3recipes/README.txt	2007-06-21 17:03:25 UTC (rev 76905)
+++ zc.zope3recipes/trunk/zc/zope3recipes/README.txt	2007-06-21 17:41:15 UTC (rev 76906)
@@ -98,11 +98,11 @@
 Let's run the buildout and see what we get:
 
     >>> print system(join('bin', 'buildout')),
-    buildout: Develop: /sample-buildout/demo1
-    buildout: Develop: /sample-buildout/demo2
-    buildout: Installing myapp
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/runzope.
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/debugzope.
+    Develop: '/sample-buildout/demo1'
+    Develop: '/sample-buildout/demo2'
+    Installing myapp.
+    Generated script '/sample-buildout/parts/myapp/runzope'.
+    Generated script '/sample-buildout/parts/myapp/debugzope'.
 
 A directory is created in the parts directory for our application files:
 
@@ -230,11 +230,9 @@
     ... ''' % globals())
 
     >>> print system(join('bin', 'buildout')),
-    buildout: Develop: /sample-buildout/demo1
-    buildout: Develop: /sample-buildout/demo2
-    buildout: Updating myapp
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/runzope.
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/debugzope.
+    Develop: '/sample-buildout/demo1'
+    Develop: '/sample-buildout/demo2'
+    Updating myapp.
 
 Note that this is recognized as not being a change to the
 configuration; the messages say that myapp was updated, not
@@ -287,12 +285,12 @@
     ... ''' % globals())
 
     >>> print system(join('bin', 'buildout')),
-    buildout: Develop: /sample-buildout/demo1
-    buildout: Develop: /sample-buildout/demo2
-    buildout: Uninstalling myapp
-    buildout: Installing myapp
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/runzope.
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/debugzope.
+    Develop: '/sample-buildout/demo1'
+    Develop: '/sample-buildout/demo2'
+    Uninstalling myapp.
+    Installing myapp.
+    Generated script '/sample-buildout/parts/myapp/runzope'.
+    Generated script '/sample-buildout/parts/myapp/debugzope'.
 
 The part has been re-installed, and the runzope script generated is
 different now.  Note that the main() function is imported from a
@@ -350,12 +348,12 @@
 Now, Let's run the buildout and see what we get:
 
     >>> print system(join('bin', 'buildout')),
-    buildout: Develop: /sample-buildout/demo1
-    buildout: Develop: /sample-buildout/demo2
-    buildout: Uninstalling myapp
-    buildout: Installing myapp
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/runzope.
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/debugzope.
+    Develop: '/sample-buildout/demo1'
+    Develop: '/sample-buildout/demo2'
+    Uninstalling myapp.
+    Installing myapp.
+    Generated script '/sample-buildout/parts/myapp/runzope'.
+    Generated script '/sample-buildout/parts/myapp/debugzope'.
 
 The runzope script runs the Web server:
 
@@ -454,12 +452,12 @@
     ... ''' % globals())
 
     >>> print system(join('bin', 'buildout')),
-    buildout: Develop: /sample-buildout/demo1
-    buildout: Develop: /sample-buildout/demo2
-    buildout: Uninstalling myapp
-    buildout: Installing myapp
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/runzope.
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/debugzope.
+    Develop: '/sample-buildout/demo1'
+    Develop: '/sample-buildout/demo2'
+    Uninstalling myapp.
+    Installing myapp.
+    Generated script '/sample-buildout/parts/myapp/runzope'.
+    Generated script '/sample-buildout/parts/myapp/debugzope'.
 
 We'll get ftesting.zcml files and ftesting-base.zcml files created in
 the application:
@@ -595,15 +593,15 @@
 Let's run the buildout, and see what we get:
 
     >>> print system(join('bin', 'buildout')),
-    buildout: Develop: /sample-buildout/demo1
-    buildout: Develop: /sample-buildout/demo2
-    buildout: Uninstalling myapp
-    buildout: Installing database
-    buildout: Installing myapp
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/runzope.
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/debugzope.
-    buildout: Installing instance
-    zc.buildout.easy_install: Generated script /sample-buildout/bin/instance.
+    Develop: '/sample-buildout/demo1'
+    Develop: '/sample-buildout/demo2'
+    Uninstalling myapp.
+    Installing database.
+    Installing myapp.
+    Generated script '/sample-buildout/parts/myapp/runzope'.
+    Generated script '/sample-buildout/parts/myapp/debugzope'.
+    Installing instance.
+    Generated script '/sample-buildout/bin/instance'.
 
 We see that the database and myapp parts were included by virtue of
 being referenced from the instance part.
@@ -693,16 +691,16 @@
     ... ''' % globals())
 
     >>> print system(join('bin', 'buildout')),
-    buildout: Develop: /sample-buildout/demo1
-    buildout: Develop: /sample-buildout/demo2
-    buildout: Uninstalling instance
-    buildout: Uninstalling myapp
-    buildout: Updating database
-    buildout: Installing myapp
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/runzope.
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/debugzope.
-    buildout: Installing instance
-    zc.buildout.easy_install: Generated script /sample-buildout/bin/instance.
+    Develop: '/sample-buildout/demo1'
+    Develop: '/sample-buildout/demo2'
+    Uninstalling instance.
+    Uninstalling myapp.
+    Updating database.
+    Installing myapp.
+    Generated script '/sample-buildout/parts/myapp/runzope'.
+    Generated script '/sample-buildout/parts/myapp/debugzope'.
+    Installing instance.
+    Generated script '/sample-buildout/bin/instance'.
 
 The generated zope.conf file now uses the ZServer server components
 instead:
@@ -775,16 +773,16 @@
     ... ''' % globals())
 
     >>> print system(join('bin', 'buildout')),
-    buildout: Develop: /sample-buildout/demo1
-    buildout: Develop: /sample-buildout/demo2
-    buildout: Uninstalling instance
-    buildout: Uninstalling myapp
-    buildout: Updating database
-    buildout: Installing myapp
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/runzope.
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/debugzope.
-    buildout: Installing instance
-    zc.buildout.easy_install: Generated script /sample-buildout/bin/instance.
+    Develop: '/sample-buildout/demo1'
+    Develop: '/sample-buildout/demo2'
+    Uninstalling instance.
+    Uninstalling myapp.
+    Updating database.
+    Installing myapp.
+    Generated script '/sample-buildout/parts/myapp/runzope'.
+    Generated script '/sample-buildout/parts/myapp/debugzope'.
+    Installing instance.
+    Generated script '/sample-buildout/bin/instance'.
 
 The generated zope.conf file now uses the Twisted server components
 once more:
@@ -871,15 +869,13 @@
     ... ''' % globals())
 
     >>> print system(join('bin', 'buildout')),
-    buildout: Develop: /sample-buildout/demo1
-    buildout: Develop: /sample-buildout/demo2
-    buildout: Uninstalling instance
-    buildout: Updating database
-    buildout: Updating myapp
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/runzope.
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/debugzope.
-    buildout: Installing instance
-    zc.buildout.easy_install: Generated script /sample-buildout/bin/instance.
+    Develop: '/sample-buildout/demo1'
+    Develop: '/sample-buildout/demo2'
+    Uninstalling instance.
+    Updating database.
+    Updating myapp.
+    Installing instance.
+    Generated script '/sample-buildout/bin/instance'.
 
 Then the section (or sections) we provide will be used and new ones
 won't be added:
@@ -953,15 +949,13 @@
     ... ''' % globals())
 
     >>> print system(join('bin', 'buildout')),
-    buildout: Develop: /sample-buildout/demo1
-    buildout: Develop: /sample-buildout/demo2
-    buildout: Uninstalling instance
-    buildout: Updating database
-    buildout: Updating myapp
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/runzope.
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/debugzope.
-    buildout: Installing instance
-    zc.buildout.easy_install: Generated script /sample-buildout/bin/instance.
+    Develop: '/sample-buildout/demo1'
+    Develop: '/sample-buildout/demo2'
+    Uninstalling instance.
+    Updating database.
+    Updating myapp.
+    Installing instance.
+    Generated script '/sample-buildout/bin/instance'.
 
     >>> cat('parts', 'instance', 'zope.conf')
     site-definition /sample-buildout/parts/myapp/site.zcml
@@ -1047,15 +1041,13 @@
     ... ''' % globals())
 
     >>> print system(join('bin', 'buildout')),
-    buildout: Develop: /sample-buildout/demo1
-    buildout: Develop: /sample-buildout/demo2
-    buildout: Uninstalling instance
-    buildout: Updating database
-    buildout: Updating myapp
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/runzope.
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/debugzope.
-    buildout: Installing instance
-    zc.buildout.easy_install: Generated script /sample-buildout/bin/instance.
+    Develop: '/sample-buildout/demo1'
+    Develop: '/sample-buildout/demo2'
+    Uninstalling instance.
+    Updating database.
+    Updating myapp.
+    Installing instance.
+    Generated script '/sample-buildout/bin/instance'.
 
     >>> cat('parts', 'instance', 'zope.conf')
     site-definition /sample-buildout/parts/myapp/site.zcml
@@ -1153,15 +1145,13 @@
     ... ''' % globals())
 
     >>> print system(join('bin', 'buildout')),
-    buildout: Develop: /sample-buildout/demo1
-    buildout: Develop: /sample-buildout/demo2
-    buildout: Uninstalling instance
-    buildout: Updating database
-    buildout: Updating myapp
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/runzope.
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/debugzope.
-    buildout: Installing instance
-    zc.buildout.easy_install: Generated script /sample-buildout/bin/instance.
+    Develop: '/sample-buildout/demo1'
+    Develop: '/sample-buildout/demo2'
+    Uninstalling instance.
+    Updating database.
+    Updating myapp.
+    Installing instance.
+    Generated script '/sample-buildout/bin/instance'.
 
     >>> cat('parts', 'instance', 'zdaemon.conf')
     <runner>
@@ -1258,15 +1248,13 @@
     ... ''' % globals())
 
     >>> print system(join('bin', 'buildout')),
-    buildout: Develop: /sample-buildout/demo1
-    buildout: Develop: /sample-buildout/demo2
-    buildout: Uninstalling instance
-    buildout: Uninstalling database
-    buildout: Updating myapp
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/runzope.
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/debugzope.
-    buildout: Installing instance
-    zc.buildout.easy_install: Generated script /sample-buildout/bin/instance.
+    Develop: '/sample-buildout/demo1'
+    Develop: '/sample-buildout/demo2'
+    Uninstalling instance.
+    Uninstalling database.
+    Updating myapp.
+    Installing instance.
+    Generated script '/sample-buildout/bin/instance'.
 
     >>> cat('parts', 'instance', 'zope.conf')
     site-definition /sample-buildout/parts/myapp/site.zcml
@@ -1408,15 +1396,13 @@
 use the deployment.  If we rerun the buildout:
 
     >>> print system(join('bin', 'buildout')),
-    buildout: Develop: /sample-buildout/demo1
-    buildout: Develop: /sample-buildout/demo2
-    buildout: Uninstalling instance
-    buildout: Installing database
-    buildout: Updating myapp
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/runzope.
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/debugzope.
-    buildout: Installing instance
-    zc.buildout.easy_install: Generated script /root/etc/init.d/myapp-run-instance.
+    Develop: '/sample-buildout/demo1'
+    Develop: '/sample-buildout/demo2'
+    Uninstalling instance.
+    Installing database.
+    Updating myapp.
+    Installing instance.
+    Generated script '/root/etc/init.d/myapp-run-instance'.
 
 The installer files will move.  We'll no-longer have the instance part:
 
@@ -1556,16 +1542,13 @@
     ... ''' % globals())
 
     >>> print system(join('bin', 'buildout')),
-    buildout: Develop: /sample-buildout/demo1
-    buildout: Develop: /sample-buildout/demo2
-    buildout: Updating database
-    buildout: Updating myapp
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/runzope.
-    zc.buildout.easy_install: Generated script /sample-buildout/parts/myapp/debugzope.
-    buildout: Updating instance
-    zc.buildout.easy_install: Generated script /root/etc/init.d/myapp-run-instance.
-    buildout: Installing instance2
-    zc.buildout.easy_install: Generated script /root/etc/init.d/myapp-run-instance2.
+    Develop: '/sample-buildout/demo1'
+    Develop: '/sample-buildout/demo2'
+    Updating database.
+    Updating myapp.
+    Updating instance.
+    Installing instance2.
+    Generated script '/root/etc/init.d/myapp-run-instance2'.
 
 Now, we have the new instance configuration files:
 

Modified: zc.zope3recipes/trunk/zc/zope3recipes/tests.py
===================================================================
--- zc.zope3recipes/trunk/zc/zope3recipes/tests.py	2007-06-21 17:03:25 UTC (rev 76905)
+++ zc.zope3recipes/trunk/zc/zope3recipes/tests.py	2007-06-21 17:41:15 UTC (rev 76906)
@@ -42,8 +42,8 @@
     ... ''')
 
     >>> print system(join('bin', 'buildout')),
-    buildout: Installing ctl
-    zc.buildout.easy_install: Generated script /sample-buildout/bin/ctl.
+    Installing ctl.
+    Generated script '/sample-buildout/bin/ctl'.
 
 We'll create a configuration file:
 
@@ -109,9 +109,9 @@
 
     >>> print system(join('bin', 'buildout')),
     Couldn't find index page for 'zc.recipe.egg' (maybe misspelled?)
-    buildout: Installing instance
+    Installing instance.
     While:
-      Installing instance
+      Installing instance.
     Error: No database sections have been defined.
     """
 



More information about the Checkins mailing list