rubocop-shopify 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0885f64f2574e1f3db7bb466fb9dcdbc1c0f1fbaf29336c209e666b10fc9104b'
-  data.tar.gz: b0a2e7bbef8f68e98c15348689d1c20433ea2da70c7727146b095028ae22992d
+  metadata.gz: f94416de0fd49d1bac517f3d0e252ec142e57ddd4dd1e54ca7ca9bfff450c225
+  data.tar.gz: c3df65a2baf8b2ea61d4a654cb87f79059f0c0bb6b228094745c869037ad2263
 SHA512:
-  metadata.gz: e352f773f31c7846508a1033019a098a7d45f72220a4ca55c81f5be24e1b74e1d5f53f61bbbff03311d62f5c495e7236aa9d8502ad0eb1bac0d4cafceb6fed45
-  data.tar.gz: 5c6ca00c17a0a0c465bb2093368fd37fc473a807f6b7db21eaddd57d1aa1aaab4a149304a92f256b2b3abf6500eebf481abaed6d406b5ea464ebd4b085f7a43f
+  metadata.gz: 7bdf223592a04d7258d54952d716099729eb89f84c85c91ce4d3dfaf98edb5d59cce9e508278b81a8ef5cc0d15f5414a08e4ab6a3ad5826a61c261c47810d29c
+  data.tar.gz: 6b3574852de0cccc719e9cbf89090fd4c6184fdfe5c19059ed9c3b7004d6de8b8fcffec29b3a04604ab092b32f1eabda2fbc85a81e3d45a8d5a9faf434c6e8b0

data/lib/rubocop/shopify/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Shopify
-    VERSION = "3.0.2"
+    VERSION = "3.1.0"
   end
 end

data/lib/rubocop-shopify.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
+require "rubocop"
 require "rubocop/shopify/version"
 require "rubocop/shopify/plugin"
 
-require "rubocop/cop/lint/no_return_in_memoization"
-require "rubocop/cop/style/proc_case_when"
+RuboCop::Cop::Lint.register_cop :NoReturnInMemoization, "#{__dir__}/rubocop/cop/lint/no_return_in_memoization"
+RuboCop::Cop::Style.register_cop :ProcCaseWhen, "#{__dir__}/rubocop/cop/style/proc_case_when"

data/lib/tasks/config.rake

@@ -8,6 +8,16 @@ namespace :config do
     file = "rubocop.yml"
     target = args.fetch(:target, "test/fixtures/full_config.yml")
 
+    # Reset the default configuration and loaded plugins so that plugins loaded
+    # as side effects of running tests (e.g. rubocop-minitest's
+    # AssertOffense#integrate_plugins!) do not leak into the dump. Without this,
+    # integrate_plugins! injects all installed lint_roller plugins into the
+    # global default_configuration, and a prior load_file("rubocop.yml") marks
+    # rubocop-shopify as already loaded so resolve_plugins skips re-injecting it
+    # after the reset. Both are lazily rebuilt on the next access.
+    RuboCop::ConfigLoader.instance_variable_set(:@default_configuration, nil)
+    RuboCop::ConfigLoader.loaded_plugins.clear
+
     file_config = RuboCop::ConfigLoader.load_file(file)
     config = RuboCop::ConfigLoader.merge_with_default(file_config, file)
     output = config.to_h.to_yaml.gsub(config.base_dir_for_path_parameters, "")

data/rubocop.yml

@@ -23,10 +23,8 @@ Bundler/OrderedGems:
 Gemspec/AddRuntimeDependency:
   Enabled: false
 
-<% if rubocop_version >= '1.77' %>
 Gemspec/AttributeAssignment:
   Enabled: true
-<% end %>
 
 Gemspec/DeprecatedAttributeAssignment:
   Enabled: true
@@ -79,10 +77,8 @@ Layout/EmptyLineAfterGuardClause:
 Layout/EmptyLines:
   Enabled: false
 
-<% if rubocop_version >= '1.79' %>
 Layout/EmptyLinesAfterModuleInclusion:
   Enabled: false
