cumulusci-plus 5.0.21__tar.gz → 5.0.21.dev0__tar.gz

{cumulusci_plus-5.0.21 → cumulusci_plus-5.0.21.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cumulusci-plus
-Version: 5.0.21
+Version: 5.0.21.dev0
 Summary: Build and release tools for Salesforce developers
 Project-URL: Homepage, https://github.com/jorgesolebur/CumulusCI
 Project-URL: Changelog, https://cumulusci.readthedocs.io/en/stable/history.html
@@ -35,6 +35,7 @@ Requires-Dist: psutil
 Requires-Dist: pydantic<2
 Requires-Dist: pyjwt
 Requires-Dist: python-dateutil
+Requires-Dist: python-dotenv
 Requires-Dist: pytz
 Requires-Dist: pyyaml
 Requires-Dist: requests

cumulusci_plus-5.0.21.dev0/cumulusci/__about__.py

@@ -0,0 +1 @@
+__version__ = "5.0.21.dev0"

{cumulusci_plus-5.0.21 → cumulusci_plus-5.0.21.dev0}/cumulusci/cumulusci.yml

@@ -749,6 +749,14 @@ tasks:
         options:
             level: info
         group: Utilities
+    copy_file:
+        description: "Copy a file for src to dest with environment variable support, Ex: &TMPDIR&/src resolves to /tmp/src on linux or %TMPDIR%/src on windows."
+        class_path: cumulusci.tasks.util.CopyFile
+        group: Utilities
+    load_dot_env:
+        description: "Log the contents of the .env file"
+        class_path: cumulusci.tasks.util.LoadDotEnv
+        group: Utilities
     configure_env:
         description: Get or set environment variables.
         class_path: cumulusci.tasks.utility.env_management.EnvManagement

{cumulusci_plus-5.0.21 → cumulusci_plus-5.0.21.dev0}/cumulusci/tasks/tests/test_util.py

@@ -182,6 +182,47 @@ class TestUtilTasks:
 
         assert os.path.exists(dest)
 
+    @pytest.mark.skipif(os.name == "posix", reason="Only run on POSIX systems")
+    def test_CopyFileVars(self):
+        src_expanded = os.path.expandvars(os.path.join("$TMPDIR", "src"))
+        with open(src_expanded, "w"):
+            pass
+
+        src = os.path.join("&TMPDIR&", "src")
+        dest = os.path.join("&TMPDIR&", "dest")
+
+        task_config = TaskConfig({"options": {"src": src, "dest": dest}})
+        task = util.CopyFile(self.project_config, task_config, self.org_config)
+        task()
+
+        assert os.path.exists(os.path.expandvars(os.path.join("$TMPDIR", "dest")))
+
+    def test_CopyFileVars_Windows(self):
+        """Test CopyFile environment variable replacement on Windows."""
+        with mock.patch("os.name", "nt"):  # Mock Windows
+            src = os.path.join("&TMPDIR&", "src")
+            dest = os.path.join("&TMPDIR&", "dest")
+
+            task_config = TaskConfig({"options": {"src": src, "dest": dest}})
+            task = util.CopyFile(self.project_config, task_config, self.org_config)
+
+            # On Windows, &TMPDIR& should become %TMPDIR%
+            assert task.options["src"] == os.path.join("%TMPDIR%", "src")
+            assert task.options["dest"] == os.path.join("%TMPDIR%", "dest")
+
+    def test_CopyFileVars_POSIX(self):
+        """Test CopyFile environment variable replacement on POSIX."""
+        with mock.patch("os.name", "posix"):  # Mock POSIX
+            src = os.path.join("&TMPDIR&", "src")
+            dest = os.path.join("&TMPDIR&", "dest")
+
+            task_config = TaskConfig({"options": {"src": src, "dest": dest}})
+            task = util.CopyFile(self.project_config, task_config, self.org_config)
+
+            # On POSIX, &TMPDIR& should become $TMPDIR
+            assert task.options["src"] == os.path.join("$TMPDIR", "src")
+            assert task.options["dest"] == os.path.join("$TMPDIR", "dest")
+
     def test_LogLine(self):
         task_config = TaskConfig({"options": {"level": "debug", "line": "test"}})
         task = util.LogLine(self.project_config, task_config, self.org_config)

{cumulusci_plus-5.0.21 → cumulusci_plus-5.0.21.dev0}/cumulusci/tasks/util.py

@@ -1,5 +1,6 @@
 import glob
 import os
+import re
 import shutil
 import time
 
@@ -220,9 +221,44 @@ class CopyFile(BaseTask):
         },
     }
 
+    def _init_options(self, kwargs):
+        super(CopyFile, self)._init_options(kwargs)
+        self.options["src"] = self.replace_env_vars(self.options["src"])
+        self.options["dest"] = self.replace_env_vars(self.options["dest"])
+
     def _run_task(self):
         self.logger.info("Copying file {src} to {dest}".format(**self.options))
-        shutil.copyfile(src=self.options["src"], dst=self.options["dest"])
+        shutil.copyfile(
+            src=os.path.expandvars(self.options["src"]),
+            dst=os.path.expandvars(self.options["dest"]),
+        )
+
+    def replace_env_vars(self, text):
+        """
+        Environment variable replacement that handles:
+        - &VAR& -> $VAR (POSIX) or %VAR% (Windows)
+        """
+        if not text:
+            return text
+
+        pattern = r"\&([A-Za-z_][A-Za-z0-9_]*)\&"
+        if os.name == "posix":
+            # POSIX: Convert &VAR& to $VAR
+            replacement = r"$\1"
+        else:
+            # Windows: Convert &VAR$ to %VAR%
+            replacement = r"%\1%"
+
+        return re.sub(pattern, replacement, text)
+
+
+class LoadDotEnv(BaseTask):
+    def _run_task(self):
+        from dotenv import load_dotenv
+
+        load_dotenv()
+
+        self.logger.info("Loaded .env file")
 
 
 class LogLine(BaseTask):

{cumulusci_plus-5.0.21 → cumulusci_plus-5.0.21.dev0}/pyproject.toml

@@ -56,6 +56,7 @@ dependencies = [
     "snowfakery>=4.0.0",
     "xmltodict",
     "docutils==0.21.2",
+    "python-dotenv",
 ]
 
 [dependency-groups]

cumulusci_plus-5.0.21/cumulusci/__about__.py

@@ -1 +0,0 @@
-__version__ = "5.0.21"