Use Apple's preferred capitalization where possible.

Author: freakboy3742

docs/background/quickstart.rst

@@ -96,7 +96,7 @@ http://setuptools.readthedocs.io/en/latest/setuptools.html#dynamic-discovery-of-
 
 On Windows and Linux this allows for multiple executables to be defined.
 macOS will use the entry point with the same name as your `formal_name` as the
-main application, any others will be available in the Contents/MacOS folder inside the
+main application, any others will be available in the Contents/macOS folder inside the
 application bundle.
 
 For other platforms the entry point is defined in the platform template, typically

setup.cfg

@@ -72,34 +72,34 @@ console_scripts =
 briefcase.platforms =
     android = briefcase.platforms.android
     django = briefcase.platforms.django
-    ios = briefcase.platforms.ios
+    iOS = briefcase.platforms.iOS
     linux = briefcase.platforms.linux
-    macos = briefcase.platforms.macos
-    tvos = briefcase.platforms.tvos
-    watchos = briefcase.platforms.watchos
+    macOS = briefcase.platforms.macOS
+    tvOS = briefcase.platforms.tvOS
+    watchOS = briefcase.platforms.watchOS
     wearos = briefcase.platforms.wearos
     windows = briefcase.platforms.windows
 briefcase.formats.android =
     apk = briefcase.platforms.android.apk
 briefcase.formats.django =
     project = briefcase.platforms.django.project
     app = briefcase.platforms.django.app
-briefcase.formats.ios =
-    xcode = briefcase.platforms.ios.xcode
+briefcase.formats.iOS =
+    xcode = briefcase.platforms.iOS.xcode
 briefcase.formats.linux =
     appimage = briefcase.platforms.linux.appimage
     deb = briefcase.platforms.linux.deb
     flatpak = briefcase.platforms.linux.flatpak
     rpm = briefcase.platforms.linux.rpm
     snap = briefcase.platforms.linux.snap
-briefcase.formats.macos =
-    app = briefcase.platforms.macos.app
-    dmg = briefcase.platforms.macos.dmg
-    homebrew = briefcase.platforms.macos.homebrew
-briefcase.formats.tvos =
-    xcode = briefcase.platforms.tvos.xcode
-briefcase.formats.watchos =
-    xcode = briefcase.platforms.watchos.xcode
+briefcase.formats.macOS =
+    app = briefcase.platforms.macOS.app
+    dmg = briefcase.platforms.macOS.dmg
+    homebrew = briefcase.platforms.macOS.homebrew
+briefcase.formats.tvOS =
+    xcode = briefcase.platforms.tvOS.xcode
+briefcase.formats.watchOS =
+    xcode = briefcase.platforms.watchOS.xcode
 briefcase.formats.wearos =
     apk = briefcase.platforms.wearos.apk
 briefcase.formats.windows =

src/briefcase/cmdline.py

@@ -48,20 +48,29 @@ def parse_cmdline(args):
     )
 
     # <platform> *is* optional, with the default value based on the platform
-    # that you're on. It also normalizes case so "macOS" can be used to find
-    # the "macos" backend.
+    # that you're on.
     platforms = get_platforms()
+
+    # To make the UX a little forgiving, we normalize *any* case to the case
+    # actually used to register the platform. This function maps the lower-case
+    # version of the registered name to the actual registered name.
+    def normalize(name):
+        return {
+            n.lower(): n
+            for n in platforms.keys()
+        }.get(name.lower(), name)
+
     parser.add_argument(
         'platform',
         choices=list(platforms.keys()),
         default={
-            'darwin': 'macos',
+            'darwin': 'macOS',
             'linux': 'linux',
             'win32': 'windows',
         }[sys.platform],
         metavar='platform',
         nargs='?',
-        type=str.lower,
+        type=normalize,
         help='The platform to target (one of %(choices)s; default: %(default)s',
     )
 

src/briefcase/commands/create.py

@@ -659,6 +659,7 @@ def create_app(self, app: BaseConfig):
                 app=app
             ))
             shutil.rmtree(bundle_path)
