From 7d29054cf2fb9226412ca45a6f27b85cae3d5227 Mon Sep 17 00:00:00 2001 From: Seeker <meaningseeking@protonmail.com> Date: Tue, 15 Sep 2020 18:58:38 -0700 Subject: [PATCH] bump-formula-pr: add `--online` switch for `brew audit` --- Library/Homebrew/dev-cmd/bump-formula-pr.rb | 14 ++++++++++---- docs/Manpage.md | 2 ++ manpages/brew.1 | 4 ++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index 3b5a24ca79..f7a796bb89 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -42,6 +42,8 @@ module Homebrew description: "Don't run `brew audit` before opening the PR." switch "--strict", description: "Run `brew audit --strict` before opening the PR." + switch "--online", + description: "Run `brew audit --online` before opening the PR." switch "--no-browse", description: "Print the pull request URL instead of opening in a browser." switch "--no-fork", @@ -71,6 +73,7 @@ module Homebrew conflicts "--dry-run", "--write" conflicts "--no-audit", "--strict" + conflicts "--no-audit", "--online" conflicts "--url", "--tag" max_named 1 end @@ -440,11 +443,14 @@ module Homebrew end def run_audit(formula, alias_rename, old_contents, args:) + audit_args = [] + audit_args << "--strict" if args.strict? + audit_args << "--online" if args.online? if args.dry_run? if args.no_audit? ohai "Skipping `brew audit`" - elsif args.strict? - ohai "brew audit --strict #{formula.path.basename}" + elsif audit_args.present? + ohai "brew audit #{audit_args.join(" ")} #{formula.path.basename}" else ohai "brew audit #{formula.path.basename}" end @@ -454,8 +460,8 @@ module Homebrew failed_audit = false if args.no_audit? ohai "Skipping `brew audit`" - elsif args.strict? - system HOMEBREW_BREW_FILE, "audit", "--strict", formula.path + elsif audit_args.present? + system HOMEBREW_BREW_FILE, "audit", *audit_args, formula.path failed_audit = !$CHILD_STATUS.success? else system HOMEBREW_BREW_FILE, "audit", formula.path diff --git a/docs/Manpage.md b/docs/Manpage.md index c1c0870ebc..4ebe003634 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -880,6 +880,8 @@ nor vice versa. It must use whichever style specification the formula already us Don't run `brew audit` before opening the PR. * `--strict`: Run `brew audit --strict` before opening the PR. +* `--online`: + Run `brew audit --online` before opening the PR. * `--no-browse`: Print the pull request URL instead of opening in a browser. * `--no-fork`: diff --git a/manpages/brew.1 b/manpages/brew.1 index 65c0f144cb..dd7413124d 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1224,6 +1224,10 @@ Don\'t run \fBbrew audit\fR before opening the PR\. Run \fBbrew audit \-\-strict\fR before opening the PR\. . .TP +\fB\-\-online\fR +Run \fBbrew audit \-\-online\fR before opening the PR\. +. +.TP \fB\-\-no\-browse\fR Print the pull request URL instead of opening in a browser\. . -- GitLab