From 809ed4171ede425ae1470db30b1b11180132e675 Mon Sep 17 00:00:00 2001
From: Anthony Scopatz <scopatz@gmail.com>
Date: Sun, 22 Feb 2015 23:46:18 -0600
Subject: [PATCH] regex path tests

---
 tests/test_builtins.py | 41 +++++++++++++++++++++++++++++++++++++++--
 xonsh/built_ins.py     | 30 ++++++++++++++++++++----------
 2 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/tests/test_builtins.py b/tests/test_builtins.py
index e786abf0c..e8c08fec2 100644
--- a/tests/test_builtins.py
+++ b/tests/test_builtins.py
@@ -3,9 +3,10 @@ from __future__ import unicode_literals, print_function
 import os
 import sys
 
-from nose.tools import assert_equal
+from nose.tools import assert_equal, assert_true
 
-from xonsh.built_ins import Env
+from xonsh import built_ins 
+from xonsh.built_ins import Env, reglob, regexpath
 
 def test_env_normal():
     env = Env(VAR='wakka')
@@ -23,6 +24,42 @@ def test_env_detype():
     env = Env(MYPATH=['wakka', 'jawaka'])
     assert_equal({'MYPATH': 'wakka' + os.pathsep + 'jawaka'}, env.detype())
 
+def test_reglob_tests():
+    testfiles = reglob('test_.*')
+    for f in testfiles:
+        assert_true(f.startswith('test_'))
+
+def test_repath_home_itself():
+    exp = os.path.expanduser('~')
+    obs = regexpath('~')
+    assert_equal(1, len(obs))
+    assert_equal(exp, obs[0])
+
+def test_repath_home_contents():
+    home = os.path.expanduser('~')
+    exp = os.listdir(home)
+    exp = {os.path.join(home, p) for p in exp}
+    obs = set(regexpath('~/.*'))
+    assert_equal(exp, obs)
+
+def test_repath_home_var():
+    exp = os.path.expanduser('~')
+    built_ins.ENV = Env(HOME=exp)
+    obs = regexpath('$HOME')
+    assert_equal(1, len(os.environ))
+    built_ins.ENV.undo_replace_env()
+    assert_equal(1, len(obs))
+    assert_equal(exp, obs[0])
+
+def test_repath_home_var_brace():
+    exp = os.path.expanduser('~')
+    built_ins.ENV = Env(HOME=exp)
+    obs = regexpath('${HOME}')
+    assert_equal(1, len(os.environ))
+    built_ins.ENV.undo_replace_env()
+    assert_equal(1, len(obs))
+    assert_equal(exp, obs[0])
+
 
 if __name__ == '__main__':
     nose.runmodule()
diff --git a/xonsh/built_ins.py b/xonsh/built_ins.py
index 891dd97fd..2f754d673 100644
--- a/xonsh/built_ins.py
+++ b/xonsh/built_ins.py
@@ -2,6 +2,7 @@
 not to be confused with the special Python builtins module.
 """
 import os
+import re
 import builtins
 import subprocess
 from glob import glob, iglob
@@ -32,6 +33,7 @@ class Env(MutableMapping):
         for key, val in dict(*args, **kwargs).items():
             self[key] = val
         self._detyped = None
+        self._orig_env = None
 
     def detype(self):
         if self._detyped is not None:
@@ -52,9 +54,20 @@ class Env(MutableMapping):
         """Replaces the contents of os.environ with a detyped version 
         of the xonsh environement.
         """
+        if self._orig_env is None:
+            self._orig_env = dict(os.environ)
         os.environ.clear()
         os.environ.update(self.detype())
 
+    def undo_replace_env(self):
+        """Replaces the contents of os.environ with a detyped version 
+        of the xonsh environement.
+        """
+        if self._orig_env is not None:
+            os.environ.clear()
+            os.environ.update(self._orig_env)
+            self._orig_env = None
+
     #
     # Mutable mapping interface
     #
@@ -92,13 +105,6 @@ def helper(x):
     return x
 
 
-def _partsjoin(parts):
-    s = os.path.join(parts)
-    if len(parts[0]) == 0:
-        s = os.sep + s  # fix for root dir
-    return s
-
-
 def reglob(path, parts=None, i=None):
     """Regular expression-based globbing."""
     if parts is None:
@@ -106,8 +112,11 @@ def reglob(path, parts=None, i=None):
         d = os.sep if path.startswith(os.sep) else '.'
         return reglob(d, parts=parts, i=0)
     base = subdir = path
-    if i == 0 and base == '.':
-        base = ''
+    if i == 0:
+        if base == '.':
+            base = ''
+        elif base == '/' and len(parts) > 1:
+            i += 1
     regex = re.compile(os.path.join(base, parts[i]))
     files = os.listdir(subdir)
     files.sort()
@@ -134,8 +143,8 @@ def regexpath(s):
     global ENV
     if ENV is not None:
         ENV.replace_env()
-    s = os.path.expanduser(s)
     s = os.path.expandvars(s)
+    s = os.path.expanduser(s)
     return reglob(s)
 
 
@@ -156,6 +165,7 @@ def unload_builtins():
     BUILTINS_LOADED is True, sets BUILTINS_LOADED to False, and returns.
     """
     global BUILTINS_LOADED, ENV
+    ENV.undo_replace_env()
     if ENV is not None:
         ENV = None
     if not BUILTINS_LOADED: