daddy 0.9.16 → 0.9.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54b50f10c353ee074f29bc7851e0c5ee33e82a1cf325f2b1178a27565f6b649f
-  data.tar.gz: 7f05b4291c47f44960853430ac699c4919668898f5aba8d62708c9ac27ed66bd
+  metadata.gz: 3e862e37efacb02975df4d1b10c057e38300b96af772d36105af1b987aaf3c33
+  data.tar.gz: 37862ad7abc3bd741486ec24abecf8a49560ca801210249378bb8c7c77070a23
 SHA512:
-  metadata.gz: 1430690d24611de760e956483befbb9c1b890570f3314c5589e2f66806ee736b5e05a42b287d4bcf9e6df089b7c777f9a570eb7771ae77f3a25fcde0ccc8acbd
-  data.tar.gz: 6eb971434b89d35e37f405470157bad91a3e175db8d69a96e4b83038aef4e8b7df01d5778ea43242af1c2fd9a736643116017b84512872b95563fe9dc51a4594
+  metadata.gz: e74c5c181caac4dc3f77c2b032a6b6776c0b86402e8f204c50e34ca1c485da95a8c2a92e569c84d782f26587dc04ab2647f06b7c5e1a24285dff099123b09706
+  data.tar.gz: 3bea0cc1bf10b09cb6e660512f5cd51c8f30cf93e6834a65d938e373d0908d8e7cacc78e9d4c2a76eb8b52e7fbcf191d1b08ec2f53a069ea24a2c9107efb460f

data/lib/daddy/version.rb

@@ -2,6 +2,6 @@ module Daddy
   VERSION = [
     VERSION_MAJOR = '0',
     VERSION_MINOR = '9',
-    VERSION_REVISION = '16'
+    VERSION_REVISION = '18'
   ].join('.')
 end

data/lib/tasks/db_create.rake

@@ -10,19 +10,29 @@ namespace :dad do
       FileUtils.mkdir_p("tmp")
       system("echo '# mysql ddl' > tmp/create_databases.sql")
   
+      user = host = port = nil
+      config.each do |env, props|
+        next if env == 'default'
+        next if props['username'] == user
+
+        user = props['username']
+        host = props['host']
+        port = props['port']
+        system("echo 'drop user if exists \"#{user}\"@\"%\";' >> tmp/create_databases.sql")
+        system("echo 'create user \"#{user}\"@\"%\" IDENTIFIED BY \"#{props['password']}\";' >> tmp/create_databases.sql")
+      end
+
       config.each do |env, props|
         next if env == 'default'
         next if ENV['RAILS_ENV'] and ENV['RAILS_ENV'] != env
 
         system("echo 'drop database if exists #{props['database']};' >> tmp/create_databases.sql")
         system("echo 'create database #{props['database']};' >> tmp/create_databases.sql")
-        system("echo 'drop user if exists \"#{props['username']}\"@\"%\";' >> tmp/create_databases.sql")
-        system("echo 'create user \"#{props['username']}\"@\"%\" IDENTIFIED BY \"#{props['password']}\";' >> tmp/create_databases.sql")
-        system("echo 'grant all on #{props['database']}.* to #{props['username']} identified by \"#{props['password']}\";' >> tmp/create_databases.sql")
+        system("echo 'grant all on #{props['database']}.* to #{user};' >> tmp/create_databases.sql")
 
         if ENV['FILE']
-          system("echo 'grant all on #{props['database']}.* to #{props['username']}@localhost identified by \"#{props['password']}\";' >> tmp/create_databases.sql")
-          system("echo 'grant file on *.* to #{props['username']}@localhost;' >> tmp/create_databases.sql")
+          system("echo 'grant all on #{props['database']}.* to #{user}@localhost;' >> tmp/create_databases.sql")
+          system("echo 'grant file on *.* to #{user}@localhost;' >> tmp/create_databases.sql")
         end
         puts "database for environment #{env} written to tmp/create_databases.sql"
       end
@@ -30,11 +40,22 @@ namespace :dad do
       system("echo 'flush privileges;' >> tmp/create_databases.sql")
       system("echo >> tmp/create_databases.sql")
 
+      options = []
+      if host
+        port ||= 3306 if host != 'localhost'
+        options << "-h #{host}"
+        options << "-P #{port}" if port
+      end
       if ENV['MYSQL_NO_ROOT_PASSWORD']
-        fail unless system("mysql -u root < tmp/create_databases.sql")
+        options << '-u root'
       else
-        fail unless system("mysql -u #{ENV['MYSQL_ROOT'] || 'root'} -p < tmp/create_databases.sql")
+        options << "-u #{ENV['MYSQL_ROOT'] || 'root'}"
+        options << '-p'
       end
+
+      command = "mysql #{options.join(' ')} < tmp/create_databases.sql"
+      puts command
+      fail unless system(command)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.9.18
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-09 00:00:00.000000000 Z
+date: 2025-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api