daddy 0.9.14 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08a683e91f1863f8f0f5effad040d53352232fc49df964cf0f35733d8ea0ba78'
-  data.tar.gz: 436e4e02ff4609b9b94216c1d277bb5e3a6d6d9016fca3d79fd0cf43b8e14838
+  metadata.gz: 54b50f10c353ee074f29bc7851e0c5ee33e82a1cf325f2b1178a27565f6b649f
+  data.tar.gz: 7f05b4291c47f44960853430ac699c4919668898f5aba8d62708c9ac27ed66bd
 SHA512:
-  metadata.gz: e91c52a247f2e8b772cb088db3c603174e05faf2078812b2025957551d7da42539a9c72f8453e83162b119b5ec3a56a5a3179c93f63d3ce0140206340bc6e7ea
-  data.tar.gz: 313ae2396d6d8a23a0484322e8e729cd89458df0837af44204ba1f12b1b29852ab685c80137a1f0503a8c40160ff9733d9d459396f31558e5e64bd47c38551fc
+  metadata.gz: 1430690d24611de760e956483befbb9c1b890570f3314c5589e2f66806ee736b5e05a42b287d4bcf9e6df089b7c777f9a570eb7771ae77f3a25fcde0ccc8acbd
+  data.tar.gz: 6eb971434b89d35e37f405470157bad91a3e175db8d69a96e4b83038aef4e8b7df01d5778ea43242af1c2fd9a736643116017b84512872b95563fe9dc51a4594

data/lib/daddy/{uploader.rb → carrierwave.rb}

@@ -8,15 +8,15 @@ CarrierWave.configure do |config|
       "/data/#{::Rails.application.class.module_parent_name.underscore}/#{::Rails.env}"
     end
 
-  unless ::Rails.env.test?
-    if File.exists?('config/aws.yml')
+  if File.exists?('config/aws.yml')
+    aws = YAML.safe_load(ERB.new(File.read('config/aws.yml'), 0, '-').result)
+
+    if aws.dig('s3', 'enabled')
       require 'carrierwave/storage/fog'
       config.storage :fog
       config.cache_storage :fog
-  
       config.fog_provider = 'fog/aws'
-      aws = YAML.load_file('config/aws.yml')
-  
+
       config.fog_credentials = {
         provider: 'AWS',
         aws_access_key_id: aws['s3']['access_key_id'],

data/lib/daddy/rails/railtie.rb

@@ -18,14 +18,14 @@ module Daddy
 
       initializer 'carrierwave' do
         if defined?(CarrierWave)
-          ::Rails.logger.info '[daddy] loading carrierwave uploader'
-          require 'daddy/uploader'
+          puts '[daddy] loading carrierwave configuration'
+          require 'daddy/carrierwave'
         end
       end
 
       initializer 'sidekiq' do
         if defined?(Sidekiq)
-          ::Rails.logger.info '[daddy] loading sidekiq configuration'
+          puts '[daddy] loading sidekiq configuration'
           require 'daddy/sidekiq'
         end
       end

data/lib/daddy/version.rb

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

data/lib/tasks/db_config.rake

@@ -8,7 +8,7 @@ namespace :dad do
       @app_name = File.basename(Rails.root)[0..15]
 
       template = File.join(File.dirname(__FILE__), 'db/database.yml.erb')
-      render template, :to => 'config/database.yml'
+      render template, to: 'config/database.yml'
     end
   end
 end

data/lib/tasks/db_create.rake

@@ -5,31 +5,31 @@ namespace :dad do
     
     desc 'database.yml に従ってDBを作成します。'
     task :create do
-      config = YAML.load(ERB.new(File.read('config/database.yml'), 0, '-').result)
+      config = YAML.safe_load(ERB.new(File.read('config/database.yml'), 0, '-').result, [], [], aliases: true)
       
       FileUtils.mkdir_p("tmp")
       system("echo '# mysql ddl' > tmp/create_databases.sql")
   
       config.each do |env, props|
         next if env == 'default'
+        next if ENV['RAILS_ENV'] and ENV['RAILS_ENV'] != env
 
-        puts "database for environment #{env}"
         system("echo 'drop database if exists #{props['database']};' >> tmp/create_databases.sql")
         system("echo 'create database #{props['database']};' >> tmp/create_databases.sql")
+        system("echo 'drop user if exists \"#{props['username']}\"@\"%\";' >> tmp/create_databases.sql")
+        system("echo 'create user \"#{props['username']}\"@\"%\" IDENTIFIED BY \"#{props['password']}\";' >> tmp/create_databases.sql")
         system("echo 'grant all on #{props['database']}.* to #{props['username']} identified by \"#{props['password']}\";' >> tmp/create_databases.sql")
 
         if ENV['FILE']
           system("echo 'grant all on #{props['database']}.* to #{props['username']}@localhost identified by \"#{props['password']}\";' >> tmp/create_databases.sql")
           system("echo 'grant file on *.* to #{props['username']}@localhost;' >> tmp/create_databases.sql")
         end
+        puts "database for environment #{env} written to tmp/create_databases.sql"
       end
 
       system("echo 'flush privileges;' >> tmp/create_databases.sql")
       system("echo >> tmp/create_databases.sql")
 
-      puts
-      puts File.read('tmp/create_databases.sql')
-
       if ENV['MYSQL_NO_ROOT_PASSWORD']
         fail unless system("mysql -u root < tmp/create_databases.sql")
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.16
 platform: ruby
 authors:
 - ichy
@@ -353,6 +353,7 @@ files:
 - lib/capistrano/tasks/clear_cache.rake
 - lib/capistrano/tasks/update_linked_files.rake
 - lib/daddy.rb
+- lib/daddy/carrierwave.rb
 - lib/daddy/cucumber.rb
 - lib/daddy/cucumber/helpers.rb
 - lib/daddy/cucumber/helpers/assert.rb
@@ -383,7 +384,6 @@ files:
 - lib/daddy/sidekiq.rb
 - lib/daddy/tasks.rb
 - lib/daddy/test_help.rb
-- lib/daddy/uploader.rb
 - lib/daddy/utils/config.rb
 - lib/daddy/utils/sql_utils.rb
 - lib/daddy/utils/string_utils.rb
@@ -466,7 +466,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: My rails dad