Skip to content

cmd/list: Constrain -lrt options to formulae #10133

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
issyl0 merged 4 commits into from
Dec 24, 2020
Merged

cmd/list: Constrain -lrt options to formulae #10133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b4646d
cmd/list: Limit `-lrt` options to being passed with `--formula`
issyl0 Dec 24, 2020
570a660
cli/parser: Only prefix short options with one dash
issyl0 Dec 24, 2020
27afcf5
cli/parser: Improve single or multi "-" detection
issyl0 Dec 24, 2020
531cae4
cli/parser: Option-ify arg names when raising `OptionConstraintError`
issyl0 Dec 24, 2020
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
7 changes: 4 additions & 3 deletions Library/Homebrew/cli/parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,10 @@ def check_constraints
@constraints.each do |primary, secondary, constraint_type|
primary_passed = option_passed?(primary)
secondary_passed = option_passed?(secondary)

primary = name_to_option(primary)
secondary = name_to_option(secondary)

if :mandatory.equal?(constraint_type) && primary_passed && !secondary_passed
raise OptionConstraintError.new(primary, secondary)
end
Expand Down Expand Up @@ -533,9 +537,6 @@ def formulae(argv)

class OptionConstraintError < UsageError
def initialize(arg1, arg2, missing: false)
arg1 = "--#{arg1.tr("_", "-")}"
arg2 = "--#{arg2.tr("_", "-")}"

message = if missing
"`#{arg2}` cannot be passed without `#{arg1}`."
else
Expand Down
3 changes: 3 additions & 0 deletions Library/Homebrew/cmd/list.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,14 @@ def list_args
description: "Force output to be one entry per line. " \
"This is the default when output is not to a terminal."
switch "-l",
depends_on: "--formula",
description: "List formulae in long format. If the output is to a terminal, "\
"a total sum for all the file sizes is printed before the long listing."
switch "-r",
depends_on: "--formula",
description: "Reverse the order of the formulae sort to list the oldest entries first."
switch "-t",
depends_on: "--formula",
description: "Sort formulae by time modified, listing most recently modified first."

conflicts "--formula", "--cask"
Expand Down