daddy 0.10.0 → 0.10.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/itamae/environments/ruby/default.rb +6 -1
- data/lib/daddy/carrierwave.rb +2 -2
- data/lib/daddy/version.rb +1 -1
- data/lib/tasks/db_create.rake +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: aec349d264b54ecf0aa49dac7343c815bf471a6e44dee5ae7a22fd78dcf791b5
|
|
4
|
+
data.tar.gz: 6305a019b045829312d6726286f544c228e282a73629d73962dad82f12499d55
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 836273fd4df0b1c7ba98e10eb0af40ea794d802ad4d82fda8d891c60c530b130ce1b93b75df3c2d56f557d931a773a94b7a4f44279b37742c7a549194f879ec2
|
|
7
|
+
data.tar.gz: '023854a0103dfeb079680d3e8db591775388ac9f40990dd9a8f8f6059887e3e908bfce660fafeb903310c484d1080451ebad14608ecde180beb1f6e485aec7f5'
|
|
@@ -15,13 +15,18 @@ execute "install ruby-#{version}" do
|
|
|
15
15
|
cwd '/var/daddy/tmp'
|
|
16
16
|
command <<-EOF
|
|
17
17
|
set -eu
|
|
18
|
+
rm -Rf ruby-#{version}/
|
|
18
19
|
tar zxf ruby-#{version}.tar.gz
|
|
20
|
+
|
|
21
|
+
# avoid override confirmation when a different version of ruby was installed before
|
|
22
|
+
sudo rm -f /usr/local/bin/{bundle,bundler,erb,irb,gem,rdoc,ruby}
|
|
23
|
+
|
|
19
24
|
pushd ruby-#{version}
|
|
20
25
|
mkdir -p build
|
|
21
26
|
pushd build
|
|
22
27
|
../configure --disable-install-rdoc
|
|
23
28
|
make
|
|
24
|
-
|
|
29
|
+
sudo make install
|
|
25
30
|
popd
|
|
26
31
|
popd
|
|
27
32
|
EOF
|
data/lib/daddy/carrierwave.rb
CHANGED
|
@@ -8,8 +8,8 @@ CarrierWave.configure do |config|
|
|
|
8
8
|
"/data/#{::Rails.application.class.module_parent_name.underscore}/#{::Rails.env}"
|
|
9
9
|
end
|
|
10
10
|
|
|
11
|
-
if File.
|
|
12
|
-
aws = YAML.safe_load(ERB.new(File.read('config/aws.yml'), 0, '-').result)
|
|
11
|
+
if File.exist?('config/aws.yml')
|
|
12
|
+
aws = YAML.safe_load(ERB.new(File.read('config/aws.yml'), 0, '-').result, aliases: true)
|
|
13
13
|
|
|
14
14
|
if aws.dig('s3', 'enabled')
|
|
15
15
|
require 'carrierwave/storage/fog'
|
data/lib/daddy/version.rb
CHANGED
data/lib/tasks/db_create.rake
CHANGED
|
@@ -5,7 +5,7 @@ namespace :dad do
|
|
|
5
5
|
|
|
6
6
|
desc 'database.yml に従ってDBを作成します。'
|
|
7
7
|
task :create do
|
|
8
|
-
config = YAML.safe_load(ERB.new(File.read('config/database.yml'), 0, '-').result,
|
|
8
|
+
config = YAML.safe_load(ERB.new(File.read('config/database.yml'), 0, '-').result, aliases: true)
|
|
9
9
|
|
|
10
10
|
FileUtils.mkdir_p("tmp")
|
|
11
11
|
system("echo '# mysql ddl' > tmp/create_databases.sql")
|