daddy 0.11.3 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 913cfbabdf728c1b6e0e1768b778d1d6972a86eb9d2bf1784c0ee4bd0532ee3d
-  data.tar.gz: be021799518b5758507721f1a8a3e6381bc490ec2b3e25d25bba8752965093e1
+  metadata.gz: cd77f32d1f89b47fc19d5c35efb4711c1e72fcce4e2dfa2984332278f86f6636
+  data.tar.gz: cecd83ad21bb9f8847b6e98f0aca8ffb6f333bad65d60ad9dbc1b13da174a991
 SHA512:
-  metadata.gz: 46cbd69ae09c9f666692902d5e01c96e4a28be3bcf3967862645f435e24b036e7ede6d8c8dd66f252ff30b4bac36d64b799221ce252d953f904b4868bc69264a
-  data.tar.gz: 83dc2792ec9d7890f495f253642699ced8dd9c24423243b216ec79ffdb8fc910f214a0827f361602eb59f969ab4d5f866a29178698ebb002d6555ff441ede5af
+  metadata.gz: c14ae8d1ad86dc4a2c3bbaec528bd81b5d18183db95a155cf67dc699b5a7f1b64d12f00b963d659eab24085db7743a3a8bc3bbdcdb313b0860871b03dc9c82ce
+  data.tar.gz: 34c1733777d3560ae565002a31afa4af551b0ab733b183372e09bfc1171f16e33efddb9f2d7b28e1b99f75808c45de7e87d2adf91162137c141310985fcdb07d

data/itamae/environments/base/default.rb

@@ -5,6 +5,7 @@
   gcc
   gcc-c++
   git
+  glibc-langpack-ja
   make
   libcurl-devel
   libffi-devel
@@ -12,11 +13,15 @@
   libxml2-devel
   libxslt-devel
   openssl-devel
+  patch
   readline-devel
   shared-mime-info
   sudo
+  tar
+  unzip
   wget
   which
+  zip
   zlib-devel
 }.each do |name|
   package name do
@@ -33,7 +38,6 @@ end
   end
 end
 
-execute 'dnf clean all' do
+execute 'dnf clean all --enablerepo=powertools' do
   user 'root'
-  options '--enablerepo=powertools'
 end

data/itamae/environments/nodejs/default.rb

@@ -15,16 +15,16 @@ execute 'place /etc/yum.repos.d/nodesource-nodejs.repo' do
   not_if "diff #{::File.join(::File.dirname(__FILE__), 'files/etc/yum.repos.d/nodesource-nodejs.repo')} /etc/yum.repos.d/nodesource-nodejs.repo"
 end
 
-execute 'yum clean all --enablerepo=nodesource-nodejs' do
+package 'nodejs' do
   user 'root'
-  action :nothing
-  subscribes :run, "execute[place /etc/yum.repos.d/nodesource-nodejs.repo]", :immediately
+  version '22.21.1-1nodesource'
+  options '--enablerepo=nodesource-nodejs'
 end
 
-package 'nodejs' do
+execute 'dnf clean all --enablerepo=nodesource-nodejs' do
   user 'root'
-  version '22.18.0-1nodesource'
-  options '--enablerepo=nodesource-nodejs'
+  action :nothing
+  subscribes :run, "package[nodejs]", :immediately
 end
 
 execute 'place /etc/yum.repos.d/yarn.repo' do
@@ -37,13 +37,13 @@ execute 'place /etc/yum.repos.d/yarn.repo' do
   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
+package 'yarn' do
   user 'root'
-  action :nothing
-  subscribes :run, "execute[place /etc/yum.repos.d/yarn.repo]", :immediately
+  options '--enablerepo=yarn'
 end
 
-package 'yarn' do
+execute 'dnf clean all --enablerepo=yarn' do
   user 'root'
-  options '--enablerepo=yarn'
+  action :nothing
+  subscribes :run, "package[yarn]", :immediately
 end

data/itamae/environments/ruby/default.rb

@@ -1,4 +1,4 @@
-version = ENV['RUBY_VERSION'] || '3.4.7'
+version = ENV['RUBY_VERSION'] || '3.4.8'
 short_version = version.split('.')[0..1].join('.')
 
 execute "download ruby-#{version}" do
@@ -15,7 +15,7 @@ execute "install ruby-#{version}" do
   cwd '/var/daddy/tmp'
   command <<-EOF
     set -eu
-    rm -Rf ruby-#{version}/
+    sudo rm -Rf ruby-#{version}/
     tar zxf ruby-#{version}.tar.gz
 
     # avoid override confirmation when a different version of ruby was installed before
@@ -33,9 +33,23 @@ execute "install ruby-#{version}" do
   not_if "ruby -v | egrep \"ruby #{version}(p[0-9]+)? \""
 end
 
+bundler_versions = case short_version
+  when '2.7'
+    ['2.3.26', '2.4.22']
+  else
+    '2.7.2'
+  end
+ohai_version = case short_version
+  when '2.7'
+    '19.0.3'
+  else
+    '19.1.16'
+  end
+
 {
-  'bundler' => ['2.7.2'],
-  'itamae' => '1.14.1'
+  'bundler' => bundler_versions,
+  'itamae' => '1.14.2',
+  'ohai' => ohai_version
 }.each do |name, versions|
   versions = Array(versions)
   versions.each do |version|
@@ -47,12 +61,6 @@ end
   end
 end
 
-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'"

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

@@ -0,0 +1 @@
+53c4ddad41fbb6189f1f5ee0db57a51d54bd1f87f8755b3d68604156a35b045b  ruby-3.4.8.tar.gz

data/lib/daddy/rails/railtie.rb

@@ -18,14 +18,12 @@ module Daddy
 
       initializer 'carrierwave' do
         if defined?(CarrierWave)
-          puts '[daddy] loading carrierwave configuration'
           require 'daddy/carrierwave'
         end
       end
 
       initializer 'sidekiq' do
         if defined?(Sidekiq)
-          puts '[daddy] loading sidekiq configuration'
           require 'daddy/sidekiq'
         end
       end

data/lib/daddy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.12.0
 platform: ruby
 authors:
 - ichy
@@ -293,7 +293,7 @@ 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.7.tar.gz_sha256sum.txt
+- itamae/environments/ruby/ruby-3.4.8.tar.gz_sha256sum.txt
 - itamae/locale/en.yml
 - itamae/locale/ja.yml
 - itamae/templates/etc/god/master.conf.erb
@@ -416,7 +416,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.0'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.5'
+      version: '3.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

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

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