[Checkins] SVN: grokproject/trunk/ Move version_info_url to the template vars without making it a real question.

[Maurits van Rees]

Log message for revision 86086:
  Move version_info_url to the template vars without making it a real question.
  

Changed:
  U   grokproject/trunk/CHANGES.txt
  U   grokproject/trunk/grokproject/__init__.py

-=-
Modified: grokproject/trunk/CHANGES.txt
===================================================================
--- grokproject/trunk/CHANGES.txt	2008-05-02 10:50:30 UTC (rev 86085)
+++ grokproject/trunk/CHANGES.txt	2008-05-02 10:55:07 UTC (rev 86086)
@@ -4,6 +4,9 @@
 0.8 (unreleased)
 ------------------
 
+* Move version_info_url to the template vars without making it a real
+  question.
+
 * Rename the grokproject template to just grok.  Me Grok Like Short Names.
 
 * Do not add eggs-directory to the buildout.cfg, as the absolute paths

Modified: grokproject/trunk/grokproject/__init__.py
===================================================================
--- grokproject/trunk/grokproject/__init__.py	2008-05-02 10:50:30 UTC (rev 86085)
+++ grokproject/trunk/grokproject/__init__.py	2008-05-02 10:55:07 UTC (rev 86086)
@@ -12,23 +12,50 @@
 
 VERSIONINFO_INFO_URL = 'http://grok.zope.org/releaseinfo/current'
 
+
+class ask_var(var):
+
+    def __init__(self, name, description,
+                 default='', should_echo=True, should_ask=True):
+        super(ask_var, self).__init__(
+            name, description, default=default,
+            should_echo=should_echo)
+        self.should_ask = should_ask
+
+
 class GrokProject(templates.Template):
     _template_dir = 'template'
     summary = "A grok project"
     required_templates = []
 
     vars = [
-        var('user', 'Name of an initial administrator user', default=NoDefault),
-        var('passwd', 'Password for the initial administrator user',
+        ask_var('user', 'Name of an initial administrator user', default=NoDefault),
+        ask_var('passwd', 'Password for the initial administrator user',
             default=NoDefault, should_echo=False),
-        var('newest', 'Check for newer versions of packages', default='false'),
-        var('version_info_url',
+        ask_var('newest', 'Check for newer versions of packages', default='false'),
+        ask_var('version_info_url',
             "The URL to a *.cfg file containing a [versions] section.",
-            default=None),
+            default=None, should_ask=False),
         ]
 
     def check_vars(self, vars, cmd):
+        #[var.name for var in self.vars if not var.should_ask]
+        skipped_vars = {}
+        for var in self.vars:
+            if not var.should_ask:
+                skipped_vars[var.name] = var.default
+                self.vars.remove(var)
+
         vars = super(GrokProject, self).check_vars(vars, cmd)
+        for name in skipped_vars:
+            vars[name] = skipped_vars[name]
+        extra_args = [v.split('=') for v in cmd.args if v.find('=') != -1]
+        for arg in extra_args:
+            name = arg[0]
+            value = arg[1]
+            if name in skipped_vars:
+                vars[name] = value
+
         if vars['package'] in ('grok', 'zope'):
             print
             print "Error: The chosen project name results in an invalid " \
@@ -101,11 +128,6 @@
         if supplied_value is not None:
             extra_args.append('%s=%s' % (var.name, supplied_value))
 
-    version_info_url = options.version_info_url
-    if not version_info_url:
-        info = urllib.urlopen(VERSIONINFO_INFO_URL).read().strip()
-        version_info_url = urlparse.urljoin(VERSIONINFO_INFO_URL, info)
-    extra_args.append('extends=' + version_info_url)
     exit_code = runner.run(option_args + ['-t', 'grok', project]
                            + extra_args)
     # TODO exit_code