From 0128a3ae2b4d133caefcc4fc235a9c4502f70ca2 Mon Sep 17 00:00:00 2001 From: Ricardo Vela Date: Tue, 2 Jan 2024 10:49:38 -0600 Subject: [PATCH 01/10] drop ruby <3.2 and rails <7.0 support Cop fixes (rubocop -f o): 22 Style/FrozenStringLiteralComment 2 Style/HashSyntax 1 Lint/RedundantRequireStatement 1 Style/RedundantFreeze --- .github/workflows/tests.yml | 21 +-- .gitignore | 1 - .rubocop.yml | 2 +- .ruby-version | 2 +- Appraisals | 12 +- CHANGELOG.md | 5 + Gemfile.lock | 230 +++++++++++++++++++++++ Rakefile | 2 + gemfiles/rails_5_2.gemfile | 12 -- gemfiles/rails_6_0.gemfile | 12 -- gemfiles/rails_6_1.gemfile | 12 -- gemfiles/rails_7_0.gemfile | 2 + gemfiles/rails_7_1.gemfile | 2 + lib/uncruft.rb | 2 + lib/uncruft/deprecatable.rb | 6 +- lib/uncruft/deprecation_handler.rb | 2 +- lib/uncruft/railtie.rb | 2 + lib/uncruft/version.rb | 4 +- lib/uncruft/warning.rb | 4 +- spec/dummy/config/application.rb | 2 + spec/spec_helper.rb | 2 + spec/support/rails_root.rb | 2 + spec/uncruft/deprecatable_spec.rb | 2 + spec/uncruft/deprecation_handler_spec.rb | 2 + spec/uncruft/railtie_spec.rb | 2 + spec/uncruft/warning_spec.rb | 2 + spec/uncruft_spec.rb | 2 + uncruft.gemspec | 4 +- 28 files changed, 279 insertions(+), 76 deletions(-) create mode 100644 Gemfile.lock delete mode 100644 gemfiles/rails_5_2.gemfile delete mode 100644 gemfiles/rails_6_0.gemfile delete mode 100644 gemfiles/rails_6_1.gemfile diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bddc983..69b08d8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,29 +12,10 @@ jobs: strategy: fail-fast: false matrix: - ruby: ['2.6', '2.7', '3.0', '3.1', '3.2'] + ruby: ['3.2'] gemfile: - - gemfiles/rails_5_2.gemfile - - gemfiles/rails_6_0.gemfile - - gemfiles/rails_6_1.gemfile - gemfiles/rails_7_0.gemfile - gemfiles/rails_7_1.gemfile - exclude: - - ruby: '3.2' - gemfile: gemfiles/rails_5_2.gemfile - - ruby: '3.1' - gemfile: gemfiles/rails_5_2.gemfile - - ruby: '3.0' - gemfile: gemfiles/rails_5_2.gemfile - - ruby: '2.7' - gemfile: gemfiles/rails_7_1.gemfile - - ruby: '2.7' - gemfile: gemfiles/rails_7_0.gemfile - - ruby: '2.6' - gemfile: gemfiles/rails_7_1.gemfile - - ruby: '2.6' - gemfile: gemfiles/rails_7_0.gemfile - steps: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 diff --git a/.gitignore b/.gitignore index da3ef8e..c0124d2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,4 @@ spec/dummy/db/*.sqlite3 spec/dummy/config/deprecations.ignore doc/ .yardoc/ -Gemfile.lock /gemfiles/*.gemfile.lock diff --git a/.rubocop.yml b/.rubocop.yml index 4b51c7c..7a7d76c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,4 +4,4 @@ inherit_gem: AllCops: NewCops: enable - TargetRubyVersion: 2.6 + TargetRubyVersion: 3.2 diff --git a/.ruby-version b/.ruby-version index a603bb5..be94e6f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.5 +3.2.2 diff --git a/Appraisals b/Appraisals index f0ce2b4..4b4e22b 100644 --- a/Appraisals +++ b/Appraisals @@ -1,14 +1,4 @@ -appraise 'rails-5-2' do - gem 'railties', '~> 5.2.0' -end - -appraise 'rails-6-0' do - gem 'railties', '~> 6.0.0' -end - -appraise 'rails-6-1' do - gem 'railties', '~> 6.1.0' -end +# frozen_string_literal: true appraise 'rails-7-0' do gem 'railties', '~> 7.0.0' diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ab0ac5..3ce6cac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,11 @@ and this project aims to adhere to [Semantic Versioning](http://semver.org/spec/ ### Removed ### Fixed +## [0.4.0] - 2024-01-02 +### Removed +- Drops support for Rails < 7.0 +- Drops support for Ruby < 3.2 + ## [0.3.3] - 2023-04-27 ### Fixed - Some ruby warnings included vendored bin paths that weren't being normalized by the diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..db6b08f --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,230 @@ +PATH + remote: . + specs: + uncruft (0.4.0) + railties (>= 5.2.0) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.0.8) + actionpack (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activesupport (= 7.0.8) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.0) + actionpack (7.0.8) + actionview (= 7.0.8) + activesupport (= 7.0.8) + rack (~> 2.0, >= 2.2.4) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (7.0.8) + actionpack (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.0.8) + activesupport (= 7.0.8) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (7.0.8) + activesupport (= 7.0.8) + globalid (>= 0.3.6) + activemodel (7.0.8) + activesupport (= 7.0.8) + activerecord (7.0.8) + activemodel (= 7.0.8) + activesupport (= 7.0.8) + activestorage (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activesupport (= 7.0.8) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (7.0.8) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + appraisal (2.2.0) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + betterlint (1.6.0) + rubocop (> 1.0) + rubocop-performance + rubocop-rails + rubocop-rake + rubocop-rspec (>= 2.24) + builder (3.2.4) + concurrent-ruby (1.2.2) + crass (1.0.6) + date (3.3.4) + diff-lcs (1.5.0) + erubi (1.12.0) + globalid (1.2.1) + activesupport (>= 6.1) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + json (2.7.1) + language_server-protocol (3.17.0.3) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + mail (2.8.1) + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + marcel (1.0.2) + method_source (1.0.0) + mini_mime (1.1.5) + minitest (5.20.0) + net-imap (0.4.6) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.4.0) + net-protocol + nio4r (2.6.1) + nokogiri (1.15.5-arm64-darwin) + racc (~> 1.4) + parallel (1.23.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + racc (1.7.3) + rack (2.2.8) + rack-test (2.1.0) + rack (>= 1.3) + rails (7.0.8) + actioncable (= 7.0.8) + actionmailbox (= 7.0.8) + actionmailer (= 7.0.8) + actionpack (= 7.0.8) + actiontext (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activemodel (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) + bundler (>= 1.15.0) + railties (= 7.0.8) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) + method_source + rake (>= 12.2) + thor (~> 1.0) + zeitwerk (~> 2.5) + rainbow (3.1.1) + rake (13.1.0) + regexp_parser (2.8.3) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rubocop (1.58.0) + json (~> 2.3) + language_server-protocol (>= 3.17.0) + parallel (~> 1.10) + parser (>= 3.2.2.4) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.30.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.30.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.24.0) + rubocop (~> 1.33) + rubocop-performance (1.19.1) + rubocop (>= 1.7.0, < 2.0) + rubocop-ast (>= 0.4.0) + rubocop-rails (2.22.2) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rake (0.6.0) + rubocop (~> 1.0) + rubocop-rspec (2.25.0) + rubocop (~> 1.40) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + ruby-progressbar (1.13.0) + thor (1.3.0) + timecop (0.9.8) + timeout (0.4.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.5.0) + websocket-driver (0.7.6) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.6.12) + +PLATFORMS + arm64-darwin-22 + +DEPENDENCIES + appraisal (~> 2.2.0) + betterlint + rails + rspec + timecop (~> 0.9.1) + uncruft! + +BUNDLED WITH + 2.4.22 diff --git a/Rakefile b/Rakefile index ed3bce9..6080c6d 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + begin require 'bundler/setup' rescue LoadError diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile deleted file mode 100644 index 61cf07d..0000000 --- a/gemfiles/rails_5_2.gemfile +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal", "~> 2.2.0" -gem "betterlint" -gem "rails" -gem "railties", "~> 5.2.0" -gem "rspec" -gem "timecop", "~> 0.9.1" - -gemspec path: "../" diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile deleted file mode 100644 index d3aec0d..0000000 --- a/gemfiles/rails_6_0.gemfile +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal", "~> 2.2.0" -gem "betterlint" -gem "rails" -gem "railties", "~> 6.0.0" -gem "rspec" -gem "timecop", "~> 0.9.1" - -gemspec path: "../" diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile deleted file mode 100644 index 8cc80c5..0000000 --- a/gemfiles/rails_6_1.gemfile +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal", "~> 2.2.0" -gem "betterlint" -gem "rails" -gem "railties", "~> 6.1.0" -gem "rspec" -gem "timecop", "~> 0.9.1" - -gemspec path: "../" diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile index 99ed58a..2218e1c 100644 --- a/gemfiles/rails_7_0.gemfile +++ b/gemfiles/rails_7_0.gemfile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # This file was generated by Appraisal source "https://rubygems.org" diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile index a70ebad..31e0ce8 100644 --- a/gemfiles/rails_7_1.gemfile +++ b/gemfiles/rails_7_1.gemfile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # This file was generated by Appraisal source "https://rubygems.org" diff --git a/lib/uncruft.rb b/lib/uncruft.rb index e002922..01b0e05 100644 --- a/lib/uncruft.rb +++ b/lib/uncruft.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'active_support' require 'active_support/time' diff --git a/lib/uncruft/deprecatable.rb b/lib/uncruft/deprecatable.rb index 2cf9d34..b70712a 100644 --- a/lib/uncruft/deprecatable.rb +++ b/lib/uncruft/deprecatable.rb @@ -1,11 +1,13 @@ +# frozen_string_literal: true + module Uncruft module Deprecatable extend ActiveSupport::Concern module ClassMethods def deprecate_attribute(attribute, message:) - deprecate_method attribute, message: message - deprecate_method :"#{attribute}=", message: message + deprecate_method(attribute, message:) + deprecate_method :"#{attribute}=", message: end def deprecate_method(method, message:) diff --git a/lib/uncruft/deprecation_handler.rb b/lib/uncruft/deprecation_handler.rb index dcaf45d..e0d4cab 100644 --- a/lib/uncruft/deprecation_handler.rb +++ b/lib/uncruft/deprecation_handler.rb @@ -1,4 +1,4 @@ -require 'set' +# frozen_string_literal: true module Uncruft class DeprecationHandler diff --git a/lib/uncruft/railtie.rb b/lib/uncruft/railtie.rb index 0708a47..f2fa7b3 100644 --- a/lib/uncruft/railtie.rb +++ b/lib/uncruft/railtie.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'rails' module Uncruft diff --git a/lib/uncruft/version.rb b/lib/uncruft/version.rb index c605261..9571fe0 100644 --- a/lib/uncruft/version.rb +++ b/lib/uncruft/version.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Uncruft - VERSION = '0.3.4'.freeze + VERSION = '0.4.0' end diff --git a/lib/uncruft/warning.rb b/lib/uncruft/warning.rb index 12fb00f..0d3eb9f 100644 --- a/lib/uncruft/warning.rb +++ b/lib/uncruft/warning.rb @@ -1,6 +1,8 @@ +# frozen_string_literal: true + module Uncruft module Warning - DEPRECATION_PATTERN = /(deprecation|deprecated)/i.freeze + DEPRECATION_PATTERN = /(deprecation|deprecated)/i def warn(str, *args, **kwargs) if str =~ DEPRECATION_PATTERN # rubocop:disable Performance/RegexpMatch diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb index 5e044d5..2afbe01 100644 --- a/spec/dummy/config/application.rb +++ b/spec/dummy/config/application.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__) require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) $LOAD_PATH.unshift File.expand_path('../../../lib', __dir__) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 719dc84..3bec73c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'bundler' Bundler.require :default, :development diff --git a/spec/support/rails_root.rb b/spec/support/rails_root.rb index fd086ac..9593044 100644 --- a/spec/support/rails_root.rb +++ b/spec/support/rails_root.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module ::Rails class << self def root diff --git a/spec/uncruft/deprecatable_spec.rb b/spec/uncruft/deprecatable_spec.rb index 0d86d90..d4d40c2 100644 --- a/spec/uncruft/deprecatable_spec.rb +++ b/spec/uncruft/deprecatable_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' RSpec.describe Uncruft::Deprecatable do diff --git a/spec/uncruft/deprecation_handler_spec.rb b/spec/uncruft/deprecation_handler_spec.rb index 2293714..35a159f 100644 --- a/spec/uncruft/deprecation_handler_spec.rb +++ b/spec/uncruft/deprecation_handler_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' RSpec.describe Uncruft::DeprecationHandler do diff --git a/spec/uncruft/railtie_spec.rb b/spec/uncruft/railtie_spec.rb index ede8b50..2d7c96b 100644 --- a/spec/uncruft/railtie_spec.rb +++ b/spec/uncruft/railtie_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe Uncruft::Railtie do diff --git a/spec/uncruft/warning_spec.rb b/spec/uncruft/warning_spec.rb index 7e90ee4..17c07c7 100644 --- a/spec/uncruft/warning_spec.rb +++ b/spec/uncruft/warning_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe Uncruft::Warning do diff --git a/spec/uncruft_spec.rb b/spec/uncruft_spec.rb index 2acfe87..e2baca2 100644 --- a/spec/uncruft_spec.rb +++ b/spec/uncruft_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' RSpec.describe Uncruft do diff --git a/uncruft.gemspec b/uncruft.gemspec index 9501730..6e5743a 100644 --- a/uncruft.gemspec +++ b/uncruft.gemspec @@ -1,3 +1,5 @@ +# frozen_string_literal: true + $LOAD_PATH.push File.expand_path('lib', __dir__) require 'uncruft/version' @@ -17,7 +19,7 @@ Gem::Specification.new do |s| s.files = Dir['{lib}/**/*', 'LICENSE', 'Rakefile', 'README.md'] - s.required_ruby_version = '>= 2.6.0' + s.required_ruby_version = '>= 3.2.2' s.add_dependency 'railties', '>= 5.2.0' end From 76727507b004e8402f0d0d170be2896d464df3f0 Mon Sep 17 00:00:00 2001 From: Ricardo Vela Date: Tue, 2 Jan 2024 10:53:29 -0600 Subject: [PATCH 02/10] make ruby version pin less specific --- uncruft.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uncruft.gemspec b/uncruft.gemspec index 6e5743a..b94e6e6 100644 --- a/uncruft.gemspec +++ b/uncruft.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.files = Dir['{lib}/**/*', 'LICENSE', 'Rakefile', 'README.md'] - s.required_ruby_version = '>= 3.2.2' + s.required_ruby_version = '>= 3.2' s.add_dependency 'railties', '>= 5.2.0' end From 7c9c039a5b18a27bb32714eb03b4123bd6525128 Mon Sep 17 00:00:00 2001 From: Ricardo Vela Date: Tue, 2 Jan 2024 13:45:54 -0600 Subject: [PATCH 03/10] keep support for Ruby >=3.0 and Rails >=6.1 --- .github/workflows/tests.yml | 3 ++- .rubocop.yml | 2 +- .ruby-version | 2 +- Appraisals | 4 ++++ gemfiles/rails_6_1.gemfile | 14 ++++++++++++++ uncruft.gemspec | 2 +- 6 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 gemfiles/rails_6_1.gemfile diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 69b08d8..392233f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,8 +12,9 @@ jobs: strategy: fail-fast: false matrix: - ruby: ['3.2'] + ruby: ['3.0', '3.1', '3.2'] gemfile: + - gemfiles/rails_6_1.gemfile - gemfiles/rails_7_0.gemfile - gemfiles/rails_7_1.gemfile steps: diff --git a/.rubocop.yml b/.rubocop.yml index 7a7d76c..75a78bf 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,4 +4,4 @@ inherit_gem: AllCops: NewCops: enable - TargetRubyVersion: 3.2 + TargetRubyVersion: 3.0 diff --git a/.ruby-version b/.ruby-version index be94e6f..818bd47 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.2 +3.0.6 diff --git a/Appraisals b/Appraisals index 4b4e22b..535aac5 100644 --- a/Appraisals +++ b/Appraisals @@ -1,5 +1,9 @@ # frozen_string_literal: true +appraise 'rails-6-1' do + gem 'railties', '~> 6.1.0' +end + appraise 'rails-7-0' do gem 'railties', '~> 7.0.0' end diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile new file mode 100644 index 0000000..2a669fd --- /dev/null +++ b/gemfiles/rails_6_1.gemfile @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "appraisal", "~> 2.2.0" +gem "betterlint" +gem "rails" +gem "railties", "~> 6.1.0" +gem "rspec" +gem "timecop", "~> 0.9.1" + +gemspec path: "../" diff --git a/uncruft.gemspec b/uncruft.gemspec index b94e6e6..ad6992b 100644 --- a/uncruft.gemspec +++ b/uncruft.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.files = Dir['{lib}/**/*', 'LICENSE', 'Rakefile', 'README.md'] - s.required_ruby_version = '>= 3.2' + s.required_ruby_version = '>= 3.0' s.add_dependency 'railties', '>= 5.2.0' end From ac6f9ef945d6347bf27ff068d69af108d3c55f7b Mon Sep 17 00:00:00 2001 From: Ricardo Vela Date: Tue, 2 Jan 2024 13:47:23 -0600 Subject: [PATCH 04/10] undo rubocop hash syntax changes --- lib/uncruft/deprecatable.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/uncruft/deprecatable.rb b/lib/uncruft/deprecatable.rb index b70712a..33ebb35 100644 --- a/lib/uncruft/deprecatable.rb +++ b/lib/uncruft/deprecatable.rb @@ -6,8 +6,8 @@ module Deprecatable module ClassMethods def deprecate_attribute(attribute, message:) - deprecate_method(attribute, message:) - deprecate_method :"#{attribute}=", message: + deprecate_method(attribute, message: message) + deprecate_method :"#{attribute}=", message: message end def deprecate_method(method, message:) From a685912510e18b49f17d6cb255710550b21cada9 Mon Sep 17 00:00:00 2001 From: Ricardo Vela Date: Tue, 2 Jan 2024 13:51:54 -0600 Subject: [PATCH 05/10] remove parens added by rubocop (reduces diff noise) --- lib/uncruft/deprecatable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/uncruft/deprecatable.rb b/lib/uncruft/deprecatable.rb index 33ebb35..27e520c 100644 --- a/lib/uncruft/deprecatable.rb +++ b/lib/uncruft/deprecatable.rb @@ -6,7 +6,7 @@ module Deprecatable module ClassMethods def deprecate_attribute(attribute, message:) - deprecate_method(attribute, message: message) + deprecate_method attribute, message: message deprecate_method :"#{attribute}=", message: message end From 537c21d9d8497238d224a0928942f89efff2c044 Mon Sep 17 00:00:00 2001 From: Ricardo Vela <97992712+argvniyx-enroute@users.noreply.github.com> Date: Tue, 2 Jan 2024 15:04:02 -0600 Subject: [PATCH 06/10] Update CHANGELOG.md Co-authored-by: Harris Effron --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ce6cac..f45351c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,8 +13,8 @@ and this project aims to adhere to [Semantic Versioning](http://semver.org/spec/ ## [0.4.0] - 2024-01-02 ### Removed -- Drops support for Rails < 7.0 -- Drops support for Ruby < 3.2 +- Drops support for Rails < 6.1 +- Drops support for Ruby < 3.0 ## [0.3.3] - 2023-04-27 ### Fixed From 033dddc8b23a6a86c3ff1281793ad0f6f9c61d35 Mon Sep 17 00:00:00 2001 From: Ricardo Vela <97992712+argvniyx-enroute@users.noreply.github.com> Date: Tue, 2 Jan 2024 15:04:13 -0600 Subject: [PATCH 07/10] Update uncruft.gemspec Co-authored-by: Harris Effron --- uncruft.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uncruft.gemspec b/uncruft.gemspec index ad6992b..d57f4ad 100644 --- a/uncruft.gemspec +++ b/uncruft.gemspec @@ -21,5 +21,5 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 3.0' - s.add_dependency 'railties', '>= 5.2.0' + s.add_dependency 'railties', '>= 6.1.0' end From 57cf61d99a894c00e456bbd9a12f2789c2b87cb8 Mon Sep 17 00:00:00 2001 From: Ricardo Vela Date: Tue, 2 Jan 2024 15:17:10 -0600 Subject: [PATCH 08/10] unpin appraisal, `be appraisal install` unpinned `appraisal` because of an issue with ruby 3.2 + bundler 2.4<=; see https://github.com/thoughtbot/appraisal/issues/199#issuecomment-1374700828 unpinning gives us `appraisal 2.5.0`, version by which we have a fix (we want to run `be appraisal install`) to generate lockfiles --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index d90e5d5..f5f6be5 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gemspec -gem 'appraisal', '~> 2.2.0' +gem 'appraisal' gem 'betterlint' gem 'rails' gem 'rspec' diff --git a/Gemfile.lock b/Gemfile.lock index db6b08f..eb81f2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: uncruft (0.4.0) - railties (>= 5.2.0) + railties (>= 6.1.0) GEM remote: https://rubygems.org/ @@ -72,7 +72,7 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - appraisal (2.2.0) + appraisal (2.5.0) bundler rake thor (>= 0.14.0) @@ -219,7 +219,7 @@ PLATFORMS arm64-darwin-22 DEPENDENCIES - appraisal (~> 2.2.0) + appraisal betterlint rails rspec From 0707b4631c8c2a5c8345f986de7edf4a22118b9f Mon Sep 17 00:00:00 2001 From: Ricardo Vela Date: Tue, 2 Jan 2024 15:20:21 -0600 Subject: [PATCH 09/10] track appraisal gemfile.lock files gemfiles are updated since we unpinned `appraisal` --- .gitignore | 1 - gemfiles/rails_6_1.gemfile | 2 +- gemfiles/rails_6_1.gemfile.lock | 232 ++++++++++++++++++++++++++++ gemfiles/rails_7_0.gemfile | 2 +- gemfiles/rails_7_0.gemfile.lock | 231 ++++++++++++++++++++++++++++ gemfiles/rails_7_1.gemfile | 2 +- gemfiles/rails_7_1.gemfile.lock | 264 ++++++++++++++++++++++++++++++++ 7 files changed, 730 insertions(+), 4 deletions(-) create mode 100644 gemfiles/rails_6_1.gemfile.lock create mode 100644 gemfiles/rails_7_0.gemfile.lock create mode 100644 gemfiles/rails_7_1.gemfile.lock diff --git a/.gitignore b/.gitignore index c0124d2..4b56376 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,3 @@ spec/dummy/db/*.sqlite3 spec/dummy/config/deprecations.ignore doc/ .yardoc/ -/gemfiles/*.gemfile.lock diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile index 2a669fd..9518417 100644 --- a/gemfiles/rails_6_1.gemfile +++ b/gemfiles/rails_6_1.gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" -gem "appraisal", "~> 2.2.0" +gem "appraisal" gem "betterlint" gem "rails" gem "railties", "~> 6.1.0" diff --git a/gemfiles/rails_6_1.gemfile.lock b/gemfiles/rails_6_1.gemfile.lock new file mode 100644 index 0000000..7ebf6af --- /dev/null +++ b/gemfiles/rails_6_1.gemfile.lock @@ -0,0 +1,232 @@ +PATH + remote: .. + specs: + uncruft (0.4.0) + railties (>= 6.1.0) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.1.7.6) + actionpack (= 6.1.7.6) + activejob (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) + mail (>= 2.7.1) + actionmailer (6.1.7.6) + actionpack (= 6.1.7.6) + actionview (= 6.1.7.6) + activejob (= 6.1.7.6) + activesupport (= 6.1.7.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.1.7.6) + actionview (= 6.1.7.6) + activesupport (= 6.1.7.6) + rack (~> 2.0, >= 2.0.9) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.1.7.6) + actionpack (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) + nokogiri (>= 1.8.5) + actionview (6.1.7.6) + activesupport (= 6.1.7.6) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.1.7.6) + activesupport (= 6.1.7.6) + globalid (>= 0.3.6) + activemodel (6.1.7.6) + activesupport (= 6.1.7.6) + activerecord (6.1.7.6) + activemodel (= 6.1.7.6) + activesupport (= 6.1.7.6) + activestorage (6.1.7.6) + actionpack (= 6.1.7.6) + activejob (= 6.1.7.6) + activerecord (= 6.1.7.6) + activesupport (= 6.1.7.6) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (6.1.7.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + appraisal (2.5.0) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + betterlint (1.7.0) + rubocop (> 1.0) + rubocop-performance + rubocop-rails + rubocop-rake + rubocop-rspec (>= 2.24) + builder (3.2.4) + concurrent-ruby (1.2.2) + crass (1.0.6) + date (3.3.4) + diff-lcs (1.5.0) + erubi (1.12.0) + globalid (1.2.1) + activesupport (>= 6.1) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + json (2.7.1) + language_server-protocol (3.17.0.3) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + mail (2.8.1) + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + marcel (1.0.2) + method_source (1.0.0) + mini_mime (1.1.5) + minitest (5.20.0) + net-imap (0.4.9) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.4.0) + net-protocol + nio4r (2.7.0) + nokogiri (1.16.0-arm64-darwin) + racc (~> 1.4) + parallel (1.24.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + racc (1.7.3) + rack (2.2.8) + rack-test (2.1.0) + rack (>= 1.3) + rails (6.1.7.6) + actioncable (= 6.1.7.6) + actionmailbox (= 6.1.7.6) + actionmailer (= 6.1.7.6) + actionpack (= 6.1.7.6) + actiontext (= 6.1.7.6) + actionview (= 6.1.7.6) + activejob (= 6.1.7.6) + activemodel (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) + bundler (>= 1.15.0) + railties (= 6.1.7.6) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) + method_source + rake (>= 12.2) + thor (~> 1.0) + rainbow (3.1.1) + rake (13.1.0) + regexp_parser (2.8.3) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rubocop (1.59.0) + json (~> 2.3) + language_server-protocol (>= 3.17.0) + parallel (~> 1.10) + parser (>= 3.2.2.4) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.30.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.30.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.24.0) + rubocop (~> 1.33) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rails (2.23.1) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rake (0.6.0) + rubocop (~> 1.0) + rubocop-rspec (2.25.0) + rubocop (~> 1.40) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + ruby-progressbar (1.13.0) + sprockets (4.2.1) + concurrent-ruby (~> 1.0) + rack (>= 2.2.4, < 4) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) + sprockets (>= 3.0.0) + thor (1.3.0) + timecop (0.9.8) + timeout (0.4.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.5.0) + websocket-driver (0.7.6) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.6.12) + +PLATFORMS + arm64-darwin-22 + +DEPENDENCIES + appraisal + betterlint + rails + railties (~> 6.1.0) + rspec + timecop (~> 0.9.1) + uncruft! + +BUNDLED WITH + 2.4.22 diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile index 2218e1c..76f62b7 100644 --- a/gemfiles/rails_7_0.gemfile +++ b/gemfiles/rails_7_0.gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" -gem "appraisal", "~> 2.2.0" +gem "appraisal" gem "betterlint" gem "rails" gem "railties", "~> 7.0.0" diff --git a/gemfiles/rails_7_0.gemfile.lock b/gemfiles/rails_7_0.gemfile.lock new file mode 100644 index 0000000..559275e --- /dev/null +++ b/gemfiles/rails_7_0.gemfile.lock @@ -0,0 +1,231 @@ +PATH + remote: .. + specs: + uncruft (0.4.0) + railties (>= 6.1.0) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.0.8) + actionpack (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activesupport (= 7.0.8) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.0) + actionpack (7.0.8) + actionview (= 7.0.8) + activesupport (= 7.0.8) + rack (~> 2.0, >= 2.2.4) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (7.0.8) + actionpack (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.0.8) + activesupport (= 7.0.8) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (7.0.8) + activesupport (= 7.0.8) + globalid (>= 0.3.6) + activemodel (7.0.8) + activesupport (= 7.0.8) + activerecord (7.0.8) + activemodel (= 7.0.8) + activesupport (= 7.0.8) + activestorage (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activesupport (= 7.0.8) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (7.0.8) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + appraisal (2.5.0) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + betterlint (1.7.0) + rubocop (> 1.0) + rubocop-performance + rubocop-rails + rubocop-rake + rubocop-rspec (>= 2.24) + builder (3.2.4) + concurrent-ruby (1.2.2) + crass (1.0.6) + date (3.3.4) + diff-lcs (1.5.0) + erubi (1.12.0) + globalid (1.2.1) + activesupport (>= 6.1) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + json (2.7.1) + language_server-protocol (3.17.0.3) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + mail (2.8.1) + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + marcel (1.0.2) + method_source (1.0.0) + mini_mime (1.1.5) + minitest (5.20.0) + net-imap (0.4.9) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.4.0) + net-protocol + nio4r (2.7.0) + nokogiri (1.16.0-arm64-darwin) + racc (~> 1.4) + parallel (1.24.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + racc (1.7.3) + rack (2.2.8) + rack-test (2.1.0) + rack (>= 1.3) + rails (7.0.8) + actioncable (= 7.0.8) + actionmailbox (= 7.0.8) + actionmailer (= 7.0.8) + actionpack (= 7.0.8) + actiontext (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activemodel (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) + bundler (>= 1.15.0) + railties (= 7.0.8) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) + method_source + rake (>= 12.2) + thor (~> 1.0) + zeitwerk (~> 2.5) + rainbow (3.1.1) + rake (13.1.0) + regexp_parser (2.8.3) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rubocop (1.59.0) + json (~> 2.3) + language_server-protocol (>= 3.17.0) + parallel (~> 1.10) + parser (>= 3.2.2.4) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.30.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.30.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.24.0) + rubocop (~> 1.33) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rails (2.23.1) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rake (0.6.0) + rubocop (~> 1.0) + rubocop-rspec (2.25.0) + rubocop (~> 1.40) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + ruby-progressbar (1.13.0) + thor (1.3.0) + timecop (0.9.8) + timeout (0.4.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.5.0) + websocket-driver (0.7.6) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.6.12) + +PLATFORMS + arm64-darwin-22 + +DEPENDENCIES + appraisal + betterlint + rails + railties (~> 7.0.0) + rspec + timecop (~> 0.9.1) + uncruft! + +BUNDLED WITH + 2.4.22 diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile index 31e0ce8..16f5b01 100644 --- a/gemfiles/rails_7_1.gemfile +++ b/gemfiles/rails_7_1.gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" -gem "appraisal", "~> 2.2.0" +gem "appraisal" gem "betterlint" gem "rails" gem "railties", "~> 7.1.0" diff --git a/gemfiles/rails_7_1.gemfile.lock b/gemfiles/rails_7_1.gemfile.lock new file mode 100644 index 0000000..5e55eeb --- /dev/null +++ b/gemfiles/rails_7_1.gemfile.lock @@ -0,0 +1,264 @@ +PATH + remote: .. + specs: + uncruft (0.4.0) + railties (>= 6.1.0) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (7.1.2) + actionpack (= 7.1.2) + activesupport (= 7.1.2) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + zeitwerk (~> 2.6) + actionmailbox (7.1.2) + actionpack (= 7.1.2) + activejob (= 7.1.2) + activerecord (= 7.1.2) + activestorage (= 7.1.2) + activesupport (= 7.1.2) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.1.2) + actionpack (= 7.1.2) + actionview (= 7.1.2) + activejob (= 7.1.2) + activesupport (= 7.1.2) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.2) + actionpack (7.1.2) + actionview (= 7.1.2) + activesupport (= 7.1.2) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.2) + actionpack (= 7.1.2) + activerecord (= 7.1.2) + activestorage (= 7.1.2) + activesupport (= 7.1.2) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.1.2) + activesupport (= 7.1.2) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.2) + activesupport (= 7.1.2) + globalid (>= 0.3.6) + activemodel (7.1.2) + activesupport (= 7.1.2) + activerecord (7.1.2) + activemodel (= 7.1.2) + activesupport (= 7.1.2) + timeout (>= 0.4.0) + activestorage (7.1.2) + actionpack (= 7.1.2) + activejob (= 7.1.2) + activerecord (= 7.1.2) + activesupport (= 7.1.2) + marcel (~> 1.0) + activesupport (7.1.2) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + appraisal (2.5.0) + bundler + rake + thor (>= 0.14.0) + ast (2.4.2) + base64 (0.2.0) + betterlint (1.7.0) + rubocop (> 1.0) + rubocop-performance + rubocop-rails + rubocop-rake + rubocop-rspec (>= 2.24) + bigdecimal (3.1.5) + builder (3.2.4) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) + crass (1.0.6) + date (3.3.4) + diff-lcs (1.5.0) + drb (2.2.0) + ruby2_keywords + erubi (1.12.0) + globalid (1.2.1) + activesupport (>= 6.1) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + io-console (0.7.1) + irb (1.11.0) + rdoc + reline (>= 0.3.8) + json (2.7.1) + language_server-protocol (3.17.0.3) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + mail (2.8.1) + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + marcel (1.0.2) + mini_mime (1.1.5) + minitest (5.20.0) + mutex_m (0.2.0) + net-imap (0.4.9) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.4.0) + net-protocol + nio4r (2.7.0) + nokogiri (1.16.0-arm64-darwin) + racc (~> 1.4) + parallel (1.24.0) + parser (3.2.2.4) + ast (~> 2.4.1) + racc + psych (5.1.2) + stringio + racc (1.7.3) + rack (3.0.8) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails (7.1.2) + actioncable (= 7.1.2) + actionmailbox (= 7.1.2) + actionmailer (= 7.1.2) + actionpack (= 7.1.2) + actiontext (= 7.1.2) + actionview (= 7.1.2) + activejob (= 7.1.2) + activemodel (= 7.1.2) + activerecord (= 7.1.2) + activestorage (= 7.1.2) + activesupport (= 7.1.2) + bundler (>= 1.15.0) + railties (= 7.1.2) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.1.2) + actionpack (= 7.1.2) + activesupport (= 7.1.2) + irb + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + rainbow (3.1.1) + rake (13.1.0) + rdoc (6.6.2) + psych (>= 4.0.0) + regexp_parser (2.8.3) + reline (0.4.1) + io-console (~> 0.5) + rexml (3.2.6) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rubocop (1.59.0) + json (~> 2.3) + language_server-protocol (>= 3.17.0) + parallel (~> 1.10) + parser (>= 3.2.2.4) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.30.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.30.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.19.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.24.0) + rubocop (~> 1.33) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rails (2.23.1) + activesupport (>= 4.2.0) + rack (>= 1.1) + rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rake (0.6.0) + rubocop (~> 1.0) + rubocop-rspec (2.25.0) + rubocop (~> 1.40) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) + stringio (3.1.0) + thor (1.3.0) + timecop (0.9.8) + timeout (0.4.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.5.0) + webrick (1.8.1) + websocket-driver (0.7.6) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.6.12) + +PLATFORMS + arm64-darwin-22 + +DEPENDENCIES + appraisal + betterlint + rails + railties (~> 7.1.0) + rspec + timecop (~> 0.9.1) + uncruft! + +BUNDLED WITH + 2.4.22 From 458587ef431416f9843ff6274e1898146a7e476b Mon Sep 17 00:00:00 2001 From: Ricardo Vela Date: Tue, 2 Jan 2024 15:26:56 -0600 Subject: [PATCH 10/10] bundle lock --add-platform x86_64-linux --- Gemfile.lock | 3 +++ gemfiles/rails_6_1.gemfile.lock | 3 +++ gemfiles/rails_7_0.gemfile.lock | 3 +++ gemfiles/rails_7_1.gemfile.lock | 3 +++ 4 files changed, 12 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index eb81f2d..95c2981 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,6 +119,8 @@ GEM nio4r (2.6.1) nokogiri (1.15.5-arm64-darwin) racc (~> 1.4) + nokogiri (1.15.5-x86_64-linux) + racc (~> 1.4) parallel (1.23.0) parser (3.2.2.4) ast (~> 2.4.1) @@ -217,6 +219,7 @@ GEM PLATFORMS arm64-darwin-22 + x86_64-linux DEPENDENCIES appraisal diff --git a/gemfiles/rails_6_1.gemfile.lock b/gemfiles/rails_6_1.gemfile.lock index 7ebf6af..1f5986d 100644 --- a/gemfiles/rails_6_1.gemfile.lock +++ b/gemfiles/rails_6_1.gemfile.lock @@ -113,6 +113,8 @@ GEM nio4r (2.7.0) nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) + nokogiri (1.16.0-x86_64-linux) + racc (~> 1.4) parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) @@ -218,6 +220,7 @@ GEM PLATFORMS arm64-darwin-22 + x86_64-linux DEPENDENCIES appraisal diff --git a/gemfiles/rails_7_0.gemfile.lock b/gemfiles/rails_7_0.gemfile.lock index 559275e..0ad1193 100644 --- a/gemfiles/rails_7_0.gemfile.lock +++ b/gemfiles/rails_7_0.gemfile.lock @@ -119,6 +119,8 @@ GEM nio4r (2.7.0) nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) + nokogiri (1.16.0-x86_64-linux) + racc (~> 1.4) parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) @@ -217,6 +219,7 @@ GEM PLATFORMS arm64-darwin-22 + x86_64-linux DEPENDENCIES appraisal diff --git a/gemfiles/rails_7_1.gemfile.lock b/gemfiles/rails_7_1.gemfile.lock index 5e55eeb..5e70ff1 100644 --- a/gemfiles/rails_7_1.gemfile.lock +++ b/gemfiles/rails_7_1.gemfile.lock @@ -137,6 +137,8 @@ GEM nio4r (2.7.0) nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) + nokogiri (1.16.0-x86_64-linux) + racc (~> 1.4) parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) @@ -250,6 +252,7 @@ GEM PLATFORMS arm64-darwin-22 + x86_64-linux DEPENDENCIES appraisal