Merge pull request #3295 from reitermarkus/code-style

Set RuboCop maximum to current maximum.
Homebrew · Oct 12, 2017 · 04801a2 · 04801a2
2 parents 56458f0 + 71b6e23
commit 04801a2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
@@ -63,26 +63,26 @@ Metrics/AbcSize:
   Max: 250
 
 Metrics/BlockLength:
-  Max: 1250
+  Max: 144
 
 Metrics/ClassLength:
-  Max: 1500
+  Max: 589
 
 Metrics/CyclomaticComplexity:
   Max: 75
 
 Metrics/LineLength:
-  Max: 400
+  Max: 324
 
 Metrics/MethodLength:
-  Max: 250
+  Max: 222
 
 Metrics/ModuleLength:
   CountComments: false
-  Exclude:
-    - '**/bin/**/*'
-    - '**/cmd/**/*'
-    - '**/lib/**/*'
+  Max: 367
+
+Metrics/ParameterLists:
+  CountKeywordArgs: false
 
 Metrics/PerceivedComplexity:
   Max: 100

diff --git a/Library/.auditcops.yml → Library/.rubocop_audit.yml b/Library/.auditcops.yml → Library/.rubocop_audit.yml
diff --git a/Library/Homebrew/.rubocop.yml b/Library/Homebrew/.rubocop.yml
@@ -25,14 +25,20 @@ Lint/NestedMethodDefinition:
 Lint/ParenthesesAsGroupedExpression:
   Enabled: true
 
+Metrics/BlockLength:
+  Max: 1250
+
 Metrics/BlockNesting:
   Max: 5
 
-Metrics/ModuleLength:
-  Max: 360
+Metrics/ClassLength:
+  Max: 1226
+
+Metrics/LineLength:
+  Max: 244
 
-Metrics/ParameterLists:
-  CountKeywordArgs: false
+Metrics/MethodLength:
+  Max: 195
 
 # we won't change backward compatible method names
 Naming/MethodName:

diff --git a/Library/Homebrew/cmd/style.rb b/Library/Homebrew/cmd/style.rb
@@ -109,7 +109,7 @@ def check_style_impl(files, output_type, options = {})
       args << "--config" << HOMEBREW_LIBRARY_PATH/".rubocop.yml"
       args << HOMEBREW_LIBRARY_PATH
     else
-      args << "--config" << HOMEBREW_LIBRARY/".auditcops.yml"
+      args << "--config" << HOMEBREW_LIBRARY/".rubocop_audit.yml"
       args += files
     end
 

diff --git a/Library/Homebrew/test/cmd/style_spec.rb b/Library/Homebrew/test/cmd/style_spec.rb
@@ -4,12 +4,12 @@
   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/".auditcops.yml"
+      FileUtils.ln_s HOMEBREW_LIBRARY_PATH.parent/".rubocop.yml", HOMEBREW_LIBRARY/".rubocop_audit.yml"
 
       example.run
     ensure
       FileUtils.rm_f HOMEBREW_LIBRARY/"Homebrew"
-      FileUtils.rm_f HOMEBREW_LIBRARY/".auditcops.yml"
+      FileUtils.rm_f HOMEBREW_LIBRARY/".rubocop_audit.yml"
     end
   end