From 29e27bc31d43e66a42e985d96def60cb7f214b8b Mon Sep 17 00:00:00 2001 From: Timofey Solomko Date: Sun, 22 Oct 2017 16:29:32 +0300 Subject: [PATCH] Update SwiftCLI to 3.1.0 --- Package.resolved | 4 ++-- Package.swift | 2 +- Sources/swcomp/7ZipCommand.swift | 4 ++-- Sources/swcomp/GlobalOptions.swift | 2 +- Sources/swcomp/TarCommand.swift | 10 +++++----- Sources/swcomp/ZipCommand.swift | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Package.resolved b/Package.resolved index 0df668db..a3884ed2 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/jakeheis/SwiftCLI", "state": { "branch": null, - "revision": "36bb5dd52deed7264b6f41c1a2190d376cb9f17c", - "version": "3.0.3" + "revision": "8e5916bfcc7f8acee6fb2cb36d1ffefb02ac2460", + "version": "3.1.0" } } ] diff --git a/Package.swift b/Package.swift index 7a6807a7..027e7cc7 100644 --- a/Package.swift +++ b/Package.swift @@ -9,7 +9,7 @@ let package = Package( targets: ["SWCompression"]), ], dependencies: [ - .package(url: "https://github.com/jakeheis/SwiftCLI", .upToNextMinor(from: "3.0.0")) + .package(url: "https://github.com/jakeheis/SwiftCLI", from: "3.0.0") ], targets: [ .target( diff --git a/Sources/swcomp/7ZipCommand.swift b/Sources/swcomp/7ZipCommand.swift index e7c818e9..b76bbae3 100644 --- a/Sources/swcomp/7ZipCommand.swift +++ b/Sources/swcomp/7ZipCommand.swift @@ -12,8 +12,8 @@ class SevenZipCommand: Command { let name = "7z" let shortDescription = "Extracts 7-Zip container" - let info = Flag("-i", "--info", usage: "Print list of entries in container and their attributes") - let extract = Key("-e", "--extract", usage: "Extract container into specified directory (it must be empty or not exist)") + let info = Flag("-i", "--info", description: "Print list of entries in container and their attributes") + let extract = Key("-e", "--extract", description: "Extract container into specified directory (it must be empty or not exist)") var optionGroups: [OptionGroup] { let actions = OptionGroup(options: [info, extract], restriction: .exactlyOne) diff --git a/Sources/swcomp/GlobalOptions.swift b/Sources/swcomp/GlobalOptions.swift index a50f51bd..5c23d21f 100644 --- a/Sources/swcomp/GlobalOptions.swift +++ b/Sources/swcomp/GlobalOptions.swift @@ -8,7 +8,7 @@ import SWCompression import SwiftCLI struct GlobalOptions: GlobalOptionsSource { - static let verbose = Flag("--verbose", usage: "Print the list of extracted files and directories.") + static let verbose = Flag("--verbose", description: "Print the list of extracted files and directories.") static var options: [Option] { return [verbose] } diff --git a/Sources/swcomp/TarCommand.swift b/Sources/swcomp/TarCommand.swift index 378209b7..be79b17e 100644 --- a/Sources/swcomp/TarCommand.swift +++ b/Sources/swcomp/TarCommand.swift @@ -12,12 +12,12 @@ class TarCommand: Command { let name = "tar" let shortDescription = "Extracts TAR container" - let gz = Flag("-z", "--gz", usage: "Decompress with GZip first") - let bz2 = Flag("-j", "--bz2", usage: "Decompress with BZip2 first") - let xz = Flag("-x", "--xz", usage: "Decompress with XZ first") + let gz = Flag("-z", "--gz", description: "Decompress with GZip first") + let bz2 = Flag("-j", "--bz2", description: "Decompress with BZip2 first") + let xz = Flag("-x", "--xz", description: "Decompress with XZ first") - let info = Flag("-i", "--info", usage: "Print list of entries in container and their attributes") - let extract = Key("-e", "--extract", usage: "Extract container into specified directory (it must be empty or not exist)") + let info = Flag("-i", "--info", description: "Print list of entries in container and their attributes") + let extract = Key("-e", "--extract", description: "Extract container into specified directory (it must be empty or not exist)") var optionGroups: [OptionGroup] { let compressions = OptionGroup(options: [gz, bz2, xz], restriction: .atMostOne) diff --git a/Sources/swcomp/ZipCommand.swift b/Sources/swcomp/ZipCommand.swift index b1008ca7..39e462f0 100644 --- a/Sources/swcomp/ZipCommand.swift +++ b/Sources/swcomp/ZipCommand.swift @@ -12,8 +12,8 @@ class ZipCommand: Command { let name = "zip" let shortDescription = "Extracts ZIP container" - let info = Flag("-i", "--info", usage: "Print list of entries in container and their attributes") - let extract = Key("-e", "--extract", usage: "Extract container into specified directory (it must be empty or not exist)") + let info = Flag("-i", "--info", description: "Print list of entries in container and their attributes") + let extract = Key("-e", "--extract", description: "Extract container into specified directory (it must be empty or not exist)") var optionGroups: [OptionGroup] { let actions = OptionGroup(options: [info, extract], restriction: .exactlyOne)