daddy 0.10.2 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aec349d264b54ecf0aa49dac7343c815bf471a6e44dee5ae7a22fd78dcf791b5
-  data.tar.gz: 6305a019b045829312d6726286f544c228e282a73629d73962dad82f12499d55
+  metadata.gz: 428b4e87e71ac4be74245dd68b7b03d0a0518e10c0f17582a949984fce689202
+  data.tar.gz: 90bc49e4be6ea236c3aed6ea792c22d646248c4f7ae0bcdc644c34bef9fe15fb
 SHA512:
-  metadata.gz: 836273fd4df0b1c7ba98e10eb0af40ea794d802ad4d82fda8d891c60c530b130ce1b93b75df3c2d56f557d931a773a94b7a4f44279b37742c7a549194f879ec2
-  data.tar.gz: '023854a0103dfeb079680d3e8db591775388ac9f40990dd9a8f8f6059887e3e908bfce660fafeb903310c484d1080451ebad14608ecde180beb1f6e485aec7f5'
+  metadata.gz: 6067b6e8678d4f1b9c1e1361ea321b6f45436548ccae02c0cf20782b10be9ab63d696d28bb8f9f6ad6e9c219c80cee0e2dbee0f0a7b28d67132071c5207cf3a1
+  data.tar.gz: d823bcea3962118d4516a0ceb46a71c67d9586e4673db93893a209f93ec77831c552b0cc507de0278440194d563ef1d8649c7282e6147386383510eb0d035f36

data/itamae/environments/ruby/default.rb

@@ -34,13 +34,16 @@ execute "install ruby-#{version}" do
 end
 
 {
-  'bundler' => '2.3.26',
+  'bundler' => ['2.3.26', '2.7.1'],
   'itamae' => '1.14.1'
-}.each do |name, version|
-  gem_package name do
-    user 'root'
-    version version if version
-    options '-N'
+}.each do |name, versions|
+  versions = Array(versions)
+  versions.each do |version|
+    gem_package name do
+      user 'root'
+      version version
+      options '-N'
+    end
   end
 end
 

data/lib/daddy/carrierwave.rb

@@ -9,7 +9,7 @@ CarrierWave.configure do |config|
     end
 
   if File.exist?('config/aws.yml')
-    aws = YAML.safe_load(ERB.new(File.read('config/aws.yml'), 0, '-').result, aliases: true)
+    aws = YAML.safe_load(ERB.new(File.read('config/aws.yml'), trim_mode: '-').result, aliases: true)
 
     if aws.dig('s3', 'enabled')
       require 'carrierwave/storage/fog'

data/lib/daddy/itamae/config.rb

@@ -7,7 +7,7 @@ module Daddy
     if @_config.nil?
       daddy_yml = File.join('config', 'daddy.yml')
       if File.exist?(daddy_yml)
-        parsed = ERB.new(File.read(daddy_yml), 0, '-').result
+        parsed = ERB.new(File.read(daddy_yml), trim_mode: '-').result
         @_config = Daddy::Utils::Config.new(YAML.load(parsed))
       else
         @_config = Daddy::Utils::Config.new

data/lib/daddy/version.rb

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

data/lib/tasks/dad.rake

@@ -34,7 +34,9 @@ namespace :dad do
             fail unless system("#{env} bundle exec itamae docker --ohai --image daddy-base --tag #{tag} --log-level=#{log_level} #{role_file}")
           end
         else
-          fail unless system("#{env} bundle exec itamae local --ohai --log-level=#{log_level} #{role_file}")
+          Bundler.with_unbundled_env do
+            fail unless system("#{env} bundle exec itamae local --ohai --log-level=#{log_level} #{role_file}")
+          end
         end
       end
     end

data/lib/tasks/db_create.rake

@@ -5,7 +5,7 @@ namespace :dad do
     
     desc 'database.yml に従ってDBを作成します。'
     task :create do
-      config = YAML.safe_load(ERB.new(File.read('config/database.yml'), 0, '-').result, aliases: true)
+      config = YAML.safe_load(ERB.new(File.read('config/database.yml'), trim_mode: '-').result, aliases: true)
       
       FileUtils.mkdir_p("tmp")
       system("echo '# mysql ddl' > tmp/create_databases.sql")

data/lib/tasks/db_dump.rake

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

data/lib/tasks/db_load.rake

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

data/lib/tasks/generate/view.rake

@@ -25,7 +25,7 @@ namespace :dad do
         FileUtils.mkdir_p(view_dir)
 
         view_file = "#{view_dir}/#{File.basename(template)}"
-        File.write(view_file, ERB.new(File.read(template), 0, '-').result)
+        File.write(view_file, ERB.new(File.read(template), trim_mode: '-').result)
       end
     end
     

data/lib/tasks/task_helper.rb

@@ -59,7 +59,7 @@ def self.task_file(*path)
 end
 
 def self.render(template, options = {})
-  text = ERB.new(File.read(template), 0, '-').result
+  text = ERB.new(File.read(template), trim_mode: '-').result
 
   if options[:to]
     FileUtils.mkdir_p(File.dirname(options[:to]))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.4
 platform: ruby
 authors:
 - ichy