From bf76e517d8d0bd42cf026b266cfd24479e9172a6 Mon Sep 17 00:00:00 2001 From: Razvan Azamfirei Date: Wed, 20 Mar 2024 10:29:29 -0400 Subject: [PATCH] livecheck: introduce --extract-plist make --no-extract-plist behavior the default remove explicit --no-extract-plist option suggestions from code review --- Library/Homebrew/dev-cmd/livecheck.rb | 8 +-- Library/Homebrew/livecheck/livecheck.rb | 16 ++--- completions/bash/brew | 81 +------------------------ completions/fish/brew.fish | 51 +--------------- completions/zsh/_brew | 68 ++------------------- docs/Manpage.md | 65 +------------------- manpages/brew.1 | 41 +------------ 7 files changed, 25 insertions(+), 305 deletions(-) diff --git a/Library/Homebrew/dev-cmd/livecheck.rb b/Library/Homebrew/dev-cmd/livecheck.rb index 24c4ae55b9a1fd..351fcb8a18d051 100644 --- a/Library/Homebrew/dev-cmd/livecheck.rb +++ b/Library/Homebrew/dev-cmd/livecheck.rb @@ -38,13 +38,13 @@ def livecheck_args description: "Only check formulae." switch "--cask", "--casks", description: "Only check casks." - switch "--no-extract-plist", - description: "Exclude casks using the ExtractPlist livecheck strategy." + switch "--extract-plist", + description: "Include casks using the ExtractPlist livecheck strategy." conflicts "--debug", "--json" conflicts "--tap=", "--eval-all", "--installed" conflicts "--cask", "--formula" - conflicts "--formula", "--no-extract-plist" + conflicts "--formula", "--extract-plist" named_args [:formula, :cask], without_api: true end @@ -128,10 +128,10 @@ def livecheck handle_name_conflict: !args.formula? && !args.cask?, check_resources: args.resources?, newer_only: args.newer_only?, + extract_plist: args.extract_plist?, quiet: args.quiet?, debug: args.debug?, verbose: args.verbose?, - no_extract_plist: args.no_extract_plist?, }.compact Livecheck.run_checks(formulae_and_casks_to_check, **options) diff --git a/Library/Homebrew/livecheck/livecheck.rb b/Library/Homebrew/livecheck/livecheck.rb index 156664ba3ae73a..568657463b8cdc 100644 --- a/Library/Homebrew/livecheck/livecheck.rb +++ b/Library/Homebrew/livecheck/livecheck.rb @@ -167,16 +167,16 @@ def resolve_livecheck_reference( check_resources: T::Boolean, json: T::Boolean, newer_only: T::Boolean, + extract_plist: T::Boolean, debug: T::Boolean, quiet: T::Boolean, verbose: T::Boolean, - no_extract_plist: T::Boolean, ).void } def run_checks( formulae_and_casks_to_check, full_name: false, handle_name_conflict: false, check_resources: false, json: false, newer_only: false, - debug: false, quiet: false, verbose: false, no_extract_plist: false + extract_plist: false, debug: false, quiet: false, verbose: false ) load_other_tap_strategies(formulae_and_casks_to_check) @@ -198,12 +198,11 @@ def run_checks( .select { |items| items.length > 1 } .flatten end + formulae_and_casks_total = formulae_and_casks_to_check.count has_a_newer_upstream_version = T.let(false, T::Boolean) if json && !quiet && $stderr.tty? - formulae_and_casks_total = formulae_and_casks_to_check.count - Tty.with($stderr) do |stderr| stderr.puts Formatter.headline("Running checks", color: :blue) end @@ -218,6 +217,9 @@ def run_checks( ) end + # If only one formula/cask is being checked, we enable extract-plist + extract_plist = true if formulae_and_casks_total == 1 + formulae_checked = formulae_and_casks_to_check.map.with_index do |formula_or_cask, i| formula = formula_or_cask if formula_or_cask.is_a?(Formula) cask = formula_or_cask if formula_or_cask.is_a?(Cask::Cask) @@ -238,11 +240,11 @@ def run_checks( puts end - if cask && no_extract_plist && formula_or_cask.livecheck.strategy == :extract_plist + if cask && !extract_plist && formula_or_cask.livecheck.strategy == :extract_plist skip_info = { - cask: cask.token.to_s, + cask: cask.token, status: "skipped", - messages: ["Livecheck skipped due to --no-plist"], + messages: ["Livecheck skipped due to the ExtractPlist strategy"], meta: { livecheckable: true }, } diff --git a/completions/bash/brew b/completions/bash/brew index d520917126a1f7..b32585b38776e0 100644 --- a/completions/bash/brew +++ b/completions/bash/brew @@ -1330,13 +1330,13 @@ _brew_lc() { --cask --debug --eval-all + --extract-plist --formula --full-name --help --installed --json --newer-only - --no-extract-plist --quiet --resources --tap @@ -1410,34 +1410,6 @@ _brew_linkage() { __brew_complete_installed_formulae } -_brew_list() { - local cur="${COMP_WORDS[COMP_CWORD]}" - case "${cur}" in - -*) - __brewcomp " - --cask - --debug - --formula - --full-name - --help - --multiple - --pinned - --quiet - --verbose - --versions - -1 - -l - -r - -t - " - return - ;; - *) ;; - esac - __brew_complete_installed_formulae - __brew_complete_installed_casks -} - _brew_livecheck() { local cur="${COMP_WORDS[COMP_CWORD]}" case "${cur}" in @@ -1446,13 +1418,13 @@ _brew_livecheck() { --cask --debug --eval-all + --extract-plist --formula --full-name --help --installed --json --newer-only - --no-extract-plist --quiet --resources --tap @@ -1512,34 +1484,6 @@ _brew_log() { __brew_complete_casks } -_brew_ls() { - local cur="${COMP_WORDS[COMP_CWORD]}" - case "${cur}" in - -*) - __brewcomp " - --cask - --debug - --formula - --full-name - --help - --multiple - --pinned - --quiet - --verbose - --versions - -1 - -l - -r - -t - " - return - ;; - *) ;; - esac - __brew_complete_installed_formulae - __brew_complete_installed_casks -} - _brew_migrate() { local cur="${COMP_WORDS[COMP_CWORD]}" case "${cur}" in @@ -1814,24 +1758,6 @@ _brew_pr_upload() { esac } -_brew_prof() { - local cur="${COMP_WORDS[COMP_CWORD]}" - case "${cur}" in - -*) - __brewcomp " - --debug - --help - --quiet - --stackprof - --verbose - " - return - ;; - *) ;; - esac - __brew_complete_commands -} - _brew_pyenv_sync() { local cur="${COMP_WORDS[COMP_CWORD]}" case "${cur}" in @@ -2727,11 +2653,9 @@ _brew() { leaves) _brew_leaves ;; link) _brew_link ;; linkage) _brew_linkage ;; - list) _brew_list ;; livecheck) _brew_livecheck ;; ln) _brew_ln ;; log) _brew_log ;; - ls) _brew_ls ;; migrate) _brew_migrate ;; missing) _brew_missing ;; nodenv-sync) _brew_nodenv_sync ;; @@ -2745,7 +2669,6 @@ _brew() { pr-publish) _brew_pr_publish ;; pr-pull) _brew_pr_pull ;; pr-upload) _brew_pr_upload ;; - prof) _brew_prof ;; pyenv-sync) _brew_pyenv_sync ;; rbenv-sync) _brew_rbenv_sync ;; readall) _brew_readall ;; diff --git a/completions/fish/brew.fish b/completions/fish/brew.fish index 68c6ca79741dac..c4b75ddbe60fa1 100644 --- a/completions/fish/brew.fish +++ b/completions/fish/brew.fish @@ -941,13 +941,13 @@ __fish_brew_complete_cmd 'lc' 'Check for newer versions of formulae and/or casks __fish_brew_complete_arg 'lc' -l cask -d 'Only check casks' __fish_brew_complete_arg 'lc' -l debug -d 'Display any debugging information' __fish_brew_complete_arg 'lc' -l eval-all -d 'Evaluate all available formulae and casks, whether installed or not, to check them' +__fish_brew_complete_arg 'lc' -l extract-plist -d 'Include casks using the ExtractPlist livecheck strategy' __fish_brew_complete_arg 'lc' -l formula -d 'Only check formulae' __fish_brew_complete_arg 'lc' -l full-name -d 'Print formulae and casks with fully-qualified names' __fish_brew_complete_arg 'lc' -l help -d 'Show this message' __fish_brew_complete_arg 'lc' -l installed -d 'Check formulae and casks that are currently installed' __fish_brew_complete_arg 'lc' -l json -d 'Output information in JSON format' __fish_brew_complete_arg 'lc' -l newer-only -d 'Show the latest version only if it\'s newer than the formula/cask' -__fish_brew_complete_arg 'lc' -l no-extract-plist -d 'Exclude casks using the ExtractPlist livecheck strategy' __fish_brew_complete_arg 'lc' -l quiet -d 'Suppress warnings, don\'t print a progress bar for JSON output' __fish_brew_complete_arg 'lc' -l resources -d 'Also check resources for formulae' __fish_brew_complete_arg 'lc' -l tap -d 'Check formulae and casks within the given tap, specified as user`/`repo' @@ -989,36 +989,17 @@ __fish_brew_complete_arg 'linkage' -l verbose -d 'Make some output more verbose' __fish_brew_complete_arg 'linkage' -a '(__fish_brew_suggest_formulae_installed)' -__fish_brew_complete_cmd 'list' 'List all installed formulae and casks' -__fish_brew_complete_arg 'list' -l cask -d 'List only casks, or treat all named arguments as casks' -__fish_brew_complete_arg 'list' -l debug -d 'Display any debugging information' -__fish_brew_complete_arg 'list' -l formula -d 'List only formulae, or treat all named arguments as formulae' -__fish_brew_complete_arg 'list' -l full-name -d 'Print formulae with fully-qualified names. Unless `--full-name`, `--versions` or `--pinned` are passed, other options (i.e. `-1`, `-l`, `-r` and `-t`) are passed to `ls`(1) which produces the actual output' -__fish_brew_complete_arg 'list' -l help -d 'Show this message' -__fish_brew_complete_arg 'list' -l multiple -d 'Only show formulae with multiple versions installed' -__fish_brew_complete_arg 'list' -l pinned -d 'List only pinned formulae, or only the specified (pinned) formulae if formula are provided. See also `pin`, `unpin`' -__fish_brew_complete_arg 'list' -l quiet -d 'Make some output more quiet' -__fish_brew_complete_arg 'list' -l verbose -d 'Make some output more verbose' -__fish_brew_complete_arg 'list' -l versions -d 'Show the version number for installed formulae, or only the specified formulae if formula are provided' -__fish_brew_complete_arg 'list' -l 1 -d 'Force output to be one entry per line. This is the default when output is not to a terminal' -__fish_brew_complete_arg 'list' -l l -d 'List formulae and/or casks in long format. Has no effect when a formula or cask name is passed as an argument' -__fish_brew_complete_arg 'list' -l r -d 'Reverse the order of the formulae and/or casks sort to list the oldest entries first. Has no effect when a formula or cask name is passed as an argument' -__fish_brew_complete_arg 'list' -l t -d 'Sort formulae and/or casks by time modified, listing most recently modified first. Has no effect when a formula or cask name is passed as an argument' -__fish_brew_complete_arg 'list; and not __fish_seen_argument -l cask -l casks' -a '(__fish_brew_suggest_formulae_installed)' -__fish_brew_complete_arg 'list; and not __fish_seen_argument -l formula -l formulae' -a '(__fish_brew_suggest_casks_installed)' - - __fish_brew_complete_cmd 'livecheck' 'Check for newer versions of formulae and/or casks from upstream' __fish_brew_complete_arg 'livecheck' -l cask -d 'Only check casks' __fish_brew_complete_arg 'livecheck' -l debug -d 'Display any debugging information' __fish_brew_complete_arg 'livecheck' -l eval-all -d 'Evaluate all available formulae and casks, whether installed or not, to check them' +__fish_brew_complete_arg 'livecheck' -l extract-plist -d 'Include casks using the ExtractPlist livecheck strategy' __fish_brew_complete_arg 'livecheck' -l formula -d 'Only check formulae' __fish_brew_complete_arg 'livecheck' -l full-name -d 'Print formulae and casks with fully-qualified names' __fish_brew_complete_arg 'livecheck' -l help -d 'Show this message' __fish_brew_complete_arg 'livecheck' -l installed -d 'Check formulae and casks that are currently installed' __fish_brew_complete_arg 'livecheck' -l json -d 'Output information in JSON format' __fish_brew_complete_arg 'livecheck' -l newer-only -d 'Show the latest version only if it\'s newer than the formula/cask' -__fish_brew_complete_arg 'livecheck' -l no-extract-plist -d 'Exclude casks using the ExtractPlist livecheck strategy' __fish_brew_complete_arg 'livecheck' -l quiet -d 'Suppress warnings, don\'t print a progress bar for JSON output' __fish_brew_complete_arg 'livecheck' -l resources -d 'Also check resources for formulae' __fish_brew_complete_arg 'livecheck' -l tap -d 'Check formulae and casks within the given tap, specified as user`/`repo' @@ -1055,25 +1036,6 @@ __fish_brew_complete_arg 'log; and not __fish_seen_argument -l cask -l casks' -a __fish_brew_complete_arg 'log; and not __fish_seen_argument -l formula -l formulae' -a '(__fish_brew_suggest_casks_all)' -__fish_brew_complete_cmd 'ls' 'List all installed formulae and casks' -__fish_brew_complete_arg 'ls' -l cask -d 'List only casks, or treat all named arguments as casks' -__fish_brew_complete_arg 'ls' -l debug -d 'Display any debugging information' -__fish_brew_complete_arg 'ls' -l formula -d 'List only formulae, or treat all named arguments as formulae' -__fish_brew_complete_arg 'ls' -l full-name -d 'Print formulae with fully-qualified names. Unless `--full-name`, `--versions` or `--pinned` are passed, other options (i.e. `-1`, `-l`, `-r` and `-t`) are passed to `ls`(1) which produces the actual output' -__fish_brew_complete_arg 'ls' -l help -d 'Show this message' -__fish_brew_complete_arg 'ls' -l multiple -d 'Only show formulae with multiple versions installed' -__fish_brew_complete_arg 'ls' -l pinned -d 'List only pinned formulae, or only the specified (pinned) formulae if formula are provided. See also `pin`, `unpin`' -__fish_brew_complete_arg 'ls' -l quiet -d 'Make some output more quiet' -__fish_brew_complete_arg 'ls' -l verbose -d 'Make some output more verbose' -__fish_brew_complete_arg 'ls' -l versions -d 'Show the version number for installed formulae, or only the specified formulae if formula are provided' -__fish_brew_complete_arg 'ls' -l 1 -d 'Force output to be one entry per line. This is the default when output is not to a terminal' -__fish_brew_complete_arg 'ls' -l l -d 'List formulae and/or casks in long format. Has no effect when a formula or cask name is passed as an argument' -__fish_brew_complete_arg 'ls' -l r -d 'Reverse the order of the formulae and/or casks sort to list the oldest entries first. Has no effect when a formula or cask name is passed as an argument' -__fish_brew_complete_arg 'ls' -l t -d 'Sort formulae and/or casks by time modified, listing most recently modified first. Has no effect when a formula or cask name is passed as an argument' -__fish_brew_complete_arg 'ls; and not __fish_seen_argument -l cask -l casks' -a '(__fish_brew_suggest_formulae_installed)' -__fish_brew_complete_arg 'ls; and not __fish_seen_argument -l formula -l formulae' -a '(__fish_brew_suggest_casks_installed)' - - __fish_brew_complete_cmd 'migrate' 'Migrate renamed packages to new names, where formula are old names of packages' __fish_brew_complete_arg 'migrate' -l cask -d 'Only migrate casks' __fish_brew_complete_arg 'migrate' -l debug -d 'Display any debugging information' @@ -1231,15 +1193,6 @@ __fish_brew_complete_arg 'pr-upload' -l verbose -d 'Make some output more verbos __fish_brew_complete_arg 'pr-upload' -l warn-on-upload-failure -d 'Warn instead of raising an error if the bottle upload fails. Useful for repairing bottle uploads that previously failed' -__fish_brew_complete_cmd 'prof' 'Run Homebrew with a Ruby profiler' -__fish_brew_complete_arg 'prof' -l debug -d 'Display any debugging information' -__fish_brew_complete_arg 'prof' -l help -d 'Show this message' -__fish_brew_complete_arg 'prof' -l quiet -d 'Make some output more quiet' -__fish_brew_complete_arg 'prof' -l stackprof -d 'Use `stackprof` instead of `ruby-prof` (the default)' -__fish_brew_complete_arg 'prof' -l verbose -d 'Make some output more verbose' -__fish_brew_complete_arg 'prof' -a '(__fish_brew_suggest_commands)' - - __fish_brew_complete_cmd 'pyenv-sync' 'Create symlinks for Homebrew\'s installed Python versions in `~/.pyenv/versions`' __fish_brew_complete_arg 'pyenv-sync' -l debug -d 'Display any debugging information' __fish_brew_complete_arg 'pyenv-sync' -l help -d 'Show this message' diff --git a/completions/zsh/_brew b/completions/zsh/_brew index afbb2f31e3a9dd..ae2ff29d1a6962 100644 --- a/completions/zsh/_brew +++ b/completions/zsh/_brew @@ -181,7 +181,6 @@ __brew_internal_commands() { 'leaves:List installed formulae that are not dependencies of another installed formula or cask' 'link:Symlink all of formula'\''s installed files into Homebrew'\''s prefix' 'linkage:Check the library links from the given formula kegs' - 'list:List all installed formulae and casks' 'livecheck:Check for newer versions of formulae and/or casks from upstream' 'log:Show the `git log` for formula or cask, or show the log for the Homebrew repository if no formula or cask is provided' 'migrate:Migrate renamed packages to new names, where formula are old names of packages' @@ -196,7 +195,6 @@ __brew_internal_commands() { 'pr-publish:Publish bottles for a pull request with GitHub Actions' 'pr-pull:Download and publish bottles, and apply the bottle commit from a pull request with artifacts generated by GitHub Actions' 'pr-upload:Apply the bottle commit and publish bottles to a host' - 'prof:Run Homebrew with a Ruby profiler' 'pyenv-sync:Create symlinks for Homebrew'\''s installed Python versions in `~/.pyenv/versions`' 'rbenv-sync:Create symlinks for Homebrew'\''s installed Ruby versions in `~/.rbenv/versions`' 'readall:Import all items from the specified tap, or from all installed taps if none is provided' @@ -1168,18 +1166,18 @@ _brew_lc() { _arguments \ '(--json)--debug[Display any debugging information]' \ '(--tap --installed)--eval-all[Evaluate all available formulae and casks, whether installed or not, to check them]' \ + '(--formula)--extract-plist[Include casks using the ExtractPlist livecheck strategy]' \ '--full-name[Print formulae and casks with fully-qualified names]' \ '--help[Show this message]' \ '(--tap --eval-all)--installed[Check formulae and casks that are currently installed]' \ '(--debug)--json[Output information in JSON format]' \ '--newer-only[Show the latest version only if it'\''s newer than the formula/cask]' \ - '(--formula)--no-extract-plist[Exclude casks using the ExtractPlist livecheck strategy]' \ '--quiet[Suppress warnings, don'\''t print a progress bar for JSON output]' \ '--resources[Also check resources for formulae]' \ '(--eval-all --installed)--tap[Check formulae and casks within the given tap, specified as user`/`repo]' \ '--verbose[Make some output more verbose]' \ - formula \ - '(--cask --no-extract-plist)--formula[Only check formulae]' \ + '(--cask --extract-plist)--formula[Only check formulae]' \ '*::formula:__brew_formulae' \ - cask \ '(--formula)--cask[Only check casks]' \ @@ -1227,46 +1225,23 @@ _brew_linkage() { '*::installed_formula:__brew_installed_formulae' } -# brew list -_brew_list() { - _arguments \ - '--debug[Display any debugging information]' \ - '(--versions --pinned --l --r --t)--full-name[Print formulae with fully-qualified names. Unless `--full-name`, `--versions` or `--pinned` are passed, other options (i.e. `-1`, `-l`, `-r` and `-t`) are passed to `ls`(1) which produces the actual output]' \ - '--help[Show this message]' \ - '(--cask --pinned)--multiple[Only show formulae with multiple versions installed]' \ - '(--cask --multiple --1 --l --r --t --full-name)--pinned[List only pinned formulae, or only the specified (pinned) formulae if formula are provided. See also `pin`, `unpin`]' \ - '--quiet[Make some output more quiet]' \ - '--verbose[Make some output more verbose]' \ - '(--1 --l --r --t --full-name)--versions[Show the version number for installed formulae, or only the specified formulae if formula are provided]' \ - '-1[Force output to be one entry per line. This is the default when output is not to a terminal]' \ - '-l[List formulae and/or casks in long format. Has no effect when a formula or cask name is passed as an argument]' \ - '-r[Reverse the order of the formulae and/or casks sort to list the oldest entries first. Has no effect when a formula or cask name is passed as an argument]' \ - '-t[Sort formulae and/or casks by time modified, listing most recently modified first. Has no effect when a formula or cask name is passed as an argument]' \ - - installed_formula \ - '(--cask)--formula[List only formulae, or treat all named arguments as formulae]' \ - '*::installed_formula:__brew_installed_formulae' \ - - installed_cask \ - '(--formula --pinned --multiple)--cask[List only casks, or treat all named arguments as casks]' \ - '*::installed_cask:__brew_installed_casks' -} - # brew livecheck _brew_livecheck() { _arguments \ '(--json)--debug[Display any debugging information]' \ '(--tap --installed)--eval-all[Evaluate all available formulae and casks, whether installed or not, to check them]' \ + '(--formula)--extract-plist[Include casks using the ExtractPlist livecheck strategy]' \ '--full-name[Print formulae and casks with fully-qualified names]' \ '--help[Show this message]' \ '(--tap --eval-all)--installed[Check formulae and casks that are currently installed]' \ '(--debug)--json[Output information in JSON format]' \ '--newer-only[Show the latest version only if it'\''s newer than the formula/cask]' \ - '(--formula)--no-extract-plist[Exclude casks using the ExtractPlist livecheck strategy]' \ '--quiet[Suppress warnings, don'\''t print a progress bar for JSON output]' \ '--resources[Also check resources for formulae]' \ '(--eval-all --installed)--tap[Check formulae and casks within the given tap, specified as user`/`repo]' \ '--verbose[Make some output more verbose]' \ - formula \ - '(--cask --no-extract-plist)--formula[Only check formulae]' \ + '(--cask --extract-plist)--formula[Only check formulae]' \ '*::formula:__brew_formulae' \ - cask \ '(--formula)--cask[Only check casks]' \ @@ -1308,29 +1283,6 @@ _brew_log() { '*::cask:__brew_casks' } -# brew ls -_brew_ls() { - _arguments \ - '--debug[Display any debugging information]' \ - '(--versions --pinned --l --r --t)--full-name[Print formulae with fully-qualified names. Unless `--full-name`, `--versions` or `--pinned` are passed, other options (i.e. `-1`, `-l`, `-r` and `-t`) are passed to `ls`(1) which produces the actual output]' \ - '--help[Show this message]' \ - '(--cask --pinned)--multiple[Only show formulae with multiple versions installed]' \ - '(--cask --multiple --1 --l --r --t --full-name)--pinned[List only pinned formulae, or only the specified (pinned) formulae if formula are provided. See also `pin`, `unpin`]' \ - '--quiet[Make some output more quiet]' \ - '--verbose[Make some output more verbose]' \ - '(--1 --l --r --t --full-name)--versions[Show the version number for installed formulae, or only the specified formulae if formula are provided]' \ - '-1[Force output to be one entry per line. This is the default when output is not to a terminal]' \ - '-l[List formulae and/or casks in long format. Has no effect when a formula or cask name is passed as an argument]' \ - '-r[Reverse the order of the formulae and/or casks sort to list the oldest entries first. Has no effect when a formula or cask name is passed as an argument]' \ - '-t[Sort formulae and/or casks by time modified, listing most recently modified first. Has no effect when a formula or cask name is passed as an argument]' \ - - installed_formula \ - '(--cask)--formula[List only formulae, or treat all named arguments as formulae]' \ - '*::installed_formula:__brew_installed_formulae' \ - - installed_cask \ - '(--formula --pinned --multiple)--cask[List only casks, or treat all named arguments as casks]' \ - '*::installed_cask:__brew_installed_casks' -} - # brew migrate _brew_migrate() { _arguments \ @@ -1523,18 +1475,6 @@ _brew_pr_upload() { '--warn-on-upload-failure[Warn instead of raising an error if the bottle upload fails. Useful for repairing bottle uploads that previously failed]' } -# brew prof -_brew_prof() { - _arguments \ - '--debug[Display any debugging information]' \ - '--help[Show this message]' \ - '--quiet[Make some output more quiet]' \ - '--stackprof[Use `stackprof` instead of `ruby-prof` (the default)]' \ - '--verbose[Make some output more verbose]' \ - - command \ - '*::command:__brew_commands' -} - # brew pyenv-sync _brew_pyenv_sync() { _arguments \ diff --git a/docs/Manpage.md b/docs/Manpage.md index b2dc18c64fbdf2..1cb2634a07cafc 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -703,59 +703,6 @@ installations. : Link the HEAD version of the formula if it is installed. -### `list`, `ls` \[*`options`*\] \[*`installed_formula`*\|*`installed_cask`* ...\] - -List all installed formulae and casks. If *`formula`* is provided, summarise the -paths within its current keg. If *`cask`* is provided, list its artifacts. - -`--formula` - -: List only formulae, or treat all named arguments as formulae. - -`--cask` - -: List only casks, or treat all named arguments as casks. - -`--full-name` - -: Print formulae with fully-qualified names. Unless `--full-name`, `--versions` - or `--pinned` are passed, other options (i.e. `-1`, `-l`, `-r` and `-t`) are - passed to `ls`(1) which produces the actual output. - -`--versions` - -: Show the version number for installed formulae, or only the specified formulae - if *`formula`* are provided. - -`--multiple` - -: Only show formulae with multiple versions installed. - -`--pinned` - -: List only pinned formulae, or only the specified (pinned) formulae if - *`formula`* are provided. See also `pin`, `unpin`. - -`-1` - -: Force output to be one entry per line. This is the default when output is not - to a terminal. - -`-l` - -: List formulae and/or casks in long format. Has no effect when a formula or - cask name is passed as an argument. - -`-r` - -: Reverse the order of the formulae and/or casks sort to list the oldest entries - first. Has no effect when a formula or cask name is passed as an argument. - -`-t` - -: Sort formulae and/or casks by time modified, listing most recently modified - first. Has no effect when a formula or cask name is passed as an argument. - ### `log` \[*`options`*\] \[*`formula`*\|*`cask`*\] Show the `git log` for *`formula`* or *`cask`*, or show the log for the Homebrew @@ -2283,9 +2230,9 @@ from `HOMEBREW_LIVECHECK_WATCHLIST` or `~/.homebrew/livecheck_watchlist.txt`. : Only check casks. -`--no-extract-plist` +`--extract-plist` -: Exclude casks using the ExtractPlist livecheck strategy. +: Include casks using the ExtractPlist livecheck strategy. ### `pr-automerge` \[*`options`*\] @@ -2486,14 +2433,6 @@ Apply the bottle commit and publish bottles to a host. : Use the specified download strategy class for downloading the bottle's URL instead of Homebrew's default. -### `prof` \[`--stackprof`\] *`command`* \[...\] - -Run Homebrew with a Ruby profiler. For example, `brew prof readall`. - -`--stackprof` - -: Use `stackprof` instead of `ruby-prof` (the default). - ### `release` \[`--major`\] \[`--minor`\] Create a new draft Homebrew/brew release with the appropriate version number and diff --git a/manpages/brew.1 b/manpages/brew.1 index e065dc458585b2..e4b5eda4fcbdb6 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -441,38 +441,6 @@ Allow keg\-only formulae to be linked\. .TP \fB\-\-HEAD\fP Link the HEAD version of the formula if it is installed\. -.SS "\fBlist\fP, \fBls\fP \fR[\fIoptions\fP] \fR[\fIinstalled_formula\fP|\fIinstalled_cask\fP \.\.\.]" -List all installed formulae and casks\. If \fIformula\fP is provided, summarise the paths within its current keg\. If \fIcask\fP is provided, list its artifacts\. -.TP -\fB\-\-formula\fP -List only formulae, or treat all named arguments as formulae\. -.TP -\fB\-\-cask\fP -List only casks, or treat all named arguments as casks\. -.TP -\fB\-\-full\-name\fP -Print formulae with fully\-qualified names\. Unless \fB\-\-full\-name\fP, \fB\-\-versions\fP or \fB\-\-pinned\fP are passed, other options (i\.e\. \fB\-1\fP, \fB\-l\fP, \fB\-r\fP and \fB\-t\fP) are passed to \fBls\fP(1) which produces the actual output\. -.TP -\fB\-\-versions\fP -Show the version number for installed formulae, or only the specified formulae if \fIformula\fP are provided\. -.TP -\fB\-\-multiple\fP -Only show formulae with multiple versions installed\. -.TP -\fB\-\-pinned\fP -List only pinned formulae, or only the specified (pinned) formulae if \fIformula\fP are provided\. See also \fBpin\fP, \fBunpin\fP\&\. -.TP -\fB\-1\fP -Force output to be one entry per line\. This is the default when output is not to a terminal\. -.TP -\fB\-l\fP -List formulae and/or casks in long format\. Has no effect when a formula or cask name is passed as an argument\. -.TP -\fB\-r\fP -Reverse the order of the formulae and/or casks sort to list the oldest entries first\. Has no effect when a formula or cask name is passed as an argument\. -.TP -\fB\-t\fP -Sort formulae and/or casks by time modified, listing most recently modified first\. Has no effect when a formula or cask name is passed as an argument\. .SS "\fBlog\fP \fR[\fIoptions\fP] \fR[\fIformula\fP|\fIcask\fP]" Show the \fBgit log\fP for \fIformula\fP or \fIcask\fP, or show the log for the Homebrew repository if no formula or cask is provided\. .TP @@ -1451,8 +1419,8 @@ Only check formulae\. \fB\-\-cask\fP Only check casks\. .TP -\fB\-\-no\-extract\-plist\fP -Exclude casks using the ExtractPlist livecheck strategy\. +\fB\-\-extract\-plist\fP +Include casks using the ExtractPlist livecheck strategy\. .SS "\fBpr\-automerge\fP \fR[\fIoptions\fP]" Find pull requests that can be automatically merged using \fBbrew pr\-publish\fP\&\. .TP @@ -1584,11 +1552,6 @@ Use the specified \fIURL\fP as the root of the bottle\[u2019]s URL instead of Ho .TP \fB\-\-root\-url\-using\fP Use the specified download strategy class for downloading the bottle\[u2019]s URL instead of Homebrew\[u2019]s default\. -.SS "\fBprof\fP \fR[\fB\-\-stackprof\fP] \fIcommand\fP \fR[\.\.\.]" -Run Homebrew with a Ruby profiler\. For example, \fBbrew prof readall\fP\&\. -.TP -\fB\-\-stackprof\fP -Use \fBstackprof\fP instead of \fBruby\-prof\fP (the default)\. .SS "\fBrelease\fP \fR[\fB\-\-major\fP] \fR[\fB\-\-minor\fP]" Create a new draft Homebrew/brew release with the appropriate version number and release notes\. .P