get options vs. command attrs right

3 files changed, 13 insertions, 12 deletions

diff --git a/pyramid/scaffolds/template.py b/pyramid/scaffolds/template.py
index 4ffa946d3..c7797cc1d 100644
--- a/pyramid/scaffolds/template.py
+++ b/pyramid/scaffolds/template.py
@@ -65,7 +65,7 @@ class Template(object):
         template_dir = self.template_dir()
         if not self.exists(output_dir):
             self.out("Creating directory %s" % output_dir)
-            if not command.simulate:
+            if not command.options.simulate:
                 # Don't let copydir create this top-level directory,
                 # since copydir will svn add it sometimes:
                 self.makedirs(output_dir)
@@ -73,9 +73,9 @@ class Template(object):
             template_dir,
             output_dir,
             vars,
-            verbosity=command.verbose,
+            verbosity=command.verbosity,
             simulate=command.options.simulate,
-            interactive=command.interactive,
+            interactive=command.options.interactive,
             overwrite=command.options.overwrite,
             indent=1,
             template_renderer=self.template_renderer
diff --git a/pyramid/scripts/pcreate.py b/pyramid/scripts/pcreate.py
index dfd9f691b..5c8d3120e 100644
--- a/pyramid/scripts/pcreate.py
+++ b/pyramid/scripts/pcreate.py
@@ -15,9 +15,7 @@ def main(argv=sys.argv, quiet=False):
     return command.run()
 
 class PCreateCommand(object):
-    verbose = True
-    interactive = False
-    simulate = False
+    verbosity = 1
     usage = "usage: %prog [options] distribution_name"
     parser = optparse.OptionParser(usage)
     parser.add_option('-s', '--scaffold',
@@ -37,6 +35,10 @@ class PCreateCommand(object):
                       dest='overwrite',
                       action='store_true',
                       help='Always overwrite')
+    parser.add_option('--interactive',
+                      dest='interactive',
+                      action='store_true',
+                      help='When a file would be overwritten, interrogate')
 
     def __init__(self, argv, quiet=False):
         self.quiet = quiet
diff --git a/pyramid/tests/test_scaffolds/test_template.py b/pyramid/tests/test_scaffolds/test_template.py
index 88a31e802..e674a338d 100644
--- a/pyramid/tests/test_scaffolds/test_template.py
+++ b/pyramid/tests/test_scaffolds/test_template.py
@@ -85,8 +85,8 @@ class TestTemplate(unittest.TestCase):
         self.assertEqual(copydir.kw,
                          {'template_renderer':inst.template_renderer,
                           'indent':1,
-                          'verbosity':True,
-                          'simulate':True,
+                          'verbosity':1,
+                          'simulate':False,
                           'overwrite':False,
                           'interactive':False,
                           })
@@ -125,13 +125,12 @@ class DummyCopydir(object):
         self.kw = kw
 
 class DummyOptions(object):
-    simulate = True
+    simulate = False
     overwrite = False
+    interactive = False
         
 class DummyCommand(object):
     options = DummyOptions()
-    verbose = True
-    interactive = False
-    simulate = False
+    verbosity = 1