house_style 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60dd79ae28c2a1699e7484038e09b801a34f6a61d7657ab7ba64a7cbf70db40d
-  data.tar.gz: 78084875ed16986c3b8291e356498ec97607454d3364b0532e744d81074af377
+  metadata.gz: a1e510d7e4cbc21fa180982b5ee1cd6cbe8e5e2711afba99fb84cf8418cadbcd
+  data.tar.gz: eaefe1b0334a00a9740769b3f8ec9b7243e03ed79ea42a491f956bb4161850c7
 SHA512:
-  metadata.gz: b3eeb1147984ef9a73d8ec6510dd6df3300e61abc487e66d88ec84c3cc27b00ee00c8bb9756e0283b2ebba06f85ab8fe95980ddae2b9f4fc0cfcf2d916217032
-  data.tar.gz: 7edfe2d0ebff0553ff58c1c582196e5ef17c80e32dbc9f7805f2fa43fa85d3e9efc6bab11675707218d5a4a4ff0d0b7f64e9c396a6fd95e5feab18de42755214
+  metadata.gz: 93e2a39e1731896b2c444188bea2d1fe3086ae115bee2f36c78f31dc74b2ffed803aa5e0064ce67d0ef60099ba89c59e39322a1a931e5f47c297577ee01c4571
+  data.tar.gz: f808a69b2945921167811d188069c4861391670a0f173a7607f5079591bec6bf07789fcff74972d97ab5f859d678b803b2d1992db67202a7926f0a6b3688db36

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## CURRENT
+
+## 2.2.0
+### Bug fixes
+- Install db_migrate.yml only if `db/migrate/` folder exists rather than just `db/` folder.
+### Changes
+- Rails: Move the AllCops to the Ruby one instead of repeating the same block. Disable Rails/SquishedSQLHeredocs and Rails/SkipsModelValidations.
+- RSpec: Disable Spec/ContextWording, RSpec/NestedGroups, RSpec/DescribeClass and Style/BlockDelimiters.
+### New features
+- Add new configuration for feature tests inside `features/` folder.
+
 ## 2.1.0
 - Enable NewCops by default
 - Support Rubocop up to 1.22.x and latest extensions

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       = '2.1.0'
+  spec.version       = '2.2.0'
   spec.authors       = ['Altmetric', 'Scott Matthewman']
   spec.email         = ['engineering@altmetric.com', 'scott.matthewman@gmail.com']
 

data/lib/generators/house_style/install_generator.rb

@@ -12,17 +12,25 @@ module HouseStyle
     end
 
     def create_rspec_rubocop_yml
-      template 'rspec-rubocop.yml', 'spec/.rubocop.yml'
+      template 'rspec_rubocop.yml', 'spec/.rubocop.yml'
     end
 
     def create_db_migrate_rubocop_yml
       template 'db_migrate_rubocop.yml', 'db/migrate/.rubocop.yml' if Dir.exist?(db_path)
     end
 
+    def create_features_rubocop_yml
+      template 'features_rubocop.yml', 'features/.rubocop.yml' if Dir.exist?(features_path)
+    end
+
     private
 
     def db_path
-      File.join(Rails.root, 'db')
+      File.join(Rails.root, 'db', 'migrate')
+    end
+
+    def features_path
+      File.join(Rails.root, 'features')
     end
   end
 end

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

@@ -0,0 +1,3 @@
+inherit_from: ../.rubocop.yml
+inherit_gem:
+  house_style: features/rubocop.yml

data/rails/rubocop.yml

@@ -3,13 +3,6 @@ inherit_from:
   - ./default_rules.yml
   - ./style.yml
 
-AllCops:
-  Exclude:
-    - bin/**/*
-    - vendor/**/*
-    - db/*schema.rb
-    - lib/tasks/cucumber.rake
-    - Guardfile
 Rails:
   Enabled: true
 Rails/InverseOf:
@@ -21,5 +14,9 @@ Rails/EnvironmentVariableAccess:
   AllowReads: true
 Rails/ShortI18n:
   Enabled: false
+Rails/SquishedSQLHeredocs:
+  Enabled: false
+Rails/SkipsModelValidations:
+  Enabled: false
 
 require: rubocop-rails

data/rails/style.yml

@@ -22,10 +22,8 @@ Style/StringLiterals:
     - config/environments/test.rb
     - config/initializers/**
     - config/puma.rb
-    - config.ru
     - Rakefile
 
 Style/SymbolArray:
   Exclude:
     - config/initializers/filter_parameter_logging.rb
-

data/rspec/rubocop.yml

@@ -14,8 +14,7 @@ Metrics/BlockLength:
 Metrics/ModuleLength:
   Enabled: false
 RSpec/ContextWording:
-  Exclude:
-    - spec/support/shared_contexts/rake.rb
+  Enabled: false
 RSpec/ExampleLength:
   Enabled: false
 RSpec/MultipleExpectations:
@@ -24,9 +23,12 @@ RSpec/MultipleMemoizedHelpers:
   Max: 10
 RSpec/NotToNot:
   EnforcedStyle: to_not
+RSpec/NestedGroups:
+  Enabled: false
+RSpec/DescribeClass:
+  Enabled: false
 Style/BlockDelimiters:
-  Exclude:
-    - spec/factories/**/*.rb
+  Enabled: false
 Style/Documentation:
   Enabled: false
 Style/SymbolProc:

data/ruby/configuration.yml

@@ -6,9 +6,14 @@ AllCops:
   NewCops: enable
 
   Exclude:
-    - 'bin/**/*'
-    - 'vendor/**/*'
-    - 'Guardfile'
+    - bin/**/*
+    - vendor/**/*
+    - Guardfile
+    - lib/tasks/cucumber.rake
+    - node_modules/**/*
+    - tmp/**/*
+    - db/*schema.rb
+    - config.ru
 
 Gemspec/RequiredRubyVersion:
   Enabled: false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: house_style
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Altmetric
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-08 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -140,7 +140,8 @@ files:
 - house_style.gemspec
 - lib/generators/house_style/install_generator.rb
 - lib/generators/house_style/templates/db_migrate_rubocop.yml
-- lib/generators/house_style/templates/rspec-rubocop.yml
+- lib/generators/house_style/templates/features_rubocop.yml
+- lib/generators/house_style/templates/rspec_rubocop.yml
 - lib/generators/house_style/templates/rubocop.yml
 - performance/default_rules.yml
 - performance/rubocop.yml
@@ -174,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: A centralised store of house style rules