From a321ffd4f3be1ad5984ebf1975c5efa48508cf40 Mon Sep 17 00:00:00 2001 From: Mohammed Abdulkareem Date: Thu, 26 Sep 2024 15:39:35 +0300 Subject: [PATCH 01/13] Support Rails 7.2 --- diffcrypt.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diffcrypt.gemspec b/diffcrypt.gemspec index 3ae32cd..bb8173a 100644 --- a/diffcrypt.gemspec +++ b/diffcrypt.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |spec| spec.executables = %w[diffcrypt] spec.require_paths = ['lib'] - spec.add_runtime_dependency 'activesupport', '>= 6.0', '< 7.2' + spec.add_runtime_dependency 'activesupport', '>= 6.0', '< 7.3' spec.add_runtime_dependency 'thor', '>= 0.20', '< 2' spec.metadata['rubygems_mfa_required'] = 'true' end From 44b55098abea0d6990084b3e8c37e7df79967ee4 Mon Sep 17 00:00:00 2001 From: Mohammed Abdulkareem Date: Thu, 26 Sep 2024 15:47:31 +0300 Subject: [PATCH 02/13] Updated Rails version matrix --- test/rails_test.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/rails_test.rb b/test/rails_test.rb index 360da83..5bdb80b 100644 --- a/test/rails_test.rb +++ b/test/rails_test.rb @@ -6,9 +6,10 @@ require 'open3' RAILS_VERSIONS = %w[ - 6.1.7.7 - 7.0.8.3 - 7.1.3.3 + 6.1.7.8 + 7.0.8.4 + 7.1.4 + 7.2.1 ].freeze RAILS_FLAGS = %w[ From 54e2f3dec50870890196cd97cbb977e618e25460 Mon Sep 17 00:00:00 2001 From: Mohammed Abdulkareem Date: Thu, 26 Sep 2024 15:51:09 +0300 Subject: [PATCH 03/13] Bumped ruby version requirement to 3.0.0 --- diffcrypt.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diffcrypt.gemspec b/diffcrypt.gemspec index bb8173a..ba83b57 100644 --- a/diffcrypt.gemspec +++ b/diffcrypt.gemspec @@ -12,7 +12,7 @@ Gem::Specification.new do |spec| spec.description = 'Diffable encrypted configuration files that can be safely committed into a git repository' spec.homepage = 'https://github.com/diffcrypt/diffcrypt-ruby' spec.license = 'MIT' - spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0') + spec.required_ruby_version = Gem::Requirement.new('>= 3.0.0') # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'" From d771147d144fb495d34ef1197fff726e6722813d Mon Sep 17 00:00:00 2001 From: Mohammed Abdulkareem Date: Thu, 26 Sep 2024 15:53:50 +0300 Subject: [PATCH 04/13] Rubocop Ruby target as well --- .rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 1956e70..c8e6d3b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,6 +1,6 @@ AllCops: NewCops: enable - TargetRubyVersion: 2.6 + TargetRubyVersion: 3.0 Style/ClassAndModuleChildren: Exclude: From e5d7c694befb43052329fcec813b0c67ea5cd41e Mon Sep 17 00:00:00 2001 From: Mohammed Abdulkareem Date: Thu, 26 Sep 2024 15:55:16 +0300 Subject: [PATCH 05/13] remove redundant sort --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index df48b05..304d840 100644 --- a/Rakefile +++ b/Rakefile @@ -11,4 +11,4 @@ end task default: :test path = File.expand_path(__dir__) -Dir.glob("#{path}/lib/diffcrypt/tasks/**/*.rake").sort.each { |f| load f } +Dir.glob("#{path}/lib/diffcrypt/tasks/**/*.rake").each { |f| load f } From e78e9426cc9266ea5f4a2d8c58c4009fd6aaa807 Mon Sep 17 00:00:00 2001 From: Lud Date: Fri, 11 Oct 2024 19:10:46 +0200 Subject: [PATCH 06/13] Update Rakefile --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 304d840..a47194d 100644 --- a/Rakefile +++ b/Rakefile @@ -11,4 +11,4 @@ end task default: :test path = File.expand_path(__dir__) -Dir.glob("#{path}/lib/diffcrypt/tasks/**/*.rake").each { |f| load f } +Dir.glob("#{path}/lib/diffcrypt/tasks/**/*.rake").each { load(_1) } From f25e143a13ff699aa59077ce02cd7c264a766b15 Mon Sep 17 00:00:00 2001 From: Mohammed Abdulkareem Date: Fri, 11 Oct 2024 20:29:27 +0300 Subject: [PATCH 07/13] Installs zeitwerk --- test/rails_test.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/rails_test.rb b/test/rails_test.rb index 5bdb80b..38159fb 100644 --- a/test/rails_test.rb +++ b/test/rails_test.rb @@ -58,6 +58,8 @@ def setup Dir.chdir(tmp_version_root) do File.write('Gemfile', "gem 'diffcrypt', path: '../../..'", mode: 'a') + # Install Zeitwerk before 2.7, because 2.7 requires Ruby 3.2+ + File.write('Gemfile', "gem 'zeitwerk', '~> 2.6'", mode: 'a') run_command('bundle', 'install') stdout, _stderr, _status = run_command('bundle', 'exec', 'rails', 'r', 'puts Rails.version') assert_equal rails_version, stdout.strip From e2c3815ce7f73236d6ef288d33d1f5c4ce07f4aa Mon Sep 17 00:00:00 2001 From: Mohammed Abdulkareem Date: Fri, 11 Oct 2024 20:32:26 +0300 Subject: [PATCH 08/13] Try again with global zeitwerk --- test/rails_test.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/rails_test.rb b/test/rails_test.rb index 38159fb..595e58d 100644 --- a/test/rails_test.rb +++ b/test/rails_test.rb @@ -48,6 +48,9 @@ def setup RAILS_VERSIONS.each do |rails_version| define_method "test_that_rails_#{rails_version.gsub('.', '_')}_works" do + # Install Zeitwerk before 2.7, because 2.7 requires Ruby 3.2+ + run_command('gem', 'install', 'zeitwerk', '-v', '2.6.11') + Bundler.with_unbundled_env do Dir.chdir(TMP_RAILS_ROOT) do tmp_version_root = "rails_#{rails_version.gsub('.', '_')}" @@ -58,8 +61,6 @@ def setup Dir.chdir(tmp_version_root) do File.write('Gemfile', "gem 'diffcrypt', path: '../../..'", mode: 'a') - # Install Zeitwerk before 2.7, because 2.7 requires Ruby 3.2+ - File.write('Gemfile', "gem 'zeitwerk', '~> 2.6'", mode: 'a') run_command('bundle', 'install') stdout, _stderr, _status = run_command('bundle', 'exec', 'rails', 'r', 'puts Rails.version') assert_equal rails_version, stdout.strip From 8ec33654a06eae30def68aef96a7695abddd5f63 Mon Sep 17 00:00:00 2001 From: Mohammed Abdulkareem Date: Fri, 11 Oct 2024 20:37:01 +0300 Subject: [PATCH 09/13] Maybe use exact rails version --- test/rails_test.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/rails_test.rb b/test/rails_test.rb index 595e58d..ac6ed8a 100644 --- a/test/rails_test.rb +++ b/test/rails_test.rb @@ -48,9 +48,6 @@ def setup RAILS_VERSIONS.each do |rails_version| define_method "test_that_rails_#{rails_version.gsub('.', '_')}_works" do - # Install Zeitwerk before 2.7, because 2.7 requires Ruby 3.2+ - run_command('gem', 'install', 'zeitwerk', '-v', '2.6.11') - Bundler.with_unbundled_env do Dir.chdir(TMP_RAILS_ROOT) do tmp_version_root = "rails_#{rails_version.gsub('.', '_')}" @@ -61,6 +58,7 @@ def setup Dir.chdir(tmp_version_root) do File.write('Gemfile', "gem 'diffcrypt', path: '../../..'", mode: 'a') + File.write('Gemfile', "gem 'zeitwerk', '2.6.11'", mode: 'a') run_command('bundle', 'install') stdout, _stderr, _status = run_command('bundle', 'exec', 'rails', 'r', 'puts Rails.version') assert_equal rails_version, stdout.strip From 84d2487ac231f86cf9021a6989fe307026f547f9 Mon Sep 17 00:00:00 2001 From: Mohammed Abdulkareem Date: Fri, 11 Oct 2024 21:41:23 +0300 Subject: [PATCH 10/13] Update test/rails_test.rb --- test/rails_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/rails_test.rb b/test/rails_test.rb index ac6ed8a..94a782b 100644 --- a/test/rails_test.rb +++ b/test/rails_test.rb @@ -58,7 +58,7 @@ def setup Dir.chdir(tmp_version_root) do File.write('Gemfile', "gem 'diffcrypt', path: '../../..'", mode: 'a') - File.write('Gemfile', "gem 'zeitwerk', '2.6.11'", mode: 'a') + File.write('Gemfile', "\ngem 'zeitwerk', '2.6.11'", mode: 'a') run_command('bundle', 'install') stdout, _stderr, _status = run_command('bundle', 'exec', 'rails', 'r', 'puts Rails.version') assert_equal rails_version, stdout.strip From b1d0d7d011a8224e3c9bbcf52e0f034b91faa402 Mon Sep 17 00:00:00 2001 From: Lud Date: Fri, 11 Oct 2024 20:50:53 +0200 Subject: [PATCH 11/13] chore: update CI to run on Ruby 3 x Rails 6 & 7 (#3) * chore: add appraisal * update CI to run on ruby/rails matrix * no need to have test lockfiles in repo * fix typo and cleanup * continue on error * no need for dark magic rails test? * Fixed rubocop --------- Co-authored-by: Mohammed Abdulkareem Co-authored-by: Mohammed Abdulkareem --- .github/workflows/test.yml | 33 +++++++++++++----- .gitignore | 2 ++ Appraisals | 13 +++++++ Gemfile | 1 + gemfiles/rails_6.1.gemfile | 16 +++++++++ gemfiles/rails_7.1.gemfile | 16 +++++++++ gemfiles/rails_7.2.gemfile | 16 +++++++++ test/rails_test.rb | 70 -------------------------------------- 8 files changed, 89 insertions(+), 78 deletions(-) create mode 100644 Appraisals create mode 100644 gemfiles/rails_6.1.gemfile create mode 100644 gemfiles/rails_7.1.gemfile create mode 100644 gemfiles/rails_7.2.gemfile delete mode 100644 test/rails_test.rb diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 59ead51..eef3fb7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,15 +7,27 @@ on: pull_request: jobs: - rspec: + tests: + name: "RSpec @ Ruby ${{ matrix.ruby }}, Rails ${{ matrix.rails }}" runs-on: ubuntu-latest + continue-on-error: true + env: + BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile strategy: matrix: ruby: - - "3.0.7" - - "3.1.5" + - "3.1" + - "3.3" + - "head" + rails: + - "6.1" + - "7.1" + - "7.2" + exclude: + - ruby: "3.3" + rails: "6.1" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: @@ -24,15 +36,20 @@ jobs: - name: Run rspec run: bundle exec rake test - rubocop: + linters: + name: "Rubocop @ Ruby ${{ matrix.ruby }}, Rails ${{ matrix.rails }}" runs-on: ubuntu-latest + continue-on-error: true + env: + BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile strategy: matrix: ruby: - - "3.0.7" - - "3.1.5" + - "head" + rails: + - "7.2" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: diff --git a/.gitignore b/.gitignore index 82d8097..01e4723 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /tmp/ Gemfile.lock *.gem +.ruby-version +gemfiles/*.lock diff --git a/Appraisals b/Appraisals new file mode 100644 index 0000000..dbb1264 --- /dev/null +++ b/Appraisals @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +SUPPORTED_RAILS_VERSIONS = %w[ + 6.1 + 7.1 + 7.2 +].freeze + +SUPPORTED_RAILS_VERSIONS.each do |version| + appraise "rails-#{version}" do + gem 'rails', "~> #{version}" + end +end diff --git a/Gemfile b/Gemfile index 5f853a1..588d2ff 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,7 @@ source 'https://rubygems.org' # Specify your gem's dependencies in diffcrypt.gemspec gemspec +gem 'appraisal' gem 'minitest', '~> 5.0' gem 'minitest-reporters', '~> 1.6.0' gem 'rake', '~> 13.2' diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile new file mode 100644 index 0000000..3b0fe0f --- /dev/null +++ b/gemfiles/rails_6.1.gemfile @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +# This file was generated by Appraisal + +source 'https://rubygems.org' + +gem 'appraisal' +gem 'minitest', '~> 5.0' +gem 'minitest-reporters', '~> 1.6.0' +gem 'rails', '~> 6.1' +gem 'rake', '~> 13.2' +gem 'rubocop', '~> 1.25.1' +gem 'simplecov', '~> 0.22.0', require: false +gem 'simplecov-lcov', '< 0.9' + +gemspec path: '../' diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile new file mode 100644 index 0000000..3f4cbf5 --- /dev/null +++ b/gemfiles/rails_7.1.gemfile @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +# This file was generated by Appraisal + +source 'https://rubygems.org' + +gem 'appraisal' +gem 'minitest', '~> 5.0' +gem 'minitest-reporters', '~> 1.6.0' +gem 'rails', '~> 7.1' +gem 'rake', '~> 13.2' +gem 'rubocop', '~> 1.25.1' +gem 'simplecov', '~> 0.22.0', require: false +gem 'simplecov-lcov', '< 0.9' + +gemspec path: '../' diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile new file mode 100644 index 0000000..91c2eb6 --- /dev/null +++ b/gemfiles/rails_7.2.gemfile @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +# This file was generated by Appraisal + +source 'https://rubygems.org' + +gem 'appraisal' +gem 'minitest', '~> 5.0' +gem 'minitest-reporters', '~> 1.6.0' +gem 'rails', '~> 7.2' +gem 'rake', '~> 13.2' +gem 'rubocop', '~> 1.25.1' +gem 'simplecov', '~> 0.22.0', require: false +gem 'simplecov-lcov', '< 0.9' + +gemspec path: '../' diff --git a/test/rails_test.rb b/test/rails_test.rb deleted file mode 100644 index 94a782b..0000000 --- a/test/rails_test.rb +++ /dev/null @@ -1,70 +0,0 @@ -# frozen_string_literal: true - -require 'test_helper' -require 'bundler' - -require 'open3' - -RAILS_VERSIONS = %w[ - 6.1.7.8 - 7.0.8.4 - 7.1.4 - 7.2.1 -].freeze - -RAILS_FLAGS = %w[ - --api - --skip-action-cable - --skip-active-storage - --skip-bundle - --skip-git - --skip-javascript - --skip-keeps - --skip-system-test - --skip-test -].freeze - -TMP_RAILS_ROOT = File.join(__dir__, '../tmp/test') - -# Helper to ensure we raise if command is not successful -def run_command(*command) - stdout, stderr, status = Open3.capture3(*command) - if status.success? == false - errors = [ - " Command Failed: #{command.join(' ')}", - stdout.split("\n").map { |line| " #{line}" }.join("\n"), - stderr.split("\n").map { |line| " #{line}" }.join("\n"), - ] - raise errors.join("\n") - end - - [stdout, stderr, status] -end - -class RailsTest < Minitest::Test - def setup - FileUtils.mkdir_p(TMP_RAILS_ROOT) unless Dir.exist?(TMP_RAILS_ROOT) - end - - RAILS_VERSIONS.each do |rails_version| - define_method "test_that_rails_#{rails_version.gsub('.', '_')}_works" do - Bundler.with_unbundled_env do - Dir.chdir(TMP_RAILS_ROOT) do - tmp_version_root = "rails_#{rails_version.gsub('.', '_')}" - FileUtils.remove_dir(tmp_version_root) if Dir.exist?(tmp_version_root) - run_command('gem', 'install', 'rails', '--version', rails_version, '--force') - run_command('rails', "_#{rails_version}_", 'new', *RAILS_FLAGS, tmp_version_root) - raise "Rails #{rails_version} app creation failed" unless Dir.exist?(tmp_version_root) - - Dir.chdir(tmp_version_root) do - File.write('Gemfile', "gem 'diffcrypt', path: '../../..'", mode: 'a') - File.write('Gemfile', "\ngem 'zeitwerk', '2.6.11'", mode: 'a') - run_command('bundle', 'install') - stdout, _stderr, _status = run_command('bundle', 'exec', 'rails', 'r', 'puts Rails.version') - assert_equal rails_version, stdout.strip - end - end - end - end - end -end From a7c7eeb8a02609af05d9f4c2212e2b5d03f14972 Mon Sep 17 00:00:00 2001 From: Lud Date: Fri, 11 Oct 2024 20:53:22 +0200 Subject: [PATCH 12/13] don't use deprecated OpenStruct --- .rubocop.yml | 4 ---- test/diffcrypt/rails/application_helper_test.rb | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index c8e6d3b..4e700c1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -23,10 +23,6 @@ Style/TrailingCommaInHashLiteral: EnforcedStyleForMultiline: consistent_comma Style/AccessorGrouping: EnforcedStyle: separated -Style/OpenStructUse: - Exclude: - - test/*_test.rb - - test/**/*_test.rb Layout/LineLength: Exclude: diff --git a/test/diffcrypt/rails/application_helper_test.rb b/test/diffcrypt/rails/application_helper_test.rb index 5fb8930..f07ad05 100644 --- a/test/diffcrypt/rails/application_helper_test.rb +++ b/test/diffcrypt/rails/application_helper_test.rb @@ -7,10 +7,10 @@ class MockApplication include Diffcrypt::Rails::ApplicationHelper + Config = Struct.new(:require_master_key) + def config - OpenStruct.new( - require_master_key: true, - ) + Config.new(true) end end From 3dc7e9918054d00bf7dfc9552c650eacc5f1e8a9 Mon Sep 17 00:00:00 2001 From: Lud Date: Fri, 11 Oct 2024 20:54:45 +0200 Subject: [PATCH 13/13] exclude ruby head / rails 6.1 --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eef3fb7..4d23625 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,6 +26,8 @@ jobs: exclude: - ruby: "3.3" rails: "6.1" + - ruby: "head" + rails: "6.1" steps: - uses: actions/checkout@v3 - name: Set up Ruby