Ignore more.

CHANGES.txt

@@ -11,6 +11,19 @@ priorities include:
 Change History
 **************
 
+1.0.0b31 (2007-???)
+=====================
+
+Bugs Fixed
+----------
+
+- The setup command wasn't documented.
+
+- The setup command failed if run in a directory without specifying a
+  configuration file.
+
+- The setup command raised a stupid exception if run without arguments.
+
 1.0.0b30 (2007-08-20)
 =====================
 

setup.py

@@ -7,8 +7,6 @@ def read(*rnames):
 long_description=(
         read('README.txt')
         + '\n' +
-        read('CHANGES.txt')
-        + '\n' +
         'Detailed Documentation\n'
         '**********************\n'
         + '\n' +
@@ -18,6 +16,8 @@ long_description=(
         + '\n' +
         read('src', 'zc', 'buildout', 'downloadcache.txt')
         + '\n' +
+        read('src', 'zc', 'buildout', 'setup.txt')
+        + '\n' +
         read('src', 'zc', 'buildout', 'update.txt')
         + '\n' +
         read('src', 'zc', 'buildout', 'debugging.txt')
@@ -26,6 +26,8 @@ long_description=(
         + '\n' +
         read('src', 'zc', 'buildout', 'easy_install.txt')
         + '\n' +
+        read('CHANGES.txt')
+        + '\n' +
         'Download\n'
         '**********************\n'
         )
@@ -35,7 +37,7 @@ open('doc.txt', 'w').write(long_description)
 name = "zc.buildout"
 setup(
     name = name,
-    version = "1.0.0b30",
+    version = "1.0.0b31",
     author = "Jim Fulton",
     author_email = "jim@zope.com",
     description = "System for managing development buildouts",

src/zc/buildout/buildout.py

@@ -83,6 +83,11 @@ class Buildout(UserDict.DictMixin):
                 if command == 'init':
                     print 'Creating %r.' % config_file
                     open(config_file, 'w').write('[buildout]\nparts = \n')
+                elif command == 'setup':
+                    # Sigh. this model of a buildout nstance
+                    # with methods is breaking down :(
+                    config_file = None
+                    data['buildout']['directory'] = '.'
                 else:
                     raise zc.buildout.UserError(
                         "Couldn't open %s" % config_file)
@@ -727,7 +732,8 @@ class Buildout(UserDict.DictMixin):
     def setup(self, args):
         if not args:
             raise zc.buildout.UserError(
-                "setup command expects one or more arguments.\n"
+                "The setup command requires the path to a setup script or \n"
+                "directory containing a setup script, and it's arguments."
                 )
         setup = args.pop(0)
         if os.path.isdir(setup):

src/zc/buildout/tests.py

@@ -2479,7 +2479,7 @@ def test_suite():
     import zc.buildout.testselectingpython
     suite = unittest.TestSuite((
         doctest.DocFileSuite(
-            'buildout.txt', 'runsetup.txt', 'repeatable.txt',
+            'buildout.txt', 'runsetup.txt', 'repeatable.txt', 'setup.txt',
             setUp=zc.buildout.testing.buildoutSetUp,
             tearDown=zc.buildout.testing.buildoutTearDown,
             checker=renormalizing.RENormalizing([