🎨 SwiftFormat

.swift-version

@@ -0,0 +1 @@
+4.2

.swiftformat

@@ -0,0 +1,18 @@
+#
+# .swiftformat
+# mas-cli
+#
+# https://github.com/nicklockwood/SwiftFormat#config-file
+#
+
+--exclude Carthage/
+
+# Disabled rules
+--disable blankLinesAroundMark
+
+# Enabled rules (disabled by default)
+--enable trailingClosures
+
+# Rule options
+--commas inline
+--importgrouping testable-top

Brewfile

@@ -1,3 +1,4 @@
 brew "carthage"
 brew "shellcheck"
 brew "swiftlint"
+brew "swiftformat"

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- 🎨 SwiftFormat #215
 - ⬆️ Nimble (7.3.2) #213
 - ⬆️ Quick (1.3.2) #213
 - ⬆️ Result (4.1.0) #213

MasKit/AppStore/Downloader.swift

@@ -19,7 +19,7 @@ func download(_ adamId: UInt64) -> MASError? {
     }
 
     guard let storeAccount = account as? ISStoreAccount
-        else { fatalError("Unable to cast StoreAccount to ISStoreAccount") }
+    else { fatalError("Unable to cast StoreAccount to ISStoreAccount") }
     let purchase = SSPurchase(adamId: adamId, account: storeAccount)
 
     var purchaseError: MASError?

MasKit/AppStore/ISStoreAccount.swift

@@ -6,8 +6,8 @@
 //  Copyright (c) 2015 Andrew Naylor. All rights reserved.
 //
 
-import StoreFoundation
 import CommerceKit
+import StoreFoundation
 
 extension ISStoreAccount: StoreAccount {
     static var primaryAccountIsPresentAndSignedIn: Bool {

MasKit/AppStore/PurchaseDownloadObserver.swift

@@ -31,17 +31,17 @@ import StoreFoundation
         }
     }
 
