cap_db_dump 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 010ed3cf256f446566acc86e8cbf49aa2d4965ea5f0a057dd436c4f41c53dea0
-  data.tar.gz: 40adc98e605ef94aee244c90ad859bfc01551dc8f6c62a95a1335455e8851c6b
+  metadata.gz: 634f242534913169dcad7483e973eabf67248bc7615a3efa44db678195e9a9ae
+  data.tar.gz: 87cd8de8ad173684cee9963b6c14717a6135affb8db7c45cba3959978cd1b7ae
 SHA512:
-  metadata.gz: 39ac68fc4e29e92b771ed8ccdb2cda3efe517d2b0b99d91db9bbe0b59034bec653334954e93e9098ff4ebd977419596c52b39e63af510dfa37124dc78028e53b
-  data.tar.gz: 8b48771c21890446cc650b1e1bd33e82390ec25933ef08c85fba01fff043a20d0b3793e9ef3638631866e137f28734f8ec22b8f7501d483d547543e30fd159e7
+  metadata.gz: 39108992543cb7bd245f2fbd18ba463599bbd16d5f310675c860b0e5ef3ad37f349bd8f698fe35bb2c5c4180982cb9a354e1169aa110efef200e19a065722e44
+  data.tar.gz: 4375688a259683891cf56f77c43e3624b50c7ca024a061f09c813432199922758922f801d3019492565b0644badcbd3eaa1f168e69241ee223467ed3866ffdca

data/lib/cap_db_dump/recipes.rb

@@ -1,3 +1,6 @@
+require "json"
+require "yaml"
+
 Capistrano::Configuration.instance(:must_exist).load do
   namespace :database do
     DATABASE_ENGINES = [
@@ -12,6 +15,9 @@ Capistrano::Configuration.instance(:must_exist).load do
     set :database_engine, :mysql # specify :mysql | :psql
     # https://www.postgresql.org/docs/12/app-pgdump.html
     set :pg_dump_format, :c # specify c: 'compressed' (aka -Fc), :d 'directory', or set to nil for plain text
+    # :yaml reads config/database.yml as plain YAML, :rails asks `rails runner` on the server for the
+    # resolved config, and :auto uses :yaml unless database.yml contains ERB.
+    set :database_config_source, :auto
 
     module CapDbDumpHelpers
       def dump_path
@@ -50,6 +56,32 @@ Capistrano::Configuration.instance(:must_exist).load do
         @database_yml ||= read_db_yml
       end
 
+      def database_yml_path
+        "#{current_path}/config/database.yml"
+      end
+
+      def database_config_from_yaml(yaml)
+        YAML.safe_load(yaml, aliases: true)
+      end
+
+      # rvm-capistrano wraps commands in `rvm-shell '...' -c '...'`, so this must not contain single quotes.
+      def rails_runner_database_config_command
+        ruby = "puts :CAP_DB_DUMP_CONFIG_BEGIN, ActiveRecord::Base.connection_db_config.configuration_hash.to_json, :CAP_DB_DUMP_CONFIG_END"
+        "cd #{current_path} && RAILS_ENV=#{rails_env} bundle exec rails runner \"#{ruby}\""
+      end
+
+      # No pty, so stderr stays out of the captured output and the output (which has the password) isn't echoed.
+      def database_config_from_rails
+        output = capture(rails_runner_database_config_command, :pty => false)
+        json = output[/CAP_DB_DUMP_CONFIG_BEGIN\s*(\{.*?\})\s*CAP_DB_DUMP_CONFIG_END/m, 1]
+
+        unless json
+          raise "Could not find the database config in the output of rails runner"
+        end
+
+        { rails_env.to_s => JSON.parse(json) }
+      end
+
       def tasks_matching_for_db_dump
         { :only => { :db_dump => true } }
       end
@@ -63,8 +95,17 @@ Capistrano::Configuration.instance(:must_exist).load do
           raise "Cannot be run in dry_run mode!"
         end
 
-        yaml = capture("cat #{current_path}/config/database.yml")
-        YAML.safe_load(yaml, aliases: true)
+        case database_config_source.to_sym
+        when :yaml
+          database_config_from_yaml(capture("cat #{database_yml_path}"))
+        when :rails
+          database_config_from_rails
+        when :auto
+          yaml = capture("cat #{database_yml_path}")
+          yaml.include?("<%") ? database_config_from_rails : database_config_from_yaml(yaml)
+        else
+          raise "Unknown database_config_source. use one of: [:yaml, :rails, :auto]"
+        end
       end
     end
 
@@ -82,8 +123,12 @@ Capistrano::Configuration.instance(:must_exist).load do
       "[client]\npassword=\"#{escaped_password}\"\n"
     end
 
+    def database_port?
+      database_port && !database_port.to_s.strip.empty?
+    end
+
     def postgres_port
-      database_port ? "-p #{database_port}" : ""
+      database_port? ? "-p #{database_port}" : ""
     end
 
     def pg_password
@@ -104,7 +149,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     def pg_port
-      database_port && !database_port.empty? ? "-p #{database_port}" : ""
+      database_port? ? "-p #{database_port}" : ""
     end
 
     task :create_dump, tasks_matching_for_db_dump do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cap_db_dump
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Scott Taylor
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-03 00:00:00.000000000 Z
+date: 2026-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano