daddy 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fddeed217959d9de392da986b9f8b1d357f9e08f3c4ac7652b7a87885a0fe095
-  data.tar.gz: 13a011a3d8056a15341e85bdc1478e560dc8b43ae7cbbae05e2975a60053aa63
+  metadata.gz: 1e5eef0850a7efcdc0209be3aedbfbd5450c3d44c7160219cf3e60dc1e1a4b9b
+  data.tar.gz: 37255910782ed007ea26655786cdffa4a76b3c033061580d8f163502845c3617
 SHA512:
-  metadata.gz: f48e73801f7f29c1e51fce407e98fefb665eac622c21ca3fe603f3fb114c58ff6c8a78aa59e8311134fe09e387c931ae0a114438fa044f8379f2f5e59d316fbc
-  data.tar.gz: afd6e4c2bed81fed71edc345305269b1ae92ba8af8b944f97b595564e08ccf84f6cd02cc92c0281bb20b080aaaf735024308ad8bfd888d631beb0afccead2732
+  metadata.gz: 34c59652da8d8c79edf6d1f77eb7a6a436a82185a06c2f1276903760e43b56c43d67ee783b4e5139eb5ab0e4efe76be7925ab4bc4b0fb2cd0508ee7812017918
+  data.tar.gz: 1ce44e90f38559ddb39c01a05ae966eb5ca6703284cc1941bce10ddbf92cf25d7695dda6764d5a038dd45904892da963415fd6c3ba136b094e165aab6a339632

data/itamae/environments/base/default.rb

@@ -2,11 +2,9 @@
   ImageMagick-devel
   autoconf
   automake
-  epel-release
   gcc
   gcc-c++
   git
-  graphviz
   make
   libcurl-devel
   libffi-devel

data/itamae/environments/docker/default.rb

@@ -18,8 +18,8 @@ group 'docker' do
 end
 
 execute "add user to docker group" do
-  command "sudo usermod -a -G docker #{ENV['USER']} && newgrp docker"
-  not_if "groups #{ENV['USER']} | grep -E \"\sdocker\""
+  command "sudo usermod -a -G docker ${USER} && newgrp docker"
+  not_if "groups ${USER} | grep -E \"\sdocker\""
 end
 
 service 'docker' 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_10.x/el/7/$basearch
+baseurl=https://rpm.nodesource.com/pub_12.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_10.x/el/7/SRPMS
+baseurl=https://rpm.nodesource.com/pub_12.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.3'
+version = ENV['RUBY_VERSION'] || '2.6.6'
 short_version = version.split('.')[0..1].join('.')
 
 execute "download ruby-#{version}" do
@@ -27,8 +27,8 @@ end
 
 {
   'rubygems-update' => nil,
-  'bundler' => '2.0.1',
-  'itamae' => '1.10.3',
+  'bundler' => '2.0.2',
+  'itamae' => '1.10.6',
   'daddy' => nil
 }.each do |name, version|
   gem_package name do

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

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

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

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

data/lib/daddy/version.rb

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

data/lib/tasks/db_create.rake

@@ -5,7 +5,7 @@ namespace :dad do
     
     desc 'database.yml に従ってDBを作成します。'
     task :create do
-      config = YAML.load_file("#{Rails.root}/config/database.yml")
+      config = YAML.load(ERB.new(File.read('config/database.yml'), 0, '-').result)
       
       FileUtils.mkdir_p("tmp")
       system("echo '# mysql ddl' > tmp/create_databases.sql")
@@ -30,7 +30,7 @@ namespace :dad do
       puts
       puts File.read('tmp/create_databases.sql')
 
-      if ENV['DAD_MYSQL_NO_ROOT_PASSWORD']
+      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")

data/lib/tasks/rails_erd.rake

@@ -2,6 +2,7 @@ if defined?(RailsERD)
   Rake::Task['db:migrate'].enhance do
     ENV['filename'] = 'tmp/db_layout'
     ENV['attributes'] = 'foreign_keys, content, primary_keys, timestamp, inheritance'
+    ENV['inheritance'] = 'true'
 
     excludes = ['ActiveRecord::SchemaMigration']
     excludes << 'ActiveRecord::SessionStore::Session' if defined?(ActiveRecord::SessionStore)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2020-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -328,6 +328,8 @@ files:
 - 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/locale/en.yml
 - itamae/locale/ja.yml
 - itamae/templates/etc/god/master.conf.erb