-    func downloadQueue(_ queue: CKDownloadQueue, changedWithAddition download: SSDownload) {
+    func downloadQueue(_: CKDownloadQueue, changedWithAddition download: SSDownload) {
         guard download.metadata.itemIdentifier == purchase.itemIdentifier else {
             return
         }
         clearLine()
         printInfo("Downloading \(download.metadata.title)")
     }
 
-    func downloadQueue(_ queue: CKDownloadQueue, changedWithRemoval download: SSDownload) {
+    func downloadQueue(_: CKDownloadQueue, changedWithRemoval download: SSDownload) {
         guard download.metadata.itemIdentifier == purchase.itemIdentifier,
-              let status = download.status else {
+            let status = download.status else {
             return
         }
 
@@ -76,7 +76,7 @@ func progress(_ state: ProgressState) {
 
     let completeLength = Int(state.percentComplete * Float(barLength))
     var bar = ""
-    for index in 0..<barLength {
+    for index in 0 ..< barLength {
         if index < completeLength {
             bar += "#"
         } else {

MasKit/AppStore/SSPurchase.swift

@@ -15,11 +15,11 @@ typealias SSPurchaseCompletion =
 extension SSPurchase {
     convenience init(adamId: UInt64, account: ISStoreAccount) {
         self.init()
-        self.buyParameters =
+        buyParameters =
             "productType=C&price=0&salableAdamId=\(adamId)&pricingParameters=STDRDL&pg=default&appExtVrsId=0"
-        self.itemIdentifier = adamId
-        self.accountIdentifier = account.dsID
-        self.appleID = account.identifier
+        itemIdentifier = adamId
+        accountIdentifier = account.dsID
+        appleID = account.identifier
 
         let downloadMetadata = SSDownloadMetadata()
         downloadMetadata.kind = "software"

MasKit/Commands/Account.swift

@@ -18,7 +18,7 @@ public struct AccountCommand: CommandProtocol {
     public init() {}
 
     /// Runs the command.
-    public func run(_ options: Options) -> Result<(), MASError> {
+    public func run(_: Options) -> Result<(), MASError> {
         if let account = ISStoreAccount.primaryAccount {
             print(String(describing: account.identifier))
         } else {

MasKit/Commands/Home.swift

@@ -31,9 +31,9 @@ public struct HomeCommand: CommandProtocol {
     public func run(_ options: HomeOptions) -> Result<(), MASError> {
         do {
             guard let result = try storeSearch.lookup(app: options.appId)
-                else {
-                    print("No results found")
-                    return .failure(.noSearchResultsFound)
+            else {
+                print("No results found")
+                return .failure(.noSearchResultsFound)
             }
 
             do {

MasKit/Commands/Info.swift

@@ -7,8 +7,8 @@
 //
 
 import Commandant
-import Result
 import Foundation
+import Result
 
 /// Displays app details. Uses the iTunes Lookup API:
 /// https://affiliate.itunes.apple.com/resources/documentation/itunes-store-web-service-search-api/#lookup
@@ -27,9 +27,9 @@ public struct InfoCommand: CommandProtocol {
     public func run(_ options: InfoOptions) -> Result<(), MASError> {
         do {
             guard let result = try storeSearch.lookup(app: options.appId)
-                else {
-                    print("No results found")
-                    return .failure(.noSearchResultsFound)
+            else {
+                print("No results found")
+                return .failure(.noSearchResultsFound)
             }
 
             print(AppInfoFormatter.format(app: result))

MasKit/Commands/Install.swift

@@ -7,8 +7,8 @@
 //
 
 import Commandant
-import Result
 import CommerceKit
+import Result
 
 /// Installs previously purchased apps from the Mac App Store.
 public struct InstallCommand: CommandProtocol {
@@ -54,7 +54,7 @@ public struct InstallOptions: OptionsProtocol {
 
     public static func create(_ appIds: [Int]) -> (_ forceInstall: Bool) -> InstallOptions {
         return { forceInstall in
-            return InstallOptions(appIds: appIds.map {UInt64($0)}, forceInstall: forceInstall)
+            InstallOptions(appIds: appIds.map { UInt64($0) }, forceInstall: forceInstall)
         }
     }
 

MasKit/Commands/List.swift

@@ -25,7 +25,7 @@ public struct ListCommand: CommandProtocol {
     }
 
     /// Runs the command.
-    public func run(_ options: Options) -> Result<(), MASError> {
+    public func run(_: Options) -> Result<(), MASError> {
         let products = appLibrary.installedApps
         if products.isEmpty {
             print("No installed apps found")

MasKit/Commands/Lucky.swift

@@ -7,8 +7,8 @@
 //
 
 import Commandant
-import Result
 import CommerceKit
+import Result
 
 /// Command which installs the first search result. This is handy as many MAS titles
 /// can be long with embedded keywords.
@@ -89,7 +89,7 @@ public struct LuckyOptions: OptionsProtocol {
 
     public static func create(_ appName: String) -> (_ forceInstall: Bool) -> LuckyOptions {
         return { forceInstall in
-            return LuckyOptions(appName: appName, forceInstall: forceInstall)
+            LuckyOptions(appName: appName, forceInstall: forceInstall)
         }
     }
 

MasKit/Commands/Open.swift

@@ -27,7 +27,7 @@ public struct OpenCommand: CommandProtocol {
     public init(storeSearch: StoreSearch = MasStoreSearch(),
                 openCommand: ExternalCommand = OpenSystemCommand()) {
         self.storeSearch = storeSearch
-        self.systemOpen = openCommand
+        systemOpen = openCommand
     }
 
     /// Runs the command.
@@ -40,20 +40,20 @@ public struct OpenCommand: CommandProtocol {
             }
 
             guard let appId = Int(options.appId)
-                else {
-                    print("Invalid app ID")
-                    return .failure(.noSearchResultsFound)
+            else {
+                print("Invalid app ID")
+                return .failure(.noSearchResultsFound)
             }
 
             guard let result = try storeSearch.lookup(app: appId)
-                else {
-                    print("No results found")
-                    return .failure(.noSearchResultsFound)
+            else {
+                print("No results found")
+                return .failure(.noSearchResultsFound)
             }
 
             guard var url = URLComponents(string: result.trackViewUrl)
-                else {
-                    return .failure(.searchFailed)
+            else {
+                return .failure(.searchFailed)
             }
             url.scheme = masScheme
 

MasKit/Commands/Outdated.swift

@@ -7,8 +7,8 @@
 //
 
 import Commandant
-import Result
 import CommerceKit
+import Result
 
 /// Command which displays a list of installed apps which have available updates
 /// ready to be installed from the Mac App Store.
@@ -27,15 +27,15 @@ public struct OutdatedCommand: CommandProtocol {
     }
 
     /// Runs the command.
-    public func run(_ options: Options) -> Result<(), MASError> {
+    public func run(_: Options) -> Result<(), MASError> {
         let updateController = CKUpdateController.shared()
         let updates = updateController?.availableUpdates()
         for update in updates! {
             if let installed = appLibrary.installedApp(forBundleId: update.bundleID) {
                 // Display version of installed app compared to available update.
                 print("""
-                    \(update.itemIdentifier) \(update.title) (\(installed.bundleVersion) -> \(update.bundleVersion))
-                    """)
+                \(update.itemIdentifier) \(update.title) (\(installed.bundleVersion) -> \(update.bundleVersion))
+                """)
             } else {
                 print("\(update.itemIdentifier) \(update.title) (unknown -> \(update.bundleVersion))")
             }

MasKit/Commands/Reset.swift

@@ -7,8 +7,8 @@
 //
 
 import Commandant
-import Result
 import CommerceKit
+import Result
 
 /// Kills several macOS processes as a means to reset the app store.
 public struct ResetCommand: CommandProtocol {
@@ -21,22 +21,22 @@ public struct ResetCommand: CommandProtocol {
     /// Runs the command.
     public func run(_ options: Options) -> Result<(), MASError> {
         /*
-        The "Reset Application" command in the Mac App Store debug menu performs
-        the following steps
- 
+         The "Reset Application" command in the Mac App Store debug menu performs
+         the following steps
+
          - killall Dock
          - killall storeagent (storeagent no longer exists)
          - rm com.apple.appstore download directory
          - clear cookies (appears to be a no-op)
 
-        As storeagent no longer exists we will implement a slight variant and kill all
-        App Store-associated processes
+         As storeagent no longer exists we will implement a slight variant and kill all
+         App Store-associated processes
          - storeaccountd
          - storeassetd
          - storedownloadd
          - storeinstalld
          - storelegacy
-        */
+         */
 
         // Kill processes
         let killProcs = [
@@ -60,7 +60,7 @@ public struct ResetCommand: CommandProtocol {
         kill.launch()
         kill.waitUntilExit()
 
-        if kill.terminationStatus != 0 && options.debug {
+        if kill.terminationStatus != 0, options.debug {
             let output = stderr.fileHandleForReading.readDataToEndOfFile()
             printInfo("killall  failed:\r\n\(String(data: output, encoding: String.Encoding.utf8)!)")
         }

MasKit/Commands/SignIn.swift

@@ -31,7 +31,7 @@ public struct SignInCommand: CommandProtocol {
             printInfo("Signing in to Apple ID: \(options.username)")
 
             let password: String = {
-                if options.password == "" && !options.dialog {
+                if options.password == "", !options.dialog {
                     return String(validatingUTF8: getpass("Password: "))!
                 }
                 return options.password
@@ -56,8 +56,8 @@ public struct SignInOptions: OptionsProtocol {
 
     static func create(username: String) -> (_ password: String) -> (_ dialog: Bool) -> SignInOptions {
         return { password in { dialog in
-            return SignInOptions(username: username, password: password, dialog: dialog)
-        }}
+            SignInOptions(username: username, password: password, dialog: dialog)
+        } }
     }
 
     public static func evaluate(_ mode: CommandMode) -> Result<SignInOptions, CommandantError<MASError>> {

MasKit/Commands/SignOut.swift

@@ -7,8 +7,8 @@
 //
 
 import Commandant
-import Result
 import CommerceKit
+import Result
 
 public struct SignOutCommand: CommandProtocol {
     public typealias Options = NoOptions<MASError>
@@ -18,7 +18,7 @@ public struct SignOutCommand: CommandProtocol {
     public init() {}
 
     /// Runs the command.
-    public func run(_ options: Options) -> Result<(), MASError> {
+    public func run(_: Options) -> Result<(), MASError> {
         if #available(macOS 10.13, *) {
             let accountService: ISAccountService = ISServiceProxy.genericShared().accountService
             accountService.signOut()

MasKit/Commands/Uninstall.swift

@@ -7,8 +7,8 @@
 //
 
 import Commandant
-import Result
 import CommerceKit
+import Result
 import StoreFoundation
 
 /// Command which uninstalls apps managed by the Mac App Store.
@@ -64,7 +64,7 @@ public struct UninstallOptions: OptionsProtocol {
 
     static func create(_ appId: Int) -> (_ dryRun: Bool) -> UninstallOptions {
         return { dryRun in
-            return UninstallOptions(appId: appId, dryRun: dryRun)
+            UninstallOptions(appId: appId, dryRun: dryRun)
         }
     }
 

MasKit/Commands/Upgrade.swift

@@ -7,8 +7,8 @@
 //
 
 import Commandant
-import Result
 import CommerceKit
+import Result
 
 /// Command which upgrades apps with new versions available in the Mac App Store.
 public struct UpgradeCommand: CommandProtocol {

MasKit/Commands/Vendor.swift

@@ -31,13 +31,13 @@ public struct VendorCommand: CommandProtocol {
     public func run(_ options: VendorOptions) -> Result<(), MASError> {
         do {
             guard let result = try storeSearch.lookup(app: options.appId)
-                else {
-                    print("No results found")
-                    return .failure(.noSearchResultsFound)
+            else {
+                print("No results found")
+                return .failure(.noSearchResultsFound)
             }
 
             guard let vendorWebsite = result.sellerUrl
-                else { throw MASError.noVendorWebsite }
+            else { throw MASError.noVendorWebsite }
 
             do {
                 try openCommand.run(arguments: vendorWebsite)