envstack 0.7.4__tar.gz → 0.7.5__tar.gz

{envstack-0.7.4/lib/envstack.egg-info → envstack-0.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: envstack
-Version: 0.7.4
+Version: 0.7.5
 Summary: Stacked environment variable management system
 Home-page: http://github.com/rsgalloway/envstack
 Author: Ryan Galloway

{envstack-0.7.4 → envstack-0.7.5}/lib/envstack/__init__.py

@@ -34,6 +34,6 @@ Stacked environment variable management system.
 """
 
 __prog__ = "envstack"
-__version__ = "0.7.4"
+__version__ = "0.7.5"
 
 from envstack.env import clear, init, revert, save

{envstack-0.7.4 → envstack-0.7.5}/lib/envstack/util.py

@@ -48,11 +48,14 @@ from envstack.exceptions import CyclicalReference
 # value for unresolvable variables
 null = ""
 
-# regular expression pattern for Bash-like variable expansion
+# regular expression pattern for bash-like variable expansion
 variable_pattern = re.compile(
     r"\$\{([a-zA-Z_][a-zA-Z0-9_]*)(?::([=?])(\$\{[a-zA-Z_][a-zA-Z0-9_]*\}|[^}]*))?\}"
 )
 
+# regular expression pattern for matching windows drive letters
+drive_letter_pattern = re.compile(r"(?P<sep>[:;])?(?P<drive>[A-Z]:[/\\])")
+
 
 def clear_sys_path(var: str = "PYTHONPATH"):
     """
@@ -97,11 +100,67 @@ def dedupe_list(lst: list):
     deduplicating paths.
 
     :param lst: The list to deduplicate.
-    :return: The deduplicated list.
+    :returns: The deduplicated list.
     """
     return list(OrderedDict.fromkeys(lst))
 
 
+def split_windows_paths(path_str: str):
+    """
+    Splits a windows-style path string that may contain a mix of colon and
+    semicolon delimiters, while preserving drive letter patterns. Drive letters
+    must be uppercase.
+
+    Example:
+      Input:  "C:\\Program Files\\Python:D:/path2:E:/path3:/usr/local/bin"
+      Output: ['C:\\Program Files\\Python', 'D:/path2', 'E:/path3', '/usr/local/bin']
+
+    :param path_str: The input path string.
+    :returns: The split path list.
+    """
+    result = []
+    tokens = [token.strip() for token in path_str.split(";") if token.strip()]
+
+    for token in tokens:
+        # token is windows-style, insert a marker before drive letters
+        if re.match(r"^[A-Z]:[/\\]", token) or "\\" in token:
+            modified = drive_letter_pattern.sub(lambda m: "|" + m.group("drive"), token)
+            # split on the marker, then on colons that are not in drive-letters
+            result += [
+                p
+                for part in modified.split("|")
+                for p in re.split(r"(?<![A-Z]):", part)
+                if p
+            ]
+        else:
+            result += [p for p in token.split(":") if p]
+
+    return result
+
+
+def dedupe_paths(
+    path_str: str, joiner: str = os.pathsep, platform: str = config.PLATFORM
+):
+    """
+    Deduplicates paths from a colon-separated string.
+
+    :param path_str: The input path string.
+    :param joiner: The path separator to use.
+    :platform: The platform to use.
+    :returns: The deduplicated path string.
+    """
+
+    if platform == "windows":
+        deduped = dedupe_list(split_windows_paths(path_str))
+    else:
+        deduped = dedupe_list(path_str.split(":"))
+
+    # remove empty paths
+    # deduped = [p for p in deduped if p]
+
+    return joiner.join(deduped)
+
+
 def dict_diff(dict1: dict, dict2: dict):
     """
     Compare two dictionaries and return their differences.
@@ -238,7 +297,7 @@ def evaluate_modifiers(expression: str, environ: dict = os.environ):
 
         # dedupe paths and convert to platform-specific path separators
         if ":" in result:
-            result = os.pathsep.join(dedupe_list(result.split(":")))
+            result = dedupe_paths(result)
 
     # detect recursion errors
     except RecursionError:
@@ -248,16 +307,20 @@ def evaluate_modifiers(expression: str, environ: dict = os.environ):
     except TypeError:
         if isinstance(expression, list):
             result = [
-                variable_pattern.sub(substitute_variable, str(v))
-                if isinstance(v, str)
-                else v
+                (
+                    variable_pattern.sub(substitute_variable, str(v))
+                    if isinstance(v, str)
+                    else v
+                )
                 for v in expression
             ]
         elif isinstance(expression, dict):
             result = {
-                k: variable_pattern.sub(substitute_variable, str(v))
-                if isinstance(v, str)
-                else v
+                k: (
+                    variable_pattern.sub(substitute_variable, str(v))
+                    if isinstance(v, str)
+                    else v
+                )
                 for k, v in expression.items()
             }
         else:

{envstack-0.7.4 → envstack-0.7.5/lib/envstack.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: envstack
-Version: 0.7.4
+Version: 0.7.5
 Summary: Stacked environment variable management system
 Home-page: http://github.com/rsgalloway/envstack
 Author: Ryan Galloway

{envstack-0.7.4 → envstack-0.7.5}/setup.py

@@ -40,7 +40,7 @@ with open(os.path.join(here, "README.md")) as f:
 
 setup(
     name="envstack",
-    version="0.7.4",
+    version="0.7.5",
     description="Stacked environment variable management system",
     long_description=long_description,
     long_description_content_type="text/markdown",

{envstack-0.7.4 → envstack-0.7.5}/tests/test_util.py

@@ -136,6 +136,92 @@ class TestUtils(unittest.TestCase):
             get_stack_name(name)
 
 
+class TestDedupePaths(unittest.TestCase):
+    def test_dedupe_list(self):
+        """Test dedupe_list function."""
+        from envstack.util import dedupe_list
+
+        paths = [
+            "/usr/bin",
+            "/usr/local/bin",
+            "/usr/local/bin",
+            "/usr/bin",
+            "/usr/local/bin",
+            "/some/other/path",
+        ]
+        result = dedupe_list(paths)
+        self.assertEqual(result, ["/usr/bin", "/usr/local/bin", "/some/other/path"])
+
+        paths = ["/usr/bin"]
+        result = dedupe_list(paths)
+        self.assertEqual(result, ["/usr/bin"])
+
+        paths = []
+        result = dedupe_list(paths)
+        self.assertEqual(result, [])
+
+    def test_dedupe_paths(self):
+        """Test dedupe_paths function."""
+        from envstack.util import dedupe_paths
+
+        paths = [
+            "/usr/bin",
+            "/usr/local/bin",
+            "/usr/bin",
+            "/usr/local/bin",
+            "/usr/local/bin",
+            "/some/other/path",
+        ]
+        result = dedupe_paths(":".join(paths))
+        self.assertEqual(result, "/usr/bin:/usr/local/bin:/some/other/path")
+
+        paths = ["/usr/bin"]
+        result = dedupe_paths(":".join(paths))
+        self.assertEqual(result, "/usr/bin")
+
+        paths = ["/usr/bin", ""]
+        result = dedupe_paths(":".join(paths))
+        self.assertEqual(result, "/usr/bin:")
+
+        paths = []
+        result = dedupe_paths(":".join(paths))
+        self.assertEqual(result, "")
+
+    def test_dedupe_paths_windows(self):
+        """Test dedupe_paths function on windows."""
+        from envstack.util import dedupe_paths
+
+        paths = [
+            "C:\\Program Files\\Python",
+            "D:/path2",
+            "E:/path3",
+        ]
+        result = dedupe_paths(":".join(paths), joiner=";", platform="windows")
+        self.assertEqual(result, "C:\\Program Files\\Python;D:/path2;E:/path3")
+
+        paths = [
+            "C:\\Program Files\\Python",
+            "C:\\Program Files\\Python",
+            "D:/path2",
+            "E:/path3",
+            "E:/path3",
+            "/usr/local/bin",
+        ]
+        path = ":".join(paths)
+        result = dedupe_paths(path, joiner=";", platform="windows")
+        self.assertEqual(result, "C:\\Program Files\\Python;D:/path2;E:/path3;/usr/local/bin")
+
+        # mixed paths
+        path = "X:/pipe/prod/env;X:/pipe/prod/env:/home/user/envstack/env"
+        result = dedupe_paths(path, joiner=";", platform="windows")
+        self.assertEqual(result, "X:/pipe/prod/env;/home/user/envstack/env")
+
+        # mixed paths with duplicate
+        path = "C:\\Program Files\\Python;D:/path2;E:/path3:/usr/local/bin:/usr/local/bin"
+        result = dedupe_paths(path, joiner=";", platform="windows")
+        self.assertEqual(result, "C:\\Program Files\\Python;D:/path2;E:/path3;/usr/local/bin")
+
+
 class TestSafeEval(unittest.TestCase):
     def test_safe_eval_string(self):
         value = "hello"