Skip to content

refactor CLI options #4190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 3, 2022
Merged

refactor CLI options #4190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7e40e5
refactor CLI options
tomerd Mar 3, 2022
427419f
linux fixup
tomerd Mar 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
501 changes: 264 additions & 237 deletions Sources/Commands/Options.swift
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Sources/Commands/SwiftBuildTool.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ public struct SwiftBuildTool: SwiftCommand {
version: SwiftVersion.currentVersion.completeDisplayString,
helpNames: [.short, .long, .customLong("help", withSingleDash: true)])

@OptionGroup(_hiddenFromHelp: true)
var swiftOptions: SwiftToolOptions
@OptionGroup()
var globalOptions: GlobalOptions

@OptionGroup()
var options: BuildToolOptions
Expand Down
12 changes: 6 additions & 6 deletions Sources/Commands/SwiftPackageCollectionsTool.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public struct SwiftPackageCollectionsTool: ParsableCommand {
var jsonOptions: JSONOptions

@OptionGroup(_hiddenFromHelp: true)
var swiftOptions: SwiftToolOptions
var globalOptions: GlobalOptions

func run(_ swiftTool: SwiftTool) throws {
let collections = try with(swiftTool) { collections in
Expand All @@ -99,7 +99,7 @@ public struct SwiftPackageCollectionsTool: ParsableCommand {
static let configuration = CommandConfiguration(abstract: "Refresh configured collections")

@OptionGroup(_hiddenFromHelp: true)
var swiftOptions: SwiftToolOptions
var globalOptions: GlobalOptions

func run(_ swiftTool: SwiftTool) throws {
let collections = try with(swiftTool) { collections in
Expand All @@ -125,7 +125,7 @@ public struct SwiftPackageCollectionsTool: ParsableCommand {
var skipSignatureCheck: Bool = false

@OptionGroup(_hiddenFromHelp: true)
var swiftOptions: SwiftToolOptions
var globalOptions: GlobalOptions

func run(_ swiftTool: SwiftTool) throws {
let collectionURL = try url(self.collectionURL)
Expand Down Expand Up @@ -164,7 +164,7 @@ public struct SwiftPackageCollectionsTool: ParsableCommand {
var collectionURL: String

@OptionGroup(_hiddenFromHelp: true)
var swiftOptions: SwiftToolOptions
var globalOptions: GlobalOptions

func run(_ swiftTool: SwiftTool) throws {
let collectionURL = try url(self.collectionURL)
Expand Down Expand Up @@ -198,7 +198,7 @@ public struct SwiftPackageCollectionsTool: ParsableCommand {
var searchQuery: String

@OptionGroup(_hiddenFromHelp: true)
var swiftOptions: SwiftToolOptions
var globalOptions: GlobalOptions

func run(_ swiftTool: SwiftTool) throws {
try with(swiftTool) { collections in
Expand Down Expand Up @@ -245,7 +245,7 @@ public struct SwiftPackageCollectionsTool: ParsableCommand {
var version: String?

@OptionGroup(_hiddenFromHelp: true)
var swiftOptions: SwiftToolOptions
var globalOptions: GlobalOptions

private func printVersion(_ version: PackageCollectionsModel.Package.Version?) -> String? {
guard let version = version else {
Expand Down
6 changes: 3 additions & 3 deletions Sources/Commands/SwiftPackageRegistryTool.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public struct SwiftPackageRegistryTool: ParsableCommand {
helpNames: [.short, .long, .customLong("help", withSingleDash: true)])

@OptionGroup()
var swiftOptions: SwiftToolOptions
var globalOptions: GlobalOptions

public init() {}

Expand All @@ -63,7 +63,7 @@ public struct SwiftPackageRegistryTool: ParsableCommand {
abstract: "Set a custom registry")

@OptionGroup(_hiddenFromHelp: true)
var swiftOptions: SwiftToolOptions
var globalOptions: GlobalOptions

@Flag(help: "Apply settings to all projects for this user")
var global: Bool = false
Expand Down Expand Up @@ -115,7 +115,7 @@ public struct SwiftPackageRegistryTool: ParsableCommand {
abstract: "Remove a configured registry")

@OptionGroup(_hiddenFromHelp: true)
var swiftOptions: SwiftToolOptions
var globalOptions: GlobalOptions

@Flag(help: "Apply settings to all projects for this user")
var global: Bool = false
Expand Down
Loading