mina-data_sync 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 189a72cf302e49da6dd218a584a40b95dab6b84c
-  data.tar.gz: 45551eeefb495721775d139079ab737e5c6dd600
+  metadata.gz: d81b2449d778519f0bc36481e98d133f0ce590a7
+  data.tar.gz: 5ad76b08d901c913992b7ef637e080bcab124c85
 SHA512:
-  metadata.gz: fdd31793c16b9ce58c3506b09c6e70968272dd2cfb100b1f649fc0f6e9c7005129adf91f8492efafecee86fabc918e17dd41b6563dcc758cedb11e3c3944c838
-  data.tar.gz: 7b9b272a3016c70d326f4f51317ff6408961e8a86e5c7733b86d1fc1ffcace5b2731b185ee7a466b9a8b2dfd2e237a0421f947d9dbcb2ddb3809f9f5fde90f3e
+  metadata.gz: fd0c4965dd1a7401ab673e6d9346507241992cd886dfa5473218f054535d6793c6f787b100306db404e48d627c01ae45fce95d7364f0b8edc75cb34962f6c0d7
+  data.tar.gz: 88ec9c154662ba21ac8454c0e56161d95f9da8a13a6d085d7f82400a2c31edebfc2968380ad94652e674d0125776a99ffcc7d008485bc77add8576e80c2e0164

data/lib/mina/data_sync/helpers.rb

@@ -10,13 +10,13 @@ COMMAND = <<-RUBY
   arguments = ""
   case adapter.to_s
   when "postgresql"
-    arguments += "PGPASSWORD=" + password if password
+    arguments += "PGPASSWORD=" + password + " " if password
     arguments += method == "dump" ? "pg_dump" : "psql -q"
     arguments += " -d " + database if database
     arguments += " -h " + host if host
     arguments += " -U " + username if username
     arguments += " -p " + port.to_s if port
-    arguments += " -O -c"
+    arguments += method == "dump" ? " -O -c" : ""
   when "mysql2"
     arguments += method == "dump" ? "mysqldump" : "mysql"
     arguments += " " + database if database

data/lib/mina/data_sync/tasks.rb

@@ -11,16 +11,18 @@ namespace :data_sync do
     queue "#{DATA_SYNC}"
     queue "mkdir -p #{remote_backup_path}"
     queue "CONFIG=$(#{rails} runner 'puts ActiveRecord::Base.connection.instance_variable_get(:@config).to_json')"
-    queue! %(eval $(data_sync "dump" "#{remote_backup_path}/#{backup_file}" "$CONFIG"))
+    queue %(data_sync "dump" "#{remote_backup_path}/#{backup_file}" "$CONFIG")
+    queue %(eval $(data_sync "dump" "#{remote_backup_path}/#{backup_file}" "$CONFIG"))
 
     to :after_hook do
       queue "echo '-----> Copying backup'"
       queue "mkdir -p #{local_backup_path}"
       queue "#{DATA_SYNC}"
-      queue! "rsync --progress -e 'ssh -p #{port}' #{user}@#{domain}:#{deploy_to}/#{current_path}/#{remote_backup_path}/#{backup_file} #{local_backup_path}/#{backup_file}"
+      queue "rsync --progress -e 'ssh -p #{port}' #{user}@#{domain}:#{deploy_to}/#{current_path}/#{remote_backup_path}/#{backup_file} #{local_backup_path}/#{backup_file}"
       if restore_data == 'true'
         queue "echo '-----> Restoring database'"
-        queue "CONFIG=$(#{rails} runner 'puts ActiveRecord::Base.connection.instance_variable_get(:@config).to_json')"
+        queue "CONFIG=$(RAILS_ENV=development #{bundle_bin} exec rails runner 'puts ActiveRecord::Base.connection.instance_variable_get(:@config).to_json')"
+        queue %(data_sync "restore" "#{local_backup_path}/#{backup_file}" "$CONFIG")
         queue %(eval $(data_sync "restore" "#{local_backup_path}/#{backup_file}" "$CONFIG"))
       end
     end
@@ -32,16 +34,18 @@ namespace :data_sync do
     to :before_hook do
       queue "echo '-----> Dumping database'"
       queue "#{DATA_SYNC}"
-      queue "CONFIG=$(#{rails} runner 'puts ActiveRecord::Base.connection.instance_variable_get(:@config).to_json')"
-      queue! %(eval $(data_sync "dump" "#{local_backup_path}/#{backup_file}" "$CONFIG"))
+      queue "CONFIG=$(RAILS_ENV=development #{bundle_bin} exec rails runner 'puts ActiveRecord::Base.connection.instance_variable_get(:@config).to_json')"
+      queue %(data_sync "dump" "#{local_backup_path}/#{backup_file}" "$CONFIG")
+      queue %(eval $(data_sync "dump" "#{local_backup_path}/#{backup_file}" "$CONFIG"))
       queue "echo '-----> Copying backup'"
-      queue! "rsync --progress -e 'ssh -p #{port}' #{local_backup_path}/#{backup_file} #{user}@#{domain}:#{deploy_to}/#{current_path}/#{remote_backup_path}/#{backup_file}"
+      queue "rsync --progress -e 'ssh -p #{port}' #{local_backup_path}/#{backup_file} #{user}@#{domain}:#{deploy_to}/#{current_path}/#{remote_backup_path}/#{backup_file}"
     end
 
     if restore_data == 'true'
       queue "echo '-----> Restoring database'"
       queue "cd #{deploy_to}/#{current_path}"
       queue "CONFIG=$(#{rails} runner 'puts ActiveRecord::Base.connection.instance_variable_get(:@config).to_json')"
+      queue %(data_sync "restore" "#{remote_backup_path}/#{backup_file}" "$CONFIG")
       queue %(eval $(data_sync "restore" "#{remote_backup_path}/#{backup_file}" "$CONFIG"))
     end
   end

data/lib/mina/data_sync/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module DataSync
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mina-data_sync
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Stjepan Hadjic