admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #7094 from vidusheeamoli/search-add-formulae-flag

Browse Source 
search: add separate flag for formulae
This commit is contained in:
Mike McQuaid 2020-03-04 13:38:50 +00:00 committed by GitHub
commit c42d43c824
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/cmd/search.rb
View File

@ -36,9 +36,12 @@ module Homebrew
If no <text> is provided, list all locally available formulae (including tapped ones).
No online search is performed.
EOS
switch "--formulae",
description: "Without <text>, list all locally available formulae (no online search is performed). " \
"With <text>, search online and locally for formulae."
switch "--casks",
description: "List all locally available casks (including tapped ones). "\
"No online search is performed."
description: "Without <text>, list all locally available casks (including tapped ones, no online " \
"search is performed). With <text>, search online and locally for casks."
switch "--desc",
description: "Search for formulae with a description matching <text> and casks with "\
"a name matching <text>."
@ -65,6 +68,8 @@ module Homebrew
if args.remaining.empty?
if args.casks?
raise UsageError, "specifying both --formulae and --casks requires an argument!" if args.formulae?
puts Formatter.columns(Cask::Cask.to_a.map(&:full_name).sort)
else
puts Formatter.columns(Formula.full_names.sort)
@ -88,14 +93,17 @@ module Homebrew
local_casks = search_casks(string_or_regex)
remote_casks = remote_results[:casks]
all_casks = local_casks + remote_casks
print_formulae = args.formulae?
print_casks = args.casks?
print_formulae = print_casks = true if !print_formulae && !print_casks
if all_formulae.any?
if print_formulae && all_formulae.any?
ohai "Formulae"
puts Formatter.columns(all_formulae)
end
if all_casks.any?
puts if all_formulae.any?
if print_casks && all_casks.any?
puts if args.formulae? && all_formulae.any?
ohai "Casks"
puts Formatter.columns(all_casks)
end

4
docs/Manpage.md
View File

@ -425,8 +425,10 @@ search for *`text`* is extended online to `homebrew/core` and `homebrew/cask`.
If no *`text`* is provided, list all locally available formulae (including tapped
ones). No online search is performed.
* `--formulae`:
Without *`text`*, list all locally available formulae (no online search is performed). With *`text`*, search online and locally for formulae.
* `--casks`:
List all locally available casks (including tapped ones). No online search is performed.
Without *`text`*, list all locally available casks (including tapped ones, no online search is performed). With *`text`*, search online and locally for casks.
* `--desc`:
Search for formulae with a description matching *`text`* and casks with a name matching *`text`*.
* `--macports`:

2
manpages/brew-cask.1
View File

@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
.TH "BREW\-CASK" "1" "February 2020" "Homebrew" "brew-cask"
.TH "BREW\-CASK" "1" "March 2020" "Homebrew" "brew-cask"
.
.SH "NAME"
\fBbrew\-cask\fR \- a friendly binary installer for macOS

8
manpages/brew.1
View File

@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
.TH "BREW" "1" "February 2020" "Homebrew" "brew"
.TH "BREW" "1" "March 2020" "Homebrew" "brew"
.
.SH "NAME"
\fBbrew\fR \- The Missing Package Manager for macOS
@ -548,8 +548,12 @@ Perform a substring search of cask tokens and formula names for \fItext\fR\. If
If no \fItext\fR is provided, list all locally available formulae (including tapped ones)\. No online search is performed\.
.
.TP
\fB\-\-formulae\fR
Without \fItext\fR, list all locally available formulae (no online search is performed)\. With \fItext\fR, search online and locally for formulae\.
.
.TP
\fB\-\-casks\fR
List all locally available casks (including tapped ones)\. No online search is performed\.
Without \fItext\fR, list all locally available casks (including tapped ones, no online search is performed)\. With \fItext\fR, search online and locally for casks\.
.
.TP
\fB\-\-desc\fR