From f38741d005052045e4d4c2c26b009d3ade0864f3 Mon Sep 17 00:00:00 2001 From: David Padilla <380364-dabit@users.noreply.gitlab.com> Date: Wed, 15 Dec 2021 19:49:22 -0600 Subject: [PATCH 1/5] Loosen activerecord restriction in order to be used with rails 7 --- annotate.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/annotate.gemspec b/annotate.gemspec index 81e2e6967..b0c709a29 100644 --- a/annotate.gemspec +++ b/annotate.gemspec @@ -23,7 +23,7 @@ Gem::Specification.new do |s| s.specification_version = 4 if s.respond_to? :specification_version s.add_runtime_dependency(%q, '>= 10.4', '< 14.0') - s.add_runtime_dependency(%q, ['>= 3.2', '< 7.0']) + s.add_runtime_dependency(%q, ['>= 3.2', '< 7.1']) s.metadata = { "bug_tracker_uri" => "https://github.com/ctran/annotate_models/issues/", From aa767e19fb3bea5e42304f54802f41924ac4e363 Mon Sep 17 00:00:00 2001 From: David Padilla <380364-dabit@users.noreply.gitlab.com> Date: Mon, 24 Jan 2022 14:33:42 -0600 Subject: [PATCH 2/5] Bonus: Add the rails routes rake task replica --- lib/tasks/annotate_routes.rake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/tasks/annotate_routes.rake b/lib/tasks/annotate_routes.rake index ae6829337..0a96c1fd9 100644 --- a/lib/tasks/annotate_routes.rake +++ b/lib/tasks/annotate_routes.rake @@ -28,3 +28,10 @@ task :remove_routes => :environment do options[:require] = ENV['require'] ? ENV['require'].split(',') : [] AnnotateRoutes.remove_annotations(options) end + +desc "Prints out the rails routes structure" +task routes: :environment do + require 'rails/commands/routes/routes_command' + routes = Rails::Command::RoutesCommand.new + routes.perform +end From 5a812992516815ac94b1a1362a69f4dfe5be9dd1 Mon Sep 17 00:00:00 2001 From: David Padilla <380364-dabit@users.noreply.gitlab.com> Date: Tue, 1 Feb 2022 17:26:47 -0600 Subject: [PATCH 3/5] Loosen Rails version restriction to < 8.0 --- annotate.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/annotate.gemspec b/annotate.gemspec index b0c709a29..43b2ac990 100644 --- a/annotate.gemspec +++ b/annotate.gemspec @@ -23,7 +23,7 @@ Gem::Specification.new do |s| s.specification_version = 4 if s.respond_to? :specification_version s.add_runtime_dependency(%q, '>= 10.4', '< 14.0') - s.add_runtime_dependency(%q, ['>= 3.2', '< 7.1']) + s.add_runtime_dependency(%q, ['>= 3.2', '< 8.0']) s.metadata = { "bug_tracker_uri" => "https://github.com/ctran/annotate_models/issues/", From 3e90229e471b88b833a1ece63c6bef098bfeee13 Mon Sep 17 00:00:00 2001 From: David Padilla <380364-dabit@users.noreply.gitlab.com> Date: Tue, 1 Feb 2022 17:48:44 -0600 Subject: [PATCH 4/5] Revert "Bonus: Add the rails routes rake task replica" This reverts commit aa767e19fb3bea5e42304f54802f41924ac4e363. --- lib/tasks/annotate_routes.rake | 7 ------- 1 file changed, 7 deletions(-) diff --git a/lib/tasks/annotate_routes.rake b/lib/tasks/annotate_routes.rake index 0a96c1fd9..ae6829337 100644 --- a/lib/tasks/annotate_routes.rake +++ b/lib/tasks/annotate_routes.rake @@ -28,10 +28,3 @@ task :remove_routes => :environment do options[:require] = ENV['require'] ? ENV['require'].split(',') : [] AnnotateRoutes.remove_annotations(options) end - -desc "Prints out the rails routes structure" -task routes: :environment do - require 'rails/commands/routes/routes_command' - routes = Rails::Command::RoutesCommand.new - routes.perform -end From b0d0041e06137514fa2bf5d2e10ca4af101cbfb9 Mon Sep 17 00:00:00 2001 From: David Padilla <380364-dabit@users.noreply.gitlab.com> Date: Thu, 3 Feb 2022 12:21:19 -0600 Subject: [PATCH 5/5] Update Gemfiles for integration tests --- spec/integration/rails_5.2.4.1/Gemfile.lock | 2 +- spec/integration/rails_6.0.2.1/Gemfile | 2 +- spec/integration/rails_6.0.2.1/Gemfile.lock | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spec/integration/rails_5.2.4.1/Gemfile.lock b/spec/integration/rails_5.2.4.1/Gemfile.lock index 28cf579c5..bc3a50810 100644 --- a/spec/integration/rails_5.2.4.1/Gemfile.lock +++ b/spec/integration/rails_5.2.4.1/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: ../../.. specs: annotate (3.1.1) - activerecord (>= 3.2, < 7.0) + activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) GEM diff --git a/spec/integration/rails_6.0.2.1/Gemfile b/spec/integration/rails_6.0.2.1/Gemfile index faf2f58ab..4d2b38e57 100644 --- a/spec/integration/rails_6.0.2.1/Gemfile +++ b/spec/integration/rails_6.0.2.1/Gemfile @@ -6,7 +6,7 @@ gem 'rails', '~> 6.0.2', '>= 6.0.2.1' # Use sqlite3 as the database for Active Record gem 'sqlite3', '~> 1.4' # Use Puma as the app server -gem 'puma', '~> 4.3' +gem 'puma', '~> 5.6.1' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.7' # Use Redis adapter to run Action Cable in production diff --git a/spec/integration/rails_6.0.2.1/Gemfile.lock b/spec/integration/rails_6.0.2.1/Gemfile.lock index aaae8ef30..8e1690675 100644 --- a/spec/integration/rails_6.0.2.1/Gemfile.lock +++ b/spec/integration/rails_6.0.2.1/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: ../../.. specs: annotate (3.1.1) - activerecord (>= 3.2, < 7.0) + activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) GEM @@ -82,7 +82,7 @@ GEM concurrent-ruby (1.1.8) crass (1.0.6) erubi (1.10.0) - ffi (1.12.2) + ffi (1.15.5) globalid (0.4.2) activesupport (>= 4.2.0) i18n (1.8.10) @@ -113,7 +113,7 @@ GEM mini_portile2 (~> 2.5.0) racc (~> 1.4) public_suffix (4.0.3) - puma (4.3.5) + puma (5.6.1) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -146,7 +146,7 @@ GEM rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rake (13.0.3) - rb-fsevent (0.10.3) + rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) regexp_parser (1.6.0) @@ -193,7 +193,7 @@ DEPENDENCIES capybara (>= 2.15) jbuilder (~> 2.7) listen (>= 3.0.5, < 3.2) - puma (~> 4.3) + puma (~> 5.6.1) rails (~> 6.0.2, >= 6.0.2.1) selenium-webdriver sqlite3 (~> 1.4)