From 96b3833f6c7fa078701b0704d555a1aba3eb8fd4 Mon Sep 17 00:00:00 2001 From: Esteban Pastorino Date: Sat, 27 Mar 2021 00:12:52 +0000 Subject: [PATCH 01/10] Update rubocop 0.83 --- rubocop-netlify.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubocop-netlify.gemspec b/rubocop-netlify.gemspec index 80dbcca..b91ca04 100644 --- a/rubocop-netlify.gemspec +++ b/rubocop-netlify.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |spec| spec.license = "MIT" spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0") - spec.add_dependency "rubocop", "~> 0.72", "< 0.83" + spec.add_dependency "rubocop", "~> 0.72", "< 0.84" spec.add_development_dependency "minitest", "~> 5.10" # Specify which files should be added to the gem when it is released. From b03ad86d22df53dd63639eea0d81bee3cce0c22d Mon Sep 17 00:00:00 2001 From: Esteban Pastorino Date: Sat, 27 Mar 2021 00:21:29 +0000 Subject: [PATCH 02/10] Update to 0.85.1 --- rubocop-netlify.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubocop-netlify.gemspec b/rubocop-netlify.gemspec index b91ca04..c92cd32 100644 --- a/rubocop-netlify.gemspec +++ b/rubocop-netlify.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |spec| spec.license = "MIT" spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0") - spec.add_dependency "rubocop", "~> 0.72", "< 0.84" + spec.add_dependency "rubocop", "~> 0.85", "< 0.86" spec.add_development_dependency "minitest", "~> 5.10" # Specify which files should be added to the gem when it is released. From 0d4e5a22b6a5f09aaece1df036bc994d108bd7f5 Mon Sep 17 00:00:00 2001 From: Esteban Pastorino Date: Sat, 27 Mar 2021 00:22:28 +0000 Subject: [PATCH 03/10] Update to 0.86 --- rubocop-netlify.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubocop-netlify.gemspec b/rubocop-netlify.gemspec index c92cd32..8189cb1 100644 --- a/rubocop-netlify.gemspec +++ b/rubocop-netlify.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |spec| spec.license = "MIT" spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0") - spec.add_dependency "rubocop", "~> 0.85", "< 0.86" + spec.add_dependency "rubocop", "~> 0.85", "< 0.87" spec.add_development_dependency "minitest", "~> 5.10" # Specify which files should be added to the gem when it is released. From f5be02fc7edac4622f11f7ea469003b783b0d082 Mon Sep 17 00:00:00 2001 From: Esteban Pastorino Date: Sat, 27 Mar 2021 00:28:41 +0000 Subject: [PATCH 04/10] Update to 0.87 --- rubocop-netlify.gemspec | 2 +- test/assertion_helper.rb | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/rubocop-netlify.gemspec b/rubocop-netlify.gemspec index 8189cb1..5188c8f 100644 --- a/rubocop-netlify.gemspec +++ b/rubocop-netlify.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |spec| spec.license = "MIT" spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0") - spec.add_dependency "rubocop", "~> 0.85", "< 0.87" + spec.add_dependency "rubocop", "~> 0.87", "< 0.88" spec.add_development_dependency "minitest", "~> 5.10" # Specify which files should be added to the gem when it is released. diff --git a/test/assertion_helper.rb b/test/assertion_helper.rb index b12bbc4..e43c57e 100644 --- a/test/assertion_helper.rb +++ b/test/assertion_helper.rb @@ -3,7 +3,6 @@ # Copied and adapted from: # https://github.com/rubocop-hq/rubocop-minitest/blob/v0.8.1/test/assertion_helper.rb # -# # =========== # # @@ -70,10 +69,10 @@ def inspect_source(source, cop, file = nil) end def investigate(cop, processed_source) - forces = RuboCop::Cop::Force.all.each_with_object([]) do |klass, instances| - next unless cop.join_force?(klass) - - instances << klass.new([cop]) + needed = Hash.new { |h, k| h[k] = [] } + Array(cop.class.joining_forces).each { |force| needed[force] << cop } + forces = needed.map do |force_class, joining_cops| + force_class.new(joining_cops) end commissioner = RuboCop::Cop::Commissioner.new([cop], forces, raise_error: true) From cc3bcedf57680501aabd3342f27c381f084ce698 Mon Sep 17 00:00:00 2001 From: Esteban Pastorino Date: Sat, 27 Mar 2021 00:29:01 +0000 Subject: [PATCH 05/10] Update to 0.88 --- rubocop-netlify.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubocop-netlify.gemspec b/rubocop-netlify.gemspec index 5188c8f..31f6269 100644 --- a/rubocop-netlify.gemspec +++ b/rubocop-netlify.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |spec| spec.license = "MIT" spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0") - spec.add_dependency "rubocop", "~> 0.87", "< 0.88" + spec.add_dependency "rubocop", "~> 0.87", "< 0.89" spec.add_development_dependency "minitest", "~> 5.10" # Specify which files should be added to the gem when it is released. From b9066b4203d3374a5a63c752a06af31430a46d2b Mon Sep 17 00:00:00 2001 From: Esteban Pastorino Date: Sat, 27 Mar 2021 00:29:25 +0000 Subject: [PATCH 06/10] Update to 0.89 --- rubocop-netlify.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubocop-netlify.gemspec b/rubocop-netlify.gemspec index 31f6269..db88b87 100644 --- a/rubocop-netlify.gemspec +++ b/rubocop-netlify.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |spec| spec.license = "MIT" spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0") - spec.add_dependency "rubocop", "~> 0.87", "< 0.89" + spec.add_dependency "rubocop", "~> 0.87", "< 0.90" spec.add_development_dependency "minitest", "~> 5.10" # Specify which files should be added to the gem when it is released. From 469742b465a17f82372766a055e56f98f4264bff Mon Sep 17 00:00:00 2001 From: Esteban Pastorino Date: Sat, 27 Mar 2021 01:18:23 +0000 Subject: [PATCH 07/10] Relax dependencies, we only need newer ones for tests --- rubocop-netlify.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubocop-netlify.gemspec b/rubocop-netlify.gemspec index db88b87..e76a7ce 100644 --- a/rubocop-netlify.gemspec +++ b/rubocop-netlify.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |spec| spec.license = "MIT" spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0") - spec.add_dependency "rubocop", "~> 0.87", "< 0.90" + spec.add_dependency "rubocop", "~> 0.72", "< 0.90" spec.add_development_dependency "minitest", "~> 5.10" # Specify which files should be added to the gem when it is released. From 068f9765c96b0c87493f8fc242e0d53fb8a83e6f Mon Sep 17 00:00:00 2001 From: Esteban Pastorino Date: Sat, 27 Mar 2021 23:22:23 +0000 Subject: [PATCH 08/10] Update to rubocop 0.90 Remove RESTRICT_ON_SEND on InvalidModelAssignment cop since it wasn't doing what we thought it did. Unitl < 0.90 it was ignored so we didn't notice. --- lib/rubocop/cop/netlify/invalid_model_assignment.rb | 1 - rubocop-netlify.gemspec | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/rubocop/cop/netlify/invalid_model_assignment.rb b/lib/rubocop/cop/netlify/invalid_model_assignment.rb index a715177..9dc226d 100644 --- a/lib/rubocop/cop/netlify/invalid_model_assignment.rb +++ b/lib/rubocop/cop/netlify/invalid_model_assignment.rb @@ -13,7 +13,6 @@ module Netlify # form.email = "bettse@netlify.com" class InvalidModelAssignment < Cop MSG = "Assigning to `attributes` will not update record" - RESTRICT_ON_SEND = [:attributes].freeze def_node_matcher :assign_attributes?, <<~PATTERN (send (send (...) :attributes) :[]= _ _) diff --git a/rubocop-netlify.gemspec b/rubocop-netlify.gemspec index e76a7ce..d267e1a 100644 --- a/rubocop-netlify.gemspec +++ b/rubocop-netlify.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |spec| spec.license = "MIT" spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0") - spec.add_dependency "rubocop", "~> 0.72", "< 0.90" + spec.add_dependency "rubocop", "~> 0.72", "< 0.91" spec.add_development_dependency "minitest", "~> 5.10" # Specify which files should be added to the gem when it is released. From 93a6f35d8196b9d7a85d23a89646dab2b381627e Mon Sep 17 00:00:00 2001 From: Esteban Pastorino Date: Sat, 27 Mar 2021 23:27:47 +0000 Subject: [PATCH 09/10] Update to < 1.0 --- rubocop-netlify.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubocop-netlify.gemspec b/rubocop-netlify.gemspec index d267e1a..d01d599 100644 --- a/rubocop-netlify.gemspec +++ b/rubocop-netlify.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |spec| spec.license = "MIT" spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0") - spec.add_dependency "rubocop", "~> 0.72", "< 0.91" + spec.add_dependency "rubocop", "~> 0.72", "< 1.0" spec.add_development_dependency "minitest", "~> 5.10" # Specify which files should be added to the gem when it is released. From 39dc3cc2a3a8a27270c76680ee8093e2433bf1d6 Mon Sep 17 00:00:00 2001 From: Esteban Pastorino Date: Sat, 27 Mar 2021 23:29:33 +0000 Subject: [PATCH 10/10] Update to < 2.0 --- rubocop-netlify.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubocop-netlify.gemspec b/rubocop-netlify.gemspec index d01d599..5d3ced0 100644 --- a/rubocop-netlify.gemspec +++ b/rubocop-netlify.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |spec| spec.license = "MIT" spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0") - spec.add_dependency "rubocop", "~> 0.72", "< 1.0" + spec.add_dependency "rubocop", "~> 0.72", "< 2.0" spec.add_development_dependency "minitest", "~> 5.10" # Specify which files should be added to the gem when it is released.