departure 6.7.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20a21cad1f7573b67e0d97621bec0ad444df55107245cf60e723d1888866f6f0
-  data.tar.gz: 2be02cb3f5679f7f563acdfe917bd4f59273e39428bc9abf1f25aa2ca44b1f66
+  metadata.gz: c90b332f5ca8002ae23bedaab9b368f2aa89c103ab287aa593f5563901e9bb10
+  data.tar.gz: 46c52d6ce29dda0c0358cca5da19bfd5ebbe327e626c3c4c332fa7189df17759
 SHA512:
-  metadata.gz: 78935d84d7ed9a2598f9a951ddf59f35a2b174dd8980e76b6186e9959c611ad8dee59242d29efcce366a8fde2b028feeb59fa2667fd7a155ada61c386aa4d3cd
-  data.tar.gz: 2ac8a86463173ec2cf7c1a2da87432271a2fa759db919ff825da8cad1f6bded9ee8a8e7e47fc1c85754e19fea18ad7c2093c0fa23ef1a85b26120a943fca2cf5
+  metadata.gz: dd21cf4f7b78ea979a92424540dde3a0e8bad9d1acf891f334352e5e6f9cc372d0c4fa897d9afb88d1cb282504a65895c00a87b467a52f6ca2423501c7f68af0
+  data.tar.gz: 4b9b1112c42fd3b823eeb613bbde33ec596da1a7b2e1371ef2f87960b60a4c40a21a7d43bd2222269b2a8e71bd00c91bfa5d044ff5c2dce489cc299473b73a22

data/.github/workflows/test.yml

@@ -8,23 +8,14 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 3.0
-          - 3.1
           - 3.2
           - 3.3
+          - 3.4
         gemfile:
-          - gemfiles/rails_6_1.gemfile
           - gemfiles/rails_7_0.gemfile
           - gemfiles/rails_7_1.gemfile
-        include:
-          - ruby: 2.7
-            gemfile: gemfiles/ruby_2.7_rails_6_0.gemfile
-          - ruby: 2.7
-            gemfile: gemfiles/ruby_2.7_rails_6_1.gemfile
-          - ruby: 2.7
-            gemfile: gemfiles/ruby_2.7_rails_7_0.gemfile
-          - ruby: 2.7
-            gemfile: gemfiles/ruby_2.7_rails_7_1.gemfile
+          - gemfiles/rails_7_2.gemfile
+          - gemfiles/rails_8_0.gemfile
     env:
       PERCONA_DB_USER: root
       PERCONA_DB_PASSWORD: root
@@ -52,12 +43,12 @@ jobs:
     env:
       PERCONA_DB_USER: root
       PERCONA_DB_PASSWORD: root
-      BUNDLE_GEMFILE: gemfiles/ruby_2.7_rails_6_0.gemfile
+      BUNDLE_GEMFILE: gemfiles/rails_7_1.gemfile
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.3
           bundler-cache: true
       - run: bundle exec rubocop --parallel

data/.gitignore

@@ -11,3 +11,4 @@ tags
 departure_error.log
 .ruby-version
 .idea/
+spec/dummy/log/

data/.rubocop.yml

@@ -6,7 +6,7 @@ require:
   - rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 3.4.x
 
 Metrics/AbcSize:
   Enabled: false

data/Appraisals

@@ -1,11 +1,3 @@
-appraise 'rails-6-0' do
-  gem 'rails', '6.0.6.1'
-end
-
-appraise 'rails-6-1' do
-  gem 'rails', '6.1.7.6'
-end
-
 appraise 'rails-7-0' do
   gem 'rails', '7.0.8'
 end
@@ -14,22 +6,10 @@ appraise 'rails-7-1' do
   gem 'rails', '7.1.3'
 end
 
-appraise 'ruby-2.7-rails-6-0' do
-  gem 'rails', '6.0.6.1'
-  gem 'nokogiri', '< 1.16'
-end
-
-appraise 'ruby-2.7-rails-6-1' do
-  gem 'rails', '6.1.7.6'
-  gem 'nokogiri', '< 1.16'
+appraise 'rails-7-2' do
+  gem 'rails', '7.2.2.1'
 end
 
-appraise 'ruby-2.7-rails-7-0' do
-  gem 'rails', '7.0.8'
-  gem 'nokogiri', '< 1.16'
-end
-
-appraise 'ruby-2.7-rails-7-1' do
-  gem 'rails', '7.1.3'
-  gem 'nokogiri', '< 1.16'
+appraise 'rails-8-0' do
+  gem 'rails', '8.0.2.1'
 end

data/CHANGELOG.md

