Improve Appraisal config

.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.rails }}.gemfile
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.rails }}_with_${{ matrix.adapter }}.gemfile
       ORACLE_COOKIE: sqldev
       ORACLE_FILE: oracle11g/xe/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
       ORACLE_HOME: /u01/app/oracle/product/11.2.0/xe

Appraisals

@@ -1,28 +1,48 @@
 # frozen_string_literal: true
 
-appraise 'rails_7.0.8' do # rubocop:disable Metrics/BlockLength
-  gem 'rails', '7.0.8'
+###############
+# RAILS 7.0.8 #
+###############
 
-  install_if '-> { ENV["DB_ADAPTER"] == "sqlite3" }' do
-    gem 'sqlite3', '~> 1.5.0'
-  end
+appraise 'rails_7.0.8_with_postgresql' do
+  gem 'rails', '7.0.8'
+  gem 'pg'
 
-  install_if '-> { ENV["DB_ADAPTER"] == "mysql2" }' do
-    gem 'mysql2'
+  # Fix:
+  # warning: logger was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.5.0
+  # Add logger to your Gemfile or gemspec.
+  install_if '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }' do
+    gem 'base64'
+    gem 'bigdecimal'
+    gem 'benchmark'
+    gem 'drb'
+    gem 'logger'
+    gem 'mutex_m'
+    gem 'ostruct'
   end
+end
 
-  install_if '-> { ENV["DB_ADAPTER"] == "trilogy" }' do
-    gem 'activerecord-trilogy-adapter'
-  end
+appraise 'rails_7.0.8_with_sqlite3' do
+  gem 'rails', '7.0.8'
+  gem 'sqlite3', '~> 1.5.0'
 
-  install_if '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }' do
-    gem 'ruby-oci8'
-    gem 'activerecord-oracle_enhanced-adapter', '~> 7.0.0'
+  # Fix:
+  # warning: logger was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.5.0
+  # Add logger to your Gemfile or gemspec.
+  install_if '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }' do
+    gem 'base64'
+    gem 'bigdecimal'
+    gem 'benchmark'
+    gem 'drb'
+    gem 'logger'
+    gem 'mutex_m'
+    gem 'ostruct'
   end
+end
 
-  install_if '-> { ENV["DB_ADAPTER"] == "postgis" }' do
-    gem 'activerecord-postgis-adapter'
-  end
+appraise 'rails_7.0.8_with_mysql2' do
+  gem 'rails', '7.0.8'
+  gem 'mysql2'
 
   # Fix:
   # warning: logger was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.5.0
@@ -38,60 +58,130 @@ appraise 'rails_7.0.8' do # rubocop:disable Metrics/BlockLength
   end
 end
 
-appraise 'rails_7.1.0' do
-  gem 'rails', '7.1.0'
-
-  install_if '-> { ENV["DB_ADAPTER"] == "sqlite3" }' do
-    gem 'sqlite3', '~> 1.5.0'
-  end
+appraise 'rails_7.0.8_with_trilogy' do
+  gem 'rails', '7.0.8'
+  gem 'activerecord-trilogy-adapter'
 
-  install_if '-> { ENV["DB_ADAPTER"] == "mysql2" }' do
-    gem 'mysql2'
+  # Fix:
+  # warning: logger was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.5.0
+  # Add logger to your Gemfile or gemspec.
+  install_if '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }' do
+    gem 'base64'
+    gem 'bigdecimal'
+    gem 'benchmark'
+    gem 'drb'
+    gem 'logger'
+    gem 'mutex_m'
+    gem 'ostruct'
   end
+end
 
-  install_if '-> { ENV["DB_ADAPTER"] == "trilogy" }' do
-    gem 'activerecord-trilogy-adapter'
-  end
+appraise 'rails_7.0.8_with_oracle_enhanced' do
+  gem 'rails', '7.0.8'
+  gem 'ruby-oci8'
+  gem 'activerecord-oracle_enhanced-adapter', '~> 7.0.0'
 
-  install_if '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }' do
-    gem 'ruby-oci8'
-    gem 'activerecord-oracle_enhanced-adapter', git: 'https://github.com/rsim/oracle-enhanced.git'
+  # Fix:
+  # warning: logger was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.5.0
+  # Add logger to your Gemfile or gemspec.
+  install_if '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }' do
+    gem 'base64'
+    gem 'bigdecimal'
+    gem 'benchmark'
+    gem 'drb'
+    gem 'logger'
+    gem 'mutex_m'
+    gem 'ostruct'
   end
