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

bump-formula-pr: refactor audit to own method to reduce complexity

Browse Source
This commit is contained in:
Christian Moritz 2019-07-16 23:05:36 +02:00
parent 2d9e7922b9
commit 170c6e0c70
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Library/Homebrew/dev-cmd/bump-formula-pr.rb
View File

@ -279,32 +279,7 @@ module Homebrew
alias_rename.map! { |a| formula.tap.alias_dir/a }
end
if args.dry_run?
if args.no_audit?
ohai "Skipping `brew audit`"
elsif args.strict?
ohai "brew audit --strict #{formula.path.basename}"
else
ohai "brew audit #{formula.path.basename}"
end
else
FileUtils.mv alias_rename.first, alias_rename.last if alias_rename.present?
failed_audit = false
if args.no_audit?
ohai "Skipping `brew audit`"
elsif args.strict?
system HOMEBREW_BREW_FILE, "audit", "--strict", formula.path
failed_audit = !$CHILD_STATUS.success?
else
system HOMEBREW_BREW_FILE, "audit", formula.path
failed_audit = !$CHILD_STATUS.success?
end
if failed_audit
formula.path.atomic_write(backup_file)
FileUtils.mv alias_rename.last, alias_rename.first if alias_rename.present?
odie "brew audit failed!"
end
end
run_audit(formula, alias_rename, backup_file)
formula.path.parent.cd do
branch = "#{formula.name}-#{new_formula_version}"
@ -464,4 +439,33 @@ module Homebrew
[versioned_alias, "#{name}@#{new_alias_version}"]
end
def run_audit(formula, alias_rename, backup_file)
if args.dry_run?
if args.no_audit?
ohai "Skipping `brew audit`"
elsif args.strict?
ohai "brew audit --strict #{formula.path.basename}"
else
ohai "brew audit #{formula.path.basename}"
end
return
end
FileUtils.mv alias_rename.first, alias_rename.last if alias_rename.present?
failed_audit = false
if args.no_audit?
ohai "Skipping `brew audit`"
elsif args.strict?
system HOMEBREW_BREW_FILE, "audit", "--strict", formula.path
failed_audit = !$CHILD_STATUS.success?
else
system HOMEBREW_BREW_FILE, "audit", formula.path
failed_audit = !$CHILD_STATUS.success?
end
return if failed_audit
formula.path.atomic_write(backup_file)
FileUtils.mv alias_rename.last, alias_rename.first if alias_rename.present?
odie "brew audit failed!"
end
end