daddy 0.10.1 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 860323d5c82d81dc10669207a9b9fce2b0793d6a5d6386bd789ef640ef6410cf
-  data.tar.gz: 195a9df47982b93614a8013916027c3cdd5e54ff594e5d03ed2f56653dc4fb28
+  metadata.gz: 0d676a5ccacf1c2f697ff9beb32d6467843c04fe19dac05d7c30bb82054aa626
+  data.tar.gz: 5a02c96e3ff0c809c74b6679ae67327a417aae95a6226838f055fe51dcdec92d
 SHA512:
-  metadata.gz: 83a370dd0705672323463bb2eeaca12092d0917c716c38d3373f4c727087305991ccddbaf909bfee0817ef412e44687cb525aaaf6824f2b6cdede5df1ce7584b
-  data.tar.gz: 0ab48f69475ae3170e1c24aff6c927a2912ae600e276da1b768e938937e811db04cd4b51210910dd088696ac813b7ff75e25e522b4a997ea774d2ae790933e9a
+  metadata.gz: '05706945c3f574e5d0d00d30f38c062608f0856b0d649886926578a3468554ab6cc7e1533ea3b7b7c7dfde80257b291df0156a300abec50637504113c3e321c0'
+  data.tar.gz: cc05b25c9418aaaab233b907f9cf9bf7d7a9b4a35b7a252f95048e197eb925d730229a782d43c65bcd396b0a74431ec27418cb48903eefe3699a78c033496ee0

data/itamae/environments/ruby/default.rb

@@ -15,6 +15,7 @@ execute "install ruby-#{version}" do
   cwd '/var/daddy/tmp'
   command <<-EOF
     set -eu
+    rm -Rf ruby-#{version}/
     tar zxf ruby-#{version}.tar.gz
 
     # avoid override confirmation when a different version of ruby was installed before

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)
+    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 = '1'
+    VERSION_REVISION = '3'
   ].join('.')
 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.1
+  version: 0.10.3
 platform: ruby
 authors:
 - ichy