+end
 
-  install_if '-> { ENV["DB_ADAPTER"] == "postgis" }' do
-    gem 'activerecord-postgis-adapter'
-  end
+appraise 'rails_7.0.8_with_postgis' do
+  gem 'rails', '7.0.8'
+  gem 'pg'
+  gem 'activerecord-postgis-adapter'
 
   # Fix:
   # warning: logger was loaded from the standard library, but will no longer be part of the default gems since Ruby 3.5.0
   # Add logger to your Gemfile or gemspec.
-  install_if '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.3.0") }' do
+  install_if '-> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") }' do
+    gem 'base64'
+    gem 'bigdecimal'
+    gem 'benchmark'
+    gem 'drb'
     gem 'logger'
+    gem 'mutex_m'
     gem 'ostruct'
   end
 end
 
-appraise 'rails_7.2.0' do
+###############
+# RAILS 7.1.0 #
+###############
+
+appraise 'rails_7.1.0_with_postgresql' do
+  gem 'rails', '7.1.0'
+  gem 'pg'
+end
+
+appraise 'rails_7.1.0_with_sqlite3' do
+  gem 'rails', '7.1.0'
+  gem 'sqlite3', '~> 1.5.0'
+end
+
+appraise 'rails_7.1.0_with_mysql2' do
+  gem 'rails', '7.1.0'
+  gem 'mysql2'
+end
+
+appraise 'rails_7.1.0_with_trilogy' do
+  gem 'rails', '7.1.0'
+  gem 'activerecord-trilogy-adapter'
+end
+
+appraise 'rails_7.1.0_with_oracle_enhanced' do
+  gem 'rails', '7.1.0'
+  gem 'ruby-oci8'
+  gem 'activerecord-oracle_enhanced-adapter', git: 'https://github.com/rsim/oracle-enhanced.git'
+end
+
+appraise 'rails_7.1.0_with_postgis' do
+  gem 'rails', '7.1.0'
+  gem 'pg'
+  gem 'activerecord-postgis-adapter'
+end
+
+###############
+# RAILS 7.2.0 #
+###############
+
+appraise 'rails_7.2.0_with_postgresql' do
   gem 'rails', '7.2.0'
+  gem 'pg'
+end
 
-  install_if '-> { ENV["DB_ADAPTER"] == "sqlite3" }' do
-    gem 'sqlite3', '~> 1.5.0'
-  end
+appraise 'rails_7.2.0_with_sqlite3' do
+  gem 'rails', '7.2.0'
+  gem 'sqlite3', '~> 1.5.0'
+end
 
-  install_if '-> { ENV["DB_ADAPTER"] == "mysql2" }' do
-    gem 'mysql2'
-  end
+appraise 'rails_7.2.0_with_mysql2' do
+  gem 'rails', '7.2.0'
+  gem 'mysql2'
+end
 
-  install_if '-> { ENV["DB_ADAPTER"] == "trilogy" }' do
-    gem 'activerecord-trilogy-adapter'
-  end
+appraise 'rails_7.2.0_with_trilogy' do
+  gem 'rails', '7.2.0'
+  gem 'activerecord-trilogy-adapter'
+end
 
-  install_if '-> { ENV["DB_ADAPTER"] == "oracle_enhanced" }' do
-    gem 'ruby-oci8'
-    gem 'activerecord-oracle_enhanced-adapter', git: 'https://github.com/rsim/oracle-enhanced.git'
-  end
+appraise 'rails_7.2.0_with_oracle_enhanced' do
+  gem 'rails', '7.2.0'
+  gem 'ruby-oci8'
+  gem 'activerecord-oracle_enhanced-adapter', git: 'https://github.com/rsim/oracle-enhanced.git'
+end
 
-  install_if '-> { ENV["DB_ADAPTER"] == "postgis" }' do
-    gem 'activerecord-postgis-adapter', git: 'https://github.com/rgeo/activerecord-postgis-adapter.git'
-  end
+appraise 'rails_7.2.0_with_postgis' do
+  gem 'rails', '7.2.0'
+  gem 'pg'
+  gem 'activerecord-postgis-adapter', git: 'https://github.com/rgeo/activerecord-postgis-adapter.git'
 end

