Merge pull request #145 from buildout/fdrake-buildout-home

Add BUILDOUT_HOME to specify alternate configuration source.

CHANGES.rst

@@ -4,7 +4,8 @@ Change History
 Unreleased
 ==========
 
-- TBD
+- Add BUILDOUT_HOME as an alternate way to control how the user default
+  configuration is found.
 
 2.2.1 (2013-09-05)
 ==================

src/zc/buildout/buildout.py

@@ -208,8 +208,12 @@ class Buildout(DictMixin):
 
         # load user defaults, which override defaults
         if user_defaults:
-            user_config = os.path.join(os.path.expanduser('~'),
-                                       '.buildout', 'default.cfg')
+            if os.environ.get('BUILDOUT_HOME'):
+                buildout_home = os.environ['BUILDOUT_HOME']
+            else:
+                buildout_home = os.path.join(
+                    os.path.expanduser('~'), '.buildout')
+            user_config = os.path.join(buildout_home, 'default.cfg')
             if os.path.exists(user_config):
                 _update(data, _open(os.path.dirname(user_config), user_config,
                                     [], data['buildout'].copy(), override,

src/zc/buildout/buildout.txt

@@ -1725,7 +1725,54 @@ user defaults:
     op5 b3base 5
     recipe recipes:debug
 
+If the environment variable BUILDOUT_HOME is non-empty, that is used to
+locate default.cfg instead of looking in ~/.buildout/.  Let's set up a
+configuration file in an alternate directory and verify that we get the
+appropriate set of defaults:
+
+    >>> alterhome = tmpdir('alterhome')
+    >>> write(alterhome, 'default.cfg',
+    ... """
+    ... [debug]
+    ... op1 = 1'
+    ... op7 = 7'
+    ... op8 = eight!
+    ... """)
+
+    >>> os.environ['BUILDOUT_HOME'] = alterhome
+    >>> print_(system(buildout), end='')
+    Develop: '/sample-buildout/recipes'
+    Uninstalling debug.
+    Installing debug.
+    name base
+    op buildout
+    op1 b1 1
+    op2 b2 2
+    op3 b2 3
+    op4 b3 4
+    op5 b3base 5
+    op7 7'
+    op8 eight!
+    recipe recipes:debug
+
+The -U argument still suppresses reading of the default.cfg file from
+BUILDOUT_HOME:
+
+    >>> print_(system(buildout + ' -U'), end='')
+    Develop: '/sample-buildout/recipes'
+    Uninstalling debug.
+    Installing debug.
+    name base
+    op buildout
+    op1 b1 1
+    op2 b2 2
+    op3 b2 3
+    op4 b3 4
+    op5 b3base 5
+    recipe recipes:debug
+
     >>> os.environ['HOME'] = old_home
+    >>> del os.environ['BUILDOUT_HOME']
 
 Log level
 ---------