ezcater_rubocop 6.1.1 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26eaaa7f867ad999360777e40da32e1a0e591e4906e4fadc9b23a4fb70189b94
-  data.tar.gz: 8d9fa27414f264d03cc0f5a15146aa563d23bbfdc9eddfb031fbddbe7557a617
+  metadata.gz: 21f4e7bbf647038e8c4908c7afd359289c8ddd66ed226c36321d19c339dc3894
+  data.tar.gz: d305ea39433fe93fc61a758743dbd3f173c61f1d1fcf182dfd50e8b444f6137d
 SHA512:
-  metadata.gz: 3fa02d546b7ce79d540d1d079937d36622635e3c2ddf800544ade72924ea9520ec1f592957653d20ec156fea1f042c49519487999a2da00ddcdfc7b15b46fcfe
-  data.tar.gz: f3869c5b24b6b8ae92878a10185e6403ce937d027c9b7eb8bd52f2a97fd6f402e443c86119039b44444d70ac2a1ebcb889f851ca589c34499b12503939e5ab56
+  metadata.gz: c438d47953e25c7504a53b2b4d422776827df177b3a88a13e2774329c53d50f8e4554fff20b7af6cb9c4b2d1b07dba64a15baa528f13fe75c7b8455dec321950
+  data.tar.gz: 8a31b06d99e472a02ba4018405c6fafcd65786893dbb8d03b8b76e61472dc2b0a4bee0da107da02ce0994f5bb62a82414daec6fcbdc38a2098d712d6932d7c24

data/CHANGELOG.md