Gemfile

@@ -6,14 +6,12 @@ gemspec
 
 gem 'appraisal', git: 'https://github.com/thoughtbot/appraisal.git'
 
-# gem 'activerecord-oracle_enhanced-adapter'
 gem 'combustion'
 gem 'database_cleaner'
 gem 'factory_bot'
 gem 'faker'
 gem 'generator_spec'
 gem 'guard-rspec'
-gem 'pg'
 gem 'pry'
 gem 'puma'
 gem 'rake'
@@ -25,3 +23,7 @@ gem 'rubocop-performance'
 gem 'rubocop-rake'
 gem 'rubocop-rspec'
 gem 'simplecov'
+
+# Fallback to pg if DB_ADAPTER is not set (like in dev/local environment)
+# so we can still call bin/rspec
+gem 'pg' if $PROGRAM_NAME == 'bin/rspec' && ENV['DB_ADAPTER'].nil?

gemfiles/rails_7.0.8_with_mysql2.gemfile

@@ -0,0 +1,36 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git"
+gem "combustion"
+gem "database_cleaner"
+gem "factory_bot"
+gem "faker"
+gem "generator_spec"
+gem "guard-rspec"
+gem "pry"
+gem "puma"
+gem "rake"
+gem "rspec"
+gem "rspec-retry"
+gem "rubocop"
+gem "rubocop-factory_bot"
+gem "rubocop-performance"
+gem "rubocop-rake"
+gem "rubocop-rspec"
+gem "simplecov"
+gem "rails", "7.0.8"
+gem "mysql2"
+
+install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") } do
+  gem "base64"
+  gem "bigdecimal"
+  gem "benchmark"
+  gem "drb"
+  gem "logger"
+  gem "mutex_m"
+  gem "ostruct"
+end
+
+gemspec path: "../"

gemfiles/rails_7.0.8_with_oracle_enhanced.gemfile

@@ -0,0 +1,37 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git"
+gem "combustion"
+gem "database_cleaner"
+gem "factory_bot"
+gem "faker"
+gem "generator_spec"
+gem "guard-rspec"
+gem "pry"
+gem "puma"
+gem "rake"
+gem "rspec"
+gem "rspec-retry"
+gem "rubocop"
+gem "rubocop-factory_bot"
+gem "rubocop-performance"
+gem "rubocop-rake"
+gem "rubocop-rspec"
+gem "simplecov"
+gem "rails", "7.0.8"
+gem "ruby-oci8"
+gem "activerecord-oracle_enhanced-adapter", "~> 7.0.0"
+
+install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") } do
+  gem "base64"
+  gem "bigdecimal"
+  gem "benchmark"
+  gem "drb"
+  gem "logger"
+  gem "mutex_m"
+  gem "ostruct"
+end
+
+gemspec path: "../"

gemfiles/rails_7.0.8.gemfile → gemfiles/rails_7.0.8_with_postgis.gemfile

@@ -9,7 +9,6 @@ gem "factory_bot"
 gem "faker"
 gem "generator_spec"
 gem "guard-rspec"
-gem "pg"
 gem "pry"
 gem "puma"
 gem "rake"
@@ -22,27 +21,8 @@ gem "rubocop-rake"
 gem "rubocop-rspec"
 gem "simplecov"
 gem "rails", "7.0.8"
-
-install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do
-  gem "sqlite3", "~> 1.5.0"
-end
-
-install_if -> { ENV["DB_ADAPTER"] == "mysql2" } do
-  gem "mysql2"
-end
-
-install_if -> { ENV["DB_ADAPTER"] == "trilogy" } do
-  gem "activerecord-trilogy-adapter"
-end
-
-install_if -> { ENV["DB_ADAPTER"] == "oracle_enhanced" } do
-  gem "ruby-oci8"
-  gem "activerecord-oracle_enhanced-adapter", "~> 7.0.0"
-end
-
-install_if -> { ENV["DB_ADAPTER"] == "postgis" } do
-  gem "activerecord-postgis-adapter"
-end
+gem "pg"
+gem "activerecord-postgis-adapter"
 
 install_if -> { Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0") } do
   gem "base64"