codemagic-cli-tools 0.53.5__tar.gz → 0.53.7__tar.gz

{codemagic_cli_tools-0.53.5 → codemagic_cli_tools-0.53.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codemagic-cli-tools
-Version: 0.53.5
+Version: 0.53.7
 Summary: CLI tools used in Codemagic builds
 Home-page: https://github.com/codemagic-ci-cd/cli-tools
 License: GPL-3.0-or-later

{codemagic_cli_tools-0.53.5 → codemagic_cli_tools-0.53.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "codemagic-cli-tools"
-version = "0.53.5"
+version = "0.53.7"
 description = "CLI tools used in Codemagic builds"
 readme = "README.md"
 authors = [

{codemagic_cli_tools-0.53.5 → codemagic_cli_tools-0.53.7}/src/codemagic/__version__.py

@@ -1,5 +1,5 @@
 __title__ = "codemagic-cli-tools"
 __description__ = "CLI tools used in Codemagic builds"
-__version__ = '0.53.5'
+__version__ = '0.53.7'
 __url__ = "https://github.com/codemagic-ci-cd/cli-tools"
 __licence__ = "GNU General Public License v3.0"

{codemagic_cli_tools-0.53.5 → codemagic_cli_tools-0.53.7}/src/codemagic/__version__.py-e

@@ -1,5 +1,5 @@
 __title__ = "codemagic-cli-tools"
 __description__ = "CLI tools used in Codemagic builds"
-__version__ = "0.53.5.dev"
+__version__ = "0.53.7.dev"
 __url__ = "https://github.com/codemagic-ci-cd/cli-tools"
 __licence__ = "GNU General Public License v3.0"

{codemagic_cli_tools-0.53.5 → codemagic_cli_tools-0.53.7}/src/codemagic/apple/resources/enums.py

@@ -434,37 +434,47 @@ class ReviewSubmissionItemState(ResourceEnum):
 
 class Locale(ResourceEnum):
     """
-    Referenced in https://developer.apple.com/documentation/appstoreconnectapi/betaapplocalization/attributes#discussion
+    https://developer.apple.com/documentation/appstoreconnectapi/app_store/app_metadata/app_info_localizations/managing_metadata_in_your_app_by_using_locale_shortcodes
     """
 
-    DA = "da"
-    DE_DE = "de-DE"
-    EL = "el"
-    EN_AU = "en-AU"
-    EN_CA = "en-CA"
-    EN_GB = "en-GB"
-    EN_US = "en-US"
-    ES_ES = "es-ES"
-    ES_MX = "es-MX"
-    FI = "fi"
-    FR_CA = "fr-CA"
-    FR_FR = "fr-FR"
-    ID = "id"
-    IT = "it"
-    JA = "ja"
-    KO = "ko"
-    MS = "ms"
-    NL_NL = "nl-NL"
-    NO = "no"
-    PT_BR = "pt-BR"
-    PT_PT = "pt-PT"
-    RU = "ru"
-    SV = "sv"
-    TH = "th"
-    TR = "tr"
-    VI = "vi"
-    ZH_HANS = "zh-Hans"
-    ZH_HANT = "zh-Hant"
+    AR_SA = "ar-SA"  # Arabic
+    CA = "ca"  # Catalan
+    CS = "cs"  # Czech
+    DA = "da"  # Danish
+    DE_DE = "de-DE"  # German
+    EL = "el"  # Greek
+    EN_AU = "en-AU"  # English (Australia)
+    EN_CA = "en-CA"  # English (Canada)
+    EN_GB = "en-GB"  # English (U.K.)
+    EN_US = "en-US"  # English (U.S.)
+    ES_ES = "es-ES"  # Spanish (Spain)
+    ES_MX = "es-MX"  # Spanish (Mexico)
+    FI = "fi"  # Finnish
+    FR_CA = "fr-CA"  # French (Canada)
+    FR_FR = "fr-FR"  # French
+    HE = "he"  # Hebrew
+    HI = "hi"  # Hindi
+    HR = "hr"  # Croatian
+    HU = "hu"  # Hungarian
+    ID = "id"  # Indonesian
+    IT = "it"  # Italian
+    JA = "ja"  # Japanese
+    KO = "ko"  # Korean
+    MS = "ms"  # Malay
+    NL_NL = "nl-NL"  # Dutch
+    NO = "no"  # Norwegian
+    PL = "pl"  # Polish
+    PT_BR = "pt-BR"  # Portuguese (Brazil)
+    PT_PT = "pt-PT"  # Portuguese (Portugal)
+    RO = "ro"  # Romanian
+    RU = "ru"  # Russian
+    SK = "sk"  # Slovak
+    SV = "sv"  # Swedish
+    TH = "th"  # Thai
+    TR = "tr"  # Turkish
+    UK = "uk"  # Ukrainian
+    ZH_HANS = "zh-Hans"  # Chinese (Simplified)
+    ZH_HANT = "zh-Hant"  # Chinese (Traditional)
 
 
 class SubscriptionStatusUrlVersion(ResourceEnum):

{codemagic_cli_tools-0.53.5 → codemagic_cli_tools-0.53.7}/src/codemagic/models/certificate_p12_exporter.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import contextlib
 import pathlib
-import re
 import shutil
 import subprocess
 import tempfile
@@ -16,7 +15,6 @@ from typing import Union
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives._serialization import PrivateFormat
 from cryptography.hazmat.primitives.serialization import pkcs12
-from packaging.version import Version
 
 from codemagic.mixins import RunningCliAppMixin
 from codemagic.mixins import StringConverterMixin
@@ -29,6 +27,8 @@ if TYPE_CHECKING:
 
 
 class _OpenSsl:
+    __SUPPORTS_NOENC__: Optional[bool] = None
+
     def __init__(self):
         self._executable = shutil.which("openssl")
 
@@ -36,32 +36,36 @@ class _OpenSsl:
         if self._executable is None:
             raise IOError("OpenSSL executable is not present on system")
 
-    def get_version(self) -> Optional[Version]:
-        if not self._executable:
-            return None
+    def _is_noenc_flag_supported(self) -> bool:
+        """
+        OpenSSL version 3.0.0 deprecated option `-nodes` for disabling encryption
+        when invoking `openssl pkcs12`. It is replaced with `-noenc`.
+        See https://www.openssl.org/docs/man3.0/man1/openssl-pkcs12.html
 
-        try:
-            version_output = subprocess.check_output([self._executable, "version"])
-        except subprocess.CalledProcessError:
-            version_output = b""
+        Vanilla macOS (at least up to version 14.6) however still bundles `openssl`
+        executable that is using LibreSSL version that does not support `-noenc`.
 
-        version_match = re.search(r"\d+\.\d+\.\d+", version_output.decode(errors="ignore"))
-        if not version_match:
-            return None
+        Check the `-noenc` support by just parsing help message.
+        """
+
+        if self.__SUPPORTS_NOENC__ is None:
+            completed_process = subprocess.run(
+                (self._executable, "pkcs12", "-help"),
+                capture_output=True,
+                check=False,
+            )
+            # Check both stdout and stderr because LibreSSL doesn't have help commands per-se.
+            # Execution fails, and it just outputs "unknown option '-help'" along with full
+            # command usage to stderr.
+            self.__SUPPORTS_NOENC__ = b"-noenc" in completed_process.stdout or b"-noenc" in completed_process.stderr
 
-        return Version(version_match.group())
+        return self.__SUPPORTS_NOENC__
 
     @property
     def no_encryption_flag(self) -> Literal["-nodes", "-noenc"]:
-        # Starting from OpenSSL version 3.0.0 `-nodes` is deprecated for disabling encryption
-        # when invoking `openssl pkcs12`. It is replaced with `-noenc`.
-        # See https://www.openssl.org/docs/man3.0/man1/openssl-pkcs12.html
-
-        openssl_version = self.get_version()
-        if openssl_version and openssl_version < Version("3.0.0"):
-            # Use legacy flag only if we are sure that the version is earlier than 3.0.0
-            return "-nodes"
-        return "-noenc"
+        if self._is_noenc_flag_supported():
+            return "-noenc"
+        return "-nodes"
 
 
 class P12Exporter(RunningCliAppMixin, StringConverterMixin):

{codemagic_cli_tools-0.53.5 → codemagic_cli_tools-0.53.7}/src/codemagic/models/enums.py

@@ -1,6 +1,10 @@
+from __future__ import annotations
+
 import contextlib
 import enum
 import re
+from typing import Dict
+from typing import Tuple
 
 from codemagic.utilities import log
 
@@ -19,6 +23,8 @@ class ResourceEnumMeta(enum.EnumMeta):
     graceful_fallback = True
     enable_name_transformation = False
 
+    __graceful_fallback_cache: Dict[Tuple[str, str], str] = {}
+
     def __call__(cls, value, *args, **kwargs):  # noqa: N805
         try:
             return super().__call__(value, *args, **kwargs)
@@ -29,11 +35,21 @@ class ResourceEnumMeta(enum.EnumMeta):
             logger = log.get_logger(cls, log_to_stream=False)
             logger.warning("Undefined Resource enumeration: %s", ve)
             try:
-                enum_class = ResourceEnum(f"Graceful{cls.__name__}", {value: value})
-                return enum_class(value)
+                return cls._create_graceful_fallback_instance(value)
             except TypeError:
                 raise ve
 
+    def _create_graceful_fallback_instance(cls, value):  # noqa: N805
+        cache_key = (cls.__name__, value)
+
+        try:
+            enum_class = cls.__graceful_fallback_cache[cache_key]
+        except KeyError:
+            enum_class = ResourceEnum(f"Graceful{cls.__name__}", {value: value})
+            cls.__graceful_fallback_cache[cache_key] = enum_class
+
+        return enum_class(value)
+
     def _transform_class_name(cls):  # noqa: N805
         """
         If enabled, transform CamelCase class name 'ClassName' to more

{codemagic_cli_tools-0.53.5 → codemagic_cli_tools-0.53.7}/tests/models/enums/test_resource_enum.py

@@ -44,3 +44,12 @@ def test_context_manager(is_graceful_before):
         with pytest.raises(ValueError):
             MockEnum("invalid value")
     assert ResourceEnumMeta.graceful_fallback is is_graceful_before
+
+
+def test_graceful_fallback_identity():
+    ResourceEnumMeta.graceful_fallback = True
+    e1 = MockEnum("undefined-value")
+    e2 = MockEnum("undefined-value")
+    assert e1 is e2  # Enumerations with the same value should persist identity
+    assert e1 == e2  # Enumerations with the same value should be equal
+    assert e1.value == e2.value  # And of course their values should also be equal