daddy 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f7d4db72f3c9f1f8f96add5ad7f6da3ad7dea508c097f64d6db6c59928e38c1
-  data.tar.gz: 0cc61f03619a743519bd616fcae5f208be60a720f134a0c57eaebb9a70b77d6d
+  metadata.gz: f71b758b41276f069327bb600ffc20ac7fafecf1245913333dee6f718dc72142
+  data.tar.gz: 10961fa1199db0e326ea388d95337822feb447afa55414786f3e82db412ca9b7
 SHA512:
-  metadata.gz: 0f81db5a4cf6b5900ae9e2418494f293f9e7c0dde23705a300be7a83dc52fec73c4365117bcb5aa2365873f09e1debee8a59fffd97fe32233977301a94b8335d
-  data.tar.gz: 5e2283c57da41945227b8cbdb27b5f8fe1b67e4511fa900eab7330d360d86a7cf2dea52c5f3328ec5583c67c186f7fbe1771d2b47dea1a8b3311f421d374787d
+  metadata.gz: 6786c310177fee7fb8cce31d7fdfc5145acccd65b5cc13b2d1aaea441eff058d5e7088a71256b3378debd01a6b622c9aeb6f66f49140369adfe0a3eb95fabcf0
+  data.tar.gz: 1176e6f9decb1fb0ec4fd1d427630a4ca68e2a123df34bc796f4e2b8060e56e911bc4d41b227494b7d4ae66eff6c7f3e6c57d2aac489d2c446e54b4112373b96

data/itamae/environments/ruby/default.rb

@@ -1,4 +1,4 @@
-version = ENV['RUBY_VERSION'] || '3.4.3'
+version = ENV['RUBY_VERSION'] || '3.4.7'
 short_version = version.split('.')[0..1].join('.')
 
 execute "download ruby-#{version}" do
@@ -53,3 +53,8 @@ execute 'gem update --system 3.7.2 -N' do
   subscribes :run, "gem_package[bundler]", :immediately
 end
 
+execute "bundle config set --global path ~/.gem/ruby/#{short_version}.0" do
+  user ENV['USER']
+  not_if "bundle config get path | grep -qE '\\.gem/ruby/#{short_version}.0'"
+end
+

data/itamae/environments/ruby/ruby-3.4.7.tar.gz_sha256sum.txt

@@ -0,0 +1 @@
+23815a6d095696f7919090fdc3e2f9459b2c83d57224b2e446ce1f5f7333ef36  ruby-3.4.7.tar.gz

data/lib/daddy/version.rb

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

data/lib/tasks/db_create.rake

@@ -1,8 +1,9 @@
-require 'rake'
+require_relative 'task_helper'
 
 namespace :dad do
   namespace :db do
-    
+    include DatabaseHelpers
+
     desc 'database.yml に従ってDBを作成します。'
     task :create do
       config = YAML.safe_load(ERB.new(File.read('config/database.yml'), trim_mode: '-').result, aliases: true)
@@ -10,31 +11,71 @@ namespace :dad do
       FileUtils.mkdir_p("tmp")
       system("echo '# mysql ddl' > tmp/create_databases.sql")
   
-      user = host = port = nil
+      # Collect all unique users from the target environment and databases
+      users = {}
+      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")
+        next if ENV['RAILS_ENV'] and ENV['RAILS_ENV'] != env
+        
+        if multiple_databases?(props)
+          # Multiple databases configuration (Rails 8 style)
+          props.each do |db_name, db_config|
+            next unless db_config.is_a?(Hash) && db_config['username']
+            username = db_config['username']
+            users[username] ||= {
+              'password' => db_config['password'],
+              'host' => db_config['host'],
+              'port' => db_config['port']
+            }
+            host ||= db_config['host']
+            port ||= db_config['port']
+          end
+        else
+          # Single database configuration
+          next unless props['username']
+          username = props['username']
+          users[username] ||= {
+            'password' => props['password'],
+            'host' => props['host'],
+            'port' => props['port']
+          }
+          host ||= props['host']
+          port ||= props['port']
+        end
+      end
+      
+      # Create users
+      users.each do |username, user_info|
+        system("echo 'drop user if exists \"#{username}\"@\"%\";' >> tmp/create_databases.sql")
+        system("echo 'create user \"#{username}\"@\"%\" IDENTIFIED BY \"#{user_info['password']}\";' >> tmp/create_databases.sql")
       end
 
+      # Create databases
       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 'grant all on #{props['database']}.* to #{user};' >> tmp/create_databases.sql")
-
-        if ENV['FILE']
-          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")
+        if multiple_databases?(props)
+          # Multiple databases configuration (Rails 8 style)
+          props.each do |db_name, db_config|
+            next unless db_config.is_a?(Hash) && db_config['database']
+            database = db_config['database']
+            username = db_config['username']
+            
+            create_database_sql(database, username)
+            puts "database #{database} (#{env}/#{db_name}) written to tmp/create_databases.sql"
+          end
+        else
+          # Single database configuration
+          next unless props['database']
+          database = props['database']
+          username = props['username']
+          
+          create_database_sql(database, username)
+          puts "database #{database} (#{env}) written to 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")

data/lib/tasks/task_helper.rb

@@ -139,4 +139,32 @@ def self.run_itamae(*recipes)
   end
 
   run "bundle exec itamae local #{options.join(' ')} #{recipe_files.join(' ')}"
+end
+
+# Database helper methods for dad:db namespace
+module DatabaseHelpers
+  # Helper method to check if a configuration is multiple databases (Rails 8 style)
+  def multiple_databases?(props)
+    return false unless props.is_a?(Hash)
+    # Standard Rails database config keys
+    standard_keys = ['adapter', 'collation', 'database', 'encoding', 'host', 'max_connections', 'migrations_paths', 'password', 'port', 'url', 'username']
+    # If it has a 'database' key directly, it's a single database config
+    return false if props.key?('database')
+    # If it has keys that are not standard keys and those values are hashes with 'database' keys, it's multiple databases
+    props.any? do |key, value|
+      !standard_keys.include?(key.to_s) && value.is_a?(Hash) && value.key?('database')
+    end
+  end
+
+  # Helper method to write database creation SQL commands
+  def create_database_sql(database, username)
+    system("echo 'drop database if exists #{database};' >> tmp/create_databases.sql")
+    system("echo 'create database #{database};' >> tmp/create_databases.sql")
+    system("echo 'grant all on #{database}.* to \"#{username}\"@\"%\";' >> tmp/create_databases.sql")
+
+    if ENV['FILE']
+      system("echo 'grant all on #{database}.* to \"#{username}\"@localhost;' >> tmp/create_databases.sql")
+      system("echo 'grant file on *.* to \"#{username}\"@localhost;' >> tmp/create_databases.sql")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - ichy
@@ -293,6 +293,7 @@ files:
 - itamae/environments/ruby/ruby-2.7.8.tar.gz_sha256sum.txt
 - itamae/environments/ruby/ruby-3.2.9.tar.gz_sha256sum.txt
 - itamae/environments/ruby/ruby-3.4.3.tar.gz_sha256sum.txt
+- itamae/environments/ruby/ruby-3.4.7.tar.gz_sha256sum.txt
 - itamae/locale/en.yml
 - itamae/locale/ja.yml
 - itamae/templates/etc/god/master.conf.erb