aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGautham Goli2017-02-12 11:07:03 +0530
committerGautham Goli2017-02-12 14:52:13 +0530
commit5dc358c1b7254aa622504cd98528779caf6dee00 (patch)
tree677e69d46be452d83233b6a629be3d020813a721
parent1f5cf4fd40fc3528e700a421afc9a128c159cac9 (diff)
downloadbrew-5dc358c1b7254aa622504cd98528779caf6dee00.tar.bz2
Update rubocop config
-rw-r--r--Library/.rubocop.yml9
-rw-r--r--Library/Homebrew/rubocops.rb1
-rw-r--r--Library/Homebrew/rubocops/bottle_block_cop.rb2
3 files changed, 6 insertions, 6 deletions
diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index 012fcd609..30b9ec81e 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -6,10 +6,9 @@ AllCops:
- '**/Casks/**/*'
- '**/vendor/**/*'
-require:
- - ./Homebrew/rubocops/bottle_block_cop.rb
+require: ./Homebrew/rubocops.rb
-CustomCops/CorrectBottleBlock:
+Homebrew/CorrectBottleBlock:
Enabled: true
Metrics/AbcSize:
@@ -47,7 +46,7 @@ Lint/AssignmentInCondition:
Enabled: false
Lint/EndAlignment:
- AlignWith: variable
+ EnforcedStyleAlignWith: variable
Lint/ParenthesesAsGroupedExpression:
Enabled: false
@@ -69,7 +68,7 @@ Style/BlockDelimiters:
EnforcedStyle: line_count_based
Style/CaseIndentation:
- IndentWhenRelativeTo: end
+ EnforcedStyle: end
Style/ClassAndModuleChildren:
EnforcedStyle: nested
diff --git a/Library/Homebrew/rubocops.rb b/Library/Homebrew/rubocops.rb
new file mode 100644
index 000000000..1a28dd213
--- /dev/null
+++ b/Library/Homebrew/rubocops.rb
@@ -0,0 +1 @@
+require_relative "./rubocops/bottle_block_cop"
diff --git a/Library/Homebrew/rubocops/bottle_block_cop.rb b/Library/Homebrew/rubocops/bottle_block_cop.rb
index e16672683..55eb55152 100644
--- a/Library/Homebrew/rubocops/bottle_block_cop.rb
+++ b/Library/Homebrew/rubocops/bottle_block_cop.rb
@@ -1,6 +1,6 @@
module RuboCop
module Cop
- module CustomCops
+ module Homebrew
class CorrectBottleBlock < Cop
MSG = "Use rebuild instead of revision in bottle block".freeze