rubocop-shopify 2.15.0 → 2.16.0

data/lib/rubocop/shopify/gem_version_string_comparable_backport.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# This is true for Ruby 3.2+, so once support for 3.1 is dropped, we can remove this.
+# Until then, some installations may have a recent enough version of RubyGems, but it is not guaranteed.
+return if Gem::Version.new(Gem::VERSION) >= Gem::Version.new("3.5.6")
+
+module RuboCop
+  module Shopify
+    # Backport rubygems/rubygems#5275, so we can compare `Gem::Version`s directly against `String`s.
+    #
+    #     Gem::Version.new("1.2.3") > "1.2"
+    #
+    # Without this, to support Ruby < 3.2, we would have to create a new `Gem::Version` instance ourselves.
+    #
+    #     Gem::Version.new("1.2.3") > Gem::Version.new("1.2")
+    #
+    # This would get very verbose in our RuboCop config files.
+    module GemVersionStringComparableBackport
+      def <=>(other)
+        return self <=> self.class.new(other) if (String === other) && self.class.correct?(other)
+
+        super
+      end
+
+      Gem::Version.prepend(self)
+    end
+  end
+end

data/lib/tasks/config.rake

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "rubocop"
+
+namespace :config do
+  desc "Dump the full RuboCop config as a YAML file for testing"
+  task :dump, [:target] do |_task, args|
+    file = "rubocop.yml"
+    target = args.fetch(:target, "test/fixtures/full_config.yml")
+
+    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, "")
+
+    # Removing trailing whitespaces from each line due to older libyaml versions
+    # converting nil hash values into whitespaces. GitHub actions is still stuck
+    # with libyaml < 0.2.5. This line can be removed once it is upgraded. Psych
+    # can be used to check for the running libyaml version:
+    #
+    # ```ruby
+    # require "psych"
+    # puts Psych::LIBYAML_VERSION
+    # ```
+    #
+    # For more info, see: https://github.com/yaml/libyaml/pull/186
+    output.gsub!(/\s\n/, "\n")
+
+    File.write(target, output)
+  end
+end

data/rubocop-cli.yml

@@ -10,9 +10,6 @@ AllCops:
   Exclude:
     - 'vendor/**/*'
 
-  # Mac OS Catalina ships with 2.6.3
-  TargetRubyVersion: 2.6
-
 # We disable this at entrypoint.
 # Due to CLI apps being invoked via an entry point,
 # we can exclude this from all files

data/rubocop.yml

@@ -16,6 +16,11 @@ AllCops:
 Bundler/OrderedGems:
   Enabled: false
 
+<% if rubocop_version >= "1.65" %>
+Gemspec/AddRuntimeDependency:
+  Enabled: false
+<% end %>
+
 Gemspec/DeprecatedAttributeAssignment:
   Enabled: true
 
@@ -60,6 +65,11 @@ Layout/FirstMethodArgumentLineBreak:
 Layout/HashAlignment:
   EnforcedLastArgumentHashStyle: ignore_implicit
 
+<% if rubocop_version >= "1.67" %>
+Layout/LeadingCommentSpace:
+  AllowRBSInlineAnnotation: true
+<% end %>
+
 Layout/LineContinuationLeadingSpace:
   Enabled: true
 
@@ -111,6 +121,11 @@ Lint/AmbiguousOperatorPrecedence:
 Lint/AmbiguousRange:
   Enabled: false
 
+<% if rubocop_version >= "1.71" %>
+Lint/ArrayLiteralInRegexp:
+  Enabled: false
+<% end %>
+
 Lint/BooleanSymbol:
   Enabled: false
 
@@ -120,6 +135,16 @@ Lint/ConstantDefinitionInBlock:
 Lint/ConstantOverwrittenInRescue:
   Enabled: true
 
+<% if rubocop_version >= "1.70" %>
+Lint/ConstantReassignment:
+  Enabled: false
+<% end %>
+
+<% if rubocop_version >= "1.72" %>
+Lint/CopDirectiveSyntax:
+  Enabled: false
+<% end %>
+
 Lint/DeprecatedConstants:
   Enabled: false
 
@@ -150,6 +175,11 @@ Lint/DuplicateRequire:
 Lint/DuplicateRescueException:
   Enabled: false
 
+<% if rubocop_version >= "1.67" %>
+Lint/DuplicateSetElement:
+  Enabled: false
+<% end %>
+
 Lint/EmptyBlock:
   Enabled: false
 
@@ -180,6 +210,11 @@ Lint/FloatComparison:
 Lint/HashCompareByIdentity:
   Enabled: false
 
+<% if rubocop_version >= "1.69" %>
+Lint/HashNewWithKeywordArgumentsAsDefault:
+  Enabled: false
+<% end %>
+
 Lint/IdentityComparison:
   Enabled: false
 
@@ -189,23 +224,17 @@ Lint/IncompatibleIoSelectWithFiberScheduler:
 Lint/InterpolationCheck:
   Enabled: false
 
-<% if rubocop_version >= "1.59" %>
 Lint/ItWithoutArgumentsInBlock:
   Enabled: true
-<% end %>
 
 Lint/LambdaWithoutLiteralBlock:
   Enabled: false
 
-<% if rubocop_version >= "1.58" %>
 Lint/LiteralAssignmentInCondition:
   Enabled: true
-<% end %>
 
-<% if rubocop_version >= "1.53" %>
 Lint/MixedCaseRange:
   Enabled: true
-<% end %>
 
 Lint/MixedRegexpCaptureTypes:
   Enabled: false
@@ -228,6 +257,11 @@ Lint/NonDeterministicRequireOrder:
 Lint/NumberedParameterAssignment:
   Enabled: false
 
+<% if rubocop_version >= "1.69" %>
+Lint/NumericOperationWithConstantResult:
+  Enabled: false
+<% end %>
+
 Lint/OrAssignmentToConstant:
   Enabled: false
 
@@ -240,10 +274,8 @@ Lint/RaiseException:
 Lint/RedundantDirGlobSort:
   Enabled: false
 
-<% if rubocop_version >= "1.53" %>
 Lint/RedundantRegexpQuantifiers:
   Enabled: true
-<% end %>
 
 Lint/RedundantRequireStatement:
   Enabled: false
@@ -251,6 +283,11 @@ Lint/RedundantRequireStatement:
 Lint/RedundantSafeNavigation:
   Enabled: false
 
+<% if rubocop_version >= "1.72" %>
+Lint/RedundantTypeConversion:
+  Enabled: false
+<% end %>
+
 Lint/RedundantWithIndex:
   Enabled: false
 
@@ -296,9 +333,19 @@ Lint/ShadowedArgument:
 Lint/ShadowingOuterLocalVariable:
   Enabled: false
 
+<% if rubocop_version >= "1.70" %>
+Lint/SharedMutableDefault:
+  Enabled: false
+<% end %>
+
 Lint/StructNewOverride:
   Enabled: false
 
+<% if rubocop_version >= "1.72" %>
+Lint/SuppressedExceptionInNumberConversion:
+  Enabled: false
+<% end %>
+
 Lint/SymbolConversion:
   Enabled: false
 
@@ -317,6 +364,11 @@ Lint/TrailingCommaInAttributeDeclaration:
 Lint/TripleQuotes:
   Enabled: false
 
+<% if rubocop_version >= "1.68" %>
+Lint/UnescapedBracketInRegexp:
+  Enabled: false
+<% end %>
+
 Lint/UnexpectedBlockArity:
   Enabled: false
 
@@ -335,9 +387,24 @@ Lint/UriEscapeUnescape:
 Lint/UriRegexp:
   Enabled: false
 
+<% if rubocop_version >= "1.72" %>
+Lint/UselessConstantScoping:
+  Enabled: false
+<% end %>
+
+<% if rubocop_version >= "1.69" %>
+Lint/UselessDefined:
+  Enabled: false
+<% end %>
+
 Lint/UselessMethodDefinition:
   Enabled: false
 
+<% if rubocop_version >= "1.66" %>
+Lint/UselessNumericOperation:
+  Enabled: false
+<% end %>
+
 Lint/UselessRescue:
   Enabled: true
 
@@ -389,21 +456,6 @@ Naming/HeredocDelimiterCase:
 Naming/HeredocDelimiterNaming:
   Enabled: false
 
