Merge pull request #135 from majioa/devel

some fixes when pulling a db

Author: sgruhier

lib/capistrano-db-tasks/database.rb

@@ -108,7 +108,13 @@ def initialize(cap_instance)
       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}' + Rails.application.config.database_configuration[Rails.env].to_yaml + '#{DBCONFIG_END_FLAG}'\"", '2>/dev/null')
+          run_string = "runner \"puts '#{DBCONFIG_BEGIN_FLAG}' + ActiveRecord::Base.connection.instance_variable_get(:@config).to_yaml + '#{DBCONFIG_END_FLAG}'\""
+          dirty_config_content =
+            if @cap.capture(:ruby, "bin/rails -v", '2>/dev/null').size > 0
+              @cap.capture(:ruby, "bin/rails #{run_string}", '2>/dev/null')
+            else
+              @cap.capture(:rails, run_string, '2>/dev/null')
+            end
           # Remove all warnings, errors and artefacts produced by bunlder, rails and other useful tools
           config_content = dirty_config_content.match(/#{DBCONFIG_BEGIN_FLAG}(.*?)#{DBCONFIG_END_FLAG}/m)[1]
           @config = YAML.load(config_content).each_with_object({}) { |(k, v), h| h[k.to_s] = v }
@@ -122,7 +128,9 @@ def dump
     end
 
     def download(local_file = "#{output_file}")
-      @cap.download! db_dump_file_path, local_file
+      @cap.within @cap.current_path do
+        @cap.download! db_dump_file_path, local_file
+      end
     end
 
     def clean_dump_if_needed
@@ -186,7 +194,9 @@ def dump
 
     def upload
       remote_file = "#{@cap.current_path}/#{output_file}"
-      @cap.upload! output_file, remote_file
+      @cap.within @cap.current_path do
+        @cap.upload! output_file, remote_file
+      end
     end
 
     private
@@ -223,6 +233,8 @@ def remote_to_local(instance)
 
       begin
         remote_db.dump.download
+      rescue Exception => e
+        puts "E[#{e.class}]: #{e.message}"
       ensure
         remote_db.clean_dump_if_needed
       end