ezcater_rubocop 2.4.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2096c91ae045203c587668c5973b89b1b873645d0f0d1d95641eb556dd536dff
-  data.tar.gz: a989856aa682768b8a3e9c47270dc441cd6743420cf8884451b53579a61c6c1f
+  metadata.gz: de7fc9b23bdafa3b1a308dcfc89e404611d8a6d33f9b9e6a43d9d1729d221c52
+  data.tar.gz: 04322af4861d786fd3b35be77d6f1917c0d4b0d77dcb9279c71efb0dab751294
 SHA512:
-  metadata.gz: 772cc5d23fa87784f870effdc91bccf4bdb12665c017b7f3a845f38c572c46a3232ad2acddd89e48be6f6566144e63b6693c4a78638e18e1231eb0086c8bfea9
-  data.tar.gz: 7396c095538e84ca0984ecec837d18164a0bc3fdd3b2a11b5dcf8ae586f926100518ab78bb757a10f998c0b3c819d0e62a59025561653877e6f8829aa4a013ce
+  metadata.gz: 26e9b3cba968e6c88621d348efcc1bad551deca81cf97022a42c342f3bd1145162c14ccbb7faaf2d2d5b9abf9b2f469261a96b862a27abcf28b2067746e58786
+  data.tar.gz: e225a8844a45e36ed48c4e9d8139d7c743376b4c4c7655d0a6b03ef3562fa627b5abc3c17959c4ab0541477301780367f71c908706cb3db734b054bead68ca0e

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.1.1

data/CHANGELOG.md

@@ -6,102 +6,164 @@ This gem is moving onto its own [Semantic Versioning](https://semver.org/) schem
 
 Prior to v1.0.0 this gem was versioned based on the `MAJOR`.`MINOR` version of RuboCop. The first release of the ezcater_rubocop gem was `v0.49.0`.
 
+## v3.0.2
+
+- Loosen restrictions to allow for Ruby 3.1 and latest dependency gems
+
+## v3.0.1
+
+- Fix the RspecDotNotSelfDot cop to work with rubocop-rspec
+- Exclude appraisal generated gemfiles for possible embedded gems in rails apps
+
+## v3.0.0
+
+- Upgrade rubocop: 1.16.0
+- Upgrade rubocop-rails: 2.10.1
+- Upgrade rubocop-rspec: 2.3.0
+- This is a major upgrade because a large number of cops have been introduced, tweaked, or renamed. Here is an aggregate of the breaking changes introduced
+  - RuboCop assumes that Cop classes do not define new `on_<type>` methods at runtime (e.g. via `extend` in `initialize`).
+  - Enable all pending cops for RuboCop 1.0.
+  - Change logic for cop department name computation. Cops inside deep namespaces (5 or more levels deep) now belong to departments with names that are calculated by joining module names starting from the third one with slashes as separators. For example, cop `Rubocop::Cop::Foo::Bar::Baz` now belongs to `Foo/Bar` department (previously it was `Bar`).
+  - `RegexpNode#parsed_tree` now processes regexps including interpolation (by blanking the interpolation before parsing, rather than skipping).
+  - Cop `Metrics/AbcSize` now counts ||=, &&=, multiple assignments, for, yield, iterating blocks. `&.` now count as conditions too (unless repeated on the same variable). Default bumped from 15 to 17. Consider using `rubocop -a --disable-uncorrectable` to ease transition.
+  - Cop `Metrics/PerceivedComplexity` now counts `else` in `case` statements, `&.`, `||=`, `&&=` and blocks known to iterate. Default bumped from 7 to 8. Consider using `rubocop -a --disable-uncorrectable` to ease transition.
+  - Extensive refactoring of internal classes `Team`, `Commissioner`, `Corrector`. `Cop::Cop#corrections` not completely compatible. See Upgrade Notes.
+  - `rubocop -a / --autocorrect` no longer run unsafe corrections; `rubocop -A / --autocorrect-all` run both safe and unsafe corrections. Options `--safe-autocorrect` is deprecated.
+  - Order for gems names now disregards underscores and dashes unless `ConsiderPunctuation` setting is set to `true`.
+  - Cop `Metrics/CyclomaticComplexity` now counts `&.`, `||=`, `&&=` and blocks known to iterate. Default bumped from 6 to 7. Consider using `rubocop -a --disable-uncorrectable` to ease transition.
+  - Remove support for unindent/active_support/powerpack from `Layout/HeredocIndentation`, so it only recommends using squiggy heredoc.
+  - Change the max line length of `Layout/LineLength` to 120 by default.
+  - Inspect all files given on command line unless `--only-recognized-file-types` is given.
+  - Enabling a cop overrides disabling its department.
+  - Renamed `Layout/Tab` cop to `Layout/IndentationStyle`.
+  - Drop support for Ruby 2.3.
+  - Drop support for ruby 2.4.
+  - Retire `RSpec/InvalidPredicateMatcher` cop.
+  - Enabled pending cop (`RSpec/StubbedMock`).
+
 ## v2.4.0
+
 - Fix `FeatureFlagActive` cop so that it allows feature flag names to be variables in addition to strings.
 - Add check to `FeatureFlagActive` that the first parameter is a string or a variable, and use the appropriate messaging.
 
 ## v2.3.0
+
 - Add `FeatureFlagActive` cop. This provides confidence that upgrading to `ezcater_feature_flag-client` v2.0.0, which
-    contains breaking API changes, can be done safely.
+  contains breaking API changes, can be done safely.
 
 ## v2.2.0
+
 - Require Ruby 2.6 or later.
 - Set `TargetRubyVersion` to 2.6 in `rubocop_gem` configuration.
 
 ## v2.1.0
+
 - Enable `Rails/SaveBang` with `AllowImplicitReturn: false`, and with autocorrection disabled.
 
 ## v2.0.0
+
 - Update to `rubocop` v0.81.0, `rubocop-rspec` v1.38.1 and `rubocop-rails` v2.5.2.
 - This is being released as a major update because cops have been renamed so this is unlikely to be
   a drop-in replacement.
 - This is the first release to support Ruby 2.7.
 
 ## v1.4.1
+
 - Correct a matching syntax issue with `Ezcater/RubyTimeout` so that it applies in the expected cases.
 
 ## v1.4.0
+
 - Add `Ezcater/RubyTimeout` cop.
 
 ## v1.3.0
+
 - Add `Ezcater/GraphqlFieldsNaming` cop.
 
 ## v1.2.0
+
 - Add `Ezcater/RailsTopLevelSqlExecute` to replace `ActiveRecord::Base.connection.execute` with `execute` in `db/migrate/`.
 
 ## v1.1.1
+
 - Exclude `lib/tasks/` for `Ezcater/RailsEnv` and `Ezcater/DirectEnvCheck`.
 
 ## v1.1.0
+
 - Add `Ezcater/RailsEnv` cop.
 - Add `Ezcater/DirectEnvCheck` cop.
 
 ## v1.0.2
+
 - Exclude bootsnap cache directory (`tmp/cache`).
 
 ## v1.0.1
+
 - Disable `Rails/HasAndBelongsToMany` cop.
 - Disable `Style/DoubleNegation` cop.
 
 ## v1.0.0
+
 - Begin using Semantic Versioning
 - Delete `Ezcater/PrivateAttr`
 
 ## v0.61.1
+
 - `Layout/IndentHash` enforces consistent style
 - `Layout/IndentArray` enforces consistent style
 
 ## v0.61.0
+
 - Update to `rubocop` v0.61.1.
 - Update to `rubocop-rspec` v1.30.1
 
 ## v0.59.0
+
 - Disable `Style/NegatedIf`.
 
 ## v0.58.4
+
 - Update `Metrics/BlockLength` to exclude `app/graphql/**/*.rb`
 - Move `Metrics/BlockLength` exclusions for `lib/tasks/**/*.rake` and
   `config/environments/*.rb` into rubocop_rails.yml
 
 ## v0.58.3
+
 - Updated `Layout/MultilineMethodCallIndentation` to `indented`.
 
 ## v0.58.2
+
 - Updated `Ezcater/RspecDotNotSelfDot` to flag offenses for `::class_method`.
 
 ## v0.58.1
+
 - Update to `rubocop-rspec` v1.28.0.
 - Remove configuration for removed `FactoryBot/DynamicAttributeDefinedStatically` cop.
 
 ## v0.58.0
+
 - Update to rubocop v0.58.1.
 - Enable `Naming/MemoizedInstanceVariableName` with required leading
   underscore.
 
 ## v0.57.4
+
 - Configure `Rspec/MessageExpectation` with the `allow` style.
 
 ## v0.57.3
+
 - Do not use broken parser v2.5.1.1.
 
 ## v0.57.2
+
 - Fix `Ezcater/RspecRequireHttpStatusMatcher` cop.
 
 ## v0.57.1
+
 - Add `Ezcater/RspecRequireHttpStatusMatcher` cop.
 - Enable `Rails/HttpStatus` cop and enforce symbols.
 
 ## v0.57.0
+
 - Update to rubocop v0.57.2 and rubocop-rspec v1.27.0.
 - Disable new cop `Naming/MemoizedInstanceVariableName` until configuration
   options are available.
@@ -112,100 +174,128 @@ Prior to v1.0.0 this gem was versioned based on the `MAJOR`.`MINOR` version of R
 - Exclude appraisal generated gemfiles for gems.
 
 ## v0.52.8
+
 - Add new configuration `rubocop_gem` for use with gems.
 
 ## v0.52.7
+
 - Enable `Style/FrozenStringLiteralComment` with the `when_needed` style.
 
 ## v0.52.6
+
 - Configure `Style/TrailingCommaInLiteral` with `consistent_comma` style.
 
 ## v0.52.5
+
 - Add `Ezcater/RspecMatchOrderedArray` cop.
 - Fix array equality matcher violations in specs.
 
 ## v0.52.4
+
 - Configure `Style/RegexpLiteral` cop with the `AllowInnerSlashes: true` option.
 
 ## v0.52.3
+
 - Disable `Style/GuardClause` cop.
 - Exclude `spec/integrations` for `RSpec/DescribeClass`.
 
 ## v0.52.2
+
 - Disable `Style/IfUnlessModifier` cop.
 
 ## v0.52.1
+
 - Allow staging as a rails environment for the Rails/UnknownEnv cop.
 
 ## v0.52.0
+
 - Update to rubocop v0.52.1 and rubocop-rspec v1.22.2.
 
 ## v0.51.8
+
 - Disable `RSpec/LetSetup` cop.
 
 ## v0.51.7
+
 - Rename `Ezcater/RspecRequireGqlErrorHelpers` cop to `Ezcater/RequireGqlErrorHelpers`.
 
 ## v0.51.6
+
 - Add `Ezcater/RailsConfiguration` cop.
 - Exclude `config/environments/*.rb` for the `Metrics/BlockLength` cop.
 
 ## v0.51.5
+
 - Add `Ezcater/RspecRequireGqlErrorHelpers` cop.
 
 ## v0.51.4
+
 - Exclude `Gemfile` for the `Metrics/LineLength` cop.
 - Add `system` to the excluded spec directories for `RSpec/DescribeClass`.
 
 ## v0.51.3
+
 - Configure `RSpec/DescribeClass` to exclude the spec directories which
   are excluded by explicit metadata.
 - Exclude `lib/tasks` for the `Metrics/BlockLength` cop.
 
 ## v0.51.2
+
 - Configure `Style/RaiseArgs` to use the `compact` style.
 
 ## v0.51.1
+
 - Disable `Rails/FilePath` cop.
 - Disable `Style/EmptyLiteral` cop.
 
 ## v0.51.0
+
 - Update to rubocop v0.51.0 and rubocop-rspec v1.20.0.
 - Disable new cop `RSpec/ContextWording`.
 - Disable `Style/StderrPuts` for `bin/yarn`.
 
 ## v0.50.5
+
 - Configure `RSpec/NestedGroups` with a `Max` value of 5.
 
 ## v0.50.4
+
 - Configure `Style/PercentLiteralDelimiters` to prefer parentheses.
 
 ## v0.50.3
+
 - Configure `RSpec/MultipleExpectations` with a `Max` value of 5.
 
 ## v0.50.2
+
 - Add `Ezcater/PrivateAttr` custom cop.
 - Configure `RSpec/ExampleLength` with a `Max` value of 25.
 - Add `circle_rubocop.rb` script.
 
 ## v0.50.1
+
 - Add shared configuration.
 - Do not apply `Ezcater/StyleDig` to access using a range.
 
 ## v0.50.0
+
 - Update to rubocop v0.50.0 and rubocop-rspec v1.18.0.
 - Do not apply `Ezcater/StyleDig` to assignments with nested access.
 
 # v0.49.3
+
 - Do not apply `Ezcater/StyleDig` to access using a range.
 
 # v0.49.2
+
 - Do not apply `Ezcater/StyleDig` to assignments to with nested access.
 
 ## v0.49.1
+
 - Add `Ezcater/RspecRequireBrowserMock` cop.
 
 ## v0.49.0
+
 - Initial release.
 - Add `Ezcater/RspecRequireFeatureFlagMock` cop.
 - Add `Ezcater/RspecDotNotSelfDot` cop.

data/README.md

@@ -61,11 +61,11 @@ configuration for existing offenses and auto-correction.
 
 This gem contains a script, `circle_rubocop.rb`, that can be used to run RuboCop in CI.
 
-The behavior of the script is that all files are checked on master or if the rubocop
-configuration has changed. On non-master branches, only the files added or changed on
+The behavior of the script is that all files are checked on main or if the rubocop
+configuration has changed. On non-main branches, only the files added or changed on
 the branch are checked.
 
-For non-master branches, `[rubocop skip]` can be included in the commit message to skip
+For non-main branches, `[rubocop skip]` can be included in the commit message to skip
 running rubocop.
 
 ## Versioning
@@ -74,15 +74,15 @@ This gem is using [Semantic Versioning](https://semver.org/). All version bumps
 
 ## Custom Cops
 
-1. [RailsConfiguration](https://github.com/ezcater/ezcater_rubocop/blob/master/lib/rubocop/cop/ezcater/rails_configuration.rb) - Enforce use of `Rails.configuration` instead of `Rails.application.config`.
-1. [RequireGqlErrorHelpers](https://github.com/ezcater/ezcater_rubocop/blob/master/lib/rubocop/cop/ezcater/require_gql_error_helpers.rb) - Use the helpers provided by `GQLErrors` instead of raising `GraphQL::ExecutionError` directly.
-1. [RspecDotNotSelfDot](https://github.com/ezcater/ezcater_rubocop/blob/master/lib/rubocop/cop/ezcater/rspec_dot_not_self_dot.rb) - Enforce ".<class method>" instead of "self.<class method>" and "::<class method>" for example group description.
-1. [RspecMatchOrderedArray](https://github.com/ezcater/ezcater_rubocop/blob/master/lib/rubocop/cop/ezcater/rspec_match_ordered_array.rb) - Enforce use of `match_ordered_array` matcher instead of `eq` matcher. This matcher comes from the [ezcater_matchers](https://github.com/ezcater/ezcater_matchers) gem.
-1. [RspecRequireBrowserMock](https://github.com/ezcater/ezcater_rubocop/blob/master/lib/rubocop/cop/ezcater/rspec_require_browser_mock.rb) - Enforce use of `mock_ezcater_app`, `mock_chrome_browser` & `mock_custom_browser` helpers instead of mocking `Browser` or `EzBrowser` directly.
-1. [RspecRequireFeatureFlagMock](https://github.com/ezcater/ezcater_rubocop/blob/master/lib/rubocop/cop/ezcater/rspec_require_feature_flag_mock.rb) - Enforce use of `mock_feature_flag` helper instead of mocking `FeatureFlag.is_active?` directly.
-1. [RspecRequireHttpStatusMatcher](https://github.com/ezcater/ezcater_rubocop/blob/master/lib/rubocop/cop/ezcater/rspec_require_http_status_matcher.rb) - Use the HTTP status code matcher, like `expect(response).to have_http_status :bad_request`, rather than `expect(response.code).to eq 400`
-1. [StyleDig](https://github.com/ezcater/ezcater_rubocop/blob/master/lib/rubocop/cop/ezcater/style_dig.rb) - Recommend `dig` for deeply nested access.
-1. [GraphqlFieldsNaming](https://github.com/ezcater/ezcater_rubocop/blob/master/lib/rubocop/cop/ezcater/graphql_fields_naming.rb) - Enforce the configured style when naming graphQL fields and arguments.
+1. [RailsConfiguration](https://github.com/ezcater/ezcater_rubocop/blob/main/lib/rubocop/cop/ezcater/rails_configuration.rb) - Enforce use of `Rails.configuration` instead of `Rails.application.config`.
+1. [RequireGqlErrorHelpers](https://github.com/ezcater/ezcater_rubocop/blob/main/lib/rubocop/cop/ezcater/require_gql_error_helpers.rb) - Use the helpers provided by `GQLErrors` instead of raising `GraphQL::ExecutionError` directly.
+1. [RspecDotNotSelfDot](https://github.com/ezcater/ezcater_rubocop/blob/main/lib/rubocop/cop/ezcater/rspec_dot_not_self_dot.rb) - Enforce ".<class method>" instead of "self.<class method>" and "::<class method>" for example group description.
+1. [RspecMatchOrderedArray](https://github.com/ezcater/ezcater_rubocop/blob/main/lib/rubocop/cop/ezcater/rspec_match_ordered_array.rb) - Enforce use of `match_ordered_array` matcher instead of `eq` matcher. This matcher comes from the [ezcater_matchers](https://github.com/ezcater/ezcater_matchers) gem.
+1. [RspecRequireBrowserMock](https://github.com/ezcater/ezcater_rubocop/blob/main/lib/rubocop/cop/ezcater/rspec_require_browser_mock.rb) - Enforce use of `mock_ezcater_app`, `mock_chrome_browser` & `mock_custom_browser` helpers instead of mocking `Browser` or `EzBrowser` directly.
+1. [RspecRequireFeatureFlagMock](https://github.com/ezcater/ezcater_rubocop/blob/main/lib/rubocop/cop/ezcater/rspec_require_feature_flag_mock.rb) - Enforce use of `mock_feature_flag` helper instead of mocking `FeatureFlag.is_active?` directly.
+1. [RspecRequireHttpStatusMatcher](https://github.com/ezcater/ezcater_rubocop/blob/main/lib/rubocop/cop/ezcater/rspec_require_http_status_matcher.rb) - Use the HTTP status code matcher, like `expect(response).to have_http_status :bad_request`, rather than `expect(response.code).to eq 400`
+1. [StyleDig](https://github.com/ezcater/ezcater_rubocop/blob/main/lib/rubocop/cop/ezcater/style_dig.rb) - Recommend `dig` for deeply nested access.
+1. [GraphqlFieldsNaming](https://github.com/ezcater/ezcater_rubocop/blob/main/lib/rubocop/cop/ezcater/graphql_fields_naming.rb) - Enforce the configured style when naming graphQL fields and arguments.
 
 ## Development
 

data/bin/circle_rubocop.rb

@@ -4,10 +4,10 @@
 require "English"
 
 # This script is used to run Rubocop in CircleCI so that on branches only
-# the changed files are checked and on master all files are checked.
+# the changed files are checked and on main all files are checked.
 #
 # Additionally if rubocop configuration is changed, all files are checked, and
-# if the commit description on a non-master branch includes [rubocop skip]
+# if the commit description on a non-main branch includes [rubocop skip]
 # then rubocop is skipped.
 
 def run(command)
@@ -20,7 +20,7 @@ def rubocop_everything
 end
 
 begin
-  if ENV["CIRCLE_BRANCH"] == "master"
+  if ENV["CIRCLE_BRANCH"] == "main"
     rubocop_everything
   else
     git_commit_desc = `git log --format=%B -n 1 $CIRCLE_SHA1`
@@ -30,7 +30,7 @@ begin
       exit 0
     end
 
-    changed_files = `git diff --diff-filter=d --name-only origin/master...$CIRCLE_BRANCH`.split("\n").join(" ")
+    changed_files = `git diff --diff-filter=d --name-only origin/main...$CIRCLE_BRANCH`.split("\n").join(" ")
     raise "Failed to identify changed files" unless $CHILD_STATUS.success?
 
     if changed_files.strip.empty? || changed_files.include?(".rubocop")

data/conf/rubocop.yml

@@ -2,6 +2,8 @@ require: ezcater_rubocop
 
 AllCops:
   DisplayCopNames: true
+  NewCops: disable
+  SuggestExtensions: false
 
 Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
@@ -20,8 +22,8 @@ Metrics/AbcSize:
 
 Metrics/BlockLength:
   Exclude:
-  - "*.gemspec"
-  - "spec/**/*.rb"
+    - "*.gemspec"
+    - "spec/**/*.rb"
 
 Metrics/CyclomaticComplexity:
   Enabled: false
@@ -29,7 +31,7 @@ Metrics/CyclomaticComplexity:
 Layout/LineLength:
   Max: 120
   Exclude:
-  - "Gemfile"
+    - "Gemfile"
 
 Metrics/MethodLength:
   Enabled: true
@@ -44,9 +46,12 @@ Naming/MemoizedInstanceVariableName:
 
 Naming/MethodParameterName:
   AllowedNames:
-  - e
-  - ex
-  - id
+    - e
+    - ex
+    - id
+
+Naming/VariableNumber:
+  Enabled: false
 
 Rails:
   Enabled: false
@@ -56,12 +61,12 @@ RSpec/ContextWording:
 
 RSpec/DescribeClass:
   Exclude:
-  - "spec/requests/**/*.rb"
-  - "spec/features/**/*.rb"
-  - "spec/routing/**/*.rb"
-  - "spec/views/**/*.rb"
-  - "spec/system/**/*.rb"
-  - "spec/integrations/**/*.rb"
+    - "spec/requests/**/*.rb"
+    - "spec/features/**/*.rb"
+    - "spec/routing/**/*.rb"
+    - "spec/views/**/*.rb"
+    - "spec/system/**/*.rb"
+    - "spec/integrations/**/*.rb"
 
 RSpec/ExampleLength:
   Max: 25
@@ -109,12 +114,12 @@ Style/NumericLiterals:
 
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
-    default: '()'
-    '%i': '()'
-    '%I': '()'
-    '%r': '{}'
-    '%w': '()'
-    '%W': '()'
+    default: "()"
+    "%i": "()"
+    "%I": "()"
+    "%r": "{}"
+    "%w": "()"
+    "%W": "()"
 
 Style/RaiseArgs:
   EnforcedStyle: compact
@@ -131,6 +136,9 @@ Style/StderrPuts:
   Exclude:
     - "bin/yarn"
 
+Style/StringConcatenation:
+  Enabled: false
+
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
@@ -146,6 +154,184 @@ Style/TrailingCommaInHashLiteral:
 # enabled or disabled. New cops are not enabled by default until the
 # next major release.
 
+# New cops introduced between 0.81.0 and 1.16.0
+Layout/BeginEndAlignment:
+  Enabled: false
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: false
+
+Layout/IndentationStyle:
+  Enabled: false
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: false
+
+Lint/BinaryOperatorWithIdenticalOperands:
+  Enabled: false
+
+Lint/ConstantDefinitionInBlock:
+  Enabled: false
+
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: false
+
+Lint/DuplicateElsifCondition:
+  Enabled: false
+
+Lint/DuplicateRequire:
+  Enabled: false
+
+Lint/DuplicateRescueException:
+  Enabled: false
+
+Lint/EmptyConditionalBody:
+  Enabled: false
+
+Lint/EmptyFile:
+  Enabled: false
+
+Lint/FloatComparison:
+  Enabled: false
+
+Lint/HashCompareByIdentity:
+  Enabled: false
+
+Lint/IdentityComparison:
+  Enabled: false
+
+Lint/MissingSuper:
+  Enabled: false
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: false
+
+Lint/OutOfRangeRegexpRef:
+  Enabled: false
+
+Lint/RedundantSafeNavigation:
+  Enabled: false
+
+Lint/SelfAssignment:
+  Enabled: false
+
+Lint/TopLevelReturnWithArgument:
+  Enabled: false
+
+Lint/TrailingCommaInAttributeDeclaration:
+  Enabled: false
+
+Lint/UnreachableLoop:
+  Enabled: false
+
+Lint/UselessMethodDefinition:
+  Enabled: false
+
+Lint/UselessTimes:
+  Enabled: false
+
+Rails/ArelStar:
+  Enabled: false
+
+Rails/Pick:
+  Enabled: false
+
+Rails/RedundantForeignKey:
+  Enabled: false
+
+RSpec/Capybara/CurrentPathExpectation:
+  Enabled: false
+
+RSpec/Capybara/FeatureMethods:
+  Enabled: false
+
+RSpec/Capybara/VisibilityMatcher:
+  Enabled: false
+
+RSpec/EmptyHook:
+  Enabled: false
+
+RSpec/FactoryBot/AttributeDefinedStatically:
+  Enabled: false
+
+RSpec/FactoryBot/CreateList:
+  Enabled: false
+
+RSpec/FactoryBot/FactoryClassName:
+  Enabled: false
+
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+
+RSpec/NotToNot:
+  Enabled: false
+
+RSpec/Rails/HttpStatus:
+  Enabled: false
+
+RSpec/RepeatedIncludeExample:
+  Enabled: false
+
+RSpec/StubbedMock:
+  Enabled: false
+
+RSpec/VariableDefinition:
+  Enabled: false
+
+RSpec/VariableName:
+  Enabled: false
+
+Style/AccessorGrouping:
+  Enabled: false
+
+Style/BisectedAttrAccessor:
+  Enabled: false
+
+Style/CaseLikeIf:
+  Enabled: false
+
+Style/CombinableLoops:
+  Enabled: false
+
+Style/ExponentialNotation:
+  Enabled: false
+
+Style/GlobalStdStream:
+  Enabled: false
+
+Style/HashAsLastArrayItem:
+  Enabled: false
+
+Style/HashLikeCase:
+  Enabled: false
+
+Style/KeywordParametersOrder:
+  Enabled: false
+
+Style/OptionalBooleanParameter:
+  Enabled: false
+
+Style/RedundantAssignment:
+  Enabled: false
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: false
+
+Style/RedundantRegexpEscape:
+  Enabled: false
+
+Style/RedundantSelfAssignment:
+  Enabled: false
+
+Style/SingleArgumentDig:
+  Enabled: false
+
+Style/SlicingWithRange:
+  Enabled: false
+
+Style/SoleNestedConditional:
+  Enabled: false
+
 #### New cops in v0.81
 
 Lint/RaiseException:

data/conf/rubocop_rails.yml

@@ -9,6 +9,7 @@ AllCops:
   TargetRailsVersion: 5.2
   Exclude:
     - tmp/cache/**/*
+    - '**/gemfiles/*.gemfile'
 
 Metrics/BlockLength:
   inherit_mode:

data/config/default.yml

@@ -5,57 +5,57 @@ Ezcater/GraphqlFieldsNaming:
     - snake_case
     - camelCase
   Include:
-    - 'app/graphql/**/*.rb'
+    - "app/graphql/**/*.rb"
 
 Ezcater/RailsConfiguration:
-  Description: 'Enforce the use of `Rails.configuration` instead of `Rails.application.config`.'
+  Description: "Enforce the use of `Rails.configuration` instead of `Rails.application.config`."
   Enabled: true
 
 Ezcater/RailsEnv:
-  Description: 'Enforce the use of `Rails.configuration.x.<foo>` instead of checking `Rails.env`.'
+  Description: "Enforce the use of `Rails.configuration.x.<foo>` instead of checking `Rails.env`."
   Enabled: false
 
 Ezcater/DirectEnvCheck:
-  Description: 'Enforce the use of `Rails.configuration.x.<foo>` instead of checking `ENV`.'
+  Description: "Enforce the use of `Rails.configuration.x.<foo>` instead of checking `ENV`."
   Enabled: false
 
 Ezcater/FeatureFlagActive:
-  Description: 'Enforce the proper arguments are given to EzcaterFeatureFlag.active?'
+  Description: "Enforce the proper arguments are given to EzcaterFeatureFlag.active?"
   Enabled: true
 
 Ezcater/RspecDotNotSelfDot:
   Description: 'Enforce ".<class method>" instead of "self.<class method>" for example group description.'
   Enabled: true
   Include:
-    - '**/*_spec.rb'
+    - "**/*_spec.rb"
 
 Ezcater/RspecRequireBrowserMock:
-  Description: 'Enforce use of `mock_ezcater_app`, `mock_chrome_browser` & `mock_custom_browser` helpers instead of mocking `Browser` or `EzBrowser` directly.'
+  Description: "Enforce use of `mock_ezcater_app`, `mock_chrome_browser` & `mock_custom_browser` helpers instead of mocking `Browser` or `EzBrowser` directly."
   Enabled: true
   Include:
-    - '**/*_spec.rb'
+    - "**/*_spec.rb"
 
 Ezcater/RspecRequireFeatureFlagMock:
-  Description: 'Enforce use of `mock_feature_flag` helpers instead of mocking `FeatureFlag.is_active?` directly.'
+  Description: "Enforce use of `mock_feature_flag` helpers instead of mocking `FeatureFlag.is_active?` directly."
   Enabled: true
   Include:
-    - '**/*_spec.rb'
+    - "**/*_spec.rb"
 
 Ezcater/RspecRequireHttpStatusMatcher:
-  Description: 'Use the HTTP status code matcher, like `expect(response).to have_http_status :bad_request`, rather than `expect(response.code).to eq 400`'
+  Description: "Use the HTTP status code matcher, like `expect(response).to have_http_status :bad_request`, rather than `expect(response.code).to eq 400`"
   Enabled: true
   Include:
-    - '**/*_spec.rb'
+    - "**/*_spec.rb"
 
 Ezcater/RequireGqlErrorHelpers:
-  Description: 'Use the helpers provided by `GQLErrors` instead of raising `GraphQL::ExecutionError` directly.'
+  Description: "Use the helpers provided by `GQLErrors` instead of raising `GraphQL::ExecutionError` directly."
   Enabled: true
 
 Ezcater/StyleDig:
-  Description: 'Recommend `dig` for deeply nested access.'
+  Description: "Recommend `dig` for deeply nested access."
   Enabled: true
   AutoCorrect: false
 
 Ezcater/RubyTimeout:
-  Description: 'Disallow use of `Timeout.timeout` because it is unsafe and can cause unexpected behavior.'
+  Description: "Disallow use of `Timeout.timeout` because it is unsafe and can cause unexpected behavior."
   Enabled: true

data/ezcater_rubocop.gemspec

@@ -44,15 +44,15 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.6"
 
-  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake", "~> 12.3"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.11"
   spec.add_development_dependency "rspec_junit_formatter"
-  spec.add_development_dependency "simplecov", "< 0.18.0"
+  spec.add_development_dependency "simplecov"
 
-  spec.add_runtime_dependency "parser", "!= 2.5.1.1"
-  spec.add_runtime_dependency "rubocop", "~> 0.81.0"
-  spec.add_runtime_dependency "rubocop-rails", "~> 2.5.2"
-  spec.add_runtime_dependency "rubocop-rspec", "~> 1.38.1"
+  spec.add_runtime_dependency "parser", ">= 2.6"
+  spec.add_runtime_dependency "rubocop", ">= 1.16.0", "< 2.0"
+  spec.add_runtime_dependency "rubocop-rails", ">= 2.10.1", "< 3.0"
+  spec.add_runtime_dependency "rubocop-rspec", ">= 2.3.0", "< 3.0"
 end

data/lib/ezcater_rubocop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EzcaterRubocop
-  VERSION = "2.4.0"
+  VERSION = "3.0.2"
 end

data/lib/rubocop/cop/ezcater/graphql_fields_naming.rb

@@ -40,7 +40,7 @@ module RuboCop
 
           return if includes_camelize?(node)
 
-          check_name(node, first_arg.value, node.first_argument.loc.expression)
+          check_name(node, first_arg.value, node.first_argument)
         end
 
         alias on_super on_send
@@ -65,8 +65,8 @@ module RuboCop
           node.children[1]
         end
 
-        def message(style)
-          format(MSG, style: style)
+        def message(msg_style)
+          format(MSG, style: msg_style)
         end
       end
     end

data/lib/rubocop/cop/ezcater/rspec_dot_not_self_dot.rb

@@ -24,29 +24,45 @@ module RuboCop
       #   end
 
       class RspecDotNotSelfDot < Cop
-        SELF_DOT_REGEXP = /["']self\./.freeze
-        COLON_COLON_REGEXP = /["'](\:\:)/.freeze
+        include RuboCop::RSpec::Language
+        extend RuboCop::RSpec::Language::NodePattern
+
+        RSPEC_EXAMPLE_PREFIXES = ["", "x", "f"].freeze
+        EXAMPLE_GROUP_IDENTIFIERS = (RSPEC_EXAMPLE_PREFIXES.map do |prefix|
+          %w(describe context feature).map { |identifier| "#{prefix}#{identifier}" }
+        end.flatten + %w(example_group)).freeze
+        EXAMPLE_IDENTIFIERS = (RSPEC_EXAMPLE_PREFIXES.map do |prefix|
+          %w(it specify example scenario).map { |identifier| "#{prefix}#{identifier}" }
+        end.flatten + %w(its focus skip)).freeze
+
+        SELF_DOT_REGEXP = /\Aself\./.freeze # rubocop:disable Style/RedundantFreeze
+        COLON_COLON_REGEXP = /\A(\:\:)/.freeze # rubocop:disable Style/RedundantFreeze
 
         SELF_DOT_MSG = 'Use ".<class method>" instead of "self.<class method>" for example group description.'
         COLON_COLON_MSG = 'Use ".<class method>" instead of "::<class method>" for example group description.'
 
-        def_node_matcher :example_group_match, <<-PATTERN
-          (send _ #{RuboCop::RSpec::Language::ExampleGroups::ALL.node_pattern_union} $_ ...)
+        def_node_matcher :example_group?, <<~PATTERN
+          (block
+            (send #rspec? {#{EXAMPLE_GROUP_IDENTIFIERS.map { |i| ":#{i}" }.join(' ')}}
+              (str ...) ...
+            ) ...
+          )
         PATTERN
 
-        def on_send(node)
-          example_group_match(node) do |doc|
-            if doc.source.match?(SELF_DOT_REGEXP)
-              add_offense(doc, location: :expression, message: SELF_DOT_MSG)
-            elsif doc.source.match?(COLON_COLON_REGEXP)
-              add_offense(doc, location: :expression, message: COLON_COLON_MSG)
-            end
+        def on_block(node)
+          return unless example_group?(node)
+
+          str_node = node.send_node.arguments[0]
+          if str_node.value.match?(SELF_DOT_REGEXP)
+            add_offense(str_node, location: :expression, message: SELF_DOT_MSG)
+          elsif str_node.value.match?(COLON_COLON_REGEXP)
+            add_offense(str_node, location: :expression, message: COLON_COLON_MSG)
           end
         end
 
         def autocorrect(node)
           lambda do |corrector|
-            experession_end = node.source.match?(COLON_COLON_REGEXP) ? 3 : 6
+            experession_end = node.source.match?("::") ? 3 : 6
             corrector.replace(Parser::Source::Range.new(node.source_range.source_buffer,
                                                         node.source_range.begin_pos + 1,
                                                         node.source_range.begin_pos + experession_end), ".")

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ezcater_rubocop
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 3.0.2
 platform: ruby
 authors:
 - ezCater, Inc
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -84,72 +84,90 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "!="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.1.1
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "!="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.1.1
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.16.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.81.0
+        version: 1.16.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.10.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.10.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.38.1
+        version: 2.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.38.1
+        version: 2.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: ezCater custom cops and shared configuration
 email:
 - engineering@ezcater.com
@@ -160,6 +178,7 @@ extra_rdoc_files: []
 files:
 - ".github/CODEOWNERS"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".tool-versions"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -192,7 +211,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -207,8 +226,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: ezCater custom cops and shared configuration
 test_files: []