capistrano-shortcuts 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9013af032f3b5bf35417397388819b1675044e5b
-  data.tar.gz: ef8a5ff9d741326842bb01abef8cbbcf5adf33f0
+  metadata.gz: 069f3f05499903ac48decabe44d43bbb6139920e
+  data.tar.gz: 1333bdaee1fcdbca80e2c793bdd536f9d2a0360c
 SHA512:
-  metadata.gz: 824b2979f951aad98089840f7af147fc28bca558d7a47ae94ad0f5abb5b36797ba1a8c1994fc2ccb3e9cef66245bd6644c126429d1076ec8d9839d140987519e
-  data.tar.gz: c6de0aeed3965dc8e31fef26b80bb7528c840d06f61cad746e98f19aaf8ba866e91b406d72c44af18ce38811cf2e79637449b4fb02969b2023e0f885a961cb47
+  metadata.gz: 2db7a27dd14a4d08fb6bfc9654ec8c2ddda3b51342f556864c88ba553dfa79c8ca48f8dc9caf805e4a194609cf078b39e1cddd8eb09b34fa82d4eb83088c49e8
+  data.tar.gz: 07e6463ea9d45919fca6dc0a17359f1729ed283ebae2a06ba14eb9674aacbd33d90cb5d341a37c2c7750e0a40ab372c1d9d6cc3b40dc12e7b174bf091310d126

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-shortcuts (0.6.1)
+    capistrano-shortcuts (0.7.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/capistrano/shortcuts/tasks/deploy_database.rake

@@ -22,7 +22,12 @@ namespace :db do
         else
           domain = db_config[fetch(:rails_env)]['host']
         end
-        execute("scp -i #{fetch(:aws_key_pair)} #{fetch(:user)}@#{domain}:~/#{dump_file}.gz .")
+        command = "scp "
+        if fetch(:aws_key_pair)
+          command += "-i #{fetch(:aws_key_pair)} "
+        end
+        command += "#{fetch(:user)}@#{domain}:~/#{dump_file}.gz ."
+        execute(command)
       end
       execute("rm #{dump_file}.gz")
       run_locally do
@@ -60,7 +65,12 @@ namespace :db do
         domain = db_config[fetch(:rails_env)]['host']
       end
 
-      execute("scp -i #{fetch(:aws_key_pair)} #{dump_file}.gz #{fetch(:user)}@#{domain}:~")
+      command = "scp "
+      if fetch(:aws_key_pair)
+        command += "-i #{fetch(:aws_key_pair)} "
+      end
+      command += "#{dump_file}.gz #{fetch(:user)}@#{domain}:~"
+      execute(command)
       execute("rm #{dump_file}.gz")
     end
     on roles(:db) do
@@ -80,11 +90,15 @@ namespace :db do
   end
 
   def dump_db(config, output_file)
-    execute("MYSQL_PWD=#{config['password']} " +
+    command = "MYSQL_PWD=#{config['password']} " +
             "mysqldump -f " +
-            "-u #{config['username']} " +
-            "#{config['database']} " +
-            "-r #{output_file}")
+            "-u #{config['username']} "
+    if config['db_host']
+      command += "-h #{config['db_host']} "
+    end
+    command += "#{config['database']} " +
+               "-r #{output_file}"
+    execute(command)
     execute("gzip -f #{output_file}")
   end
 

data/lib/capistrano/shortcuts/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Shortcuts
-    VERSION = "0.6.1"
+    VERSION = "0.7.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-shortcuts
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Todd Gehman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler