capistrano-alchemy 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cac5fa83da30feb19219a4daac90869cc62041d
-  data.tar.gz: 2edbd3c3b6669ab45dec01f0e8abb1fff6654611
+  metadata.gz: ccf9597911523ef71181e42d21c45c701c684205
+  data.tar.gz: f0a7c1abd703d6246d6191ee6b698ffd35c03ae6
 SHA512:
-  metadata.gz: 4f3fb820cdb646bd302bed4d9404818555cd744e769b23403c056b2764795ef2dda0ec3da1aa108dfab90b38df68344e204b5a728a51c95db3fcbf4046aa97fb
-  data.tar.gz: 66e328cba1f60d1218391e1a2252fca5819c5fd23ef165ec76762b0f79824012df7097f0bf7135a938ea26a51e22ac355ca57bdbdba33bdbc3e79613347a631b
+  metadata.gz: d945b45ef595c8a332617d927e33ba6723730c0aee18c3a966c2d81cd18178ad35e78354592e0b0205a7c61f0f45c7026dea6e70001dc6dc214fc229d76ec9bd
+  data.tar.gz: 1a7c210e28166b934666ee0fe6f17726fbfa8adde6d3def6ff56366d6c85bab312d9761b271963109e9a033d5074c82112c2734d5f30b3fbfd3b2a100ec4ae62

data/lib/capistrano/alchemy/deploy_support.rb

@@ -1,5 +1,3 @@
-require 'spinner'
-
 module Capistrano::Alchemy::DeploySupport
   # Makes a backup of the remote database and stores it in db/ folder
   def backup_database
@@ -16,7 +14,8 @@ module Capistrano::Alchemy::DeploySupport
 
   def db_import_cmd(server)
     raise "No server given" if !server
-    dump_cmd = "cd #{release_path} && bundle exec rake RAILS_ENV=#{fetch(:rails_env, 'production')} alchemy:db:dump"
+    env = "RAILS_ENV=#{fetch(:rails_env, 'production')}"
+    dump_cmd = "cd #{release_path} && #{rake_cmd} alchemy:db:dump #{env}"
     sql_stream = "#{ssh_command(server)} '#{dump_cmd}'"
     "#{sql_stream} | #{database_import_command(database_config['adapter'])} 1>/dev/null 2>&1"
   end
@@ -24,7 +23,8 @@ module Capistrano::Alchemy::DeploySupport
   # The actual export command that sends the data
   def db_export_cmd(server)
     raise "No server given" if !server
-    import_cmd = "cd #{release_path} && bundle exec rake RAILS_ENV=#{fetch(:rails_env, 'production')} alchemy:db:import"
+    env = "RAILS_ENV=#{fetch(:rails_env, 'production')}"
+    import_cmd = "cd #{release_path} && #{rake_cmd} alchemy:db:import #{env}"
     ssh_cmd = "#{ssh_command(server)} '#{import_cmd}'"
     "#{database_dump_command(database_config['adapter'])} | #{ssh_cmd}"
   end
@@ -46,10 +46,14 @@ module Capistrano::Alchemy::DeploySupport
   private
 
   def ssh_command(server)
-    "ssh -p #{ssh_port(server)} #{server.user}@#{server.hostname}"
+    "ssh -C -p #{ssh_port(server)} #{server.user}@#{server.hostname}"
   end
 
   def ssh_port(server)
     server.port || 22
   end
+
+  def rake_cmd
+    SSHKit.config.command_map[:rake]
+  end
 end

data/lib/capistrano/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Alchemy
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/capistrano/tasks/alchemy.rake

@@ -41,9 +41,10 @@ namespace :alchemy do
     desc "Imports the server database into your local development machine."
     task database: ['alchemy:default_paths', 'deploy:check'] do
       on roles :db do |server|
-        puts "Importing database. Please wait..."
+        puts '## Importing database'
+        puts '   Please wait! This may take some time...'
         system db_import_cmd(server)
-        puts "Done."
+        puts '   done.'
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-alchemy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano-rails
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Capistrano Tasks for AlchemyCMS.