codemagic-cli-tools 0.50.7__tar.gz → 0.51.0__tar.gz

{codemagic_cli_tools-0.50.7 → codemagic_cli_tools-0.51.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codemagic-cli-tools
-Version: 0.50.7
+Version: 0.51.0
 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.50.7 → codemagic_cli_tools-0.51.0}/pyproject.toml

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

{codemagic_cli_tools-0.50.7 → codemagic_cli_tools-0.51.0}/src/codemagic/__version__.py

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

{codemagic_cli_tools-0.50.7 → codemagic_cli_tools-0.51.0}/src/codemagic/__version__.py-e

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

{codemagic_cli_tools-0.50.7 → codemagic_cli_tools-0.51.0}/src/codemagic/apple/app_store_connect/api_client.py

@@ -8,6 +8,7 @@ from urllib import parse
 from codemagic.utilities import log
 
 from .api_session import AppStoreConnectApiSession
+from .app_store_publishing import AppStoreVersionPhasedReleases
 from .apps import Apps
 from .builds import Builds
 from .json_web_token_manager import JsonWebTokenManager
@@ -124,6 +125,10 @@ class AppStoreConnectApiClient:
     def app_store_version_localizations(self) -> AppStoreVersionLocalizations:
         return AppStoreVersionLocalizations(self)
 
+    @property
+    def app_store_version_phased_releases(self) -> AppStoreVersionPhasedReleases:
+        return AppStoreVersionPhasedReleases(self)
+
     @property
     def app_store_version_submissions(self) -> AppStoreVersionSubmissions:
         return AppStoreVersionSubmissions(self)

codemagic_cli_tools-0.51.0/src/codemagic/apple/app_store_connect/app_store_publishing/__init__.py

@@ -0,0 +1 @@
+from .app_store_version_phased_releases import AppStoreVersionPhasedReleases

codemagic_cli_tools-0.51.0/src/codemagic/apple/app_store_connect/app_store_publishing/app_store_version_phased_releases.py

@@ -0,0 +1,91 @@
+from typing import Optional
+from typing import Type
+from typing import Union
+
+from codemagic.apple.app_store_connect.resource_manager import ResourceManager
+from codemagic.apple.resources import AppStoreVersionPhasedRelease
+from codemagic.apple.resources import LinkedResourceData
+from codemagic.apple.resources import PhasedReleaseState
+from codemagic.apple.resources import ResourceId
+from codemagic.apple.resources import ResourceType
+
+
+class AppStoreVersionPhasedReleases(ResourceManager[AppStoreVersionPhasedRelease]):
+    """
+    App Store Version Phased Releases
+    https://developer.apple.com/documentation/appstoreconnectapi/app_store/app_store_version_phased_releases
+    """
+
+    @property
+    def resource_type(self) -> Type[AppStoreVersionPhasedRelease]:
+        return AppStoreVersionPhasedRelease
+
+    def create(
+        self,
+        app_store_version: Union[ResourceId, LinkedResourceData],
+        phased_release_state: Optional[PhasedReleaseState] = None,
+    ) -> AppStoreVersionPhasedRelease:
+        """
+        https://developer.apple.com/documentation/appstoreconnectapi/create_an_app_store_version_phased_release
+        """
+        if phased_release_state:
+            attributes = {
+                "phasedReleaseState": phased_release_state.value,
+            }
+        else:
+            attributes = None
+
+        relationships = {
+            "appStoreVersion": {
+                "data": self._get_attribute_data(app_store_version, ResourceType.APP_STORE_VERSIONS),
+            },
+        }
+
+        payload = self._get_create_payload(
+            ResourceType.APP_STORE_VERSION_PHASED_RELEASES,
+            attributes=attributes,
+            relationships=relationships,
+        )
+
+        response = self.client.session.post(
+            f"{self.client.API_URL}/appStoreVersionPhasedReleases",
+            json=payload,
+        ).json()
+        return AppStoreVersionPhasedRelease(response["data"], created=True)
+
+    def modify(
+        self,
+        app_store_version_phased_release: Union[LinkedResourceData, ResourceId],
+        *,
+        phased_release_state: PhasedReleaseState,
+    ) -> AppStoreVersionPhasedRelease:
+        """
+        https://developer.apple.com/documentation/appstoreconnectapi/modify_an_app_store_version_phased_release
+        """
+        app_store_version_phased_release_id = self._get_resource_id(app_store_version_phased_release)
+
+        attributes = {
+            "phasedReleaseState": phased_release_state.value,
+        }
+
+        payload = self._get_update_payload(
+            app_store_version_phased_release_id,
+            ResourceType.APP_STORE_VERSION_PHASED_RELEASES,
+            attributes=attributes,
+        )
+
+        response = self.client.session.patch(
+            f"{self.client.API_URL}/appStoreVersionPhasedReleases/{app_store_version_phased_release_id}",
+            json=payload,
+        ).json()
+        return AppStoreVersionPhasedRelease(response["data"])
+
+    def delete(self, app_store_version_phased_release: Union[LinkedResourceData, ResourceId]) -> None:
+        """
+        https://developer.apple.com/documentation/appstoreconnectapi/delete_an_app_store_version_phased_release
+        """
+        app_store_version_phased_release_id = self._get_resource_id(app_store_version_phased_release)
+
+        self.client.session.delete(
+            f"{self.client.API_URL}/appStoreVersionPhasedReleases/{app_store_version_phased_release_id}",
+        )

{codemagic_cli_tools-0.50.7 → codemagic_cli_tools-0.51.0}/src/codemagic/apple/app_store_connect/resource_manager.py

@@ -7,6 +7,7 @@ from typing import TYPE_CHECKING
 from typing import Any
 from typing import Dict
 from typing import Generic
+from typing import List
 from typing import Optional
 from typing import Sequence
 from typing import Type
@@ -16,14 +17,61 @@ from typing import Union
 from codemagic.apple.resources import LinkedResourceData
 from codemagic.apple.resources import Resource
 from codemagic.apple.resources import ResourceId
+from codemagic.apple.resources import ResourceReference
 from codemagic.apple.resources import ResourceType
 from codemagic.utilities import case_conversion
 
+R = TypeVar("R", bound=Resource)
+R_co = TypeVar("R_co", bound=Resource, covariant=True)
+R2 = TypeVar("R2", bound=Resource)
+
 if TYPE_CHECKING:
+    from typing_extensions import Protocol
+
     from codemagic.apple import AppStoreConnectApiClient
 
-R = TypeVar("R", bound=Resource)
-R2 = TypeVar("R2", bound=Resource)
+    class PResourceManager(Protocol[R_co]):
+        @property
+        def resource_type(self) -> Type[R_co]:
+            ...
+
+    class CreatingResourceManager(PResourceManager[R_co], Protocol):
+        def create(self, **create_params) -> R_co:
+            ...
+
+    class ReadingResourceManager(PResourceManager[R_co], Protocol):
+        def read(self, ref: ResourceReference) -> R_co:
+            ...
+
+    class ListingResourceManager(PResourceManager[R], Protocol):
+        def list(self, *, resource_filter: ResourceManager.Filter, **listing_options) -> List[R]:
+            ...
+
+    class DeletingResourceManager(PResourceManager[R_co], Protocol):
+        def delete(self, ref: ResourceReference) -> None:
+            ...
+
+    class ModifyingResourceManager(PResourceManager[R_co], Protocol):
+        def modify(self, ref: ResourceReference, **update_params) -> R_co:
+            ...
+
+else:
+    # TODO: Once Python 3.7 support is removed and we have Protocols
+    #   available in runtime, then those can be removed.
+    class CreatingResourceManager(Generic[R]):
+        ...
+
+    class ReadingResourceManager(Generic[R]):
+        ...
+
+    class ListingResourceManager(Generic[R]):
+        ...
+
+    class DeletingResourceManager(Generic[R]):
+        ...
+
+    class ModifyingResourceManager(Generic[R]):
+        ...
 
 
 class ResourceManager(Generic[R], metaclass=abc.ABCMeta):

{codemagic_cli_tools-0.50.7 → codemagic_cli_tools-0.51.0}/src/codemagic/apple/app_store_connect/versioning/app_store_versions.py

@@ -12,6 +12,7 @@ from codemagic.apple.resources import App
 from codemagic.apple.resources import AppStoreState
 from codemagic.apple.resources import AppStoreVersion
 from codemagic.apple.resources import AppStoreVersionLocalization
+from codemagic.apple.resources import AppStoreVersionPhasedRelease
 from codemagic.apple.resources import AppStoreVersionSubmission
 from codemagic.apple.resources import Build
 from codemagic.apple.resources import LinkedResourceData
@@ -115,6 +116,29 @@ class AppStoreVersions(ResourceManager[AppStoreVersion]):
             return None
         return Build(build_data)
 
+    def read_app_store_version_phased_release_data(
+        self,
+        app_store_version: Union[AppStoreVersion, ResourceId],
+        fields: Sequence[str] = tuple(),
+    ) -> Optional[dict]:
+        """
+        https://developer.apple.com/documentation/appstoreconnectapi/read_the_app_store_version_phased_release_information_of_an_app_store_version
+        """
+        app_store_version_id = self._get_resource_id(app_store_version)
+        url = f"{self.client.API_URL}/appStoreVersions/{app_store_version_id}/appStoreVersionPhasedRelease"
+        params = {"fields[appStoreVersionPhasedReleases]": ",".join(fields)} if fields else {}
+        response = self.client.session.get(url, params=params).json()
+        return response["data"]
+
+    def read_app_store_version_phased_release(
+        self,
+        app_store_version: Union[AppStoreVersion, ResourceId],
+    ) -> Optional[AppStoreVersionPhasedRelease]:
+        app_store_version_phased_release_data = self.read_app_store_version_phased_release_data(app_store_version)
+        if app_store_version_phased_release_data is None:
+            return None
+        return AppStoreVersionPhasedRelease(app_store_version_phased_release_data)
+
     def read_app_store_version_submission(
         self,
         app_store_version: Union[AppStoreVersion, ResourceId],

{codemagic_cli_tools-0.50.7 → codemagic_cli_tools-0.51.0}/src/codemagic/apple/resources/__init__.py

@@ -1,6 +1,7 @@
 from .app import App
 from .app_store_version import AppStoreVersion
 from .app_store_version_localization import AppStoreVersionLocalization
+from .app_store_version_phased_release import AppStoreVersionPhasedRelease
 from .app_store_version_submission import AppStoreVersionSubmission
 from .beta_app_localization import BetaAppLocalization
 from .beta_app_review_detail import BetaAppReviewDetail
@@ -16,6 +17,7 @@ from .bundle_id_capability import CapabilitySetting
 from .device import Device
 from .enums import AppStoreState
 from .enums import BetaReviewState
+from .enums import BuildAudienceType
 from .enums import BuildProcessingState
 from .enums import BundleIdPlatform
 from .enums import CapabilityOptionKey
@@ -29,6 +31,7 @@ from .enums import DeviceStatus
 from .enums import ExternalBetaState
 from .enums import InternalBetaState
 from .enums import Locale
+from .enums import PhasedReleaseState
 from .enums import Platform
 from .enums import ProfileState
 from .enums import ProfileType
@@ -36,12 +39,14 @@ from .enums import ReleaseType
 from .enums import ResourceType
 from .enums import ReviewSubmissionItemState
 from .enums import ReviewSubmissionState
+from .enums import SubscriptionStatusUrlVersion
 from .error_response import ErrorResponse
 from .pre_release_version import PreReleaseVersion
 from .profile import Profile
 from .resource import LinkedResourceData
 from .resource import Resource
 from .resource import ResourceId
+from .resource import ResourceReference
 from .review_submission import ReviewSubmission
 from .review_submission_item import ReviewSubmissionItem
 from .signing_certificate import SigningCertificate

codemagic_cli_tools-0.51.0/src/codemagic/apple/resources/app.py

@@ -0,0 +1,108 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Optional
+
+from .enums import ContentRightsDeclaration
+from .enums import Locale
+from .enums import SubscriptionStatusUrlVersion
+from .resource import Relationship
+from .resource import Resource
+
+
+class App(Resource):
+    """
+    https://developer.apple.com/documentation/appstoreconnectapi/app
+    """
+
+    attributes: Attributes
+    relationships: Optional[Relationships] = None
+
+    @dataclass
+    class Attributes(Resource.Attributes):
+        bundleId: str
+        name: str
+        primaryLocale: Locale
+        sku: str
+        contentRightsDeclaration: ContentRightsDeclaration
+        isOrEverWasMadeForKids: bool
+
+        subscriptionStatusUrl: Optional[str] = None
+        subscriptionStatusUrlForSandbox: Optional[str] = None
+        subscriptionStatusUrlVersion: Optional[SubscriptionStatusUrlVersion] = None
+        subscriptionStatusUrlVersionForSandbox: Optional[SubscriptionStatusUrlVersion] = None
+
+        def __post_init__(self):
+            if isinstance(self.contentRightsDeclaration, str):
+                self.contentRightsDeclaration = ContentRightsDeclaration(self.contentRightsDeclaration)
+            if isinstance(self.primaryLocale, str):
+                self.primaryLocale = Locale(self.primaryLocale)
+            if isinstance(self.subscriptionStatusUrlVersion, str):
+                self.subscriptionStatusUrlVersion = SubscriptionStatusUrlVersion(self.subscriptionStatusUrlVersion)
+            if isinstance(self.subscriptionStatusUrlVersionForSandbox, str):
+                self.subscriptionStatusUrlVersionForSandbox = SubscriptionStatusUrlVersion(
+                    self.subscriptionStatusUrlVersionForSandbox,
+                )
+
+    @dataclass
+    class Relationships(Resource.Relationships):
+        _OMIT_IF_NONE_KEYS = (
+            "alternativeDistributionKey",
+            "analyticsReportRequests",
+            "appAvailability",
+            "appAvailabilityV2",
+            "appClips",
+            "appCustomProductPages",
+            "appEvents",
+            "appPricePoints",
+            "appPriceSchedule",
+            "appStoreVersionExperimentsV2",
+            "betaTesters",
+            "ciProduct",
+            "customerReviews",
+            "gameCenterDetail",
+            "inAppPurchasesV2",
+            "marketplaceSearchDetail",
+            "perfPowerMetrics",
+            "pricePoints",
+            "promotedPurchases",
+            "reviewSubmissions",
+            "subscriptionGracePeriod",
+            "subscriptionGroups",
+        )
+
+        appInfos: Relationship
+        appStoreVersions: Relationship
+        betaAppLocalizations: Relationship
+        betaAppReviewDetail: Relationship
+        betaGroups: Relationship
+        betaLicenseAgreement: Relationship
+        builds: Relationship
+        endUserLicenseAgreement: Relationship
+        gameCenterEnabledVersions: Relationship
+        inAppPurchases: Relationship
+        preOrder: Relationship
+        preReleaseVersions: Relationship
+
+        alternativeDistributionKey: Optional[Relationship] = None
+        analyticsReportRequests: Optional[Relationship] = None
+        appAvailability: Optional[Relationship] = None
+        appAvailabilityV2: Optional[Relationship] = None
+        appClips: Optional[Relationship] = None
+        appCustomProductPages: Optional[Relationship] = None
+        appEvents: Optional[Relationship] = None
+        appPricePoints: Optional[Relationship] = None
+        appPriceSchedule: Optional[Relationship] = None
+        appStoreVersionExperimentsV2: Optional[Relationship] = None
+        betaTesters: Optional[Relationship] = None
+        ciProduct: Optional[Relationship] = None
+        customerReviews: Optional[Relationship] = None
+        gameCenterDetail: Optional[Relationship] = None
+        inAppPurchasesV2: Optional[Relationship] = None
+        marketplaceSearchDetail: Optional[Relationship] = None
+        perfPowerMetrics: Optional[Relationship] = None
+        pricePoints: Optional[Relationship] = None
+        promotedPurchases: Optional[Relationship] = None
+        reviewSubmissions: Optional[Relationship] = None
+        subscriptionGracePeriod: Optional[Relationship] = None
+        subscriptionGroups: Optional[Relationship] = None

codemagic_cli_tools-0.51.0/src/codemagic/apple/resources/app_store_version_phased_release.py

@@ -0,0 +1,34 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from datetime import datetime
+from typing import Optional
+
+from .enums import PhasedReleaseState
+from .resource import Resource
+
+
+class AppStoreVersionPhasedRelease(Resource):
+    """
+    https://developer.apple.com/documentation/appstoreconnectapi/appstoreversionphasedrelease
+    """
+
+    attributes: Resource.Attributes
+    relationships: Optional[Relationships] = None
+
+    @dataclass
+    class Attributes(Resource.Attributes):
+        currentDayNumber: int
+        phasedReleaseState: PhasedReleaseState
+        startDate: datetime
+        totalPauseDuration: int
+
+        def __post_init__(self):
+            if isinstance(self.phasedReleaseState, str):
+                self.phasedReleaseState = PhasedReleaseState(self.phasedReleaseState)
+            if isinstance(self.startDate, str):
+                self.startDate = Resource.from_iso_8601(self.startDate)
+
+    @dataclass
+    class Relationships(Resource.Relationships):
+        pass

{codemagic_cli_tools-0.50.7 → codemagic_cli_tools-0.51.0}/src/codemagic/apple/resources/build.py

@@ -4,6 +4,7 @@ from dataclasses import dataclass
 from datetime import datetime
 from typing import Optional
 
+from .enums import BuildAudienceType
 from .enums import BuildProcessingState
 from .resource import DictSerializable
 from .resource import Relationship
@@ -55,8 +56,15 @@ class Build(Resource):
         usesNonExemptEncryption: bool
         uploadedDate: datetime
         expirationDate: datetime
+        buildAudienceType: BuildAudienceType
+
+        computedMinMacOsVersion: Optional[str] = None
+        lsMinimumSystemVersion: Optional[str] = None
+        computedMinVisionOsVersion: Optional[str] = None
 
         def __post_init__(self):
+            if isinstance(self.buildAudienceType, str):
+                self.buildAudienceType = BuildAudienceType(self.buildAudienceType)
             if isinstance(self.processingState, str):
                 self.processingState = BuildProcessingState(self.processingState)
             if isinstance(self.uploadedDate, str):

{codemagic_cli_tools-0.50.7 → codemagic_cli_tools-0.51.0}/src/codemagic/apple/resources/enums.py

@@ -52,6 +52,15 @@ class BuildProcessingState(ResourceEnum):
     VALID = "VALID"
 
 
+class BuildAudienceType(ResourceEnum):
+    """
+    https://developer.apple.com/documentation/appstoreconnectapi/buildaudiencetype
+    """
+
+    INTERNAL_ONLY = "INTERNAL_ONLY"
+    APP_STORE_ELIGIBLE = "APP_STORE_ELIGIBLE"
+
+
 class BundleIdPlatform(ResourceEnum):
     IOS = "IOS"
     MAC_OS = "MAC_OS"
@@ -251,6 +260,17 @@ class InternalBetaState(ResourceEnum):
     READY_FOR_BETA_TESTING = "READY_FOR_BETA_TESTING"
 
 
+class PhasedReleaseState(ResourceEnum):
+    """
+    https://developer.apple.com/documentation/appstoreconnectapi/phasedreleasestate
+    """
+
+    ACTIVE = "ACTIVE"
+    COMPLETE = "COMPLETE"
+    INACTIVE = "INACTIVE"
+    PAUSED = "PAUSED"
+
+
 class Platform(ResourceEnum):
     IOS = "IOS"
     MAC_OS = "MAC_OS"
@@ -323,6 +343,7 @@ class ResourceType(ResourceEnum):
     APP_STORE_VERSIONS = "appStoreVersions"
     APP_STORE_VERSION_EXPERIMENTS = "appStoreVersionExperiments"
     APP_STORE_VERSION_LOCALIZATIONS = "appStoreVersionLocalizations"
+    APP_STORE_VERSION_PHASED_RELEASES = "appStoreVersionPhasedReleases"
     APP_STORE_VERSION_SUBMISSIONS = "appStoreVersionSubmissions"
     BETA_APP_LOCALIZATIONS = "betaAppLocalizations"
     BETA_APP_REVIEW_DETAILS = "betaAppReviewDetails"
@@ -392,3 +413,14 @@ class Locale(ResourceEnum):
     VI = "vi"
     ZH_HANS = "zh-Hans"
     ZH_HANT = "zh-Hant"
+
+
+class SubscriptionStatusUrlVersion(ResourceEnum):
+    """
+    https://developer.apple.com/documentation/appstoreconnectapi/subscriptionstatusurlversion
+    """
+
+    V1 = "V1"
+    V2 = "V2"
+    v1 = "v1"
+    v2 = "v2"

{codemagic_cli_tools-0.50.7 → codemagic_cli_tools-0.51.0}/src/codemagic/apple/resources/resource.py

@@ -16,6 +16,7 @@ from typing import Optional
 from typing import Set
 from typing import Tuple
 from typing import Type
+from typing import TypeVar
 from typing import Union
 from typing import overload
 
@@ -25,6 +26,9 @@ from codemagic.utilities import log
 
 from .enums import ResourceType
 
+LRD = TypeVar("LRD", bound="LinkedResourceData")
+ResourceReference = Union["ResourceId", LRD]
+
 
 class ResourceId(str):
     pass
@@ -97,21 +101,21 @@ class PagingInformation(DictSerializable):
             self.paging = PagingInformation.Paging(**self.paging)
 
 
+@dataclass
 class Links(DictSerializable):
     _OMIT_IF_NONE_KEYS = ("self", "related")
 
-    def __init__(_self, self: Optional[str] = None, related: Optional[str] = None):  # noqa: N805
-        _self.self = self
-        _self.related = related
+    self: Optional[str] = None
+    related: Optional[str] = None
 
 
+@dataclass
 class ResourceLinks(DictSerializable):
     """
     https://developer.apple.com/documentation/appstoreconnectapi/resourcelinks
     """
 
-    def __init__(_self, self):  # noqa: N805
-        _self.self = self
+    self: str
 
 
 @dataclass
@@ -207,9 +211,14 @@ class Resource(LinkedResourceData, metaclass=PrettyNameAbcMeta):
     class Relationships(DictSerializable, GracefulDataclassMixin):
         def __post_init__(self):
             for field in self.__dict__:
-                value = getattr(self, field)
-                if not isinstance(value, (Relationship, type(None))):
-                    setattr(self, field, Relationship(**value))
+                current_value = getattr(self, field)
+                if current_value is None or isinstance(current_value, Relationship):
+                    continue
+
+                # Relationships should have at least 'links' attribute.
+                # Set the value to none for empty relationships.
+                updated_value = Relationship(**current_value) if current_value else None
+                setattr(self, field, updated_value)
 
     @classmethod
     def _create_attributes(cls, api_response) -> Attributes:
@@ -220,6 +229,12 @@ class Resource(LinkedResourceData, metaclass=PrettyNameAbcMeta):
             defined_fields = cls.Attributes.get_defined_fields(cls, api_response["attributes"])
         return cls.Attributes(**defined_fields)
 
+    @classmethod
+    def get_id(cls, resource_reference: ResourceReference) -> ResourceId:
+        if isinstance(resource_reference, LinkedResourceData):
+            return resource_reference.id
+        return resource_reference
+
     @classmethod
     def _create_relationships(cls, api_response) -> Relationships:
         if cls.Relationships is Resource.Relationships:
@@ -312,7 +327,8 @@ class Resource(LinkedResourceData, metaclass=PrettyNameAbcMeta):
         type_prefix = self.type.value.rstrip("s")
         name = re.sub(f"{type_prefix}s?", "", name)
         name = re.sub(r"([a-z])([A-Z])", r"\1 \2", name)
-        return name.lower().capitalize()
+        name = name.lower().capitalize()
+        return re.sub("(i|vision|mac) os ", r"\1OS", name)
 
     def _hide_attribute_value(self, attribute_name: str) -> bool:
         if not hasattr(self.attributes, "__dataclass_fields__"):

codemagic_cli_tools-0.51.0/src/codemagic/mixins/path_finder.py

@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+import abc
+import logging
+import pathlib
+from typing import Iterator
+
+
+class PathFinderMixin(metaclass=abc.ABCMeta):
+    logger: logging.Logger
+
+    def glob(self, pattern: pathlib.Path) -> Iterator[pathlib.Path]:
+        if pattern.is_absolute():
+            self.logger.info(f"Searching for files matching {pattern}")
+            # absolute globs are not supported, match them as relative to root
+            relative_pattern = pattern.relative_to(pattern.anchor)
+            return pathlib.Path(pattern.anchor).glob(str(relative_pattern))
+        elif pattern == pathlib.Path("."):
+            self.logger.info(f"Searching for files matching {pattern.resolve()}")
+            # `Path('.').glob('.')` which this would essentially cause is erroneous.
+            # Return empty iterator as we cannot possibly find current directory from
+            # within the same directory.
+            return iter([])
+        else:
+            self.logger.info(f"Searching for files matching {pattern.resolve()}")
+            return pathlib.Path().glob(str(pattern))
+
+    def find_paths(self, *patterns: pathlib.Path) -> Iterator[pathlib.Path]:
+        for pattern in patterns:
+            yield from self.glob(pattern.expanduser())

{codemagic_cli_tools-0.50.7 → codemagic_cli_tools-0.51.0}/src/codemagic/models/altool/altool.py

@@ -8,6 +8,7 @@ import subprocess
 import time
 from contextlib import contextmanager
 from functools import lru_cache
+from itertools import chain
 from typing import TYPE_CHECKING
 from typing import AnyStr
 from typing import Callable
@@ -296,11 +297,14 @@ class Altool(RunningCliAppMixin, StringConverterMixin):
 
     @classmethod
     def _get_action_result(cls, action_stdout: AnyStr) -> Optional[AltoolResult]:
-        try:
-            parsed_result = json.loads(action_stdout)
-            return AltoolResult.create(**parsed_result)
-        except (TypeError, ValueError):
-            return None
+        # Try to parse the whole stdout at once first, and then do it backwards line by line
+        for line in chain([action_stdout], reversed(action_stdout.splitlines())):
+            try:
+                parsed_result = json.loads(line)
+                return AltoolResult.create(**parsed_result)
+            except (TypeError, ValueError):
+                continue
+        return None
 
     @classmethod
     def _log_process_output(cls, output: Optional[AnyStr], cli_app: Optional[CliApp]):