@@ -4,7 +4,21 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 Please follow the format in [Keep a Changelog](http://keepachangelog.com/)
 
-## [Unreleased]
+## [7.0.0] - 2025-08-21
+
+- Drop Ruby 3.1 support.  Add >= 3.2 ruby support in gemspec.  EOL for 3.1.0 was 2025-03-31
+- Drop Rails 6.1 support.  Add >= 6.2 rails support in gemspec.  EOL for 6.1.0 was 2024-10-01
+- Add Rails 8.0 support
+
+## [6.8.0] - 2025-03-31
+
+- Drop Ruby 3.0 support in specs
+- Create dummy application in specs, migrate fixtures to that application
+- Create a `bin/rails` command that loads the database from the dummy application
+- Create a RailsAdapter that will handle creating connections inside of different versions of rails
+- Implement a Rails72DeparatureAdapater that handles the differences between Rails 7.2 and other rails versions
+- Implement a ActiveRecordMigratorWithAdvisoryLock patch for ActiveRecord versions 7.1 and 7.2 to prevent ConcurrentMigrationErrors
+- Implement a configuration option `disable_rails_advisory_lock_patch` to disable the ActiveRecordMigratorWithAdvisoryLock patch in our gem
 
 ## [6.7.0] - 2024-02-20
 

data/Gemfile

@@ -2,6 +2,11 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'base64'
 gem 'codeclimate-test-reporter', '~> 1.0.3', group: :test, require: nil
-gem 'rubocop', '~> 1.60.2', require: false
+gem 'lhm'
+gem 'logger'
+gem 'mutex_m', require: false
+gem 'rubocop', '~> 1.74.0', require: false
 gem 'rubocop-performance', '~> 1.20.2', require: false
+gem 'zeitwerk', '< 2.7.0'

data/Gemfile.lock

@@ -1,196 +1,218 @@
 PATH
   remote: .
   specs:
-    departure (6.7.0)
-      activerecord (>= 6.0.0, < 7.2.0, != 7.0.0)
+    departure (7.0.0)
+      activerecord (>= 7.0.1)
       mysql2 (>= 0.4.0, < 0.6.0)
-      railties (>= 6.0.0, < 7.2.0, != 7.0.0)
+      railties (>= 7.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.1.3)
-      actionview (= 7.1.3)
-      activesupport (= 7.1.3)
+    actionpack (8.0.2.1)
+      actionview (= 8.0.2.1)
+      activesupport (= 8.0.2.1)
       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)
-    actionview (7.1.3)
-      activesupport (= 7.1.3)
+      useragent (~> 0.16)
+    actionview (8.0.2.1)
+      activesupport (= 8.0.2.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activemodel (7.1.3)
-      activesupport (= 7.1.3)
-    activerecord (7.1.3)
-      activemodel (= 7.1.3)
-      activesupport (= 7.1.3)
+    activemodel (8.0.2.1)
+      activesupport (= 8.0.2.1)
+    activerecord (8.0.2.1)
+      activemodel (= 8.0.2.1)
+      activesupport (= 8.0.2.1)
       timeout (>= 0.4.0)
-    activesupport (7.1.3)
+    activesupport (8.0.2.1)
       base64
+      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
-    ast (2.4.2)
+    ast (2.4.3)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
-    builder (3.2.4)
-    byebug (11.1.3)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
+    builder (3.3.0)
+    byebug (12.0.0)
     climate_control (0.0.4)
       activesupport (>= 3.0)
     codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
     coderay (1.1.3)
-    concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     crass (1.0.6)
-    diff-lcs (1.5.1)
+    date (3.4.1)
+    diff-lcs (1.6.1)
     docile (1.1.5)
-    drb (2.2.0)
-      ruby2_keywords
-    erubi (1.12.0)
-    i18n (1.14.1)
+    drb (2.2.1)
+    erubi (1.13.1)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    io-console (0.7.2)
-    irb (1.11.2)
-      rdoc
+    io-console (0.8.0)
+    irb (1.15.1)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.7.1)
-    language_server-protocol (3.17.0.3)
-    loofah (2.22.0)
+    json (2.10.2)
+    language_server-protocol (3.17.0.4)
+    lhm (2.2.0)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    method_source (1.0.0)
-    minitest (5.22.2)
-    mutex_m (0.2.0)
+    method_source (1.1.0)
+    minitest (5.25.5)
+    mutex_m (0.3.0)
     mysql2 (0.5.6)
-    nokogiri (1.16.2-arm64-darwin)
+    nokogiri (1.18.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-linux)
+    nokogiri (1.18.7-x86_64-linux-gnu)
       racc (~> 1.4)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.26.3)
+    parser (3.3.7.4)
       ast (~> 2.4.1)
       racc
-    pry (0.14.2)
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.4.0)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.10.1)
-      byebug (~> 11.0)
-      pry (>= 0.13, < 0.15)
-    psych (5.1.2)
+    pry-byebug (3.11.0)
+      byebug (~> 12.0)
+      pry (>= 0.13, < 0.16)
+    psych (5.2.3)
+      date
       stringio
-    racc (1.7.3)
-    rack (3.0.9)
-    rack-session (2.0.0)
+    racc (1.8.1)
+    rack (3.1.12)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
       rack (>= 3.0.0)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (2.1.0)
+    rackup (2.2.1)
       rack (>= 3)
