capistrano-db-tasks 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18ac3ae6cd8e72a0cf8aeb17906f23c009b38e84
-  data.tar.gz: 648af7e955625ab548ff6d086bbbea56c8234f38
+  metadata.gz: 70686927e9b1dbb60f98bfd3c862de83d6fb7a29
+  data.tar.gz: 42b36085956d02a87c8b3d68f8c199ad53aa6851
 SHA512:
-  metadata.gz: 44884aea8dc26dc0a9d66c10c428b4b543a01720a912bf6efabe4f325b12c105d1da0ac67c78f460db10864efa9ac60cef4012eba6a7ab6dd03fec2d389ecd28
-  data.tar.gz: de3f9770a4c9cf2a35f9df7c61e70281feb7db5a2c0d23bc913b9ed37684c5e0c43d5c665412ffb6fc75014fca1df05d0b110376c40998e26a3b3a912714fa95
+  metadata.gz: fbfbbf4e4be63dbea1b7b73f89e2f7022fd1a8d46d5be64276bce4cb29448fdff1706307562f52b0c633116a1b1c4e241bed492ffc05c37f80053a54565dbde4
+  data.tar.gz: 744bada441f262c52724899049b55a880008daf60caee2ac4173a04fce956edc67a14ba5479db4cc41aa381602752b6fc6fab75fdc71b5828daf889b9f27e000

data/.rubocop.yml

@@ -1,5 +1,5 @@
 Rails:
-  Enabled: true
+  Enabled: false
 
 AllCops:
   TargetRubyVersion: 2.3

data/CHANGELOG.md

@@ -4,10 +4,15 @@ Reverse Chronological Order:
 
 ## master
 
-https://github.com/sgruhier/capistrano-db-tasks/compare/v0.5...HEAD
+https://github.com/sgruhier/capistrano-db-tasks/compare/v0.6...HEAD
 
 * Your contribution here!
 
+# 0.6 (Dec 14 2016)
+
+* Configurable dump folder #101 #75 #61 (@artempartos, @gmhawash)
+* Fixed previous release bugs (@sitnikovme, @slavajacobson)
+
 # 0.5 (Nov 29 2016)
 
 * Fixed iteration on remote/local assets dir #98 (@elthariel)

data/README.md

@@ -1,4 +1,4 @@
-# CapistranoDbTasks | [![Code Climate](https://codeclimate.com/github/sgruhier/capistrano-db-tasks/badges/gpa.svg)](https://codeclimate.com/github/sgruhier/capistrano-db-tasks) [![Gem Version](https://badge.fury.io/rb/capistrano-db-tasks.svg)](http://badge.fury.io/rb/capistrano-db-tasks)
+# CapistranoDbTasks | [![Gem Downloads](http://img.shields.io/gem/dt/capistrano-db_sync.svg)](https://rubygems.org/gems/capistrano-db_sync)[![Code Climate](https://codeclimate.com/github/sgruhier/capistrano-db-tasks/badges/gpa.svg)](https://codeclimate.com/github/sgruhier/capistrano-db-tasks) [![Gem Version](https://badge.fury.io/rb/capistrano-db-tasks.svg)](http://badge.fury.io/rb/capistrano-db-tasks)
 
 Add database AND assets tasks to capistrano to a Rails project. It only works with capistrano 3. Older versions until 0.3 works with capistrano 2.
 
@@ -39,6 +39,9 @@ set :db_ignore_tables, []
 # if you want to exclude table data (but not table schema) from dump
 set :db_ignore_data_tables, []
 
+# configure location where the dump file should be created
+set :db_dump_dir, "./db"
+
 # If you want to import assets, you can change default asset dir (default = system)
 # This directory must be in your shared directory on the server
 set :assets_dir, %w(public/assets public/att)

data/lib/capistrano-db-tasks/database.rb

@@ -41,11 +41,11 @@ module Database
     end
 
     def current_time
-      Time.zone.now.strftime("%Y-%m-%d-%H%M%S")
+      Time.now.strftime("%Y-%m-%d-%H%M%S")
     end
 
     def output_file
-      @output_file ||= "db/#{database}_#{current_time}.sql.#{compressor.file_extension}"
+      @output_file ||= "#{database}_#{current_time}.sql.#{compressor.file_extension}"
     end
 
     def compressor
@@ -105,7 +105,7 @@ module Database
   class Remote < Base
     def initialize(cap_instance)
       super(cap_instance)
-      @cap.info "Loading remote database config"
+      puts "Loading remote database config"
       @cap.within @cap.current_path do
         @cap.with rails_env: @cap.fetch(:rails_env) do
           dirty_config_content = @cap.capture(:rails, "runner \"puts '#{DBCONFIG_BEGIN_FLAG}' + ActiveRecord::Base.connection.instance_variable_get(:@config).to_yaml + '#{DBCONFIG_END_FLAG}'\"", '2>/dev/null')
@@ -117,19 +117,19 @@ module Database
     end
 
     def dump
-      @cap.execute "cd #{@cap.current_path} && #{dump_cmd} | #{compressor.compress('-', output_file)}"
+      @cap.execute "cd #{@cap.current_path} && #{dump_cmd} | #{compressor.compress('-', db_dump_file_path)}"
       self
     end
 
     def download(local_file = "#{output_file}")
-      @cap.download! dump_file_path, local_file
+      @cap.download! db_dump_file_path, local_file
     end
 
     def clean_dump_if_needed
       if @cap.fetch(:db_remote_clean)
-        @cap.execute "rm -f #{dump_file_path}"
+        @cap.execute "rm -f #{db_dump_file_path}"
       else
-        @cap.info "leaving #{dump_file_path} on the server (add \"set :db_remote_clean, true\" to deploy.rb to remove)"
+        puts "leaving #{db_dump_file_path} on the server (add \"set :db_remote_clean, true\" to deploy.rb to remove)"
       end
     end
 
@@ -143,15 +143,19 @@ module Database
 
     private
 
-    def dump_file_path
-      "#{@cap.current_path}/#{output_file}"
+    def db_dump_file_path
+      "#{db_dump_dir}/#{output_file}"
+    end
+
+    def db_dump_dir
+      @cap.fetch(:db_dump_dir) || "#{@cap.current_path}/db"
     end
   end
 
   class Local < Base
     def initialize(cap_instance)
       super(cap_instance)
-      @cap.info "Loading local database config"
+      puts "Loading local database config"
       command = "#{Dir.pwd}/bin/rails runner \"puts '#{DBCONFIG_BEGIN_FLAG}' + ActiveRecord::Base.connection.instance_variable_get(:@config).to_yaml + '#{DBCONFIG_END_FLAG}'\""
       stdout, status = Open3.capture2(command)
       raise "Error running command (status=#{status}): #{command}" if status != 0
@@ -163,15 +167,15 @@ module Database
     # cleanup = true removes the mysqldump file after loading, false leaves it in db/
     def load(file, cleanup)
       unzip_file = File.join(File.dirname(file), File.basename(file, ".#{compressor.file_extension}"))
-      @cap.info "executing local: #{compressor.decompress(file)} && #{import_cmd(unzip_file)}"
+      puts "executing local: #{compressor.decompress(file)} && #{import_cmd(unzip_file)}"
       execute("#{compressor.decompress(file)} && #{import_cmd(unzip_file)}")
       if cleanup
-        @cap.info "removing #{unzip_file}"
+        puts "removing #{unzip_file}"
         File.unlink(unzip_file)
       else
-        @cap.info "leaving #{unzip_file} (specify :db_local_clean in deploy.rb to remove)"
+        puts "leaving #{unzip_file} (specify :db_local_clean in deploy.rb to remove)"
       end
-      @cap.info "Completed database import"
+      puts "Completed database import"
     end
 
     def dump

data/lib/capistrano-db-tasks/util.rb

@@ -1,6 +1,6 @@
 module Util
   def self.prompt(msg, prompt = "(y)es, (n)o ")
     ask(:answer, "#{msg} #{prompt} ? ")
-    (fetch(:answer) =~ /^y$|^yes$/i).zero?
+    (fetch(:answer) =~ /^y$|^yes$/i).to_i.zero?
   end
 end

data/lib/capistrano-db-tasks/version.rb

@@ -1,3 +1,3 @@
 module CapistranoDbTasks
-  VERSION = "0.5".freeze
+  VERSION = "0.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-db-tasks
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Sebastien Gruhier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano