From e652ca9ca93e35bd6682ea4e41da6e4cce25ffba Mon Sep 17 00:00:00 2001 From: Daniele Palombo <387690+DanielePalombo@users.noreply.github.com> Date: Mon, 16 Jun 2025 11:54:56 +0200 Subject: [PATCH 1/3] Upgrade ruby/rails --- .github/workflows/main.yml | 20 ++++++++++---------- Appraisals | 16 ++++++++-------- Gemfile | 3 +++ deface.gemspec | 6 ++++++ gemfiles/rails_7.0.gemfile | 2 ++ gemfiles/rails_7.1.gemfile | 16 ++++++++++++++++ gemfiles/rails_7.2.gemfile | 16 ++++++++++++++++ gemfiles/rails_8.0.gemfile | 16 ++++++++++++++++ 8 files changed, 77 insertions(+), 18 deletions(-) create mode 100644 gemfiles/rails_7.1.gemfile create mode 100644 gemfiles/rails_7.2.gemfile create mode 100644 gemfiles/rails_8.0.gemfile diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c33f2fa..8fdcfe9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,20 +14,20 @@ jobs: # gemfile: "rails_6_1" # - ruby: "2.7" # gemfile: "rails_6_1" - - ruby: "2.6" - gemfile: "rails_6.1" - - ruby: "2.5" - gemfile: "rails_6.1" + - ruby: "3.4" + gemfile: "rails_8.0" + - ruby: "3.3" + gemfile: "rails_8.0" # - ruby: "2.7" # gemfile: "rails_6_0" - - ruby: "2.6" - gemfile: "rails_6.0" - - ruby: "2.5" - gemfile: "rails_6.0" + - ruby: "3.4" + gemfile: "rails_7.2" + - ruby: "3.3" + gemfile: "rails_7.2" - - ruby: "2.5" - gemfile: "rails_5.2" + - ruby: "3.3" + gemfile: "rails_7.1" runs-on: ubuntu-latest diff --git a/Appraisals b/Appraisals index 36b171a..a07920f 100644 --- a/Appraisals +++ b/Appraisals @@ -1,35 +1,35 @@ -appraise 'rails-5.2' do +appraise 'rails-7.0' do %w[ actionview railties ].each do |rails_gem| - gem rails_gem, '~> 5.2.0' + gem rails_gem, '~> 7.0.0' end end -appraise 'rails-6.0' do +appraise 'rails-7.1' do %w[ actionview railties ].each do |rails_gem| - gem rails_gem, '~> 6.0.0' + gem rails_gem, '~> 7.1.0' end end -appraise 'rails-6.1' do +appraise 'rails-7.2' do %w[ actionview railties ].each do |rails_gem| - gem rails_gem, '~> 6.1.0' + gem rails_gem, '~> 7.2.0' end end -appraise 'rails-7.0' do +appraise 'rails-8.0' do %w[ actionview railties ].each do |rails_gem| - gem rails_gem, '~> 7.0.0' + gem rails_gem, '~> 8.0.0' end end diff --git a/Gemfile b/Gemfile index e0810bb..2b6ba92 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,8 @@ source 'https://rubygems.org' +gem 'concurrent-ruby' +gem 'mutex_m' + group :test do gem 'test-unit' gem 'pry' diff --git a/deface.gemspec b/deface.gemspec index 72c413f..e59b1d8 100644 --- a/deface.gemspec +++ b/deface.gemspec @@ -39,6 +39,7 @@ Gem::Specification.new do |spec| end spec.add_dependency('rainbow', '>= 2.1.0') spec.add_dependency('polyglot') + spec.add_dependency('drb') spec.add_development_dependency('appraisal') spec.add_development_dependency('erubis') @@ -49,4 +50,9 @@ Gem::Specification.new do |spec| spec.add_development_dependency('simplecov', '>= 0.6.4') spec.add_development_dependency('generator_spec', '~> 0.8') spec.add_development_dependency('pry') + + if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.3') + spec.add_dependency('base64') + spec.add_dependency('bigdecimal') + end end diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 82c9963..98ce405 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -2,6 +2,8 @@ source "https://rubygems.org" +gem "concurrent-ruby" +gem "mutex_m" gem "actionview", "~> 7.0.0" gem "railties", "~> 7.0.0" diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile new file mode 100644 index 0000000..392d8f8 --- /dev/null +++ b/gemfiles/rails_7.1.gemfile @@ -0,0 +1,16 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "concurrent-ruby" +gem "mutex_m" +gem "actionview", "~> 7.1.0" +gem "railties", "~> 7.1.0" + +group :test do + gem "test-unit" + gem "pry" + gem "pry-byebug" +end + +gemspec path: "../" diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile new file mode 100644 index 0000000..7dbfe12 --- /dev/null +++ b/gemfiles/rails_7.2.gemfile @@ -0,0 +1,16 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "concurrent-ruby" +gem "mutex_m" +gem "actionview", "~> 7.2.0" +gem "railties", "~> 7.2.0" + +group :test do + gem "test-unit" + gem "pry" + gem "pry-byebug" +end + +gemspec path: "../" diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile new file mode 100644 index 0000000..c97991b --- /dev/null +++ b/gemfiles/rails_8.0.gemfile @@ -0,0 +1,16 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "concurrent-ruby" +gem "mutex_m" +gem "actionview", "~> 8.0.0" +gem "railties", "~> 8.0.0" + +group :test do + gem "test-unit" + gem "pry" + gem "pry-byebug" +end + +gemspec path: "../" From d505c24db51e346c832ad03591384b0e7ae80dfd Mon Sep 17 00:00:00 2001 From: Daniele Palombo <387690+DanielePalombo@users.noreply.github.com> Date: Mon, 16 Jun 2025 11:58:14 +0200 Subject: [PATCH 2/3] Fix File.exists? error File.exists? has been replaced by File.exist? since ruby 3.2.0 --- spec/deface/precompiler_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/deface/precompiler_spec.rb b/spec/deface/precompiler_spec.rb index d043e0f..1aa0b3e 100644 --- a/spec/deface/precompiler_spec.rb +++ b/spec/deface/precompiler_spec.rb @@ -31,7 +31,7 @@ module Deface filename = 'spec/dummy/app/compiled_views/posts/precompileme.html.erb' - expect(File.exists?(filename)).to be_truthy + expect(File.exist?(filename)).to be_truthy file = File.open(filename, "rb") contents = file.read From 280a2f4df17d768b9f3cce67cc90816034cd8fe9 Mon Sep 17 00:00:00 2001 From: Elia Schito Date: Mon, 16 Jun 2025 12:29:25 +0200 Subject: [PATCH 3/3] Move all dependencies to the gemspec --- Gemfile | 9 --------- deface.gemspec | 28 ++++++++++++++-------------- gemfiles/rails_7.0.gemfile | 8 -------- gemfiles/rails_7.1.gemfile | 8 -------- gemfiles/rails_7.2.gemfile | 8 -------- gemfiles/rails_8.0.gemfile | 8 -------- 6 files changed, 14 insertions(+), 55 deletions(-) diff --git a/Gemfile b/Gemfile index 2b6ba92..fa75df1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,12 +1,3 @@ source 'https://rubygems.org' -gem 'concurrent-ruby' -gem 'mutex_m' - -group :test do - gem 'test-unit' - gem 'pry' - gem 'pry-byebug' -end - gemspec diff --git a/deface.gemspec b/deface.gemspec index e59b1d8..fa9597c 100644 --- a/deface.gemspec +++ b/deface.gemspec @@ -29,30 +29,30 @@ Gem::Specification.new do |spec| spec.rdoc_options = ["--charset=UTF-8"] spec.extra_rdoc_files = ["README.markdown"] - spec.add_dependency('nokogiri', '>= 1.6') - %w[ actionview railties ].each do |rails_gem| - spec.add_dependency(rails_gem, '>= 5.2') + spec.add_dependency(rails_gem, '>= 7.0') end - spec.add_dependency('rainbow', '>= 2.1.0') - spec.add_dependency('polyglot') + + spec.add_dependency('base64') + spec.add_dependency('bigdecimal') spec.add_dependency('drb') + spec.add_dependency('mutex_m') + spec.add_dependency('nokogiri', '>= 1.6') + spec.add_dependency('polyglot') + spec.add_dependency('rainbow', '>= 2.1.0') spec.add_development_dependency('appraisal') spec.add_development_dependency('erubis') spec.add_development_dependency('gem-release') - spec.add_development_dependency('rspec', '>= 3.1.0') - spec.add_development_dependency('haml', ['>= 4.0', '< 6']) - spec.add_development_dependency('slim', '~> 4.1') - spec.add_development_dependency('simplecov', '>= 0.6.4') spec.add_development_dependency('generator_spec', '~> 0.8') + spec.add_development_dependency('haml', ['>= 4.0', '< 6']) spec.add_development_dependency('pry') - - if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.3') - spec.add_dependency('base64') - spec.add_dependency('bigdecimal') - end + spec.add_development_dependency('pry-byebug') + spec.add_development_dependency('rspec', '>= 3.1.0') + spec.add_development_dependency('simplecov', '>= 0.6.4') + spec.add_development_dependency('slim', '~> 4.1') + spec.add_development_dependency('test-unit') end diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 98ce405..e49f880 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -2,15 +2,7 @@ source "https://rubygems.org" -gem "concurrent-ruby" -gem "mutex_m" gem "actionview", "~> 7.0.0" gem "railties", "~> 7.0.0" -group :test do - gem "test-unit" - gem "pry" - gem "pry-byebug" -end - gemspec path: "../" diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index 392d8f8..ba79111 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -2,15 +2,7 @@ source "https://rubygems.org" -gem "concurrent-ruby" -gem "mutex_m" gem "actionview", "~> 7.1.0" gem "railties", "~> 7.1.0" -group :test do - gem "test-unit" - gem "pry" - gem "pry-byebug" -end - gemspec path: "../" diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile index 7dbfe12..23fb22f 100644 --- a/gemfiles/rails_7.2.gemfile +++ b/gemfiles/rails_7.2.gemfile @@ -2,15 +2,7 @@ source "https://rubygems.org" -gem "concurrent-ruby" -gem "mutex_m" gem "actionview", "~> 7.2.0" gem "railties", "~> 7.2.0" -group :test do - gem "test-unit" - gem "pry" - gem "pry-byebug" -end - gemspec path: "../" diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile index c97991b..bb5ea2f 100644 --- a/gemfiles/rails_8.0.gemfile +++ b/gemfiles/rails_8.0.gemfile @@ -2,15 +2,7 @@ source "https://rubygems.org" -gem "concurrent-ruby" -gem "mutex_m" gem "actionview", "~> 8.0.0" gem "railties", "~> 8.0.0" -group :test do - gem "test-unit" - gem "pry" - gem "pry-byebug" -end - gemspec path: "../"