daddy 0.9.1 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e5eef0850a7efcdc0209be3aedbfbd5450c3d44c7160219cf3e60dc1e1a4b9b
-  data.tar.gz: 37255910782ed007ea26655786cdffa4a76b3c033061580d8f163502845c3617
+  metadata.gz: 617aabc2ae7cdf58928c313804c2421a352b01d7260e0cf401f450f31af04181
+  data.tar.gz: b0c97127fb9050ee7116dd0bfc0d07a22edec54e4587b65c251f3069bee9744c
 SHA512:
-  metadata.gz: 34c59652da8d8c79edf6d1f77eb7a6a436a82185a06c2f1276903760e43b56c43d67ee783b4e5139eb5ab0e4efe76be7925ab4bc4b0fb2cd0508ee7812017918
-  data.tar.gz: 1ce44e90f38559ddb39c01a05ae966eb5ca6703284cc1941bce10ddbf92cf25d7695dda6764d5a038dd45904892da963415fd6c3ba136b094e165aab6a339632
+  metadata.gz: 40915eb55f06d3052bd619da9a1a9ae6dbf1544d5d7886343213d16c3c4462d2d53cbf16dd4dffd2d93aa176c89fb6952b221a185ae9de4ff3604dd760f42dea
+  data.tar.gz: a07a24c5cb875035358e8c816b8173e180f29b4647585107f3fd50fe06b588d866280a24b79d0ed0fb824eff7ba4b4f35ab74ec4c43c0876b3d40adbe4781a59

data/itamae/environments/nodejs/default.rb

@@ -5,6 +5,12 @@ template '/etc/yum.repos.d/nodesource-el7.repo' do
   mode '644'
 end
 
+execute 'yum clean all --enablerepo=nodesource' do
+  user 'root'
+  action :nothing
+  subscribes :run, "template[/etc/yum.repos.d/nodesource-el7.repo]", :immediately
+end
+
 template '/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL' do
   user 'root'
   owner 'root'
@@ -14,6 +20,8 @@ end
 
 package 'nodejs' do
   user 'root'
+  version "16.16.0-1nodesource"
+  options '--enablerepo=nodesource'
 end
 
 template '/etc/yum.repos.d/yarn.repo' do

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

@@ -1,6 +1,6 @@
 [nodesource]
 name=Node.js Packages for Enterprise Linux 7 - $basearch
-baseurl=https://rpm.nodesource.com/pub_12.x/el/7/$basearch
+baseurl=https://rpm.nodesource.com/pub_16.x/el/7/$basearch
 failovermethod=priority
 enabled=1
 gpgcheck=1
@@ -8,7 +8,7 @@ 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_12.x/el/7/SRPMS
+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

data/itamae/environments/ruby/default.rb

@@ -1,4 +1,4 @@
-version = ENV['RUBY_VERSION'] || '2.6.6'
+version = ENV['RUBY_VERSION'] || '2.7.5'
 short_version = version.split('.')[0..1].join('.')
 
 execute "download ruby-#{version}" do
@@ -27,8 +27,8 @@ end
 
 {
   'rubygems-update' => nil,
-  'bundler' => '2.0.2',
-  'itamae' => '1.10.6',
+  'bundler' => '2.3.4',
+  'itamae' => '1.12.5',
   'daddy' => nil
 }.each do |name, version|
   gem_package name do

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

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

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

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

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

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

data/lib/daddy/version.rb

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

data/lib/tasks/dad.rake

@@ -24,7 +24,7 @@ namespace :dad do
       task role => :environment do
         role_file = "config/itamae/roles/#{role}.rb"
         log_level = ENV['DEBUG'] ? 'debug' : 'info'
-        env = "ROLE=#{role}"
+        env = "SETUP=true ROLE=#{role}"
 
          if ENV['DOCKER']
           tag = "#{Daddy.config.application}-#{role}"

data/lib/tasks/db_create.rake

@@ -33,7 +33,7 @@ namespace :dad do
       if ENV['MYSQL_NO_ROOT_PASSWORD']
         fail unless system("mysql -u root < tmp/create_databases.sql")
       else
-        fail unless system("mysql -u root -p < tmp/create_databases.sql")
+        fail unless system("mysql -u #{ENV['MYSQL_ROOT'] || 'root'} -p < tmp/create_databases.sql")
       end
     end
   end

data/lib/tasks/db_dump.rake

@@ -7,7 +7,8 @@ namespace :dad do
     task :dump do
       dump_dir = ENV['DUMP_DIR'] || ask('出力先ディレクトリ', :required => true)
 
-      config = YAML.load_file(File.join('config', 'database.yml'))[Rails.env]
+      config = YAML.load(ERB.new(File.read('config/database.yml'), 0, '-').result)[Rails.env]
+
       host = config['host'] || 'localhost'
       database = config['database']
       user = config['username']

data/lib/tasks/db_load.rake

@@ -7,7 +7,8 @@ namespace :dad do
     task :load do
       dump_file = ENV['DUMP_FILE'] || ask('ダンプファイル', :required => true)
 
-      config = YAML.load_file(File.join('config', 'database.yml'))[Rails.env]
+      config = YAML.load(ERB.new(File.read('config/database.yml'), 0, '-').result)[Rails.env]
+
       host = config['host'] || 'localhost'
       database = config['database']
       user = config['username']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.4
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-05 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -330,6 +330,9 @@ files:
 - 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/locale/en.yml
 - itamae/locale/ja.yml
 - itamae/templates/etc/god/master.conf.erb
@@ -464,7 +467,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: My rails dad