+
         print()
         print('[{app.name}] Generating application template...'.format(
             app=app

src/briefcase/platforms/__init__.py

@@ -10,10 +10,13 @@ def get_platforms():
 
 
 def get_output_formats(platform):
+    # Entry point section identifiers (briefcase.formats.macos) are always
+    # in lower case, regardless of how they're registered. However, the
+    # actual entry point names preserve case.
     return {
         entry_point.name: entry_point.load()
         for entry_point
         in pkg_resources.iter_entry_points('briefcase.formats.{platform}'.format(
-            platform=platform
+            platform=platform.lower()
         ))
     }

src/briefcase/platforms/iOS/__init__.py

@@ -0,0 +1,10 @@
+
+DEFAULT_OUTPUT_FORMAT = 'xcode'
+
+
+class iOSMixin:
+    def __init__(self, output_format, *args, **kwargs):
+        super().__init__(*args, platform='iOS', output_format=output_format, **kwargs)
+
+    def verify_tools(self):
+        pass

src/briefcase/platforms/iOS/xcode.py

@@ -0,0 +1,79 @@
+import subprocess
+
+from briefcase.config import BaseConfig
+from briefcase.commands import (
+    BuildCommand,
+    CreateCommand,
+    PublishCommand,
+    RunCommand,
+    UpdateCommand
+)
+from briefcase.exceptions import BriefcaseCommandError
+from briefcase.platforms.iOS import iOSMixin
+
+
+class iOSAppMixin(iOSMixin):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, output_format='app', **kwargs)
+
+    def binary_path(self, app):
+        return self.platform_path / '{app.formal_name} / {app.formal_name}.xcodeproj'.format(app=app)
+
+    def bundle_path(self, app):
+        return self.platform_path / '{app.formal_name}'.format(app=app)
+
+
+class iOSAppCreateCommand(iOSAppMixin, CreateCommand):
+    description = "Create and populate a iOS Xcode project."
+
+
+class iOSAppUpdateCommand(iOSAppMixin, UpdateCommand):
+    description = "Update an existing iOS Xcode project."
+
+
+class iOSAppBuildCommand(iOSAppMixin, BuildCommand):
+    description = "Build an iOS Xcode project."
+
+
+class iOSAppRunCommand(iOSAppMixin, RunCommand):
+    description = "Run an iOS Xcode project."
+
+    def run_app(self, app: BaseConfig):
+        """
+        Start the application.
+
+        :param app: The config object for the app
+        :param base_path: The path to the project directory.
+        """
+        print()
+        print('[{app.name}] Starting app...'.format(
+            app=app
+        ))
+        try:
+            print()
+            self.subprocess.run(
+                [
+                    'open',
+                    self.binary_path(app),
+                ],
+                check=True,
+            )
+        except subprocess.CalledProcessError:
+            print()
+            raise BriefcaseCommandError(
+                "Unable to start app {app.name}.".format(app=app)
+            )
+
+
+class iOSAppPublishCommand(iOSAppMixin, PublishCommand):
+    description = "Publish an iOS app."
+    publication_channels = ['ios_appstore']
+    default_publication_channel = 'ios_appstore'
+
+
+# Declare the briefcase command bindings
+create = iOSAppCreateCommand  # noqa
+update = iOSAppUpdateCommand  # noqa
+build = iOSAppBuildCommand  # noqa
+run = iOSAppRunCommand  # noqa
+publish = iOSAppPublishCommand  # noqa

src/briefcase/platforms/macos/__init__.py src/briefcase/platforms/macOS/__init__.py

@@ -2,9 +2,9 @@
 DEFAULT_OUTPUT_FORMAT = 'app'
 
 
-class MacOSMixin:
+class macOSMixin:
     def __init__(self, output_format, *args, **kwargs):
-        super().__init__(*args, platform='macos', output_format=output_format, **kwargs)
+        super().__init__(*args, platform='macOS', output_format=output_format, **kwargs)
 
     def verify_tools(self):
         pass

src/briefcase/platforms/macos/app.py src/briefcase/platforms/macOS/app.py

@@ -1,5 +1,4 @@
 import subprocess
-from pathlib import Path
 
 from briefcase.config import BaseConfig
 from briefcase.commands import (
@@ -10,10 +9,10 @@
     UpdateCommand
 )
 from briefcase.exceptions import BriefcaseCommandError
-from briefcase.platforms.macos import MacOSMixin
+from briefcase.platforms.macOS import macOSMixin
 
 
-class MacOSAppMixin(MacOSMixin):
+class macOSAppMixin(macOSMixin):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, output_format='app', **kwargs)
 
