[Checkins] SVN: grokproject/trunk/ Do not ask for eggs dir when we have a default already.

[Maurits van Rees]

Log message for revision 86135:
  Do not ask for eggs dir when we have a default already.
  

Changed:
  U   grokproject/trunk/CHANGES.txt
  U   grokproject/trunk/grokproject/templates.py
  U   grokproject/trunk/grokproject/utils.py

-=-
Modified: grokproject/trunk/CHANGES.txt
===================================================================
--- grokproject/trunk/CHANGES.txt	2008-05-02 20:38:51 UTC (rev 86134)
+++ grokproject/trunk/CHANGES.txt	2008-05-02 20:52:15 UTC (rev 86135)
@@ -4,6 +4,8 @@
 0.8 (unreleased)
 ------------------
 
+* Do not ask for eggs dir when we have a default already.
+
 * Refactor grokproject/__init__.py by moving things out into main.py,
   templates,py and utils.py, like zopeproject does.
 

Modified: grokproject/trunk/grokproject/templates.py
===================================================================
--- grokproject/trunk/grokproject/templates.py	2008-05-02 20:38:51 UTC (rev 86134)
+++ grokproject/trunk/grokproject/templates.py	2008-05-02 20:52:15 UTC (rev 86135)
@@ -9,6 +9,7 @@
 from grokproject.utils import default_eggs_dir
 from grokproject.utils import get_buildout_default_eggs_dir
 from grokproject.utils import ask_var
+from grokproject.utils import get_var
 from grokproject.utils import get_boolean_value_for_option
 
 VERSIONINFO_INFO_URL = 'http://grok.zope.org/releaseinfo/current'
@@ -44,6 +45,12 @@
             print "Please choose a different project name."
             sys.exit(1)
 
+        # Do not ask for eggs dir when we have a default already.
+        buildout_default = get_buildout_default_eggs_dir()
+        if buildout_default is not None:
+            var = get_var(self.vars, 'eggs_dir')
+            var.should_ask = False
+
         skipped_vars = {}
         for var in list(self.vars):
             if not var.should_ask:
@@ -66,8 +73,6 @@
         version_info_file_contents = urllib.urlopen(version_info_url).read()
         vars['version_info_file_contents'] = version_info_file_contents
 
-        # Handling eggs dir.
-        buildout_default = get_buildout_default_eggs_dir()
         input = os.path.expanduser(vars['eggs_dir'])
         if input == buildout_default:
             vars['eggs_dir'] = (

Modified: grokproject/trunk/grokproject/utils.py
===================================================================
--- grokproject/trunk/grokproject/utils.py	2008-05-02 20:38:51 UTC (rev 86134)
+++ grokproject/trunk/grokproject/utils.py	2008-05-02 20:52:15 UTC (rev 86135)
@@ -22,6 +22,11 @@
         if self.getter is None:
             self.getter = lambda x, y: self.default
 
+def get_var(vars, name):
+    for var in vars:
+        if var.name == name:
+            return var
+
 def get_boolean_value_for_option(vars, option):
     value = vars.get(option.name)
     if value is not None: