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

Merge pull request #2842 from GauthamGoli/audit_only_cops_option

Browse Source 
audit: Don't run audit methods when `--only-cops` option is passed
This commit is contained in:
Mike McQuaid 2017-07-02 14:45:29 +01:00 committed by GitHub
commit 2b3717a5a0
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/.rubocop.yml
View File

@ -33,6 +33,9 @@ FormulaAuditStrict/ComponentsRedundancy:
FormulaAudit/Homepage: FormulaAudit/Homepage:
Enabled: true Enabled: true
FormulaAudit/LegacyPatches:
Enabled: true
# `system` is a special case and aligns on second argument # `system` is a special case and aligns on second argument
Layout/AlignParameters: Layout/AlignParameters:
Enabled: false Enabled: false

6
Library/Homebrew/cmd/style.rb
View File

@ -94,7 +94,11 @@ module Homebrew
RuboCop::Cop::Cop.registry.departments.include?(cop.to_sym) RuboCop::Cop::Cop.registry.departments.include?(cop.to_sym)
end end
args << "--only" << cops_to_include.join(",") unless cops_to_include.empty? if cops_to_include.empty?
odie "RuboCops #{options[:only_cops].join(",")} were not found"
end
args << "--only" << cops_to_include.join(",")
end end
if files.nil? if files.nil?

6
Library/Homebrew/dev-cmd/audit.rb
View File

@ -75,16 +75,18 @@ module Homebrew
only_cops = ARGV.value("only-cops").to_s.split(",") only_cops = ARGV.value("only-cops").to_s.split(",")
except_cops = ARGV.value("except-cops").to_s.split(",") except_cops = ARGV.value("except-cops").to_s.split(",")
if !only_cops.empty? && !except_cops.empty? if !only_cops.empty? && !except_cops.empty?
odie "--only-cops and --except-cops cannot be used simultaneously!" odie "--only-cops and --except-cops cannot be used simultaneously!"
elsif (!only_cops.empty? || !except_cops.empty?) && strict elsif (!only_cops.empty? || !except_cops.empty?) && (strict || ARGV.value("only"))
odie "--only-cops/--except-cops and --strict cannot be used simultaneously" odie "--only-cops/--except-cops and --strict/--only cannot be used simultaneously"
end end
options = { fix: ARGV.flag?("--fix"), realpath: true } options = { fix: ARGV.flag?("--fix"), realpath: true }
if !only_cops.empty? if !only_cops.empty?
options[:only_cops] = only_cops options[:only_cops] = only_cops
ARGV.push("--only=style")
elsif !except_cops.empty? elsif !except_cops.empty?
options[:except_cops] = except_cops options[:except_cops] = except_cops
elsif !strict elsif !strict

1
Library/Homebrew/rubocops.rb
View File

@ -6,3 +6,4 @@ require_relative "./rubocops/homepage_cop"
require_relative "./rubocops/text_cop" require_relative "./rubocops/text_cop"
require_relative "./rubocops/caveats_cop" require_relative "./rubocops/caveats_cop"
require_relative "./rubocops/checksum_cop" require_relative "./rubocops/checksum_cop"
require_relative "./rubocops/legacy_patches_cop"