-Naming/InclusiveLanguage:
-  Enabled: true
-  FlaggedTerms:
-    master:
-      Suggestions:
-        - main
-        - primary
-        - leader
-      AllowedRegex:
-        - !ruby/regexp '/master[_\s\.]key/' # Rails master key
-        - !ruby/regexp /\w*:\/\/\S+/ # URLs (e.g. https://github.com/org/repo/blob/master/README.md)
-        - !ruby/regexp '/(?:blob|tree)/master/' # e.g. github.com/org/repo/blob/master/README.md, without https://
-        - !ruby/regexp '/origin[ \/]master/' # Legacy default git branch name
-        - !ruby/regexp '/(?<=[a-z])master|master(?=[a-z])/' # "master" substring within a longer word
-
 Naming/MemoizedInstanceVariableName:
   Enabled: false
 
@@ -447,6 +499,11 @@ Style/AccessorGrouping:
 Style/Alias:
   EnforcedStyle: prefer_alias_method
 
+<% if rubocop_version >= "1.68" %>
+Style/AmbiguousEndlessMethodDefinition:
+  Enabled: false
+<% end %>
+
 Style/ArgumentsForwarding:
   Enabled: false
 
@@ -456,6 +513,11 @@ Style/ArrayIntersect:
 Style/BisectedAttrAccessor:
   Enabled: false
 
+<% if rubocop_version >= "1.68" %>
+Style/BitwisePredicate:
+  Enabled: false
+<% end %>
+
 Style/CaseEquality:
   AllowOnConstant: true
   AllowOnSelfClass: true
@@ -476,6 +538,11 @@ Style/CollectionCompact:
 Style/ColonMethodDefinition:
   Enabled: false
 
+<% if rubocop_version >= "1.68" %>
+Style/CombinableDefined:
+  Enabled: false
+<% end %>
+
 Style/CombinableLoops:
   Enabled: false
 
@@ -497,6 +564,11 @@ Style/DataInheritance:
 Style/DateTime:
   Enabled: true
 
+<% if rubocop_version >= "1.69" %>
+Style/DigChain:
+  Enabled: false
+<% end %>
+
 Style/Dir:
   Enabled: false
 
@@ -554,9 +626,19 @@ Style/FetchEnvVar:
 Style/FileEmpty:
   Enabled: true
 
+<% if rubocop_version >= "1.69" %>
+Style/FileNull:
+  Enabled: false
+<% end %>
+
 Style/FileRead:
   Enabled: false
 
+<% if rubocop_version >= "1.69" %>
+Style/FileTouch:
+  Enabled: false
+<% end %>
+
 Style/FileWrite:
   Enabled: false
 
@@ -591,8 +673,10 @@ Style/HashExcept:
 Style/HashLikeCase:
   Enabled: false
 
-Style/HashSyntax:
-  EnforcedShorthandSyntax: either
+<% if rubocop_version >= "1.71" %>
+Style/HashSlice:
+  Enabled: false
+<% end %>
 
 Style/HashTransformKeys:
   Enabled: false
@@ -615,6 +699,16 @@ Style/InverseMethods:
 Style/InvertibleUnlessCondition:
   Enabled: true
 
+<% if rubocop_version >= "1.70" %>
+Style/ItAssignment:
+  Enabled: false
+<% end %>
+
+<% if rubocop_version >= "1.68" %>
+Style/KeywordArgumentsMerging:
+  Enabled: false
+<% end %>
+
 Style/KeywordParametersOrder:
   Enabled: false
 
@@ -628,6 +722,11 @@ Style/MagicCommentFormat:
 Style/MapCompactWithConditionalBlock:
   Enabled: false
 
+<% if rubocop_version >= "1.63" %>
+Style/MapIntoArray:
+  Enabled: false
+<% end %>
+
 Style/MapToHash:
   Enabled: false
 
@@ -730,10 +829,8 @@ Style/RandomWithOffset:
 Style/RedundantArgument:
   Enabled: false
 
-<% if rubocop_version >= "1.52" %>
 Style/RedundantArrayConstructor:
   Enabled: true
-<% end %>
 
 Style/RedundantAssignment:
   Enabled: false
