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

cmd/audit: assume Ruby 2.

Browse Source
This commit is contained in:
Mike McQuaid 2016-08-16 17:00:31 +01:00
parent 179ef2bf8c
commit 59b3c085ba
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cmd/audit.rb
View File

@ -37,8 +37,6 @@ require "cmd/style"
require "date" require "date"
module Homebrew module Homebrew
RUBY_2_OR_LATER = RUBY_VERSION.split(".").first.to_i >= 2
def audit def audit
if ARGV.switch? "D" if ARGV.switch? "D"
Homebrew.inject_dump_stats!(FormulaAuditor, /^audit_/) Homebrew.inject_dump_stats!(FormulaAuditor, /^audit_/)
@ -49,7 +47,6 @@ module Homebrew
new_formula = ARGV.include? "--new-formula" new_formula = ARGV.include? "--new-formula"
strict = new_formula || ARGV.include?("--strict") strict = new_formula || ARGV.include?("--strict")
style = strict && RUBY_2_OR_LATER
online = new_formula || ARGV.include?("--online") online = new_formula || ARGV.include?("--online")
ENV.activate_extensions! ENV.activate_extensions!
@ -62,14 +59,15 @@ module Homebrew
ff = ARGV.resolved_formulae ff = ARGV.resolved_formulae
files = ARGV.resolved_formulae.map(&:path) files = ARGV.resolved_formulae.map(&:path)
end end
if style
if strict
# Check style in a single batch run up front for performance # Check style in a single batch run up front for performance
style_results = check_style_json(files, :realpath => true) style_results = check_style_json(files, :realpath => true)
end end
ff.each do |f| ff.each do |f|
options = { :new_formula => new_formula, :strict => strict, :online => online } options = { :new_formula => new_formula, :strict => strict, :online => online }
options[:style_offenses] = style_results.file_offenses(f.path) if style options[:style_offenses] = style_results.file_offenses(f.path) if strict
fa = FormulaAuditor.new(f, options) fa = FormulaAuditor.new(f, options)
fa.audit fa.audit