@@ -24,19 +23,19 @@ def bundle_path(self, app):
         return self.platform_path / '{app.formal_name}.app'.format(app=app)
 
 
-class MacOSAppCreateCommand(MacOSAppMixin, CreateCommand):
+class macOSAppCreateCommand(macOSAppMixin, CreateCommand):
     description = "Create and populate a macOS .app bundle."
 
 
-class MacOSAppUpdateCommand(MacOSAppMixin, UpdateCommand):
+class macOSAppUpdateCommand(macOSAppMixin, UpdateCommand):
     description = "Update an existing macOS .app bundle."
 
 
-class MacOSAppBuildCommand(MacOSAppMixin, BuildCommand):
+class macOSAppBuildCommand(macOSAppMixin, BuildCommand):
     description = "Build a macOS .app bundle."
 
 
-class MacOSAppRunCommand(MacOSAppMixin, RunCommand):
+class macOSAppRunCommand(macOSAppMixin, RunCommand):
     description = "Run a macOS .app bundle."
 
     def run_app(self, app: BaseConfig):
@@ -66,13 +65,13 @@ def run_app(self, app: BaseConfig):
             )
 
 
-class MacOSAppPublishCommand(MacOSAppMixin, PublishCommand):
+class macOSAppPublishCommand(macOSAppMixin, PublishCommand):
     description = "Publish a macOS .app bundle."
 
 
 # Declare the briefcase command bindings
-create = MacOSAppCreateCommand  # noqa
-update = MacOSAppUpdateCommand  # noqa
-build = MacOSAppBuildCommand  # noqa
-run = MacOSAppRunCommand  # noqa
-publish = MacOSAppPublishCommand  # noqa
+create = macOSAppCreateCommand  # noqa
+update = macOSAppUpdateCommand  # noqa
+build = macOSAppBuildCommand  # noqa
+run = macOSAppRunCommand  # noqa
+publish = macOSAppPublishCommand  # noqa

src/briefcase/platforms/macos/dmg.py src/briefcase/platforms/macOS/dmg.py

@@ -5,10 +5,10 @@
     RunCommand,
     UpdateCommand
 )
-from briefcase.platforms.macos import MacOSMixin
+from briefcase.platforms.macOS import macOSMixin
 
 
-class MacOSDmgMixin(MacOSMixin):
+class macOSDmgMixin(macOSMixin):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, output_format='dmg', **kwargs)
 
@@ -19,23 +19,23 @@ def bundle_path(self, app):
         return self.platform_path / '{app.formal_name}.app'.format(app=app)
 
 
-class MacOSDmgCreateCommand(MacOSDmgMixin, CreateCommand):
+class macOSDmgCreateCommand(macOSDmgMixin, CreateCommand):
     description = "Create and populate a macOS .dmg bundle."
 
 
-class MacOSDmgUpdateCommand(MacOSDmgMixin, UpdateCommand):
+class macOSDmgUpdateCommand(macOSDmgMixin, UpdateCommand):
     description = "Update an existing macOS .dmg bundle."
 
 
-class MacOSDmgBuildCommand(MacOSDmgMixin, BuildCommand):
+class macOSDmgBuildCommand(macOSDmgMixin, BuildCommand):
     description = "Build a macOS .dmg bundle."
 
 
-class MacOSDmgRunCommand(MacOSDmgMixin, RunCommand):
+class macOSDmgRunCommand(macOSDmgMixin, RunCommand):
     description = "Run a macOS .dmg bundle."
 
 
-class MacOSDmgPublishCommand(MacOSDmgMixin, PublishCommand):
+class macOSDmgPublishCommand(macOSDmgMixin, PublishCommand):
     description = "Publish a macOS .dmg bundle."
 
     def add_options(self):
@@ -50,8 +50,8 @@ def add_options(self):
 
 
 # Declare the briefcase command bindings
-create = MacOSDmgCreateCommand  # noqa
-update = MacOSDmgUpdateCommand  # noqa
-build = MacOSDmgBuildCommand  # noqa
-run = MacOSDmgRunCommand  # noqa
-publish = MacOSDmgPublishCommand  # noqa
+create = macOSDmgCreateCommand  # noqa
+update = macOSDmgUpdateCommand  # noqa
+build = macOSDmgBuildCommand  # noqa
+run = macOSDmgRunCommand  # noqa
+publish = macOSDmgPublishCommand  # noqa