aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGautham Goli2017-07-18 19:10:12 +0530
committerGautham Goli2017-07-18 20:23:03 +0530
commit086e540231691bca054b70e79ec37cc344b14d37 (patch)
tree70077f8a71512f0967d8c4b1edae79fc52f5635f
parent5b3231ea0ab23aae7c552142049e99afe0d72b4b (diff)
downloadbrew-086e540231691bca054b70e79ec37cc344b14d37.tar.bz2
Add a rubocop config file to control cops' execution in audit and style
-rw-r--r--Library/.auditcops.yml5
-rw-r--r--Library/.rubocop.yml41
-rw-r--r--Library/Homebrew/cmd/style.rb2
-rw-r--r--Library/Homebrew/test/cmd/style_spec.rb4
4 files changed, 12 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 2d22fe4f8..cb065a1a4 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 14499f24b..b0f46fadc 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 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