-<% end %>
 
 Layout/EndAlignment:
   Enabled: false
@@ -189,6 +185,11 @@ Lint/AmbiguousRange:
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
 
+<% if rubocop_version >= "1.91.0" %>
+Lint/ArgumentMismatch:
+  Enabled: false
+<% end %>
+
 Lint/ArrayLiteralInRegexp:
   Enabled: false
 
@@ -207,17 +208,15 @@ Lint/ConstantOverwrittenInRescue:
 Lint/ConstantReassignment:
   Enabled: true
 
-Lint/CopDirectiveSyntax:
-  Enabled: true
-
-<% if rubocop_version >= "1.85" %>
 Lint/DataDefineOverride:
   Enabled: true
-<% end %>
 
 Lint/DeprecatedConstants:
   Enabled: false
 
+Lint/DeprecatedReference:
+  Enabled: false
+
 Lint/DuplicateBranch:
   Enabled: false
 
@@ -293,6 +292,11 @@ Lint/LiteralAssignmentInCondition:
 Lint/Loop:
   Enabled: false
 
+<% if rubocop_version >= "1.91.0" %>
+Lint/MisplacedMagicComment:
+  Enabled: false
+<% end %>
+
 Lint/MissingSuper:
   Enabled: false
 
@@ -302,6 +306,9 @@ Lint/MixedCaseRange:
 Lint/MixedRegexpCaptureTypes:
   Enabled: false
 
+Lint/NameTypo:
+  Enabled: false
+
 Lint/NoReturnInBeginEndBlocks:
   Enabled: false
 
@@ -392,17 +399,17 @@ Lint/ShadowedArgument:
 Lint/ShadowedException:
   Enabled: false
 
-<% if rubocop_version < "1.76" %>
-Lint/ShadowingOuterLocalVariable:
-  Enabled: false
-<% end %>
-
 Lint/SharedMutableDefault:
   Enabled: false
 
 Lint/StructNewOverride:
   Enabled: false
 
+<% if rubocop_version >= "1.91.0" %>
+Lint/SuperArgumentMismatch:
+  Enabled: false
+<% end %>
+
 Lint/SuppressedException:
   Enabled: false
 
@@ -445,10 +452,8 @@ Lint/UnreachableCode:
 Lint/UnreachableLoop:
   Enabled: false
 
-<% if rubocop_version >= "1.85" %>
 Lint/UnreachablePatternBranch:
   Enabled: true
-<% end %>
 
 Lint/UnusedBlockArgument:
   Enabled: false
@@ -471,10 +476,8 @@ Lint/UselessAssignment:
 Lint/UselessConstantScoping:
   Enabled: false
 
-<% if rubocop_version >= "1.76" %>
 Lint/UselessDefaultValueArgument:
   Enabled: true
-<% end %>
 
 Lint/UselessDefined:
   Enabled: false
@@ -488,10 +491,8 @@ Lint/UselessMethodDefinition:
 Lint/UselessNumericOperation:
   Enabled: false
 
-<% if rubocop_version >= "1.76" %>
 Lint/UselessOr:
   Enabled: true
-<% end %>
 
 Lint/UselessRescue:
   Enabled: false
@@ -563,16 +564,10 @@ Naming/MemoizedInstanceVariableName:
 Naming/MethodParameterName:
   MinNameLength: 1
 
-<% if rubocop_version >= "1.76" %>
 Naming/PredicateMethod:
   Enabled: false
-<% end %>
 
-<% if rubocop_version >= "1.76" %>
 Naming/PredicatePrefix:
-<% else %>
-Naming/PredicateName:
-<% end %>
   Enabled: false
   NamePrefix:
   - is_
@@ -632,10 +627,8 @@ Style/ArrayCoercion:
 Style/ArrayIntersect:
   Enabled: false
 
-<% if rubocop_version >= '1.81' %>
 Style/ArrayIntersectWithSingleElement:
   Enabled: false
-<% end %>
 
 Style/ArrayJoin:
   Enabled: false
