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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cumulusci-plus
-Version: 5.0.20
+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
@@ -127,7 +128,7 @@ license](https://github.com/SFDO-Tooling/CumulusCI/blob/main/LICENSE)
 and is not covered by the Salesforce Master Subscription Agreement.
 
 <!-- Changelog -->
-## v5.0.20 (2025-09-05)
+## v5.0.21 (2025-09-08)
 
 <!-- Release notes generated using configuration in .github/release.yml at main -->
 
@@ -135,6 +136,6 @@ and is not covered by the Salesforce Master Subscription Agreement.
 
 ### Changes
 
-- Add Skil If Exists for create profile check by [@rupeshjSFDC](https://github.com/rupeshjSFDC) in [#65](https://github.com/jorgesolebur/CumulusCI/pull/65)
+- Fix profile query from tooling api field to simple salesforce. by [@rupeshjSFDC](https://github.com/rupeshjSFDC) in [#67](https://github.com/jorgesolebur/CumulusCI/pull/67)
 
-**Full Changelog**: https://github.com/jorgesolebur/CumulusCI/compare/v5.0.19...v5.0.20
+**Full Changelog**: https://github.com/jorgesolebur/CumulusCI/compare/v5.0.20...v5.0.21

cumulusci_plus-5.0.21.dev0/cumulusci/__about__.py

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

{cumulusci_plus-5.0.20 → 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.20 → cumulusci_plus-5.0.21.dev0}/cumulusci/tasks/salesforce/profiles.py

@@ -68,7 +68,7 @@ class CreateBlankProfile(BaseSalesforceMetadataApiTask):
     def _get_profile_id(self, profile_name):
         """Returns the Id of a Profile from a given Name"""
         res = self._query_sf(
-            f"SELECT Id, Name FROM Profile WHERE FullName = '{profile_name}' LIMIT 1"
+            f"SELECT Id, Name FROM Profile WHERE Name = '{profile_name}' LIMIT 1"
         )
         if res["records"]:
             return res["records"][0]["Id"]

{cumulusci_plus-5.0.20 → cumulusci_plus-5.0.21.dev0}/cumulusci/tasks/salesforce/tests/test_profiles.py

@@ -124,7 +124,7 @@ def test_run_task_success():
     result = task._run_task()
     assert result == "001R0000029IyDPIA0"
     assert responses.calls[0].request.params == {
-        "q": "SELECT Id, Name FROM Profile WHERE FullName = 'Test Profile Name' LIMIT 1"
+        "q": "SELECT Id, Name FROM Profile WHERE Name = 'Test Profile Name' LIMIT 1"
     }
     assert responses.calls[1].request.params == {
         "q": "SELECT Id, Name FROM UserLicense WHERE Name = 'Foo' LIMIT 1"
@@ -281,7 +281,7 @@ def test_run_task_success_with_skip_if_exists_false():
 
     assert result == "10056000000VGjUAAW"
     assert responses.calls[0].request.params == {
-        "q": "SELECT Id, Name FROM Profile WHERE FullName = 'Test Profile Name' LIMIT 1"
+        "q": "SELECT Id, Name FROM Profile WHERE Name = 'Test Profile Name' LIMIT 1"
     }
 
 

{cumulusci_plus-5.0.20 → 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.20 → 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.20 → cumulusci_plus-5.0.21.dev0}/docs/history.md

@@ -2,6 +2,20 @@
 
 <!-- latest-start -->
 
+## v5.0.21 (2025-09-08)
+
+<!-- Release notes generated using configuration in .github/release.yml at main -->
+
+## What's Changed
+
+### Changes
+
+- Fix profile query from tooling api field to simple salesforce. by [@rupeshjSFDC](https://github.com/rupeshjSFDC) in [#67](https://github.com/jorgesolebur/CumulusCI/pull/67)
+
+**Full Changelog**: https://github.com/jorgesolebur/CumulusCI/compare/v5.0.20...v5.0.21
+
+<!-- latest-stop -->
+
 ## v5.0.20 (2025-09-05)
 
 <!-- Release notes generated using configuration in .github/release.yml at main -->
@@ -14,8 +28,6 @@
 
 **Full Changelog**: https://github.com/jorgesolebur/CumulusCI/compare/v5.0.19...v5.0.20
 
-<!-- latest-stop -->
-
 ## v5.0.19 (2025-09-04)
 
 <!-- Release notes generated using configuration in .github/release.yml at main -->
@@ -1945,9 +1957,9 @@ Critical Changes:
       subfolders will see a change in resolution behavior. Previously,
       a dependency specified like this:
 
-                                                    dependencies:
-                                                        - github: https://github.com/SalesforceFoundation/NPSP
-                                                          subfolder: unpackaged/config/trial
+                                                      dependencies:
+                                                          - github: https://github.com/SalesforceFoundation/NPSP
+                                                            subfolder: unpackaged/config/trial
 
         would always deploy from the latest commit on the default
         branch. Now, this dependency will be resolved to a GitHub commit
@@ -1958,12 +1970,12 @@ Critical Changes:
     - The `project__dependencies` section in `cumulusci.yml` no longer
       supports nested dependencies specified like this:
 
-                                                    dependencies:
-                                                        - namespace: "test"
-                                                          version: "1.0"
-                                                          dependencies:
-                                                            - namespace: "parent"
-                                                              version: "2.2"
+                                                      dependencies:
+                                                          - namespace: "test"
+                                                            version: "1.0"
+                                                            dependencies:
+                                                              - namespace: "parent"
+                                                                version: "2.2"
 
         All dependencies should be listed in install order.
 
@@ -2131,12 +2143,12 @@ Critical changes:
     - The `project__dependencies` section in `cumulusci.yml` will no
       longer support nested dependencies specified like this :
 
-                                                    dependencies:
-                                                      - namespace: "test"
-                                                        version: "1.0"
-                                                        dependencies:
-                                                          - namespace: "parent"
-                                                            version: "2.2"
+                                                      dependencies:
+                                                        - namespace: "test"
+                                                          version: "1.0"
+                                                          dependencies:
+                                                            - namespace: "parent"
+                                                              version: "2.2"
 
     All dependencies should be listed in install order.
 
@@ -3738,33 +3750,33 @@ New features:
 
     : -
 
-                                                    Added keywords for generating a collection of sObjects according to a template:
+                                                      Added keywords for generating a collection of sObjects according to a template:
 
-                                                    :   -   `Generate Test Data`
-                                                        -   `Salesforce Collection Insert`
-                                                        -   `Salesforce Collection Update`
+                                                      :   -   `Generate Test Data`
+                                                          -   `Salesforce Collection Insert`
+                                                          -   `Salesforce Collection Update`
 
-                                                -
+                                                  -
 
-                                                    Changes to Page Objects:
+                                                      Changes to Page Objects:
 
-                                                    :   -   More than one page object can be loaded at once.
-                                                            Once loaded, the keywords of a page object remain
-                                                            visible in the suite. Robot will give priority to
-                                                            keywords in the reverse order in which they were
-                                                            imported.
-                                                        -   There is a new keyword, `Log Current Page Object`,
-                                                            which can be useful to see information about the
-                                                            most recently loaded page object.
-                                                        -   There is a new keyword, `Get Page Object`, which
-                                                            will return the robot library for a given page
-                                                            object. This can be used in other keywords to access
-                                                            keywords from another page object if necessary.
-                                                        -   The `Go To Page` keyword will now automatically load
-                                                            the page object for the given page.
+                                                      :   -   More than one page object can be loaded at once.
+                                                              Once loaded, the keywords of a page object remain
+                                                              visible in the suite. Robot will give priority to
+                                                              keywords in the reverse order in which they were
+                                                              imported.
+                                                          -   There is a new keyword, `Log Current Page Object`,
+                                                              which can be useful to see information about the
+                                                              most recently loaded page object.
+                                                          -   There is a new keyword, `Get Page Object`, which
+                                                              will return the robot library for a given page
+                                                              object. This can be used in other keywords to access
+                                                              keywords from another page object if necessary.
+                                                          -   The `Go To Page` keyword will now automatically load
+                                                              the page object for the given page.
 
-                                                -   Added a basic debugger for Robot tests. It can be enabled
-                                                    using the `-o debug True` option to the robot task.
+                                                  -   Added a basic debugger for Robot tests. It can be enabled
+                                                      using the `-o debug True` option to the robot task.
 
 - Added support for deploying new metadata types
   `ProfilePasswordPolicy` and `ProfileSessionSetting`.
@@ -3839,8 +3851,8 @@ New features:
   permanently set this option, add this in
   `~/.cumulusci/cumulusci.yml`:
 
-                                                cli:
-                                                    plain_output: True
+                                                  cli:
+                                                      plain_output: True
 
 - Added additional info to the `cci version` command, including the
   Python version, an upgrade check, and a warning on Python 2.
@@ -5119,12 +5131,12 @@ Resolving a few issues from beta77:
   below. In flows that need to inject the actual namespace prefix,
   override the [unmanaged]{.title-ref} option .. :
 
-                                                custom_deploy_task:
-                                                    class_path: cumulusci.tasks.salesforce.Deploy
-                                                    options:
-                                                        path: your/custom/metadata
-                                                        namespace_inject: $project_config.project__package__namespace
-                                                        unmanaged: False
+                                                  custom_deploy_task:
+                                                      class_path: cumulusci.tasks.salesforce.Deploy
+                                                      options:
+                                                          path: your/custom/metadata
+                                                          namespace_inject: $project_config.project__package__namespace
+                                                          unmanaged: False
 
 ### Enhancements
 
@@ -5839,13 +5851,13 @@ Resolving a few issues from beta77:
 - **IMPORANT** This release changes the yaml structure for flows. The
   new structure now looks like this:
 
-                                                flows:
-                                                    flow_name:
-                                                        tasks:
-                                                            1:
-                                                                task: deploy
-                                                            2:
-                                                                task: run_tests
+                                                  flows:
+                                                      flow_name:
+                                                          tasks:
+                                                              1:
+                                                                  task: deploy
+                                                              2:
+                                                                  task: run_tests
 
 - See the new flow customization examples in the cookbook for examples
   of why this change was made and how to use it:

{cumulusci_plus-5.0.20 → 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.20/cumulusci/__about__.py

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