From be28fb5cbd082941dd64d49e0ba8ffab199082f1 Mon Sep 17 00:00:00 2001 From: Andrew Naylor Date: Sat, 24 Sep 2016 15:53:50 +0100 Subject: [PATCH] Update to Commandant 0.11.1 --- Seedfile | 2 +- mas-cli.xcodeproj/project.pbxproj | 8 ++++---- mas-cli/Commands/Account.swift | 2 +- mas-cli/Commands/Install.swift | 4 ++-- mas-cli/Commands/List.swift | 2 +- mas-cli/Commands/Outdated.swift | 2 +- mas-cli/Commands/Reset.swift | 4 ++-- mas-cli/Commands/Search.swift | 4 ++-- mas-cli/Commands/SignIn.swift | 4 ++-- mas-cli/Commands/SignOut.swift | 2 +- mas-cli/Commands/Upgrade.swift | 4 ++-- mas-cli/Commands/Version.swift | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Seedfile b/Seedfile index 405e43a..493066f 100644 --- a/Seedfile +++ b/Seedfile @@ -1,2 +1,2 @@ -github "giginet/Commandant", "3.0", :files => "Sources/Commandant/*.swift" +github "carthage/Commandant", "0.11.1", :files => "Sources/Commandant/*.swift" github "antitypical/Result", "3.0.0", :files => "Result/*.swift" diff --git a/mas-cli.xcodeproj/project.pbxproj b/mas-cli.xcodeproj/project.pbxproj index e70a6a1..bfb028f 100644 --- a/mas-cli.xcodeproj/project.pbxproj +++ b/mas-cli.xcodeproj/project.pbxproj @@ -14,10 +14,10 @@ 25209791ED0F49CF5BAF7348 /* LinuxSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55E3BFBE58DFCE19A53A23D7 /* LinuxSupport.swift */; }; 3053D11E74A22A4C5A6BE833 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = F547B3DC473CFB1BE0AEB70A /* Errors.swift */; }; 30EA893640B02CCF679F9C57 /* Option.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AD7FE171F643805F7BC38A7 /* Option.swift */; }; - 345960DE661C85EB2609263C /* ArgumentType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62F77E7DD6274E0371AF5CA6 /* ArgumentType.swift */; }; 693A98991CBFFA760004D3B4 /* Search.swift in Sources */ = {isa = PBXBuildFile; fileRef = 693A98981CBFFA760004D3B4 /* Search.swift */; }; 693A989B1CBFFAAA0004D3B4 /* NSURLSession+Synchronous.swift in Sources */ = {isa = PBXBuildFile; fileRef = 693A989A1CBFFAAA0004D3B4 /* NSURLSession+Synchronous.swift */; }; AD0785BC0EC6BBF4ED560DCC /* ArgumentParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA9D96DDBBCCCC5944160ABE /* ArgumentParser.swift */; }; + ADE553C828AF4EAFF39ED3E1 /* ArgumentProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4237E5AA1A289D03D2A2FB8 /* ArgumentProtocol.swift */; }; EBD6B44FDF65E0253153629F /* HelpCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FDC2B8063EC231E28353D23 /* HelpCommand.swift */; }; ED031A7C1B5127C00097692E /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED031A7B1B5127C00097692E /* main.swift */; }; ED0F237F1B87522400AE40CD /* Install.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0F237E1B87522400AE40CD /* Install.swift */; }; @@ -57,12 +57,12 @@ 326E4D331CCD66ADFE19CE39 /* Command.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Command.swift; path = Seeds/Commandant/Sources/Commandant/Command.swift; sourceTree = ""; }; 5150F7FB7CF2A77F675D8E92 /* ResultProtocol.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ResultProtocol.swift; path = Seeds/Result/Result/ResultProtocol.swift; sourceTree = ""; }; 55E3BFBE58DFCE19A53A23D7 /* LinuxSupport.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LinuxSupport.swift; path = Seeds/Commandant/Sources/Commandant/LinuxSupport.swift; sourceTree = ""; }; - 62F77E7DD6274E0371AF5CA6 /* ArgumentType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ArgumentType.swift; path = Seeds/Commandant/Sources/Commandant/ArgumentType.swift; sourceTree = ""; }; 693A98981CBFFA760004D3B4 /* Search.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Search.swift; sourceTree = ""; }; 693A989A1CBFFAAA0004D3B4 /* NSURLSession+Synchronous.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSURLSession+Synchronous.swift"; sourceTree = ""; }; 8FDC2B8063EC231E28353D23 /* HelpCommand.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HelpCommand.swift; path = Seeds/Commandant/Sources/Commandant/HelpCommand.swift; sourceTree = ""; }; 9257C5FABA335E5F060CB7F7 /* Result.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Result.swift; path = Seeds/Result/Result/Result.swift; sourceTree = ""; }; AF1B6BEDF32AF3F8A575FB1F /* Switch.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Switch.swift; path = Seeds/Commandant/Sources/Commandant/Switch.swift; sourceTree = ""; }; + B4237E5AA1A289D03D2A2FB8 /* ArgumentProtocol.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ArgumentProtocol.swift; path = Seeds/Commandant/Sources/Commandant/ArgumentProtocol.swift; sourceTree = ""; }; EA9D96DDBBCCCC5944160ABE /* ArgumentParser.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ArgumentParser.swift; path = Seeds/Commandant/Sources/Commandant/ArgumentParser.swift; sourceTree = ""; }; ED031A781B5127C00097692E /* mas */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mas; sourceTree = BUILT_PRODUCTS_DIR; }; ED031A7B1B5127C00097692E /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; @@ -148,7 +148,7 @@ children = ( F36A4ABD8025E13060312925 /* Argument.swift */, EA9D96DDBBCCCC5944160ABE /* ArgumentParser.swift */, - 62F77E7DD6274E0371AF5CA6 /* ArgumentType.swift */, + B4237E5AA1A289D03D2A2FB8 /* ArgumentProtocol.swift */, 326E4D331CCD66ADFE19CE39 /* Command.swift */, F547B3DC473CFB1BE0AEB70A /* Errors.swift */, 8FDC2B8063EC231E28353D23 /* HelpCommand.swift */, @@ -351,7 +351,7 @@ ED0F23871B87537200AE40CD /* Account.swift in Sources */, F184B6B7CD9C013CACDED0FB /* Argument.swift in Sources */, AD0785BC0EC6BBF4ED560DCC /* ArgumentParser.swift in Sources */, - 345960DE661C85EB2609263C /* ArgumentType.swift in Sources */, + ADE553C828AF4EAFF39ED3E1 /* ArgumentProtocol.swift in Sources */, 0C47E694564FCB59996690DD /* Command.swift in Sources */, ED0F238B1B87569C00AE40CD /* Downloader.swift in Sources */, ED0F238D1B8756E600AE40CD /* Error.swift in Sources */, diff --git a/mas-cli/Commands/Account.swift b/mas-cli/Commands/Account.swift index 75fab43..e349a82 100644 --- a/mas-cli/Commands/Account.swift +++ b/mas-cli/Commands/Account.swift @@ -6,7 +6,7 @@ // Copyright (c) 2015 Andrew Naylor. All rights reserved. // -struct AccountCommand: CommandType { +struct AccountCommand: CommandProtocol { typealias Options = NoOptions let verb = "account" let function = "Prints the primary account Apple ID" diff --git a/mas-cli/Commands/Install.swift b/mas-cli/Commands/Install.swift index 67a07b1..8cebb2c 100644 --- a/mas-cli/Commands/Install.swift +++ b/mas-cli/Commands/Install.swift @@ -6,7 +6,7 @@ // Copyright (c) 2015 Andrew Naylor. All rights reserved. // -struct InstallCommand: CommandType { +struct InstallCommand: CommandProtocol { typealias Options = InstallOptions let verb = "install" let function = "Install from the Mac App Store" @@ -40,7 +40,7 @@ struct InstallCommand: CommandType { } } -struct InstallOptions: OptionsType { +struct InstallOptions: OptionsProtocol { let appIds: [UInt64] let forceInstall: Bool diff --git a/mas-cli/Commands/List.swift b/mas-cli/Commands/List.swift index fdd3b0a..2d9e106 100644 --- a/mas-cli/Commands/List.swift +++ b/mas-cli/Commands/List.swift @@ -6,7 +6,7 @@ // Copyright (c) 2015 Andrew Naylor. All rights reserved. // -struct ListCommand: CommandType { +struct ListCommand: CommandProtocol { typealias Options = NoOptions let verb = "list" let function = "Lists apps from the Mac App Store which are currently installed" diff --git a/mas-cli/Commands/Outdated.swift b/mas-cli/Commands/Outdated.swift index edae967..7da061a 100644 --- a/mas-cli/Commands/Outdated.swift +++ b/mas-cli/Commands/Outdated.swift @@ -6,7 +6,7 @@ // Copyright (c) 2015 Andrew Naylor. All rights reserved. // -struct OutdatedCommand: CommandType { +struct OutdatedCommand: CommandProtocol { typealias Options = NoOptions let verb = "outdated" let function = "Lists pending updates from the Mac App Store" diff --git a/mas-cli/Commands/Reset.swift b/mas-cli/Commands/Reset.swift index f53c4df..52285fe 100644 --- a/mas-cli/Commands/Reset.swift +++ b/mas-cli/Commands/Reset.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Andrew Naylor. All rights reserved. // -struct ResetCommand: CommandType { +struct ResetCommand: CommandProtocol { typealias Options = ResetOptions let verb = "reset" let function = "Resets the Mac App Store" @@ -71,7 +71,7 @@ struct ResetCommand: CommandType { } } -struct ResetOptions: OptionsType { +struct ResetOptions: OptionsProtocol { let debug: Bool static func create(debug: Bool) -> ResetOptions { diff --git a/mas-cli/Commands/Search.swift b/mas-cli/Commands/Search.swift index 3f85d27..7601eca 100644 --- a/mas-cli/Commands/Search.swift +++ b/mas-cli/Commands/Search.swift @@ -13,7 +13,7 @@ struct ResultKeys { static let TrackId = "trackId" } -struct SearchCommand: CommandType { +struct SearchCommand: CommandProtocol { typealias Options = SearchOptions let verb = "search" let function = "Search for apps from the Mac App Store" @@ -49,7 +49,7 @@ struct SearchCommand: CommandType { } } -struct SearchOptions: OptionsType { +struct SearchOptions: OptionsProtocol { let appName: String static func create(_ appName: String) -> SearchOptions { diff --git a/mas-cli/Commands/SignIn.swift b/mas-cli/Commands/SignIn.swift index 4030ff8..1070bb1 100644 --- a/mas-cli/Commands/SignIn.swift +++ b/mas-cli/Commands/SignIn.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Andrew Naylor. All rights reserved. // -struct SignInCommand: CommandType { +struct SignInCommand: CommandProtocol { typealias Options = SignInOptions let verb = "signin" let function = "Sign in to the Mac App Store" @@ -36,7 +36,7 @@ struct SignInCommand: CommandType { } } -struct SignInOptions: OptionsType { +struct SignInOptions: OptionsProtocol { let username: String let password: String diff --git a/mas-cli/Commands/SignOut.swift b/mas-cli/Commands/SignOut.swift index 8766707..30fe0ec 100644 --- a/mas-cli/Commands/SignOut.swift +++ b/mas-cli/Commands/SignOut.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Andrew Naylor. All rights reserved. // -struct SignOutCommand: CommandType { +struct SignOutCommand: CommandProtocol { typealias Options = NoOptions let verb = "signout" let function = "Sign out of the Mac App Store" diff --git a/mas-cli/Commands/Upgrade.swift b/mas-cli/Commands/Upgrade.swift index 2e5f56a..2ee4040 100644 --- a/mas-cli/Commands/Upgrade.swift +++ b/mas-cli/Commands/Upgrade.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Andrew Naylor. All rights reserved. // -struct UpgradeCommand: CommandType { +struct UpgradeCommand: CommandProtocol { typealias Options = UpgradeOptions let verb = "upgrade" let function = "Upgrade outdated apps from the Mac App Store" @@ -56,7 +56,7 @@ struct UpgradeCommand: CommandType { } } -struct UpgradeOptions: OptionsType { +struct UpgradeOptions: OptionsProtocol { let appIds: [UInt64] static func create(_ appIds: [Int]) -> UpgradeOptions { diff --git a/mas-cli/Commands/Version.swift b/mas-cli/Commands/Version.swift index a3125a3..4f6726b 100644 --- a/mas-cli/Commands/Version.swift +++ b/mas-cli/Commands/Version.swift @@ -6,7 +6,7 @@ // Copyright © 2015 Andrew Naylor. All rights reserved. // -struct VersionCommand: CommandType { +struct VersionCommand: CommandProtocol { typealias Options = NoOptions let verb = "version" let function = "Print version number"