house_style 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c7d73723e1623f63dc207e459d60607779a0337f292376ea84994364c8ebaad
-  data.tar.gz: bff167b4593dfe8050a119e77b8faec1b1f852718151610dd21aa6e765d2e488
+  metadata.gz: 0c947968f6d0fc33d002800803ef43964505d6612eb4ae0b5b77b22f69930c8e
+  data.tar.gz: 0f2ffa40cba2c8c601918a1293860df3b4057193a91660c7bf53adffd15f1b02
 SHA512:
-  metadata.gz: e0007ffa7833fef6f6c04b51c0e5ae92b4ef986aa5d56a8998553af189d6a438fc5d7d1aba7d32b85f56cee2b807bd36933c48a2c2de0391f29232ca042f7ed3
-  data.tar.gz: 7c72f7a747f8702aa44f71910e41791d26b4573bd89c3eabce9954e7ddd6769e2b6c9d7e724915f31949c78e14eaf667d85aba544b8e0ad563e5a83429470571
+  metadata.gz: e630442c72620678ede86e122641eb7bf77a7d68d5bac6af010b3715b37570414350efb177c22603b9e8ceff70f2de05d2d9019b5bd88820f069509dfdc3e7c8
+  data.tar.gz: d3929cb712e7fcdf91937c0281bfbd3dc1eb54ce0730983a01c48ee96b1797a31102b628a5d0dc9e96b903ea8383dcba8b70041ded132f04a0d476eeccffe109

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 3.1.0
+### Changes
+- Do not suggest extensions
+- Remove Rails/FindById (it isn't safe if you're using MongoId in a project depending on your configuration)
+- Use `braces_for_chaining` for `Style/BlockDelimiters`. As a team, we've agreed to use this more general extended approach among the community. It also simplifies configuration for specs, fixtures, migrations... etc.
+## Bug fixes
+- In RSpec template, do not inherit the root configuration, as the rspec .rubocop.yml file already inherits the ruby configuration itself.
+
 ## 3.0.0
 ### Bug fixes
 - Change the Rails template so the require for the rspec plugin is done in the main .rubocop.yml file. Otherwise generating the TODO doesn't work properly.

data/features/rubocop.yml

@@ -2,6 +2,3 @@ inherit_from: ../ruby/rubocop.yml
 
 Layout/LineLength:
   Enabled: false
-Style/BlockDelimiters:
-  Exclude:
-    - factories/**/*

data/house_style.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'house_style'
-  spec.version       = '3.0.0'
+  spec.version       = '3.1.0'
   spec.authors       = ['Altmetric', 'Scott Matthewman']
   spec.email         = ['engineering@altmetric.com', 'scott.matthewman@gmail.com']
 

data/lib/generators/house_style/templates/rspec_rubocop.yml

@@ -1,3 +1,2 @@
-inherit_from: ../.rubocop.yml
 inherit_gem:
   house_style: rspec/rubocop.yml

data/rails/db_migrate.yml

@@ -2,7 +2,5 @@ Layout/EmptyLineBetweenDefs:
   Enabled: false
 Layout/LineLength:
   Enabled: false
-Style/BlockDelimiters:
-  Enabled: false
 Style/StringLiterals:
   Enabled: false

data/rails/rubocop.yml

@@ -45,8 +45,6 @@ Rails/ExpandedDateRange:
   Enabled: true
 Rails/FindBy:
   Enabled: true
-Rails/FindById:
-  Enabled: true
 Rails/FindEach:
   Enabled: true
 Rails/HttpPositionalArguments:

data/rspec/rubocop.yml

@@ -106,6 +106,3 @@ RSpec/VoidExpect:
   Enabled: true
 RSpec/Yield:
   Enabled: true
-
-Style/BlockDelimiters:
-  Enabled: false

data/ruby/configuration.yml

@@ -7,6 +7,7 @@ AllCops:
   # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true
+  SuggestExtensions: false
 
   Exclude:
     - bin/**/*

data/ruby/rubocop.yml

@@ -457,22 +457,8 @@ Style/BisectedAttrAccessor:
 Style/BlockComments:
   Enabled: true
 Style/BlockDelimiters:
-  EnforcedStyle: semantic
-  FunctionalMethods:
-    - before
-    - given
-    - given!
-    - watch
-    - times
-    - try
-    - debug
-    - error
-    - info
-    - warning
-    - let
-    - let!
-    - subject
-    - watch
+  Enabled: true
+  EnforcedStyle: braces_for_chaining
 Style/CharacterLiteral:
   Enabled: true
 Style/ClassMethods:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: house_style
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Altmetric
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop