daddy 0.9.20 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d5d86dbb44cabe3800311f156873727d232dbe352adfc945d5bbe9f42784f71
-  data.tar.gz: bc2ff86a496904472c53673449ed3ae63a6b9cd2a6526079481d219270351be2
+  metadata.gz: 860323d5c82d81dc10669207a9b9fce2b0793d6a5d6386bd789ef640ef6410cf
+  data.tar.gz: 195a9df47982b93614a8013916027c3cdd5e54ff594e5d03ed2f56653dc4fb28
 SHA512:
-  metadata.gz: dbc9c7dbc5a9ed51a3a9d60c4d37c47b836afcf23b55569e9acfdd21d444cebe829e472c0b5f25a761198ce77bbd96669ac33e8c61d7374e45aef0f6474b6c49
-  data.tar.gz: 5db0057e8354e3aada2c30235b89e4776ad681e231eba60f7aaf475191a47f9c8b3b3cfd27011d20b1eb16e0695a929da013e8deeb416e1c5d08d9609ec15b40
+  metadata.gz: 83a370dd0705672323463bb2eeaca12092d0917c716c38d3373f4c727087305991ccddbaf909bfee0817ef412e44687cb525aaaf6824f2b6cdede5df1ce7584b
+  data.tar.gz: 0ab48f69475ae3170e1c24aff6c927a2912ae600e276da1b768e938937e811db04cd4b51210910dd088696ac813b7ff75e25e522b4a997ea774d2ae790933e9a

data/itamae/environments/base/default.rb

@@ -1,6 +1,7 @@
 %w{
   autoconf
   automake
+  curl
   gcc
   gcc-c++
   git
@@ -10,7 +11,6 @@
   libtool
   libxml2-devel
   libxslt-devel
-  libyaml-devel
   openssl-devel
   readline-devel
   sudo
@@ -22,3 +22,12 @@
     user 'root'
   end
 end
+
+%w{
+  libyaml-devel
+}.each do |name|
+  package name do
+    user 'root'
+    options '--enablerepo=powertools'
+  end
+end

data/itamae/environments/docker/default.rb

@@ -18,7 +18,7 @@ group 'docker' do
 end
 
 execute "add user to docker group" do
-  command "sudo usermod -a -G docker ${USER} && newgrp docker"
+  command "sudo usermod -a -G docker ${USER}"
   not_if "groups ${USER} | grep -E \"\sdocker\""
 end
 

data/itamae/environments/local.rb

@@ -1,3 +1,4 @@
 include_recipe 'base'
 include_recipe 'nodejs'
 include_recipe 'ruby'
+include_recipe 'docker'

data/itamae/environments/nodejs/default.rb

@@ -1,36 +1,49 @@
-template '/etc/yum.repos.d/nodesource-el7.repo' do
+file '/etc/yum.repos.d/nodesource-nodejs.repo' do
   user 'root'
   owner 'root'
   group 'root'
   mode '644'
 end
 
-execute 'yum clean all --enablerepo=nodesource' do
+execute 'place /etc/yum.repos.d/nodesource-nodejs.repo' do
   user 'root'
-  action :nothing
-  subscribes :run, "template[/etc/yum.repos.d/nodesource-el7.repo]", :immediately
+  command <<-EOF
+    set -eu
+    sudo cp -f #{::File.join(::File.dirname(__FILE__), 'files/etc/yum.repos.d/nodesource-nodejs.repo')} /etc/yum.repos.d/nodesource-nodejs.repo
+    sudo chmod 644 /etc/yum.repos.d/nodesource-nodejs.repo
+  EOF
+  not_if "diff #{::File.join(::File.dirname(__FILE__), 'files/etc/yum.repos.d/nodesource-nodejs.repo')} /etc/yum.repos.d/nodesource-nodejs.repo"
 end
 
-template '/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL' do
+execute 'yum clean all --enablerepo=nodesource-nodejs' do
   user 'root'
-  owner 'root'
-  group 'root'
-  mode '644'
+  action :nothing
+  subscribes :run, "execute[place /etc/yum.repos.d/nodesource-nodejs.repo]", :immediately
 end
 
 package 'nodejs' do
   user 'root'
-  version "16.20.2-1nodesource"
-  options '--enablerepo=nodesource'
+  version '18.20.8-1nodesource'
+  options '--enablerepo=nodesource-nodejs'
 end
 
-template '/etc/yum.repos.d/yarn.repo' do
+execute 'place /etc/yum.repos.d/yarn.repo' do
   user 'root'
-  owner 'root'
-  group 'root'
-  mode '644'
+  command <<-EOF
+    set -eu
+    sudo cp -f #{::File.join(::File.dirname(__FILE__), 'files/etc/yum.repos.d/yarn.repo')} /etc/yum.repos.d/yarn.repo
+    sudo chmod 644 /etc/yum.repos.d/yarn.repo
+  EOF
+  not_if "diff #{::File.join(::File.dirname(__FILE__), 'files/etc/yum.repos.d/yarn.repo')} /etc/yum.repos.d/yarn.repo"
+end
+
+execute 'yum clean all --enablerepo=yarn' do
+  user 'root'
+  action :nothing
+  subscribes :run, "execute[place /etc/yum.repos.d/yarn.repo]", :immediately
 end
 
 package 'yarn' do
   user 'root'
+  options '--enablerepo=yarn'
 end

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

@@ -0,0 +1,8 @@
+[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
+priority=9
+enabled=0
+gpgcheck=1
+gpgkey=https://rpm.nodesource.com/gpgkey/ns-operations-public.key
+module_hotfixes=1

data/itamae/environments/nodejs/{templates/etc/yum.repos.d/yarn.repo.erb → files/etc/yum.repos.d/yarn.repo}

@@ -1,6 +1,6 @@
 [yarn]
 name=Yarn Repository
 baseurl=https://dl.yarnpkg.com/rpm/
-enabled=1
+enabled=0
 gpgcheck=1
 gpgkey=https://dl.yarnpkg.com/rpm/pubkey.gpg

data/itamae/environments/ruby/default.rb

@@ -1,4 +1,4 @@
-version = ENV['RUBY_VERSION'] || '2.7.8'
+version = ENV['RUBY_VERSION'] || '3.2.9'
 short_version = version.split('.')[0..1].join('.')
 
 execute "download ruby-#{version}" do
@@ -16,23 +16,35 @@ execute "install ruby-#{version}" do
   command <<-EOF
     set -eu
     tar zxf ruby-#{version}.tar.gz
+
+    # avoid override confirmation when a different version of ruby was installed before
+    sudo rm -f /usr/local/bin/{bundle,bundler,erb,irb,gem,rdoc,ruby}
+
     pushd ruby-#{version}
-      ./configure --disable-install-rdoc
-      make
-      sudo make install
+      mkdir -p build
+      pushd build
+        ../configure --disable-install-rdoc
+        make
+        sudo make install
+      popd
     popd
   EOF
-  not_if "ruby -v | egrep \"ruby #{version}(p[0-9]+) \""
+  not_if "ruby -v | egrep \"ruby #{version}(p[0-9]+)? \""
 end
 
 {
-  'rubygems-update' => nil,
   'bundler' => '2.3.26',
-  'itamae' => '1.14.1',
-  'daddy' => nil
+  'itamae' => '1.14.1'
 }.each do |name, version|
   gem_package name do
     user 'root'
     version version if version
+    options '-N'
   end
 end
+
+execute 'gem update --system 3.7.1 -N' do
+  user 'root'
+  action :nothing
+  subscribes :run, "gem_package[bundler]", :immediately
+end

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

@@ -1 +1 @@
-e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10  ruby-2.7.8.tar.gz
+c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0  ruby-2.7.8.tar.gz

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

@@ -0,0 +1 @@
+abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a  ruby-3.2.9.tar.gz

data/lib/daddy/carrierwave.rb

@@ -8,7 +8,7 @@ CarrierWave.configure do |config|
       "/data/#{::Rails.application.class.module_parent_name.underscore}/#{::Rails.env}"
     end
 
-  if File.exists?('config/aws.yml')
+  if File.exist?('config/aws.yml')
     aws = YAML.safe_load(ERB.new(File.read('config/aws.yml'), 0, '-').result)
 
     if aws.dig('s3', 'enabled')

data/lib/daddy/version.rb

@@ -1,7 +1,7 @@
 module Daddy
   VERSION = [
     VERSION_MAJOR = '0',
-    VERSION_MINOR = '9',
-    VERSION_REVISION = '20'
+    VERSION_MINOR = '10',
+    VERSION_REVISION = '1'
   ].join('.')
 end

data/lib/tasks/db_dump.rake

@@ -17,7 +17,7 @@ namespace :dad do
       filepath = File.join(dump_dir, "#{database}-#{Time.now.strftime('%Y-%m-%d_%H%M')}.dump.gz")
 
       run "mkdir -p #{File.dirname(filepath)}",
-          "mysqldump -u #{user} -p#{password} -h #{host} #{database} | gzip > #{filepath}",
+          "mysqldump -u #{user} -p#{password} -h #{host} #{database} --no-tablespaces | gzip > #{filepath}",
           :mask => [/-p[^ ]+/, '-pFILTERED']
     end
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.9.20
+  version: 0.10.1
 platform: ruby
 authors:
 - ichy
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-04-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -136,20 +135,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: closer
-  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'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -327,28 +312,14 @@ files:
 - itamae/cookbooks/unicorn/templates/unicorn.rb.erb
 - itamae/cookbooks/vsftpd/install.rb
 - itamae/environments/base/default.rb
-- itamae/environments/docker.rb
-- itamae/environments/docker/Dockerfile.base
 - itamae/environments/docker/default.rb
-- itamae/environments/docker/image.rb
 - itamae/environments/local.rb
-- itamae/environments/mysql.rb
 - itamae/environments/nodejs/default.rb
-- itamae/environments/nodejs/templates/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL.erb
-- itamae/environments/nodejs/templates/etc/yum.repos.d/nodesource-el7.repo.erb
-- itamae/environments/nodejs/templates/etc/yum.repos.d/yarn.repo.erb
+- itamae/environments/nodejs/files/etc/yum.repos.d/nodesource-nodejs.repo
+- itamae/environments/nodejs/files/etc/yum.repos.d/yarn.repo
 - itamae/environments/ruby/default.rb
-- itamae/environments/ruby/ruby-2.5.1.tar.gz_sha256sum.txt
-- itamae/environments/ruby/ruby-2.5.3.tar.gz_sha256sum.txt
-- itamae/environments/ruby/ruby-2.5.5.tar.gz_sha256sum.txt
-- itamae/environments/ruby/ruby-2.6.3.tar.gz_sha256sum.txt
-- itamae/environments/ruby/ruby-2.6.5.tar.gz_sha256sum.txt
-- itamae/environments/ruby/ruby-2.6.6.tar.gz_sha256sum.txt
-- itamae/environments/ruby/ruby-2.7.2.tar.gz_sha256sum.txt
-- itamae/environments/ruby/ruby-2.7.3.tar.gz_sha256sum.txt
-- itamae/environments/ruby/ruby-2.7.5.tar.gz_sha256sum.txt
-- itamae/environments/ruby/ruby-2.7.6.tar.gz_sha256sum.txt
 - itamae/environments/ruby/ruby-2.7.8.tar.gz_sha256sum.txt
+- itamae/environments/ruby/ruby-3.2.9.tar.gz_sha256sum.txt
 - itamae/locale/en.yml
 - itamae/locale/ja.yml
 - itamae/templates/etc/god/master.conf.erb
@@ -465,23 +436,24 @@ homepage: https://github.com/ichylinux/daddy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.7'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.7.1
 specification_version: 4
 summary: My rails dad
 test_files: []

data/itamae/environments/docker/Dockerfile.base

@@ -1,29 +0,0 @@
-FROM centos:7.6.1810
-MAINTAINER ichylinux@gmail.com
-
-RUN yum -y install sudo
-
-ARG user
-
-RUN useradd $user && \
-    echo "$user ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$user && \
-    sudo sed -i "s/\(^Defaults    secure_path = \).*/\1\/sbin:\/bin:\/usr\/sbin:\/usr\/bin:\/usr\/local\/bin/" /etc/sudoers
-
-USER $user
-WORKDIR /home/$user
-
-RUN sudo yum -y reinstall glibc && \
-    sudo yum -y update && \
-    sudo yum clean all
-
-RUN sudo localedef -f UTF-8 -i ja_JP ja_JP && \
-    sudo sed -i "s/\(^LANG=\).*/\1ja_JP.UTF-8/" /etc/locale.conf && \
-    sudo rm -f /etc/localtime && \
-    sudo ln -snf /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
-
-ENV LANG="ja_JP.UTF-8" \
-    LANGUAGE="ja_JP:ja" \
-    LC_ALL="ja_JP.UTF-8"
-
-RUN sudo mkdir -p /var/daddy/tmp && \
-    sudo chown $user:$user /var/daddy/tmp

data/itamae/environments/docker/image.rb

@@ -1,4 +0,0 @@
-dockerfile = File.join(File.dirname(__FILE__), 'Dockerfile.base')
-execute "docker build -t daddy-base:latest --build-arg user=#{ENV['USER']} -f #{dockerfile} #{File.dirname(dockerfile)}/" do
-  not_if "docker images | grep daddy-base"
-end

data/itamae/environments/docker.rb

@@ -1,2 +0,0 @@
-include_recipe 'docker'
-include_recipe 'docker/image'

data/itamae/environments/mysql.rb

@@ -1 +0,0 @@
-include_recipe 'daddy::mysql::install'

data/itamae/environments/nodejs/templates/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL.erb

@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-mQINBFQCN9QBEADv5QYOlCWNkI/oKST/GGpQkOZjFY2cbYdHuc2j8kyM4oeNluXq
-puEYMHOoQvbJ3DFPvsv+jCruL7qjkel9YzaF6e3RN2ystP4YBjxyOT7Bb5EnjNNU
-6oScQJ50/+RmA4N3wzBrw5+x5KQGBfRU/k7JdDKO6SGY0zzdAo3jqp1nQ9Sf+Fmg
-hsjDLVZTHorLPV3yPLb37QlvBB2YIRF+dL9l4wPAI/fGyWv+Qs7VlCZTyRAnKGbv
-qN1LvlYoV9YqxaJYYJW+MQhn4706yNJAFeOZuKejEcnZTd/NBiAR91sVnsXKgW9e
-yb4TZ7SqkmrJpuKJBpdPr1dgaK8dDmFh9Nlhpz6xZuYcKaDEDa5b3wymnixtwZf2
-WyboChIlsHDajtXZt34xP9uUge1VHyk1o8AQUzKEpuepxxLnyXArLgvHaLhQnxPA
-bQB43b4RbWYHPdB16ki2WoZX/DA4YEtfxg8GC3zXC2thMJnFburmts71iiYsxKBc
-6d7O8415xrErhk2/o2+bRhf+7qBQfW0oxQSEMBYbqP3hvhG1VWc9umjbCfMgHrHo
-IzI7W+GbRdbSsdpY6JNKuCftVfIKXeXk5FbUUP9NzsG/nyGFORkq9y0AKmocx3TD
-w9DRG2SmKIKBOG5PQuzuXqsdUaYcFpySXdPNQG2CPtguPhQivw4qM3pQpQARAQAB
-tCNOb2RlU291cmNlIDxncGctcnBtQG5vZGVzb3VyY2UuY29tPokCOAQTAQIAIgUC
-VAI31AIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQXdvo1DT6dN2uaA//
-UwKsmnz4MCH7Jn/vG0OinGQTfSH5uvlH68yOZmKLnhtfiqUq1gZz734S75ExxGP4
-SGFYeK9CqKFgoGbpjzLLc5kvA7GdDX3E/exEjYa+GrJ9uIOUtaCKstTD5fPVj2Wf
-TZtK9v1F6iYKyPHdJnSc5p7AxbLZkarF1CPJQWv2iDrg3dO3Oy41aazRwxJe9hvI
-a//XavnsW2TTeo8qfQ0qrs8vzt8bxJF+PkACmqQfbXAiflCct5XEUbhbX1b8KznP
-ppd5PLrvRTjHnZi/QRjky0qsUOukGiQhT6iZeiOUcLPeD+f7tA7JBZ08XXRfnLLj
-mqYbIHPFG4C/AM5RXu5OdCtFrZQsJgGQEeg/UxYEz5qqNljKjRZ8XsmcyeWouKFM
-LuVr1ORF6crl8lAdT3RujP2MzY8cvxJQesYKdWqk3bPXI7oG/PRReoeN86TqraYO
-UeTssVlw5lmJtAH+eHt3K6TSjd0rq1RY7xWfttD7L8ECfPmBzbL54MSmKx9MBz+o
-a9vOWQ2LjIbR/6DEyQiDpGhQTM+r0/SVS/kqR/j0SEHvOql+sn9sK1/qR1h3JtgI
-6YF4IDXBE9s0RBCLbdxtVf3eAcbOnhkhefMtpURJLdVuU8HhMCiVUlHDUPHIuT5z
-Lp+avdanIgi8Cnps/DpMI2KigEHW5mmqihXtfKj0jeE=
-=9Bql
------END PGP PUBLIC KEY BLOCK-----

data/itamae/environments/nodejs/templates/etc/yum.repos.d/nodesource-el7.repo.erb

@@ -1,15 +0,0 @@
-[nodesource]
-name=Node.js Packages for Enterprise Linux 7 - $basearch
-baseurl=https://rpm.nodesource.com/pub_16.x/el/7/$basearch
-failovermethod=priority
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL
-
-[nodesource-source]
-name=Node.js for Enterprise Linux 7 - $basearch - Source
-baseurl=https://rpm.nodesource.com/pub_16.x/el/7/SRPMS
-failovermethod=priority
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL
-gpgcheck=1

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

@@ -1 +0,0 @@
-dac81822325b79c3ba9532b048c2123357d3310b2b40024202f360251d9829b1  ruby-2.5.1.tar.gz

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

@@ -1 +0,0 @@
-9828d03852c37c20fa333a0264f2490f07338576734d910ee3fd538c9520846c  ruby-2.5.3.tar.gz

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

@@ -1 +0,0 @@
-28a945fdf340e6ba04fc890b98648342e3cccfd6d223a48f3810572f11b2514c  ruby-2.5.5.tar.gz

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

@@ -1 +0,0 @@
-577fd3795f22b8d91c1d4e6733637b0394d4082db659fccf224c774a2b1c82fb  ruby-2.6.3.tar.gz

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

@@ -1 +0,0 @@
-66976b716ecc1fd34f9b7c3c2b07bbd37631815377a2e3e85a5b194cfdcbed7d  ruby-2.6.5.tar.gz

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

@@ -1 +0,0 @@
-364b143def360bac1b74eb56ed60b1a0dca6439b00157ae11ff77d5cd2e92291  ruby-2.6.6.tar.gz

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

@@ -1 +0,0 @@
-6e5706d0d4ee4e1e2f883db9d768586b4d06567debea353c796ec45e8321c3d4  ruby-2.7.2.tar.gz

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

@@ -1 +0,0 @@
-8925a95e31d8f2c81749025a52a544ea1d05dad18794e6828709268b92e55338  ruby-2.7.3.tar.gz

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

@@ -1 +0,0 @@
-2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1  ruby-2.7.5.tar.gz

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

@@ -1 +0,0 @@
-e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10  ruby-2.7.6.tar.gz