daddy 0.11.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c61a2b9374136d7bab58f889a39fad32f581f58114fac666c3caa5872d593b70
-  data.tar.gz: 5184b70837b08b68b524c7207f9b7aaa9906e00227703d7a2c68d0c0731e3617
+  metadata.gz: f71b758b41276f069327bb600ffc20ac7fafecf1245913333dee6f718dc72142
+  data.tar.gz: 10961fa1199db0e326ea388d95337822feb447afa55414786f3e82db412ca9b7
 SHA512:
-  metadata.gz: ced8c1258872315a461415eb39161bf42e60565dde3d99c6282888f96cc8179a1b3c17e2dd4fd485fb580dc1259e8dfcbcc2e5eeeaf95bf355eb9aeecfebce1b
-  data.tar.gz: e7ccf25b3da46d354853f1ff74882be87509bc37d1a7ddcf74752dc2cf685c0303bbcd1ada007a635d78b4ce6dfb690235d8fb20766751cbb882db934065229f
+  metadata.gz: 6786c310177fee7fb8cce31d7fdfc5145acccd65b5cc13b2d1aaea441eff058d5e7088a71256b3378debd01a6b622c9aeb6f66f49140369adfe0a3eb95fabcf0
+  data.tar.gz: 1176e6f9decb1fb0ec4fd1d427630a4ca68e2a123df34bc796f4e2b8060e56e911bc4d41b227494b7d4ae66eff6c7f3e6c57d2aac489d2c446e54b4112373b96

data/itamae/environments/nodejs/default.rb

@@ -23,7 +23,7 @@ end
 
 package 'nodejs' do
   user 'root'
-  version '18.20.8-1nodesource'
+  version '22.18.0-1nodesource'
   options '--enablerepo=nodesource-nodejs'
 end
 

data/itamae/environments/nodejs/files/etc/yum.repos.d/nodesource-nodejs.repo

@@ -1,6 +1,6 @@
 [nodesource-nodejs]
 name=Node.js Packages for Linux RPM based distros - x86_64
-baseurl=https://rpm.nodesource.com/pub_18.x/nodistro/nodejs/x86_64
+baseurl=https://rpm.nodesource.com/pub_22.x/nodistro/nodejs/x86_64
 priority=9
 enabled=0
 gpgcheck=1

data/itamae/environments/ruby/default.rb

@@ -1,4 +1,4 @@
-version = ENV['RUBY_VERSION'] || '3.2.9'
+version = ENV['RUBY_VERSION'] || '3.4.7'
 short_version = version.split('.')[0..1].join('.')
 
 execute "download ruby-#{version}" do
@@ -34,7 +34,7 @@ execute "install ruby-#{version}" do
 end
 
 {
-  'bundler' => ['2.3.26', '2.7.1'],
+  'bundler' => ['2.7.2'],
   'itamae' => '1.14.1'
 }.each do |name, versions|
   versions = Array(versions)
@@ -47,8 +47,14 @@ end
   end
 end
 
-execute 'gem update --system 3.7.1 -N' do
+execute 'gem update --system 3.7.2 -N' do
   user 'root'
   action :nothing
   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.3.tar.gz_sha256sum.txt

@@ -0,0 +1 @@
+55a4cd1dcbe5ca27cf65e89a935a482c2bb2284832939266551c0ec68b437f46  ruby-3.4.3.tar.gz

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 = '0'
+    VERSION_REVISION = '2'
   ].join('.')
 end

data/lib/daddy.rb

@@ -1,5 +1,4 @@
 require 'daddy/utils/config'
-require 'daddy/utils/string_utils'
 require 'sql_builder'
 
 module Daddy

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.0
+  version: 0.11.2
 platform: ruby
 authors:
 - ichy
@@ -9,20 +9,6 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.3.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
@@ -183,14 +169,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -261,20 +247,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov-rcov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Daddy helps me build web applications since daddy knows some good practices.
 email: ichylinux@gmail.com
 executables: []
@@ -320,6 +292,8 @@ files:
 - itamae/environments/ruby/default.rb
 - 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
@@ -327,7 +301,6 @@ files:
 - itamae/templates/etc/logrotate.d/god.erb
 - itamae/templates/etc/nginx/conf.d/servers/gitbucket.conf.erb
 - itamae/templates/etc/nginx/conf.d/servers/jenkins.conf.erb
