4 files changed, 14 insertions, 40 deletions
diff --git a/Library/.auditcops.yml b/Library/.auditcops.yml
new file mode 100644
index 000000000..b5b7a8b58
--- /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 fd42fd023..cb065a1a4 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -6,48 +6,15 @@ 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:
+NewFormulaAudit:
   Enabled: false
 
-FormulaAuditStrict/BottleBlock:
-  Enabled: true
-
-FormulaAuditStrict/Desc:
-  Enabled: true
-
-FormulaAuditStrict/ComponentsOrder:
-  Enabled: true
-
-FormulaAuditStrict/ComponentsRedundancy:
-  Enabled: true
-
-FormulaAudit/Homepage:
-  Enabled: true
-
-FormulaAudit/LegacyPatches:
-  Enabled: true
-
 # `system` is a special case and aligns on second argument
 Layout/AlignParameters:
   Enabled: false
diff --git a/Library/Homebrew/cmd/style.rb b/Library/Homebrew/cmd/style.rb
index 7158fe5b9..b0f46fadc 100644
--- a/Library/Homebrew/cmd/style.rb
+++ b/Library/Homebrew/cmd/style.rb
@@ -47,7 +47,9 @@ module Homebrew
     elsif !except_cops.empty?
       options[:except_cops] = except_cops
     elsif only_cops.empty? && except_cops.empty?
-      options[:except_cops] = %w[FormulaAuditStrict FormulaAudit]
+      options[:except_cops] = %w[FormulaAudit
+                                 FormulaAuditStrict
+                                 NewFormulaAudit]
     end
 
     Homebrew.failed = check_style_and_print(target, options)
@@ -107,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 3c4c3f809..4701036f1 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