-      webrick (~> 1.8)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (7.1.3)
-      actionpack (= 7.1.3)
-      activesupport (= 7.1.3)
-      irb
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (8.0.2.1)
+      actionpack (= 8.0.2.1)
+      activesupport (= 8.0.2.1)
+      irb (~> 1.13)
       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)
+    rake (13.2.1)
+    rdoc (6.13.1)
       psych (>= 4.0.0)
-    regexp_parser (2.9.0)
-    reline (0.4.2)
+    regexp_parser (2.10.0)
+    reline (0.6.0)
       io-console (~> 0.5)
-    rexml (3.2.6)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-its (1.3.0)
+    rspec-its (1.3.1)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.0)
-    rubocop (1.60.2)
+    rspec-support (3.13.2)
+    rubocop (1.74.0)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       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)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.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)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.43.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
     rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
+    securerandom (0.4.1)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    stringio (3.1.0)
-    thor (1.3.0)
-    timeout (0.4.1)
+    stringio (3.1.6)
+    thor (1.3.2)
+    timeout (0.4.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
-    webrick (1.8.1)
-    zeitwerk (2.6.13)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.3)
+    useragent (0.16.11)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
   arm64-darwin-23
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES
   appraisal (~> 2.4.1)
+  base64
   climate_control (~> 0.0.3)
   codeclimate-test-reporter (~> 1.0.3)
   departure!
+  lhm
+  logger
+  mutex_m
   pry-byebug
   rake (>= 10.0)
   rspec (~> 3.4, >= 3.4.0)
   rspec-its (~> 1.2)
-  rubocop (~> 1.60.2)
+  rubocop (~> 1.74.0)
   rubocop-performance (~> 1.20.2)
+  zeitwerk (< 2.7.0)
 
 BUNDLED WITH
-   2.4.22
+   2.6.6

data/README.md

@@ -147,6 +147,14 @@ end
 It's strongly recommended to name it after this gems name, such as
 `config/initializers/departure.rb`
 
+### Configuration Options
+
+All configuration options are configurable from the `Departure.configure` block example below
+
+|Option|Default|What it Controls|
+|---|---|---|
+|disable_rails_advisory_lock_patch|false|When truthy, disables a patch in at least rails 7.1 and 7.2 where rails throws ConcurrentMigrationErrors due to the inability to release the advisory lock in migrations|
+
 ### Disable on per-migration basis
 
 Departure gem is enabled by default.

data/Rakefile

@@ -1,6 +1,7 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
+require 'logger'
 require './configuration'
 require './test_database'
 
@@ -12,6 +13,14 @@ namespace :db do
   desc 'Create the test database'
   task :create do
     config = Configuration.new
+
+    ActiveRecord::Base.establish_connection(
+      adapter: 'mysql2',
+      host: config['hostname'],
+      username: config['username'],
+      password: config['password']
+    )
+
     TestDatabase.new(config).setup_test_database
   end
 end

data/bin/rails

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+ENV['RAILS_ENV'] ||= 'development'
+
+APP_PATH = File.expand_path('../spec/dummy/config/application', __dir__)
+require_relative '../spec/dummy/config/boot'
+require 'rake'
+require 'departure'
+
+# Load the rails application
+require APP_PATH
+
+begin
+  Rails.application.load_tasks
+  Rake::Task['db:create'].invoke
+
+  ENV['SCHEMA'] = File.expand_path('../spec/dummy/db/base_schema.rb', __dir__)
+  Rake::Task['db:schema:load'].invoke
+rescue StandardError => e
+  puts "there was an error creating your database #{e}"
+  exit 1
+end
+
+require 'rails/commands'

data/departure.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.7.0'
+  spec.required_ruby_version = '>= 3.2.0'
 
-  spec.add_runtime_dependency 'railties', '>= 6.0.0', '!= 7.0.0', '< 7.2.0'
-  spec.add_runtime_dependency 'activerecord', '>= 6.0.0', '!= 7.0.0', '< 7.2.0'
+  spec.add_runtime_dependency 'railties', '>= 7.0.1'
+  spec.add_runtime_dependency 'activerecord', '>= 7.0.1'
   spec.add_runtime_dependency 'mysql2', '>= 0.4.0', '< 0.6.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.4.1'

data/gemfiles/rails_7_0.gemfile

@@ -2,9 +2,15 @@
 
 source 'https://rubygems.org'
 
+gem 'base64'
+gem 'bigdecimal'
 gem 'codeclimate-test-reporter', '~> 1.0.3', group: :test, require: nil
-gem 'rails', '7.0.8'
-gem 'rubocop', '~> 1.60.2', require: false
+gem 'lhm'
+gem 'logger'
+gem 'mutex_m', require: false
+gem 'rails', '> 7.0.8'
+gem 'rubocop', '~> 1.74.0', require: false
 gem 'rubocop-performance', '~> 1.20.2', require: false
+gem 'zeitwerk', '< 2.7.0'
 
 gemspec path: '../'