mina-data_sync 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 37645f8d3589d9c55c0e6042f047918331c7875f
-  data.tar.gz: aabc85f46af7f5282784fbec8b14f04407f4c5a9
+SHA256:
+  metadata.gz: 73113d75dcc06e2ed520c41c9eec7ead5f81997a9e2cc8cbbc303e7028303edd
+  data.tar.gz: 03705d30c25c7fa53e7f0cd86b117e1b26e961197385dc0293000cc2d2f7b8f9
 SHA512:
-  metadata.gz: 29fa23eb847731061d236b957ee2b853f276ed9c8f9de1847426fd8afd99541146f8baafae55fb11bf82f66d57620c78894c316e52b711a30955947bdce63fd2
-  data.tar.gz: d1a76a1b1e152117fea3289d2b2ffa6fc1887346ddf82053438dc8b80fff73039aa078756d1a429202ace6626ff2a08cdeb5552d28c59b710f9590f30df789d2
+  metadata.gz: e175c1eee90f8f4130da6bdc702b74ac650cf5d8fbcfca808bd045eb2b5fbf1b2829e290a4a0b3cd230f80bb30ad83aa982da83b89c59c40822da53e0a555d3e
+  data.tar.gz: 06d9dac2dcb74fae366872f5a2dd1c7cf2a4c2eb915717791329e3c26c4709038a38bbb7968ecd3e8436e1d53f152c842b38424dcb0157b9f8d4b06a4dd86d27

data/lib/mina/data_sync.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'erb'
 require 'tty-prompt'
+require 'date'
 require 'mina/data_sync/defaults'
 require 'mina/data_sync/helpers'
 require 'mina/data_sync/version'

data/lib/mina/data_sync/helpers.rb

@@ -9,7 +9,7 @@ COMMAND = <<-RUBY
   port = dc["port"]
   arguments = ""
   case adapter.to_s
-  when "postgresql"
+  when "postgresql", "postgis"
     arguments += "PGPASSWORD=\\"" + password + "\\" " if password
     arguments += method == "dump" ? "pg_dump" : "psql -q"
     arguments += " -d " + database if database
@@ -31,18 +31,17 @@ COMMAND = <<-RUBY
 RUBY
 
 DATA_SYNC = <<-BASH
-  function data_sync {
-    ruby -rjson -e '#{COMMAND}' "$@"
-  };
+data_sync() {
+  ruby -rjson -e '#{COMMAND}' "$@"
+};
 BASH
 
 def dump_restore(rails_root, backup_path, mode: :dump, backend: :local)
-  set :rails_env, 'development' if backend == :local
   comment %{#{mode == :dump ? 'Dumping' : 'Restoring'} database}
   command %{cd #{rails_root}}
   command DATA_SYNC.to_s
   command %{mkdir -p #{backup_path}}
-  command %{CONFIG=$(#{fetch(:rails)} runner "puts ActiveRecord::Base.connection.instance_variable_get(:@config).to_json")}
+  command %{CONFIG=$(RAILS_ENV=#{backend == :local ? 'development' : fetch(:rails_env)} bundle exec rails runner "puts ActiveRecord::Base.connection.instance_variable_get(:@config).to_json")}
   comment %{$(data_sync "#{mode}" "#{backup_path}/#{fetch(:backup_file)}" "$CONFIG")}
   command %{eval $(data_sync "#{mode}" "#{backup_path}/#{fetch(:backup_file)}" "$CONFIG")}
 end
@@ -53,7 +52,7 @@ def rsync_db(mode: :remote_to_local)
       comment %{Copying backup}
       command %{mkdir -p #{fetch(:local_backup_path)}}
       comment %{Backup: #{fetch(:local_backup_path)}/#{fetch(:backup_file)}}
-      command %{rsync --progress -e "ssh -p #{fetch(:port)}" #{fetch(:user)}@#{fetch(:domain)}:#{fetch(:current_path)}/#{fetch(:remote_backup_path)}/#{fetch(:backup_file)} #{fetch(:local_backup_path)}/#{fetch(:backup_file)}}
+      command %{rsync --progress -e "ssh -p #{fetch(:port, 22)}" #{fetch(:user)}@#{fetch(:domain)}:#{fetch(:current_path)}/#{fetch(:remote_backup_path)}/#{fetch(:backup_file)} #{fetch(:local_backup_path)}/#{fetch(:backup_file)}}
     end
   else
     run :remote do
@@ -62,7 +61,7 @@ def rsync_db(mode: :remote_to_local)
     run :local do
       comment %{Copying backup}
       comment %{Backup: #{fetch(:remote_backup_path)}/#{fetch(:backup_file)}}
-      command %{rsync --progress -e "ssh -p #{fetch(:port)}" #{fetch(:local_backup_path)}/#{fetch(:backup_file)} #{fetch(:user)}@#{fetch(:domain)}:#{fetch(:current_path)}/#{fetch(:remote_backup_path)}/#{fetch(:backup_file)}}
+      command %{rsync --progress -e "ssh -p #{fetch(:port, 22)}" #{fetch(:local_backup_path)}/#{fetch(:backup_file)} #{fetch(:user)}@#{fetch(:domain)}:#{fetch(:current_path)}/#{fetch(:remote_backup_path)}/#{fetch(:backup_file)}}
     end
   end
 end

data/lib/mina/data_sync/tasks.rb

@@ -20,7 +20,10 @@ namespace :data_sync do
   end
 
   task :restore_remote do
-    exit unless TTY::Prompt.new.yes?("Are you sure you want to restore #{fetch(:rails_env)} database?")
+    exit unless TTY::Prompt.new.yes?("Are you sure you want to restore #{fetch(:rails_env)} database?") do |q|
+      q.suffix ('y/N')
+      q.default false
+    end
     run :remote do
       dump_restore(fetch(:current_path), fetch(:remote_backup_path), mode: :restore, backend: :remote)
     end

data/lib/mina/data_sync/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module DataSync
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'.freeze
   end
 end

data/mina-data_sync.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "pry", "~> 0"
 
-  spec.add_dependency 'mina', '~> 1.0.0'
-  spec.add_dependency 'tty-prompt'
+  spec.add_dependency 'mina', '~> 1.0'
+  spec.add_dependency 'tty-prompt', '~> 0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mina-data_sync
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Stjepan Hadjic
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2021-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 description: Description
 email:
 - d4be4st@gmail.com
@@ -105,7 +105,7 @@ homepage: https://github.com/d4be4st/mina-data_sync
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -120,9 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Summary
 test_files: []