daddy 0.3.33 → 0.3.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ccd54aece78155f0dc1d720a791abd2024391e5
-  data.tar.gz: 839055c3f8929cd73179b38d3357a25c3ab8a16d
+  metadata.gz: 0a8406dde7747d2ecb6482a3359fc6c73a83467b
+  data.tar.gz: d9540330ae87efb0c0e337fa67fae7ae4e0c2372
 SHA512:
-  metadata.gz: 6a5ed3415b414134ea2f36ea6f5c237b1baf4973596499cc1c21a467505aacc39ee72aef9f33fc509b577178a677aa6e10ee3bf3e9208750acbe11396bfb2325
-  data.tar.gz: 61ff9b31dc665f7236330814598446f6bccb8e8e90e6c86220ed19964a5db8927de29c8c837f48666d28fd2b7d41ce450309140cbed7f47dd4662ec09de2a0bd
+  metadata.gz: bb19d3e42d23c63d8fc4a69f54355c098c50841e7b880e191a97a42fb5125c700a15eea6bbc7bf457ed0567d03c39e3a70b43c0035ff9e2ad5aee01d4cfb90fb
+  data.tar.gz: 35238380499643e4b73133460b8fffd36be52898ffaaf3ce7611fda4ec0f4ddaac6f3d43bde3e5a61001b12cf6a8d6d8b6b0cabb03305a1d1bc4ecd00485a80f

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.3.33'
+  VERSION = '0.3.34'
 end

data/lib/tasks/db_dump.rake

@@ -5,19 +5,19 @@ namespace :dad do
 
     desc "データベースをダンプします。"
     task :dump do
-      backup_dir = ask('出力先ディレクトリ', :required => true)
+      dump_dir = ENV['DUMP_DIR'] || ask('出力先ディレクトリ', :required => true)
 
       config = YAML.load_file(File.join('config', 'database.yml'))[Rails.env]
       host = config['host'] || 'localhost'
       database = config['database']
       user = config['username']
       password = config['password']
-      now = Time.now
-      filepath = File.join(backup_dir, "#{database}-#{now.strftime('%Y-%m-%d_%H%M')}.dump.gz")
+
+      filepath = File.join(dump_dir, "#{database}-#{Time.now.strftime('%Y-%m-%d_%H%M')}.dump.gz")
 
       run "mkdir -p #{File.dirname(filepath)}",
           "mysqldump -u #{user} -p#{password} -h #{host} #{database} | gzip > #{filepath}",
-          :gsub => [/-p[^ ]+/, '-pFILTERED']
+          :mask => [/-p[^ ]+/, '-pFILTERED']
     end
   end
 

data/lib/tasks/db_load.rake

@@ -0,0 +1,26 @@
+require_relative 'task_helper'
+
+namespace :dad do
+  namespace :db do
+
+    desc "データベースをロードします。"
+    task :load do
+      dump_file = ENV['DUMP_FILE'] || ask('ダンプファイル', :required => true)
+
+      config = YAML.load_file(File.join('config', 'database.yml'))[Rails.env]
+      host = config['host'] || 'localhost'
+      database = config['database']
+      user = config['username']
+      password = config['password']
+
+      if dump_file.end_with?('.gz')
+        run "zcat #{dump_file} | mysql -u #{user} -p#{password} -h #{host} #{database}",
+          :mask => [/-p[^ ]+/, '-pFILTERED']
+      else
+        run "mysql -u #{user} -p#{password} -h #{host} #{database} < #{dump_file}",
+          :mask => [/-p[^ ]+/, '-pFILTERED']
+      end
+    end
+  end
+
+end

data/lib/tasks/task_helper.rb

@@ -70,15 +70,21 @@ def self.ask(prompt, options = {})
   answer.blank? ? nil : answer
 end
 
+def self.quiet?
+  ARGV.include?('--quiet') or ARGV.include?('-q')
+end
+
 def self.run(*commands)
   options = commands.pop if commands.last.is_a?(Hash)
   options ||= {}
 
   commands.each do |c|
+    masked_command = options[:mask] ? c.gsub(*options[:mask]) : c
+
     if dry_run?
-      puts "command to be run: #{options[:gsub] ? c.gsub(*options[:gsub]) : c}"
+      puts "command to be run: #{masked_command}" unless quiet?
     else
-      puts options[:gsub] ? c.gsub(*options[:gsub]) : c
+      puts masked_command unless quiet?
       fail unless system(c)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.3.33
+  version: 0.3.34
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-16 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -322,6 +322,7 @@ files:
 - lib/tasks/db_create.rake
 - lib/tasks/db_dump.rake
 - lib/tasks/db_fixtures.rake
+- lib/tasks/db_load.rake
 - lib/tasks/diary.rake
 - lib/tasks/elasticsearch.rake
 - lib/tasks/elasticsearch/elasticsearch.conf.erb