@@ -747,10 +844,8 @@ Style/RedundantConditional:
 Style/RedundantConstantBase:
   Enabled: true
 
-<% if rubocop_version >= "1.53" %>
 Style/RedundantCurrentDirectoryInPath:
   Enabled: true
-<% end %>
 
 Style/RedundantDoubleSplatHashBraces:
   Enabled: true
@@ -764,9 +859,12 @@ Style/RedundantFetchBlock:
 Style/RedundantFileExtensionInRequire:
   Enabled: false
 
-<% if rubocop_version >= "1.52" %>
 Style/RedundantFilterChain:
   Enabled: true
+
+<% if rubocop_version >= "1.72" %>
+Style/RedundantFormat:
+  Enabled: false
 <% end %>
 
 Style/RedundantHeredocDelimiterQuotes:
@@ -775,21 +873,22 @@ Style/RedundantHeredocDelimiterQuotes:
 Style/RedundantInitialize:
   Enabled: false
 
+<% if rubocop_version >= "1.66" %>
+Style/RedundantInterpolationUnfreeze:
+  Enabled: false
+<% end %>
+
 Style/RedundantLineContinuation:
   Enabled: true
 
-<% if rubocop_version >= "1.53" %>
 Style/RedundantRegexpArgument:
   Enabled: true
-<% end %>
 
 Style/RedundantRegexpCharacterClass:
   Enabled: false
 
-<% if rubocop_version >= "1.52" %>
 Style/RedundantRegexpConstructor:
   Enabled: true
-<% end %>
 
 Style/RedundantRegexpEscape:
   Enabled: false
@@ -815,21 +914,27 @@ Style/RescueStandardError:
 Style/ReturnNil:
   Enabled: true
 
-<% if rubocop_version >= "1.53" %>
 Style/ReturnNilInPredicateMethodDefinition:
   Enabled: true
+
+<% if rubocop_version >= "1.68" %>
+Style/SafeNavigationChainLength:
+  Enabled: false
 <% end %>
 
 Style/SelectByRegexp:
   Enabled: false
 
+<% if rubocop_version >= "1.64" %>
+Style/SendWithLiteralMethodName:
+  Enabled: false
+<% end %>
+
 Style/SingleArgumentDig:
   Enabled: false
 
-<% if rubocop_version >= "1.57" %>
 Style/SingleLineDoEndBlock:
   Enabled: true
-<% end %>
 
 Style/SlicingWithRange:
   Enabled: false
@@ -855,10 +960,13 @@ Style/StringLiteralsInInterpolation:
 Style/StructInheritance:
   Enabled: false
 
-<% if rubocop_version >= "1.58" %>
+<% if rubocop_version >= "1.64" %>
+Style/SuperArguments:
+  Enabled: false
+<% end %>
+
 Style/SuperWithArgsParentheses:
   Enabled: true
-<% end %>
 
 Style/SwapValues:
   Enabled: false
@@ -890,10 +998,8 @@ Style/UnpackFirst:
 Style/WordArray:
   EnforcedStyle: brackets
 
-<% if rubocop_version >= "1.53" %>
 Style/YAMLFileRead:
   Enabled: true
-<% end %>
 
 Style/YodaCondition:
   Enabled: false

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-shopify
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.16.0
 platform: ruby
 authors:
 - Shopify Engineering
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-15 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.51'
+        version: '1.62'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.51'
+        version: '1.62'
 description: Gem containing the rubocop.yml config that corresponds to the implementation
   of the Shopify's style guide for Ruby.
 email: gems@shopify.com
@@ -32,15 +31,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.md
+- README.md
+- lib/rubocop/shopify/gem_version_string_comparable_backport.rb
+- lib/tasks/config.rake
 - rubocop-cli.yml
 - rubocop.yml
 homepage: https://shopify.github.io/ruby-style-guide/
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/Shopify/ruby-style-guide/tree/v2.15.0
+  source_code_uri: https://github.com/Shopify/ruby-style-guide/tree/v2.16.0
   allowed_push_host: https://rubygems.org
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -48,15 +49,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
-signing_key: 
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Shopify's style guide for Ruby.
 test_files: []