daddy 0.9.15 → 0.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83f26abfad4548e521a75c8739d373be17e949ecefdd24ee5ae6720345cfb657
-  data.tar.gz: 4e7e951bcedf7df58de4bc9cb31e95351b7641eff3dfb593455d9adc0adac63d
+  metadata.gz: 16b6d0ee819d9a4ea56297e4fd52f2ab9fa091eb5122f5402160e95599e93bcd
+  data.tar.gz: 2d647c14595a3a42b36863b7fe3b272a64e6efb9bce19761255e618baf67cfb1
 SHA512:
-  metadata.gz: 692b8c969023e967bd64d2c4153797b938fa16a432a8b21866a757d12aef468febd0a0ab940ccd84c4640d689f2ca5a5ad0e777ef5de56b224f9caf0327a2f1f
-  data.tar.gz: 2f0f3343079e1471b435d69621f29b421ecb3cfcffbb5ade14c490857af148634f40235d698085a4eaac7a9fb96a04dc49958c1935c9739117c99dd1219d8a32
+  metadata.gz: 6104f6985d62771b44c0a45d0e21f7d940b7cacc5c88432dbc6d6eaca26f0f2cfd55875027f9d4f82ee832471bd388614e356c4cf5abae3f8595c24b87934811
+  data.tar.gz: 73b78f59158b82056e5bd57e12733d2e62825dd145a5bd6f86a5eb33ef232ed2fe85f804ca25ba03c324c76777f5ce52b58dadd58ea6d71ca32812f2d656a2cb

data/lib/daddy/version.rb

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

data/lib/tasks/db_config.rake

@@ -8,7 +8,7 @@ namespace :dad do
       @app_name = File.basename(Rails.root)[0..15]
 
       template = File.join(File.dirname(__FILE__), 'db/database.yml.erb')
-      render template, :to => 'config/database.yml'
+      render template, to: 'config/database.yml'
     end
   end
 end

data/lib/tasks/db_create.rake

@@ -5,31 +5,39 @@ namespace :dad do
     
     desc 'database.yml に従ってDBを作成します。'
     task :create do
-      config = YAML.load(ERB.new(File.read('config/database.yml'), 0, '-').result)
+      config = YAML.safe_load(ERB.new(File.read('config/database.yml'), 0, '-').result, [], [], aliases: true)
       
       FileUtils.mkdir_p("tmp")
       system("echo '# mysql ddl' > tmp/create_databases.sql")
   
+      user = nil
       config.each do |env, props|
         next if env == 'default'
+        next if props['username'] == user
+
+        user = props['username']
+        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
 
-        puts "database for environment #{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 '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
 
       system("echo 'flush privileges;' >> tmp/create_databases.sql")
       system("echo >> tmp/create_databases.sql")
 
-      puts
-      puts File.read('tmp/create_databases.sql')
-
       if ENV['MYSQL_NO_ROOT_PASSWORD']
         fail unless system("mysql -u root < tmp/create_databases.sql")
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.9.17
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-09 00:00:00.000000000 Z
+date: 2025-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -466,7 +466,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: My rails dad