simplycop 1.19.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99883b9fef64cd1d01e12aa9d7d547406ac800424cd1c624a68f75f41bba4b1c
-  data.tar.gz: 8ae8553d239fb6781cd659cd10096b57cce6d5ed02afd4c06d027b44972da60c
+  metadata.gz: 16b93b73b29f5f2761bfe622cf8a34dc1186c7f89605119f46eea9a8e1b3eb4f
+  data.tar.gz: 821f8d934644b1a0c88fcbcdf9e177af15bb884b8e01a9fe07a2bcdf85d1c6f7
 SHA512:
-  metadata.gz: bac06b1dfa22a3da6c926737ededa791978e276399b6a3731abdc4ca8398be597ebfa582eeb45ed365bc2f7026f736f6f382ec39e9580d1ac5e09c7b2d727ef4
-  data.tar.gz: 017b14539f137a44b2dac61c0657b50d9edb01f37b4c4dfdf38c9a90a32b231bff9971401e2cf3a0a03d207b410ad0bd4f0b7f6a71551d915c02a5dc0a30c9b9
+  metadata.gz: d34b98203ee0fdfe46c1c6df161135a99f8972b5b6b647b9fbcd54bfcbd1cdbabf875546032897ee27ef0b2113f150ea8b8e7fedb8b948595d377d54064c0025
+  data.tar.gz: df80073336238ec58f6f1e5cbc1301114120d529c31a3ba75fd1e63f4bad88ecbb06924e456fd5573dbe57ff1e279f7f48c7b12e467f7f4c5d6eb5a758174118

data/.rubocop.yml

@@ -1,6 +1,13 @@
 inherit_from:
   - .simplycop.yml
+  - .simplycop_capybara.yml
+  - .simplycop_factory_bot.yml
+  - .simplycop_performance.yml
+  - .simplycop_rails.yml
   - .simplycop_rspec.yml
+  - .simplycop_rspec_rails.yml
 
 AllCops:
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.1
+  Exclude:
+    - simplycop.gemspec

data/.simplycop_capybara.yml

@@ -0,0 +1,35 @@
+require:
+  - rubocop-capybara
+
+Capybara/ClickLinkOrButtonStyle:
+  Enabled: false
+
+Capybara/CurrentPathExpectation:
+  Enabled: true
+
+Capybara/MatchStyle:
+  Enabled: true
+
+Capybara/NegationMatcher:
+  Enabled: true
+
+Capybara/RedundantWithinFind:
+  Enabled: true
+
+Capybara/SpecificActions:
+  Enabled: true
+
+Capybara/SpecificFinders:
+  Enabled: true
+
+Capybara/SpecificMatcher:
+  Enabled: true
+
+Capybara/VisibilityMatcher:
+  Enabled: true
+
+Capybara/RSpec/HaveSelector:
+  Enabled: true
+
+Capybara/RSpec/PredicateMatcher:
+  Enabled: true

data/.simplycop_factory_bot.yml

@@ -0,0 +1,36 @@
+require:
+  - rubocop-factory_bot
+
+FactoryBot/AssociationStyle:
+  Enabled: true
+
+FactoryBot/AttributeDefinedStatically:
+  Enabled: true
+
+FactoryBot/ConsistentParenthesesStyle:
+  Enabled: true
+
+FactoryBot/CreateList:
+  Enabled: false
+
+FactoryBot/ExcessiveCreateList:
+  Enabled: true
+
+FactoryBot/FactoryAssociationWithStrategy:
+  Enabled: true
+
+FactoryBot/FactoryClassName:
+  Enabled: true
+
+FactoryBot/FactoryNameStyle:
+  Enabled: true
+
+FactoryBot/IdSequence:
+  Enabled: true
+
+FactoryBot/RedundantFactoryOption:
+  Enabled: true
+
+# Prefer explicit factorybot call
+FactoryBot/SyntaxMethods:
+  Enabled: false

data/.simplycop_rails.yml

@@ -415,3 +415,6 @@ Rails/WhereNot:
 # Anticipate conflicts with Mongoid, like Rails/WhereNot
 Rails/WhereNotWithMultipleConditions:
   Enabled: false
+
+Rails/WhereRange:
+  Enabled: true

data/.simplycop_rspec.yml

@@ -70,7 +70,14 @@ RSpec/DescribedClassModuleWrapping:
   Enabled: false
 
 RSpec/Dialect:
-  Enabled: false
+  Enabled: true
+  PreferredMethods:
+    background: :before
+    scenario:   :it
+    xscenario:  :xit
+    given:      :let
+    given!:     :let!
+    feature:    :describe
 
 RSpec/DuplicatedMetadata:
   Enabled: true
@@ -126,10 +133,10 @@ RSpec/ExpectChange:
 RSpec/ExpectInHook:
   Enabled: true
 
-RSpec/ExpectOutput:
-  Enabled: false
+RSpec/ExpectInLet:
+  Enabled: true
 
-RSpec/FilePath:
+RSpec/ExpectOutput:
   Enabled: false
 
 RSpec/Focus:
@@ -200,6 +207,9 @@ RSpec/MetadataStyle:
 RSpec/MissingExampleGroupArgument:
   Enabled: true
 
+RSpec/MissingExpectationTargetMethod:
+  Enabled: true
+
 RSpec/MultipleDescribes:
   Enabled: true
 
@@ -333,119 +343,3 @@ RSpec/VoidExpect:
 
 RSpec/Yield:
   Enabled: true
-
-# Rspec/Capybara
-
-# Similar to FactoryBot (see below) there is an RSpec/Capybara department and a separate Capybara
-# package which is not installed in simplycop. This configuration is just for the RSpec department.
-# The namespacing has been changed to avoid warnings. 
-
-RSpec/Capybara:
-  Enabled: true
-  Include:
-    - spec/integration/*.rb
-
-Capybara/CurrentPathExpectation:
-  Enabled: true
-
-RSpec/Capybara/FeatureMethods:
-  Enabled: true
-
-Capybara/MatchStyle:
-  Enabled: true
-
-Capybara/NegationMatcher:
-  Enabled: true
-
-Capybara/SpecificActions:
-  Enabled: true
-
-Capybara/SpecificFinders:
-  Enabled: true
-
-Capybara/SpecificMatcher:
-  Enabled: true
-
-Capybara/VisibilityMatcher:
-  Enabled: true
-
-# RSpec/FactoryBot
-# NB: There is an RSpec/FactoryBot department and a separate FactoryBot package. The FactoryBot package is 
-# not installed on simplycop. The configuration is just for the RSpec department, namespaced to avoid warnings.
-
-FactoryBot/AttributeDefinedStatically:
-  Enabled: true
-
-FactoryBot/ConsistentParenthesesStyle:
-  Enabled: true
-
-FactoryBot/CreateList:
-  Enabled: false
-
-FactoryBot/FactoryClassName:
-  Enabled: true
-
-FactoryBot/FactoryNameStyle:
-  Enabled: true
-
-# Prefer explicit factorybot call
-FactoryBot/SyntaxMethods:
-  Enabled: false
-
-# Previously some FactoryBot package cops were configured due to the above confusion. There is less crossover between 
-# RSpec/FactoryBot and FactoryBot than Capybara, so it generated a number of errors when they weren't found.
-# This is how they were configured:
-
-# FactoryBot/AssociationStyle:
-#   Enabled: true
-
-# FactoryBot/AttributeDefinedStatically:
-#   Enabled: true
-
-# FactoryBot/ConsistentParenthesesStyle:
-#   Enabled: true
-
-# FactoryBot/CreateList:
-#   Enabled: false
-
-# FactoryBot/FactoryAssociationWithStrategy:
-#   Enabled: true
-
-# FactoryBot/FactoryClassName:
-#   Enabled: true
-
-# FactoryBot/FactoryNameStyle:
-#   Enabled: true
-
-# FactoryBot/IdSequence:
-#   Enabled: true
-
-# FactoryBot/RedundantFactoryOption:
-#   Enabled: true
-
-# # Prefer explicit factorybot call
-# FactoryBot/SyntaxMethods:
-#   Enabled: false
-
-# Rspec/Rails
-
-RSpecRails/AvoidSetupHook: # new in 2.4
-  Enabled: true
-
-RSpecRails/HaveHttpStatus:
-  Enabled: true
-
-RSpecRails/HttpStatus:
-  Enabled: true
-
-RSpecRails/InferredSpecType:
-  Enabled: true
-
-RSpecRails/MinitestAssertions:
-  Enabled: true
-
-RSpecRails/NegationBeValid:
-  Enabled: true
-
-RSpecRails/TravelAround:
-  Enabled: true

data/.simplycop_rspec_rails.yml

@@ -0,0 +1,23 @@
+require:
+  - rubocop-rspec_rails
+
+RSpecRails/AvoidSetupHook:
+  Enabled: true
+
+RSpecRails/HaveHttpStatus:
+  Enabled: true
+
+RSpecRails/HttpStatus:
+  Enabled: true
+
+RSpecRails/InferredSpecType:
+  Enabled: true
+
+RSpecRails/MinitestAssertions:
+  Enabled: true
+
+RSpecRails/NegationBeValid:
+  Enabled: true
+
+RSpecRails/TravelAround:
+  Enabled: true

data/catalog-info.yaml

@@ -7,6 +7,7 @@ metadata:
   annotations:
     github.com/project-slug: "simplybusiness/simplycop"
     backstage.io/source-location: url:https://github.com/simplybusiness/simplycop/
+    simplybusiness.com/bnw-app-name: simplycop
     simplybusiness.com/sast-scanning: enabled
 spec:
   type: library

data/docs/index.md

@@ -56,6 +56,16 @@ inherit_gem:
     - .simplycop_rspec.yml
 ```
 
+You may also want the following packages:
+```yaml
+
+    - .simplycop_capybara.yml
+    - .simplycop_factory_bot.yml
+    - .simplycop_rspec_rails.yml
+```
+
+NB: Capybara, FactoryBot and RSpecRails cops were previously available either via departments within `rubocop_rspec` or as packages in their own right. As of `rubocop_rspec` v3, they no longer exist as departments within `rubocop_rspec` and the packages need installing independently. If you use simplycop v1, you will still have access to some of these cops by inheriting `.simplycop_rspec`. As of simplycop v2 (which uses `rubocop_rspec` v3) you would need to inherit the packages individually.
+
 ## Usage
 
 Run Rubocop as you would usually do, i.e.

data/lib/simplycop/security/reject_all_requests_local.rb

@@ -19,7 +19,7 @@ module Security
     end
 
     def found_match(string)
-      string.match(/config.consider_all_requests\S?.*=\s?.*true/) ? true : false
+      /config.consider_all_requests\S?.*=\s?.*true/.match?(string)
     end
   end
 end

data/lib/simplycop/version.rb

@@ -7,5 +7,5 @@
 #
 
 module Simplycop
-  VERSION = '1.19.2'
+  VERSION = '2.0.0'
 end

data/simplycop.gemspec

@@ -17,10 +17,13 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rubocop', '1.64.0'
-  spec.add_dependency 'rubocop-performance', '1.21.0'
+  spec.add_dependency 'rubocop', '1.64.1'
+  spec.add_dependency 'rubocop-capybara', '2.21.0'
+  spec.add_dependency 'rubocop-factory_bot', '2.26.1'
+  spec.add_dependency 'rubocop-performance', '1.21.1'
   spec.add_dependency 'rubocop-rails', '2.25.0'
-  spec.add_dependency 'rubocop-rspec', '2.29.2'
+  spec.add_dependency 'rubocop-rspec', '3.0.1'
+  spec.add_dependency 'rubocop-rspec_rails', '2.30.0'
   spec.add_development_dependency 'bundler', '>= 2.2.15'
   spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.10'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplycop
 version: !ruby/object:Gem::Version
-  version: 1.19.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Simply Business
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-26 00:00:00.000000000 Z
+date: 2024-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,28 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.64.0
+        version: 1.64.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.64.0
+        version: 1.64.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.21.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.21.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-factory_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.26.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.26.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.21.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 1.21.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +86,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.29.2
+        version: 3.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.30.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.29.2
+        version: 2.30.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +174,8 @@ files:
 - ".ruby-version"
 - ".simplycop.yml"
 - ".simplycop_bundler.yml"
+- ".simplycop_capybara.yml"
+- ".simplycop_factory_bot.yml"
 - ".simplycop_gemspec.yml"
 - ".simplycop_layout.yml"
 - ".simplycop_lint.yml"
@@ -142,6 +186,7 @@ files:
 - ".simplycop_performance.yml"
 - ".simplycop_rails.yml"
 - ".simplycop_rspec.yml"
+- ".simplycop_rspec_rails.yml"
 - ".simplycop_security.yml"
 - ".simplycop_style.yml"
 - CODEOWNERS
@@ -152,7 +197,6 @@ files:
 - _pipeline/stage_publishdocs.yml
 - _pipeline/stage_sast_tools.yml
 - bin/console
-- bin/setup
 - catalog-info.yaml
 - docs/index.md
 - lib/simplycop.rb

data/bin/setup

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