house_style 2.0.2 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2df6f9acf71a94bb022943f74577fab9a27194df1c03da4478816637c9f0beb
-  data.tar.gz: 7a8ca38d925bec527e8807683fce9a4218bf7b9f374ad4852bc0b8acd386c549
+  metadata.gz: ce8222443b062e50feeb386f3d441f0f5e549bf2f461f457c27714f0cc0dad96
+  data.tar.gz: 6157b1653324717cdf7dc1edeca3a089d940ee701096657e66a1a35f3e7bde65
 SHA512:
-  metadata.gz: 80d7c00eee293072163215b97a41fbf7971997bb4c64157db2c54fa66652bea49f7610115362a71df055b37fb6f7430eecf9d707e5fae86665554078cd827587
-  data.tar.gz: e0e154f14f7b69bce7ffdff2964ad1cedbc99c3680ebbd034b1b010416981417d1d1b205640cf53ce78a9a383ce01588cb9ceb9385e5b0526c23fdd4dc76cc9d
+  metadata.gz: 79765f7756680a6fbdf8983dad1855e8768ab2be58045111d9b31ed16f69b2285f61f1744325d26069bc2c55d814ab0031dc8bf9bb97a034c1568dc1a077689c
+  data.tar.gz: c7cd1db842e928fb54547daabb34f64544b20eb7f22cad1b5de43429b737d2cd511998b2d1c3ee5d0397bd328a43901caa9d32d74811324dde1644685d780321

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # CHANGELOG
 
+## CURRENT
+
+## 2.2.1
+### Bug fixes
+- Do not skip features/ directory in the gem when packaging.
+
+## 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
+
 ## 2.0.2
 ### Bug fixes
 - Exclude Guardfile from Ruby & Rails configurations

data/features/rubocop.yml

@@ -0,0 +1,15 @@
+inherit_from: ../ruby/rubocop.yml
+
+Layout/LineLength:
+  Enabled: false
+Metrics/BlockLength:
+  Enabled: false
+Metrics/ModuleLength:
+  Enabled: false
+Style/BlockDelimiters:
+  Exclude:
+    - factories/**/*
+Style/Documentation:
+  Enabled: false
+Style/WordArray:
+  Enabled: false

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.0.2'
+  spec.version       = '2.2.1'
   spec.authors       = ['Altmetric', 'Scott Matthewman']
   spec.email         = ['engineering@altmetric.com', 'scott.matthewman@gmail.com']
 
@@ -12,14 +12,14 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/altmetric/house_style'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin|.gitignore|)/}) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rubocop', '>= 1.0', '< 1.16'
+  spec.add_dependency 'rubocop', '>= 1.0', '< 1.23'
   spec.add_dependency 'rubocop-performance', '~> 1.11.3'
-  spec.add_dependency 'rubocop-rails', '~> 2.10.1'
+  spec.add_dependency 'rubocop-rails', '~> 2.12.3'
   spec.add_dependency 'rubocop-rake', '< 1.0'
-  spec.add_dependency 'rubocop-rspec', '~> 2.3.0'
+  spec.add_dependency 'rubocop-rspec', '~> 2.5.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 13.0'

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

@@ -3,11 +3,17 @@ AllCops:
   DisplayStyleGuide: true
   ExtraDetails: true
   UseCache: true
+  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.0.2
+  version: 2.2.1
 platform: ruby
 authors:
 - Altmetric
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-10 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -20,7 +20,7 @@ dependencies:
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.23'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.1
+        version: 2.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.1
+        version: 2.12.3
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -79,14 +79,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -135,12 +135,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
+- features/rubocop.yml
 - 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 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: A centralised store of house style rules

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'house_style'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require 'pry'
-# Pry.start
-
-require 'irb'
-IRB.start

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here