ezcater_rubocop 6.0.1 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5f12d0a1d9d61fff795e000706b9ef2d02b0d78c65e58a5563c3f11d8870148
-  data.tar.gz: 33e6a6d1dc61072834735eb38b1e894007c87d478c8f52175158943117c76136
+  metadata.gz: 144220e45db4ba03e7754c0f656cafe7650da1669157b65396c818762e7d9185
+  data.tar.gz: b1e19818de9418e2a822ef0d1a3c067870ed36d26c7addb6d831776b4590a25d
 SHA512:
-  metadata.gz: bf0a35365a2fa3d1b59683b589a6fbe9718920a0c971cf49ada9b2b75b99d1289d8c667424d29cd4153e81e6990e24f7f552de8d6d1351eae77b480a0166bc1a
-  data.tar.gz: 5cf74d0d428af4489ff699de87603f139c96df12ef07ee4c913554b31218f464d732724667e933bf16eebc6ab71b7ac85052ef36adef5f331ee2d18903daf184
+  metadata.gz: 6da4228e123e62619f9ac2e66f53e766cd8a15160f6362fc7e33009b39749028a6e1dd4d835caa8fa101afe71dc743f6947622e43d2d3530b1ee23b3e539fadc
+  data.tar.gz: 6cbe86a738c2567d5829b58b18cc23e13f05125b4c19ebd7ad41ddbcc5945cc08774740353708488e9c88235bdf85dc5f317f7654322255c8e9bcc10c4489076

data/.github/workflows/codeql.yml

@@ -0,0 +1,71 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "main" ]
+    # https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/customizing-code-scanning#avoiding-unnecessary-scans-of-pull-requests
+    paths-ignore:
+      - '**/*.md'
+      - '**/*.txt'
+  schedule:
+    - cron: '41 22 * * 5'
+
+jobs:
+  scan:
+    name: Scan
+    runs-on: [ ubuntu-latest ]
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      # Setting fail-fast to false to prevent a failed scan in
+      # any of the matrix.language's from stopping the other scans
+      # If there are multiple offenses, better to find/report them
+      # all at once
+      fail-fast: false
+      matrix:
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]      
+        # https://aka.ms/codeql-docs/language-support
+        language: [ 'ruby' ]
+        
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

data/.github/workflows/dependency-review.yml

@@ -0,0 +1,15 @@
+name: 'Dependency Review'
+on: [pull_request]
+permissions:
+  contents: read
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: Dependency Review
+        uses: actions/dependency-review-action@v3
+        with:
+          # Possible values: "critical", "high", "moderate", "low" 
+          fail-on-severity: high

data/CHANGELOG.md

@@ -6,6 +6,13 @@ 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`.
 
+## 6.0.3
+- Fix `FeatureFlagActive` cop so that it allows feature flag names to be constants and dot method calls in addition to strings.
+
+## 6.0.2
+- Upgrade rubocop-rspec to v2.22.0 to use the new FactoryBot namespaces.
+- Fix the following wrong namespaces related to `FactoryBot`: `RSpec/FactoryBot/AttributeDefinedStatically`, `RSpec/FactoryBot/CreateList` and `RSpec/FactoryBot/FactoryClassName`.
+
 ## 6.0.1
 - Fix a bug in the `FeatureFlagNameValid` cop where the titlecase regex matcher was incorrectly finding offenses.
 
@@ -13,7 +20,7 @@ Prior to v1.0.0 this gem was versioned based on the `MAJOR`.`MINOR` version of R
 - Add `FeatureFlagNameValid` cop to validate correct feature flag name format, [adopted from the cop](https://github.com/ezcater/ez-rails/blob/2d9272eb3d2c71dc5ebc2aa01a849cf9cfae3df2/cops/rubocop/cops/feature_flags_flag_name.rb_) in `ez-rails`.
 
 ## 5.2.1
-- Fix the has the wrong namespace for `RSpec/Capybara/CurrentPathExpectation` and `RSpec/Capybara/VisibilityMatcher` cops, since [they've been extracted](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md#2180-2023-01-16) into a separate repo [rubocop-capybara](https://github.com/rubocop/rubocop-capybara).
+- Fix the wrong namespace for `RSpec/Capybara/CurrentPathExpectation` and `RSpec/Capybara/VisibilityMatcher` cops, since [they've been extracted](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md#2180-2023-01-16) into a separate repo [rubocop-capybara](https://github.com/rubocop/rubocop-capybara).
 
 ## 5.2.0
 

data/conf/rubocop.yml

@@ -245,13 +245,13 @@ RSpec/Capybara/FeatureMethods:
 RSpec/EmptyHook:
   Enabled: true
 
-RSpec/FactoryBot/AttributeDefinedStatically:
+FactoryBot/AttributeDefinedStatically:
   Enabled: true
 
-RSpec/FactoryBot/CreateList:
+FactoryBot/CreateList:
   Enabled: true
 
-RSpec/FactoryBot/FactoryClassName:
+FactoryBot/FactoryClassName:
   Enabled: true
 
 RSpec/MultipleMemoizedHelpers:

data/ezcater_rubocop.gemspec

@@ -55,5 +55,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rubocop", ">= 1.16.0", "< 2.0"
   spec.add_runtime_dependency "rubocop-graphql", ">= 0.14.0", "< 1.0"
   spec.add_runtime_dependency "rubocop-rails", ">= 2.10.1", "< 3.0"
-  spec.add_runtime_dependency "rubocop-rspec", ">= 2.3.0", "< 3.0"
+  spec.add_runtime_dependency "rubocop-rspec", ">= 2.22.0", "< 3.0"
 end

data/lib/ezcater_rubocop/version.rb

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

data/lib/ezcater_rubocop.rb

@@ -23,6 +23,7 @@ require "rubocop/cop/ezcater/rails_configuration"
 require "rubocop/cop/ezcater/rails_env"
 require "rubocop/cop/ezcater/ruby_timeout"
 require "rubocop/cop/ezcater/rails_top_level_sql_execute"
+require "rubocop/cop/ezcater/require_custom_error"
 require "rubocop/cop/ezcater/require_gql_error_helpers"
 require "rubocop/cop/ezcater/rspec_match_ordered_array"
 require "rubocop/cop/ezcater/rspec_require_browser_mock"

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

@@ -12,15 +12,20 @@ module RuboCop
       #   EzFF.active?("FlagName", identifiers: ["user:12345", "user:23456"])
       #   EzFF.active?(defined_flag_name_var, tracking_id: "brand:12345")
       #   EzFF.active?(@flag_name_ivar, tracking_id: "brand:12345")
+      #   EzFF.active?(CONSTANT_NAME, tracking_id: "brand:12345")
+      #   EzFF.active?(config.flag_name, tracking_id: "brand:12345")
       #
       #   # bad
       #   EzFF.active?("FlagName")
       #   EzFF.active?(defined_flag_name_var)
       #   EzFF.active?(@flag_name_ivar)
+      #   EzFF.active?(:symbol_name, tracking_id: "brand:12345")
+      #   EzFF.active?(123, identifiers: ["user:12345"])
 
       class FeatureFlagActive < Cop
         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 or predefined variable"
+        FIRST_PARAM_MSG = "The first argument to `EzFF.active?` must be a string literal or a variable " \
+        "or constant assigned to a string"
 
         def_node_matcher :ezff_active_one_arg, <<-PATTERN
           (send
@@ -30,7 +35,7 @@ module RuboCop
         def_node_matcher :args_matcher, <<-PATTERN
           (send
             (_ _ {:EzFF :EzcaterFeatureFlag}) :active?
-              ${str lvar ivar}
+              $_
               (_
                 (pair
                   (sym {:tracking_id :identifiers})
@@ -38,9 +43,9 @@ module RuboCop
                 ...))
         PATTERN
 
-        def_node_matcher :first_param_good, <<-PATTERN
+        def_node_matcher :first_param_bad, <<-PATTERN
           (send
-            (_ _ {:EzFF :EzcaterFeatureFlag}) :active? ${str lvar ivar} ...)
+            (_ _ {:EzFF :EzcaterFeatureFlag}) :active? ${sym int} ...)
         PATTERN
 
         def_node_matcher :method_call_matcher, <<-PATTERN
@@ -51,7 +56,7 @@ module RuboCop
         def on_send(node)
           return unless method_call_matcher(node)
 
-          if !first_param_good(node)
+          if first_param_bad(node)
             add_offense(node, location: :expression, message: FIRST_PARAM_MSG)
           end
 

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Ezcater
+      # Checks for `raise` on `StandardError` and `ArgumentError`.
+      # We want to be explicit about the error we're raising and use a custom error
+      #
+      # @example
+      #   # bad
+      #   raise StandardError, "You can't do that"
+      #
+      #   # good
+      #   raise OrderActionNotAllowed
+
+      class RequireCustomError < Cop
+        MSG = "Use a custom error class that inherits from StandardError when raising an exception"
+
+        def_node_matcher :raising_standard_or_argument_error,
+                         "(send nil? {:raise :fail} (const nil? {:StandardError :ArgumentError} ...) ...)"
+
+        def_node_matcher :initializing_standard_or_argument_error,
+                         "(send nil? {:raise :fail} (send (const nil? {:StandardError :ArgumentError} ...) ...))"
+
+        def on_send(node)
+          raising_standard_or_argument_error(node) do
+            add_offense(node, message: format(MSG))
+          end
+
+          initializing_standard_or_argument_error(node) do
+            add_offense(node, message: format(MSG))
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ezcater_rubocop
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.3
 platform: ruby
 authors:
 - ezCater, Inc
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-02 00:00:00.000000000 Z
+date: 2023-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -174,7 +174,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.22.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -184,7 +184,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.22.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -198,6 +198,8 @@ extra_rdoc_files: []
 files:
 - ".github/CODEOWNERS"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/codeql.yml"
+- ".github/workflows/dependency-review.yml"
 - ".tool-versions"
 - CHANGELOG.md
 - Gemfile
@@ -217,6 +219,7 @@ files:
 - lib/rubocop/cop/ezcater/rails_configuration.rb
 - lib/rubocop/cop/ezcater/rails_env.rb
 - lib/rubocop/cop/ezcater/rails_top_level_sql_execute.rb
+- lib/rubocop/cop/ezcater/require_custom_error.rb
 - lib/rubocop/cop/ezcater/require_gql_error_helpers.rb
 - lib/rubocop/cop/ezcater/rspec_dot_not_self_dot.rb
 - lib/rubocop/cop/ezcater/rspec_match_ordered_array.rb