Merge pull request #15 from charitywater/update-rubocop-177398947

Update rubocop and add rubocop-rspec
charitywater · Jul 22, 2021 · 30d74fc · 30d74fc
2 parents 793763a + 49a74da
commit 30d74fc
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 98 deletions.
diff --git a/cw-style.gemspec b/cw-style.gemspec
@@ -28,10 +28,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rubocop", "~> 0.89.1"
-  spec.add_dependency "rubocop-rspec-focused", "= 0.0.3"
+  spec.add_dependency "rubocop", "~> 1.18.3"
   spec.add_dependency "rubocop-thread_safety"
   spec.add_dependency "rubocop-rails"
+  spec.add_dependency "rubocop-rspec"
   spec.add_development_dependency "bundler", "~> 2.2.4"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"

diff --git a/default.yml b/default.yml
@@ -1,8 +1,7 @@
 require:
-  - rubocop/rspec/focused
   - rubocop-thread_safety
   - rubocop-rails
-  - ./lib/unless_with_multiple_conditions
+  - rubocop-rspec
   - ./lib/private_attribute_accessors
   - ./lib/update_not_update_attributes
 
@@ -37,6 +36,9 @@ Lint/RaiseException:
 Lint/StructNewOverride:
   Enabled: true
 
+Lint/SymbolConversion:
+  Enabled: false
+
 Style/ExponentialNotation:
   Enabled: true
 
@@ -52,6 +54,10 @@ Style/HashTransformValues:
 Style/SlicingWithRange:
   Enabled: true
 
+Style/UnlessLogicalOperators:
+  Enabled: true
+  EnforcedStyle: forbid_logical_operators
+
 Metrics/AbcSize:
   Enabled: false
 
@@ -92,9 +98,6 @@ Rails/Output:
 Rails/TimeZone:
   EnforcedStyle: 'flexible'
 
-RSpec/Focused:
-  Enabled: true
-
 Style/Documentation:
   Enabled: false
 
@@ -150,6 +153,9 @@ Layout/HashAlignment:
 Layout/HeredocIndentation:
   Enabled: false
 
+Layout/LineEndStringConcatenationIndentation:
+  Enabled: false
+
 Layout/MultilineMethodCallIndentation:
   Enabled: false
 
@@ -194,3 +200,12 @@ Style/TrailingCommaInHashLiteral:
 
 Style/IfUnlessModifier:
   Enabled: false
+
+Naming/VariableNumber:
+  Enabled: false
+
+RSpec:
+  Enabled: false
+
+RSpec/Focus:
+  Enabled: true
diff --git a/lib/charity_water/style/version.rb b/lib/charity_water/style/version.rb
@@ -1,5 +1,5 @@
 module CharityWater
   module Style
-    VERSION = '4.0.4'.freeze
+    VERSION = '4.1'.freeze
   end
 end
diff --git a/lib/unless_with_multiple_conditions.rb b/lib/unless_with_multiple_conditions.rb
diff --git a/spec/unless_with_multiple_conditions_spec.rb b/spec/unless_with_multiple_conditions_spec.rb