Merge pull request #68 from gocardless/cop-0.85.1

Enable support for cops introduced by 0.85

CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+2.15.0
+------
+* Support new cop introduced by rubocop v0.87: `Style/AccessorGrouping` (disabled by default),
+  `Style/BisectedAttrAccessor` and `Style/RedundantAssignment`
+* Support new cop introduced by rubocop v0.86: `Style/RedundantFetchBlock`
+* Support new cops introduced by rubocop v0.85: `Lint/MixedRegexpCaptureTypes`, `Style/RedundantRegexpEscape`
+  and `Style/RedundantRegexpCharacterClass`
+
 2.14.0
 ------
 * Enable a new cop introduced by rubocop v0.84: `Lint/DeprecatedOpenSSLConstant`

gc_ruboconfig.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'gc_ruboconfig'
-  spec.version       = '2.14.0'
+  spec.version       = '2.15.0'
   spec.summary       = "GoCardless's shared Rubocop configuration, conforming to our house style"
   spec.authors       = %w[GoCardless]
   spec.homepage      = 'https://github.com/gocardless/ruboconfig'
   spec.email         = %w[developers@gocardless.com]
   spec.license       = 'MIT'
 
   spec.files         = 'rubocop.yml'
-  spec.add_dependency 'rubocop', '>= 0.84'
+  spec.add_dependency 'rubocop', '>= 0.87'
   spec.add_dependency 'rubocop-rspec', '>= 1.38.1'
   spec.add_dependency 'rubocop-performance', '~> 1.5'
 end

rubocop.yml

@@ -24,6 +24,9 @@ Lint/RaiseException:
 Lint/StructNewOverride:
   Enabled: true
 
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+
 Metrics/ClassLength:
   Enabled: false
 
@@ -171,5 +174,23 @@ Style/ExponentialNotation:
 Style/SlicingWithRange:
   Enabled: true
 
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+
+Style/RedundantRegexpEscape:
+  Enabled: true
+
+Style/RedundantFetchBlock:
+  Enabled: true
+
+Style/AccessorGrouping:
+  Enabled: false
+
+Style/BisectedAttrAccessor:
+  Enabled: true
+
+Style/RedundantAssignment:
+  Enabled: true
+
 Lint/DeprecatedOpenSSLConstant:
   Enabled: true