-- itamae/templates/etc/sysconfig/jenkins.erb
 - itamae/templates/etc/systemd/system/tracd.service.erb
 - itamae/templates/etc/vsftpd/vsftpd.conf.erb
 - itamae/templates/etc/yum.repos.d/google-chrome.repo.erb
@@ -371,14 +344,11 @@ files:
 - lib/daddy/test_help.rb
 - lib/daddy/utils/config.rb
 - lib/daddy/utils/sql_utils.rb
-- lib/daddy/utils/string_utils.rb
 - lib/daddy/version.rb
 - lib/sql_builder.rb
 - lib/tasks/app_base_dir.rake
 - lib/tasks/cucumber_steps.rake
 - lib/tasks/dad.rake
-- lib/tasks/db/database.yml.erb
-- lib/tasks/db_config.rake
 - lib/tasks/db_create.rake
 - lib/tasks/db_dump.rake
 - lib/tasks/db_fixtures.rake
@@ -453,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.7.2
 specification_version: 4
 summary: My rails dad
 test_files: []

data/itamae/templates/etc/sysconfig/jenkins.erb

@@ -1,148 +0,0 @@
-## Path:        Development/Jenkins
-## Description: Jenkins Automation Server
-## Type:        string
-## Default:     "/var/lib/jenkins"
-## ServiceRestart: jenkins
-#
-# Directory where Jenkins store its configuration and working
-# files (checkouts, build reports, artifacts, ...).
-#
-JENKINS_HOME="/var/lib/jenkins"
-
-## Type:        string
-## Default:     ""
-## ServiceRestart: jenkins
-#
-# Java executable to run Jenkins
-# When left empty, we'll try to find the suitable Java.
-#
-JENKINS_JAVA_CMD=""
-
-## Type:        string
-## Default:     "jenkins"
-## ServiceRestart: jenkins
-#
-# Unix user account that runs the Jenkins daemon
-# Be careful when you change this, as you need to update
-# permissions of $JENKINS_HOME and /var/log/jenkins.
-#
-JENKINS_USER="jenkins"
-
-## Type:        string
-## Default: "false"
-## ServiceRestart: jenkins
-#
-# Whether to skip potentially long-running chown at the
-# $JENKINS_HOME location. Do not enable this, "true", unless
-# you know what you're doing. See JENKINS-23273.
-#
-#JENKINS_INSTALL_SKIP_CHOWN="false"
-
-## Type: string
-## Default:     "-Djava.awt.headless=true"
-## ServiceRestart: jenkins
-#
-# Options to pass to java when running Jenkins.
-#
-JENKINS_JAVA_OPTIONS="-Djava.awt.headless=true"
-JENKINS_JAVA_OPTIONS="-Dhudson.model.DirectoryBrowserSupport.CSP=\"sandbox allow-same-origin allow-scripts; default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline';\" ${JENKINS_JAVA_OPTIONS}"
-JENKINS_JAVA_OPTIONS="-Dhudson.diyChunking=false ${JENKINS_JAVA_OPTIONS}"
-
-## Type:        integer(0:65535)
-## Default:     8080
-## ServiceRestart: jenkins
-#
-# Port Jenkins is listening on.
-# Set to -1 to disable
-#
-JENKINS_PORT="8080"
-
-## Type:        string
-## Default:     ""
-## ServiceRestart: jenkins
-#
-# IP address Jenkins listens on for HTTP requests.
-# Default is all interfaces (0.0.0.0).
-#
-JENKINS_LISTEN_ADDRESS=""
-
-## Type:        integer(0:65535)
-## Default:     ""
-## ServiceRestart: jenkins
-#
-# HTTPS port Jenkins is listening on.
-# Default is disabled.
-#
-JENKINS_HTTPS_PORT=""
-
-## Type:        string
-## Default:     ""
-## ServiceRestart: jenkins
-#
-# Path to the keystore in JKS format (as created by the JDK 'keytool').
-# Default is disabled.
-#
-JENKINS_HTTPS_KEYSTORE=""
-
-## Type:        string
-## Default:     ""
-## ServiceRestart: jenkins
-#
-# Password to access the keystore defined in JENKINS_HTTPS_KEYSTORE.
-# Default is disabled.
-#
-JENKINS_HTTPS_KEYSTORE_PASSWORD=""
-
-## Type:        string
-## Default:     ""
-## ServiceRestart: jenkins
-#
-# IP address Jenkins listens on for HTTPS requests.
-# Default is disabled.
-#
-JENKINS_HTTPS_LISTEN_ADDRESS=""
-
-
-## Type:        integer(1:9)
-## Default:     5
-## ServiceRestart: jenkins
-#
-# Debug level for logs -- the higher the value, the more verbose.
-# 5 is INFO.
-#
-JENKINS_DEBUG_LEVEL="5"
-
-## Type:        yesno
-## Default:     no
-## ServiceRestart: jenkins
-#
-# Whether to enable access logging or not.
-#
-JENKINS_ENABLE_ACCESS_LOG="no"
-
-## Type:        integer
-## Default:     100
-## ServiceRestart: jenkins
-#
-# Maximum number of HTTP worker threads.
-#
-JENKINS_HANDLER_MAX="100"
-
-## Type:        integer
-## Default:     20
-## ServiceRestart: jenkins
-#
-# Maximum number of idle HTTP worker threads.
-#
-JENKINS_HANDLER_IDLE="20"
-
-## Type:        string
-## Default:     ""
-## ServiceRestart: jenkins
-#
-# Pass arbitrary arguments to Jenkins.
-# Full option list: java -jar jenkins.war --help
-#
-JENKINS_ARGS=""
-
-export PATH="${PATH}":/usr/local/bin

data/lib/daddy/utils/string_utils.rb

@@ -1,43 +0,0 @@
-require 'nkf'
-
-module Daddy
-  module Utils
-    class StringUtils
-
-      def self.to_hiragana(s)
-        return s if is_empty(s)
-        NKF::nkf('-Ww --hiragana', s)
-      end
-    
-      def self.to_katakana(s)
-        return s if is_empty(s)
-        NKF::nkf('-Ww --katakana', s)
-      end
-    
-      def self.to_zen(s)
-        return s if is_empty(s)
-        NKF::nkf('-WwXm0', s)
-      end
-    
-      def self.to_han(s)
-        return s if is_empty(s)
-        NKF::nkf('-Wwxm0Z0', s)
-      end
-    
-      def self.current_time(now = nil)
-        now = Time.now unless now
-        now.instance_eval { '%s%03d' % [strftime('%Y%m%d%H%M%S'), (usec / 1000.0).round] }
-      end
-    
-      def self.rand(length = 8)
-        chars = ("a".."z").to_a + ("A".."Z").to_a + (0..9).to_a
-        ret = []
-        length.times do |i|
-          ret[i] = chars[rand(chars.size)]
-        end
-        ret.join
-      end
-
-    end
-  end
-end

data/lib/tasks/db/database.yml.erb

@@ -1,52 +0,0 @@
-# MySQL.  Versions 5.0+ are recommended.
-#
-# Install the MYSQL driver
-#   gem install mysql2
-#
-# Ensure the MySQL gem is defined in your Gemfile
-#   gem 'mysql2'
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-#
-default: &default
-  adapter: mysql2
-  encoding: utf8
-  pool: 5
-  username: <%= @app_name %>
-  password: <%= @app_name %>
-  socket: /var/lib/mysql/mysql.sock
-
-development:
-  <<: *default
-  database: <%= @app_name %>_dev
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  <<: *default
-  database: <%= @app_name %>_test
-
-# As with config/secrets.yml, you never want to store sensitive information,
-# like your database password, in your source code. If your source code is
-# ever seen by anyone, they now have access to your database.
-#
-# Instead, provide the password as a unix environment variable when you boot
-# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
-# for a full rundown on how to provide these environment variables in a
-# production deployment.
-#
-# On Heroku and other platform providers, you may have a full connection URL
-# available as an environment variable. For example:
-#
-#   DATABASE_URL="mysql2://myuser:mypass@localhost/somedatabase"
-#
-# You can use this database configuration with:
-#
-#   production:
-#     url: <%= ENV['DATABASE_URL'] %>
-#
-production:
-  <<: *default
-  database: <%= @app_name %>_pro

data/lib/tasks/db_config.rake

@@ -1,14 +0,0 @@
-require_relative 'task_helper'
-
-namespace :dad do
-  namespace :db do
-    
-    desc 'database.yml を生成します。'
-    task :config 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'
-    end
-  end
-end