@@ -6,6 +6,18 @@ 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`.
 
+## 7.1.0
+- Upgrade rubocop to v1 API (following guide [here](https://docs.rubocop.org/rubocop/v1_upgrade_notes.html)) to stop deprecation warnings in rubocop >=1.67.
+
+## 7.0.0
+
+- Drop support for ruby 2.6 & 3.0
+
+## 6.1.2
+
+- Disable `Naming/RescuedExceptionsVariableName` so exception variable names are less restrictive.
+
+
 ## 6.1.1
 
 - Lock `rubocop-rspec` below `v2.28.0` to avoid an upstream namespacing issue.

data/conf/rubocop.yml

@@ -50,6 +50,9 @@ Naming/MethodParameterName:
     - ex
     - id
 
+Naming/RescuedExceptionsVariableName:
+  Enabled: false
+
 Naming/VariableNumber:
   Enabled: false
 

data/conf/rubocop_gem.yml

@@ -2,7 +2,7 @@ inherit_from:
   - ../conf/rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.1
   Exclude:
     - 'vendor/bundle/**/*'
     - 'gemfiles/vendor/**/*' 

data/ezcater_rubocop.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   spec.executables << "circle_rubocop.rb"
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.6"
+  spec.required_ruby_version = ">= 3.1"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "pry-byebug"

data/lib/ezcater_rubocop/version.rb

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

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

@@ -18,7 +18,7 @@ module RuboCop
       #   # bad
       #   enforce_foo! if ENV["FOO_ENFORCED"] == "true"
       #
-      class DirectEnvCheck < Cop
+      class DirectEnvCheck < Base
         MSG = <<~END_MESSAGE.split("\n").join(" ")
           Use `Rails.configuration.x.<foo>` for env-backed configuration instead of inspecting `ENV`. Restricting
           environment variables references to be within application configuration makes it more obvious which env vars
@@ -31,7 +31,7 @@ module RuboCop
 
         def on_const(node)
           env_ref(node) do
-            add_offense(node, location: :expression, message: MSG)
+            add_offense(node.loc.expression, message: MSG)
           end
         end
       end

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

@@ -22,7 +22,7 @@ module RuboCop
       #   EzFF.active?(:symbol_name, tracking_id: "brand:12345")
       #   EzFF.active?(123, identifiers: ["user:12345"])
 
-      class FeatureFlagActive < Cop
+      class FeatureFlagActive < Base
         MSG = "`EzFF.active?` must be called with at least one of `tracking_id` or `identifiers`"
         FIRST_PARAM_MSG = "The first argument to `EzFF.active?` must be a string literal or a variable " \
         "or constant assigned to a string"
@@ -57,11 +57,11 @@ module RuboCop
           return unless method_call_matcher(node)
 
           if first_param_bad(node)
-            add_offense(node, location: :expression, message: FIRST_PARAM_MSG)
+            add_offense(node.loc.expression, message: FIRST_PARAM_MSG)
           end
 
           if ezff_active_one_arg(node) || !args_matcher(node)
-            add_offense(node, location: :expression, message: MSG)
+            add_offense(node.loc.expression, message: MSG)
           end
         end
       end

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

@@ -21,7 +21,7 @@ module RuboCop
       #   EzFF.at_100?("Foo::Bar && rm -rf * ")
       #   EzFF.active?("foo::bar", identifiers: ["user:1"])
       #   MY_FLAG="Foo:bar"
-      class FeatureFlagNameValid < Cop
+      class FeatureFlagNameValid < Base
         WHITESPACE = /\s/
         ISOLATED_COLON = /(?<!:):(?!:)/
         TRIPLE_COLON = /:::/
@@ -46,7 +46,7 @@ module RuboCop
           feature_flag_constant_assignment(node) do |const_name, flag_name|
             if const_name.end_with?("_FF", "_FLAG", "_FLAG_NAME", "_FEATURE_FLAG")
               errors = find_name_violations(flag_name)
-              add_offense(node, location: :expression, message: errors.join(", ")) if errors.any?
+              add_offense(node.loc.expression, message: errors.join(", ")) if errors.any?
             end
           end
         end
@@ -56,7 +56,7 @@ module RuboCop
 
           feature_flag_method_call(node) do |flag_name|
             errors = find_name_violations(flag_name)
-            add_offense(node, location: :expression, message: errors.join(", ")) if errors.any?
+            add_offense(node.loc.expression, message: errors.join(", ")) if errors.any?
           end
         end
 

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

@@ -3,7 +3,9 @@
 module RuboCop
   module Cop
     module Ezcater
-      class RailsConfiguration < Cop
+      class RailsConfiguration < Base
+        extend RuboCop::Cop::AutoCorrector
+
         MSG = "Use `Rails.configuration` instead of `Rails.application.config`."
         RAILS_CONFIGURATION = "Rails.configuration"
 
@@ -13,13 +15,9 @@ module RuboCop
 
         def on_send(node)
           rails_application_config(node) do
-            add_offense(node, location: :expression, message: MSG)
-          end
-        end
-
-        def autocorrect(node)
-          lambda do |corrector|
-            corrector.replace(node.source_range, RAILS_CONFIGURATION)
+            add_offense(node.loc.expression, message: MSG) do |corrector|
+              corrector.replace(node.source_range, RAILS_CONFIGURATION)
+            end
           end
         end
       end

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

@@ -21,7 +21,7 @@ module RuboCop
       #   # bad
       #   enforce_foo! if ENV["RAILS_ENV"] == "production"
       #
-      class RailsEnv < Cop
+      class RailsEnv < Base
         MSG = <<~END_MESSAGE.split("\n").join(" ")
           Use `Rails.configuration.x.<foo>` for env-backed configuration instead of inspecting `Rails.env`, so that
           configuration is more centralized and gives finer control. https://ezcater.atlassian.net/wiki/x/ZIChNg
@@ -33,7 +33,7 @@ module RuboCop
 
         def on_send(node)
           rails_env(node) do
-            add_offense(node, location: :expression, message: MSG)
+            add_offense(node.loc.expression, message: MSG)
           end
         end
       end

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

@@ -14,7 +14,9 @@ module RuboCop
       #   # bad
       #   ActiveRecord::Base.connection.execute("...")
       #
-      class RailsTopLevelSqlExecute < Cop
+      class RailsTopLevelSqlExecute < Base
+        extend RuboCop::Cop::AutoCorrector
+
         MSG = <<~END_MESSAGE.split("\n").join(" ")
           Use `execute` instead of `ActiveRecord::Base.connection.execute` in migrations. The latter is
           redundant and can bypass safety checks.
@@ -26,19 +28,15 @@ module RuboCop
 
         def on_send(node)
           ar_connection_execute(node) do
-            add_offense(node, location: :expression, message: MSG)
-          end
-        end
-
-        def autocorrect(node)
-          lambda do |corrector|
-            range = Parser::Source::Range.new(
-              node.source_range.source_buffer,
-              node.source_range.begin_pos,
-              node.source_range.end_pos
-            )
+            add_offense(node.loc.expression, message: MSG) do |corrector|
+              range = Parser::Source::Range.new(
+                node.source_range.source_buffer,
+                node.source_range.begin_pos,
+                node.source_range.end_pos
+              )
 
-            corrector.replace(range, "execute(#{node.last_argument.source})")
+              corrector.replace(range, "execute(#{node.last_argument.source})")
+            end
           end
         end
       end

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

@@ -13,7 +13,7 @@ module RuboCop
       #   # good
       #   raise OrderActionNotAllowed
 
-      class RequireCustomError < Cop
+      class RequireCustomError < Base
         MSG = "Use a custom error class that inherits from StandardError when raising an exception"
 
         def_node_matcher :raising_standard_or_argument_error,

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

@@ -19,7 +19,7 @@ module RuboCop
       #   # bad
       #   GraphQL::ExecutionError.new("An error occurred")
       #   GraphQL::ExecutionError.new("You can't access this", options: { status_code: 401 })
-      class RequireGqlErrorHelpers < Cop
+      class RequireGqlErrorHelpers < Base
         MSG = "Use the helpers provided by `GQLErrors` instead of raising `GraphQL::ExecutionError` directly."
 
         def_node_matcher :graphql_const?, <<~PATTERN
@@ -29,7 +29,7 @@ module RuboCop
         def on_const(node)
           return unless graphql_const?(node)
 
-          add_offense(node, location: :expression, message: MSG)
+          add_offense(node.loc.expression, message: MSG)
         end
       end
     end

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

@@ -23,9 +23,10 @@ module RuboCop
       #     ...
       #   end
 
-      class RspecDotNotSelfDot < Cop
+      class RspecDotNotSelfDot < Base
         include RuboCop::RSpec::Language
         extend RuboCop::RSpec::Language::NodePattern
+        extend RuboCop::Cop::AutoCorrector
 
         RSPEC_EXAMPLE_PREFIXES = ["", "x", "f"].freeze
         EXAMPLE_GROUP_IDENTIFIERS = (RSPEC_EXAMPLE_PREFIXES.map do |prefix|
@@ -53,19 +54,19 @@ module RuboCop
           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
+          message = if str_node.value.match?(SELF_DOT_REGEXP)
+                      SELF_DOT_MSG
+                    elsif str_node.value.match?(COLON_COLON_REGEXP)
+                      COLON_COLON_MSG
+                    end
 
-        def autocorrect(node)
-          lambda do |corrector|
-            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), ".")
+          if message
+            add_offense(str_node.loc.expression, message: message) do |corrector|
+              expression_end = str_node.source.match?("::") ? 3 : 6
+              corrector.replace(Parser::Source::Range.new(str_node.source_range.source_buffer,
+                                                          str_node.source_range.begin_pos + 1,
+                                                          str_node.source_range.begin_pos + expression_end), ".")
+            end
           end
         end
       end

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

@@ -14,7 +14,9 @@ module RuboCop
       #   # bad
       #   expect(foo).to eq([1, 2, 3])
       #   expect(foo).to eq [1, 2, 3]
-      class RspecMatchOrderedArray < Cop
+      class RspecMatchOrderedArray < Base
+        extend RuboCop::Cop::AutoCorrector
+
         MATCH_ORDERED_ARRAY = "match_ordered_array"
         MSG = "Use the `match_ordered_array` matcher from ezcater_matchers gem "\
           "instead of `eq` when comparing collections"
@@ -25,20 +27,16 @@ module RuboCop
 
         def on_send(node)
           eq_array(node) do
-            add_offense(node, location: :expression, message: MSG)
-          end
-        end
-
-        def autocorrect(node)
-          lambda do |corrector|
-            corrector.replace(
-              Parser::Source::Range.new(
-                node.source_range.source_buffer,
-                node.source_range.begin_pos,
-                node.source_range.begin_pos + 2
-              ),
-              MATCH_ORDERED_ARRAY
-            )
+            add_offense(node.loc.expression, message: MSG) do |corrector|
+              corrector.replace(
+                Parser::Source::Range.new(
+                  node.source_range.source_buffer,
+                  node.source_range.begin_pos,
+                  node.source_range.begin_pos + 2
+                ),
+                MATCH_ORDERED_ARRAY
+              )
+            end
           end
         end
       end

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

@@ -19,7 +19,7 @@ module RuboCop
       #   # bad
       #   allow(Browser).to receive...
       #   allow(EzBrowser).to receive...
-      class RspecRequireBrowserMock < Cop
+      class RspecRequireBrowserMock < Base
         MSG = "Use the mocks provided by `BrowserHelpers` instead of mocking `%<node_source>s`"
 
         def_node_matcher :browser_const?, <<~PATTERN
@@ -39,8 +39,7 @@ module RuboCop
 
           # Finish tree navigation to full line for highlighting
           match_node = match_node.parent while match_node.parent
-          add_offense(match_node,
-                      location: :expression,
+          add_offense(match_node.loc.expression,
                       message: format(MSG, node_source: node.source))
         end
 

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

@@ -15,7 +15,7 @@ module RuboCop
       #   allow(FeatureFlag).to receive(:is_active?).and_return(true)
       #   allow(FeatureFlag).to receive(:is_active?).with("MyFeatureFlag").and_return(true)
       #   allow(FeatureFlag).to receive(:is_active?).with("MyFeatureFlag", user: current_user).and_return(true)
-      class RspecRequireFeatureFlagMock < Cop
+      class RspecRequireFeatureFlagMock < Base
         MSG = "Use the `mock_feature_flag` helper instead of mocking `allow(FeatureFlag)`"
 
         def_node_matcher :feature_flag_const?, <<~PATTERN
@@ -35,7 +35,7 @@ module RuboCop
 
           # Finish tree navigation to full line for highlighting
           match_node = match_node.parent while match_node.parent
-          add_offense(match_node, location: :expression)
+          add_offense(match_node.loc.expression)
         end
 
         private

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

@@ -14,7 +14,7 @@ module RuboCop
       #   # bad
       #   expect(response.code).to eq 201
       #   expect(response.code).to eq 400
-      class RspecRequireHttpStatusMatcher < Cop
+      class RspecRequireHttpStatusMatcher < Base
         MSG = "Use the `have_http_status` matcher, like `expect(response).to have_http_status :bad_request`, "\
           "rather than `%<node_source>s`"
 
@@ -29,8 +29,7 @@ module RuboCop
         def on_send(node)
           return if !response_status_assertion(node) && !response_code_assertion(node)
 
-          add_offense(node,
-                      location: :expression,
+          add_offense(node.loc.expression,
                       message: format(MSG, node_source: node.source))
         end
       end

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

@@ -17,7 +17,7 @@ module RuboCop
       #     ...
       #   end
       #
-      class RubyTimeout < Cop
+      class RubyTimeout < Base
         MSG = <<~END_MESSAGE.split("\n").join(" ")
           `Timeout.timeout` is unsafe. Find an alternative to achieve the same goal.
            Ex. Use the timeout capabilities of a networking library.
@@ -30,7 +30,7 @@ module RuboCop
 
         def on_send(node)
           timeout(node) do
-            add_offense(node, location: :expression, message: MSG)
+            add_offense(node.loc.expression, message: MSG)
           end
         end
       end

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

@@ -16,7 +16,8 @@ module RuboCop
       #   my_hash['foo'] && my_hash['foo']['bar']
       #   my_array[0][1]
 
-      class StyleDig < Cop
+      class StyleDig < Base
+        extend RuboCop::Cop::AutoCorrector
         extend TargetRubyVersion
 
         minimum_target_ruby_version 2.3
@@ -33,22 +34,19 @@ module RuboCop
           match_node = node
           # walk to outermost access node
           match_node = match_node.parent while access_node?(match_node.parent)
-          add_offense(match_node, location: :expression, message: MSG)
-        end
 
-        def autocorrect(node)
-          access_node = node
-          source_args = [access_node.first_argument.source]
-          while access_node?(access_node.children.first)
-            access_node = access_node.children.first
-            source_args << access_node.first_argument.source
-          end
-          root_node = access_node.children.first
+          add_offense(match_node.loc.expression, message: MSG) do |corrector|
+            access_node = match_node
+            source_args = [access_node.first_argument.source]
+            while access_node?(access_node.children.first)
+              access_node = access_node.children.first
+              source_args << access_node.first_argument.source
+            end
+            root_node = access_node.children.first
 
-          lambda do |corrector|
-            range = Parser::Source::Range.new(node.source_range.source_buffer,
+            range = Parser::Source::Range.new(match_node.source_range.source_buffer,
                                               root_node.source_range.end_pos,
-                                              node.source_range.end_pos)
+                                              match_node.source_range.end_pos)
             corrector.replace(range, ".dig(#{source_args.reverse.join(', ')})")
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ezcater_rubocop
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 7.1.0
 platform: ruby
 authors:
 - ezCater, Inc
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-04 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -235,7 +235,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -243,7 +243,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -251,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.7
-signing_key:
+signing_key: 
 specification_version: 4
 summary: ezCater custom cops and shared configuration
 test_files: []