diff --git a/Library/.auditcops.yml b/Library/.auditcops.yml new file mode 100644 index 0000000000000000000000000000000000000000..b5b7a8b581f73f498c00f5d24a8018914f0b3804 --- /dev/null +++ b/Library/.auditcops.yml @@ -0,0 +1,5 @@ +inherit_from: + - ./.rubocop.yml + +NewFormulaAudit: + Enabled: true diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml index 2d22fe4f8003adbeb348aad1d95dd56a061ae103..cb065a1a4b569e263c3445cfc93f78aa7688dc1e 100644 --- a/Library/.rubocop.yml +++ b/Library/.rubocop.yml @@ -6,47 +6,14 @@ AllCops: require: ./Homebrew/rubocops.rb -FormulaAudit/Text: +FormulaAudit: Enabled: true -FormulaAudit/Caveats: +FormulaAuditStrict: Enabled: true -FormulaAudit/Checksum: - Enabled: true - -FormulaAudit/ChecksumCase: - Enabled: true - -FormulaAudit/Conflicts: - Enabled: true - -FormulaAudit/Options: - Enabled: true - -FormulaAuditStrict/Options: - Enabled: true - -NewFormulaAudit/Options: - Enabled: true - -FormulaAuditStrict/BottleBlock: - Enabled: true - -FormulaAuditStrict/Desc: - Enabled: true - -FormulaAuditStrict/ComponentsOrder: - Enabled: true - -FormulaAuditStrict/ComponentsRedundancy: - Enabled: true - -FormulaAudit/Homepage: - Enabled: true - -FormulaAudit/LegacyPatches: - Enabled: true +NewFormulaAudit: + Enabled: false # `system` is a special case and aligns on second argument Layout/AlignParameters: diff --git a/Library/Homebrew/cmd/style.rb b/Library/Homebrew/cmd/style.rb index 14499f24bd8b21a069a069acb1eb743a666d45ea..b0f46fadc4792ada904051ed846f6249b1290c34 100644 --- a/Library/Homebrew/cmd/style.rb +++ b/Library/Homebrew/cmd/style.rb @@ -109,7 +109,7 @@ module Homebrew args << "--config" << HOMEBREW_LIBRARY_PATH/".rubocop.yml" args << HOMEBREW_LIBRARY_PATH else - args << "--config" << HOMEBREW_LIBRARY/".rubocop.yml" + args << "--config" << HOMEBREW_LIBRARY/".auditcops.yml" args += files end diff --git a/Library/Homebrew/test/cmd/style_spec.rb b/Library/Homebrew/test/cmd/style_spec.rb index 3c4c3f8099dbb994e61ef4c0d108f13538e441ed..4701036f10e1cf0272e5081210476e01bf31ad4f 100644 --- a/Library/Homebrew/test/cmd/style_spec.rb +++ b/Library/Homebrew/test/cmd/style_spec.rb @@ -4,12 +4,12 @@ describe "brew style" do around(:each) do |example| begin FileUtils.ln_s HOMEBREW_LIBRARY_PATH, HOMEBREW_LIBRARY/"Homebrew" - FileUtils.ln_s HOMEBREW_LIBRARY_PATH.parent/".rubocop.yml", HOMEBREW_LIBRARY/".rubocop.yml" + FileUtils.ln_s HOMEBREW_LIBRARY_PATH.parent/".rubocop.yml", HOMEBREW_LIBRARY/".auditcops.yml" example.run ensure FileUtils.rm_f HOMEBREW_LIBRARY/"Homebrew" - FileUtils.rm_f HOMEBREW_LIBRARY/".rubocop.yml" + FileUtils.rm_f HOMEBREW_LIBRARY/".auditcops.yml" end end