cap_db_dump 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b17670872f50b5f6e4ced82d27850b86d69f5f544c16ffd2255f9be0550d0f5
-  data.tar.gz: 95a520425a6edf34da30890fb9cc898fac58b20c9ba5c152b6ca0e7dd7fe89ec
+  metadata.gz: 010ed3cf256f446566acc86e8cbf49aa2d4965ea5f0a057dd436c4f41c53dea0
+  data.tar.gz: 40adc98e605ef94aee244c90ad859bfc01551dc8f6c62a95a1335455e8851c6b
 SHA512:
-  metadata.gz: 4e9a93f1adcbbf42ceeff9f4da05913f2df61ca31be12afa6c42fb44dd0334258f633cc0ce3f7cf91ad5938668b0031ea27df22962f8f9bafc4874983e7208ba
-  data.tar.gz: a990d7fc1d50cf589c1d0b0af8be81aa238f6c1e75a7f55855d28170213a3f9357aebcd63fbd248a2988fa5ba5afe8e038aa5d2edfcaa362adb2270fec6cddd9
+  metadata.gz: 39ac68fc4e29e92b771ed8ccdb2cda3efe517d2b0b99d91db9bbe0b59034bec653334954e93e9098ff4ebd977419596c52b39e63af510dfa37124dc78028e53b
+  data.tar.gz: 8b48771c21890446cc650b1e1bd33e82390ec25933ef08c85fba01fff043a20d0b3793e9ef3638631866e137f28734f8ec22b8f7501d483d547543e30fd159e7

data/lib/cap_db_dump/recipes.rb

@@ -68,8 +68,18 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
 
+    def database_password?
+      database_password && !database_password.to_s.empty?
+    end
+
+    # --defaults-extra-file must be the first option given to mysqldump
     def mysql_password_field
-      database_password && database_password.length > 0 ? "-p#{database_password}" : ""
+      database_password? ? "--defaults-extra-file=/dev/stdin" : ""
+    end
+
+    def mysql_password_stdin
+      escaped_password = database_password.to_s.gsub("\\") { "\\\\" }
+      "[client]\npassword=\"#{escaped_password}\"\n"
     end
 
     def postgres_port
@@ -77,9 +87,20 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     def pg_password
-      database_password && !database_password.empty? ?
-        "PGPASSWORD=#{database_password}" :
-        ""
+      database_password? ? "IFS= read -r PGPASSWORD && export PGPASSWORD &&" : ""
+    end
+
+    def pg_password_stdin
+      "#{database_password}\n"
+    end
+
+    # A pty would echo the password on stdin back into the (logged) output.
+    def run_with_password(command, stdin_data)
+      if database_password?
+        run command, :data => stdin_data, :eof => true, :pty => false
+      else
+        run command
+      end
     end
 
     def pg_port
@@ -94,9 +115,10 @@ Capistrano::Configuration.instance(:must_exist).load do
 
         ignored_tables = ignored_tables.join(" ")
 
-        command = "mysqldump -u #{database_username} -h #{database_host} #{mysql_password_field} -Q "
+        command = "mysqldump #{mysql_password_field} -u #{database_username} -h #{database_host} -Q "
         command << "--add-drop-table -O add-locks=FALSE --lock-tables=FALSE --single-transaction "
         command << "#{ignored_tables} #{database_name} > #{dump_path}"
+        password_stdin = mysql_password_stdin
       elsif database_engine == POSTGRES
         ignored_tables = schema_only_tables.map { |table_name|
           "--exclude-table=#{database_name}.#{table_name}"
@@ -109,13 +131,14 @@ Capistrano::Configuration.instance(:must_exist).load do
           command << "-F#{pg_dump_format} "
         end
         command << "#{ignored_tables} #{database_name} > #{dump_path}"
+        password_stdin = pg_password_stdin
       else
         raise "Unknown database engine. use one of: #{DATABASE_ENGINES.inspect}"
       end
 
       give_description "About to dump production DB"
 
-      run command
+      run_with_password command, password_stdin
       dump_schema_tables if schema_only_tables.any?
     end
 
@@ -124,7 +147,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         table_names = schema_only_tables.join(" ")
 
         if database_engine == MYSQL
-          command = "mysqldump -u #{database_username} -h #{database_host} #{mysql_password_field} "
+          command = "mysqldump #{mysql_password_field} -u #{database_username} -h #{database_host} "
           command << "-Q --add-drop-table --single-transaction --no-data #{database_name} #{table_names} >> #{dump_path}"
         elsif database_engine == POSTGRES
           raise "not yet supported. PR's welcome! (https://github.com/smtlaissezfaire/cap_db_dump)"
@@ -133,7 +156,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         end
 
         give_description "Dumping schema for tables: #{schema_only_tables.join(", ")}"
-        run command
+        run_with_password command, mysql_password_stdin
       end
     end
 

metadata

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