@@ -679,10 +672,8 @@ Style/ClassMethodsDefinitions:
 Style/CollectionCompact:
   Enabled: false
 
-<% if rubocop_version >= '1.77' %>
 Style/CollectionQuerying:
   Enabled: false
-<% end %>
 
 Style/CombinableDefined:
   Enabled: true
@@ -700,10 +691,8 @@ Style/CommentAnnotation:
 Style/CommentedKeyword:
   Enabled: false
 
-<% if rubocop_version >= "1.74" %>
 Style/ComparableBetween:
   Enabled: false
-<% end %>
 
 Style/ComparableClamp:
   Enabled: false
@@ -726,14 +715,21 @@ Style/Dir:
 Style/DirEmpty:
   Enabled: false
 
+<% if rubocop_version >= "1.91.0" %>
+Style/DirectiveScope:
+  Enabled: false
+<% end %>
+
 Style/DocumentDynamicEvalDefinition:
   Enabled: false
 
 Style/Documentation:
   Enabled: false
 
+<% if rubocop_version < "1.91.0" %>
 Style/DoubleCopDisableDirective:
   Enabled: false
+<% end %>
 
 Style/DoubleNegation:
   Enabled: false
@@ -750,10 +746,8 @@ Style/EmptyBlockParameter:
 Style/EmptyCaseCondition:
   Enabled: false
 
-<% if rubocop_version >= "1.84" %>
 Style/EmptyClassDefinition:
   Enabled: false
-<% end %>
 
 Style/EmptyElse:
   Enabled: false
@@ -771,10 +765,8 @@ Style/EmptyLiteral:
 Style/EmptyMethod:
   Enabled: false
 
-<% if rubocop_version >= "1.76" %>
 Style/EmptyStringInsideInterpolation:
   Enabled: false
-<% end %>
 
 Style/Encoding:
   Enabled: false
@@ -815,10 +807,8 @@ Style/FileEmpty:
 Style/FileNull:
   Enabled: false
 
-<% if rubocop_version >= "1.85" %>
 Style/FileOpen:
   Enabled: false
-<% end %>
 
 Style/FileRead:
   Enabled: false
@@ -866,10 +856,8 @@ Style/HashEachMethods:
 Style/HashExcept:
   Enabled: false
 
-<% if rubocop_version >= "1.75" %>
 Style/HashFetchChain:
   Enabled: false
-<% end %>
 
 Style/HashLikeCase:
   Enabled: false
@@ -913,10 +901,8 @@ Style/InverseMethods:
 Style/ItAssignment:
   Enabled: false
 
-<% if rubocop_version >= "1.75" %>
 Style/ItBlockParameter:
   Enabled: false
-<% end %>
 
 Style/KeywordArgumentsMerging:
   Enabled: false
@@ -943,10 +929,8 @@ Style/MapCompactWithConditionalBlock:
 Style/MapIntoArray:
   Enabled: false
 
-<% if rubocop_version >= "1.85" %>
 Style/MapJoin:
   Enabled: true
-<% end %>
 
 Style/MapToHash:
   Enabled: false
@@ -987,10 +971,8 @@ Style/ModuleFunction:
   Enabled: false
   EnforcedStyle: extend_self
 
-<% if rubocop_version >= "1.82" %>
 Style/ModuleMemberExistenceCheck:
   Enabled: true
-<% end %>
 
 Style/MultilineBlockChain:
   Enabled: false
@@ -1028,10 +1010,8 @@ Style/NegatedUnless:
 Style/NegatedWhile:
   Enabled: false
 
-<% if rubocop_version >= "1.84" %>
 Style/NegativeArrayIndex:
   Enabled: true
-<% end %>
 
 Style/NestedFileDirname:
   Enabled: false
@@ -1078,10 +1058,8 @@ Style/NumericPredicate:
 Style/ObjectThen:
   Enabled: false
 
-<% if rubocop_version >= "1.85" %>
 Style/OneClassPerFile:
   Enabled: false
-<% end %>
 
 Style/OneLineConditional:
   Enabled: false
@@ -1107,10 +1085,8 @@ Style/ParallelAssignment:
 Style/ParenthesesAroundCondition:
   Enabled: false
 
-<% if rubocop_version >= "1.85" %>
 Style/PartitionInsteadOfDoubleSelect:
   Enabled: false
-<% end %>
 
 Style/PercentLiteralDelimiters:
   Enabled: false
@@ -1121,10 +1097,8 @@ Style/PercentQLiterals:
 Style/PerlBackrefs:
   Enabled: false
 
-<% if rubocop_version >= "1.85" %>
 Style/PredicateWithKind:
   Enabled: false
-<% end %>
 
 Style/PreferredHashMethods:
   Enabled: false
@@ -1141,10 +1115,8 @@ Style/RaiseArgs:
 Style/RandomWithOffset:
   Enabled: false
 
-<% if rubocop_version >= "1.85" %>
 Style/ReduceToHash:
-  Enabled: true
-<% end %>
+  Enabled: false
 
 Style/RedundantArgument:
   Enabled: false
@@ -1152,10 +1124,8 @@ Style/RedundantArgument:
 Style/RedundantArrayConstructor:
   Enabled: false
 
-<% if rubocop_version >= "1.76" %>
 Style/RedundantArrayFlatten:
   Enabled: true
-<% end %>
 
 Style/RedundantAssignment:
   Enabled: false
@@ -1211,10 +1181,8 @@ Style/RedundantInterpolationUnfreeze:
 Style/RedundantLineContinuation:
   Enabled: false
 
-<% if rubocop_version >= "1.85" %>
 Style/RedundantMinMaxBy:
   Enabled: true
-<% end %>
 
 Style/RedundantParentheses:
   Enabled: false
@@ -1231,9 +1199,6 @@ Style/RedundantRegexpCharacterClass:
 Style/RedundantRegexpConstructor:
   Enabled: false
 
-Style/RedundantRegexpEscape:
-  Enabled: false
-
 Style/RedundantSelf:
   Enabled: false
 
@@ -1265,10 +1230,8 @@ Style/RescueStandardError:
 Style/ReturnNilInPredicateMethodDefinition:
   Enabled: false
 
-<% if rubocop_version >= "1.84" %>
 Style/ReverseFind:
   Enabled: false
-<% end %>
 
 Style/SafeNavigation:
   Enabled: false
@@ -1279,15 +1242,11 @@ Style/SafeNavigationChainLength:
 Style/Sample:
   Enabled: false
 
-<% if rubocop_version >= "1.85" %>
 Style/SelectByKind:
   Enabled: true
-<% end %>
 
-<% if rubocop_version >= "1.85" %>
 Style/SelectByRange:
   Enabled: true
-<% end %>
 
 Style/SelectByRegexp:
   Enabled: false
@@ -1359,14 +1318,17 @@ Style/SymbolArray:
 Style/SymbolProc:
   Enabled: false
 
-<% if rubocop_version >= "1.85" %>
 Style/TallyMethod:
   Enabled: true
-<% end %>
 
 Style/TernaryParentheses:
   Enabled: false
 
+<% if rubocop_version >= "1.91.0" %>
+Style/TimeNow:
+  Enabled: false
+<% end %>
+
 Style/TrailingCommaInArguments:
   Enabled: false
   EnforcedStyleForMultiline: comma

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-shopify
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Shopify Engineering
@@ -15,20 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.72'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.72.1
+        version: '1.89'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.72'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.72.1
+        version: '1.89'
 - !ruby/object:Gem::Dependency
   name: lint_roller
   requirement: !ruby/object:Gem::Requirement
@@ -64,7 +58,7 @@ homepage: https://shopify.github.io/ruby-style-guide/
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/Shopify/ruby-style-guide/tree/v3.0.2
+  source_code_uri: https://github.com/Shopify/ruby-style-guide/tree/v3.1.0
   allowed_push_host: https://rubygems.org
   default_lint_roller_plugin: RuboCop::Shopify::Plugin
 rdoc_options: []