Merge pull request #703 from Shopify/thread-safety-rubocop

Include thread-safety rubocop and refactor minimum rubocop.gemfile

Author: alexpark20

Gemfile.lock

@@ -2,7 +2,8 @@ PATH
   remote: .
   specs:
     rubocop-shopify (2.15.1)
-      rubocop (~> 1.62)
+      rubocop (~> 1.72, >= 1.72.1)
+      rubocop-thread_safety (>= 0.7.1)
 
 GEM
   remote: https://rubygems.org/
@@ -31,7 +32,7 @@ GEM
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.10.0)
-    rubocop (1.73.1)
+    rubocop (1.72.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -44,6 +45,9 @@ GEM
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.38.1)
       parser (>= 3.3.1.0)
+    rubocop-thread_safety (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)

bin/sort-cops

@@ -58,7 +58,7 @@ def sort_cops(file_path)
 end
 
 if ARGV.empty?
-  puts "Usage: ruby sort_cops.rb path/to/rubocop.yml"
+  puts "Usage: ruby sort-cops path/to/rubocop.yml"
   exit 1
 end
 

gemfiles/minimum_rubocop.gemfile

@@ -2,9 +2,21 @@
 
 eval_gemfile "../Gemfile"
 
-# This naively extracts the minimum rubocop version from our gemspec,
+# This extracts the minimum rubocop version from our gemspec,
 # allowing us to ensure that it remains compatible.
-minimum_rubocop_version = File.read("rubocop-shopify.gemspec")[/(?<=add_dependency\("rubocop", "~> ).*(?="\)$)/]
-raise "Failed to extract minimum rubocop version from gemspec" if minimum_rubocop_version.nil?
 
-gem "rubocop", minimum_rubocop_version
+supported_requirement_types = ['>=', '~>']
+supported_requirements, unsupported_requirements = Gem::Specification
+  .load("rubocop-shopify.gemspec")
+  .dependencies.find { |d| d.name == "rubocop" }
+  .requirement.requirements
+  .partition { |type, _version| supported_requirement_types.include?(type) }
+
+raise <<~ERROR_MESSAGE unless unsupported_requirements.empty?
+  Unsupported requirement types: #{unsupported_requirements.inspect}.
+  Only #{supported_requirement_types.inspect} are supported.
+ERROR_MESSAGE
+
+minimum_version = supported_requirements.map { |_type, version| version }.max
+
+gem "rubocop", minimum_version

rubocop-shopify.gemspec

@@ -23,5 +23,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 3.1.0"
 
-  s.add_dependency("rubocop", "~> 1.62")
+  s.add_dependency("rubocop", "~> 1.72", ">= 1.72.1")
+  s.add_dependency("rubocop-thread_safety", ">= 0.7.1")
 end