mina-data_sync 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d58104d7068180adc905c2bd922ba4eee9666da
-  data.tar.gz: 3805c517428a3161f12fef18c5c2f2a5cdf4946a
+  metadata.gz: 189a72cf302e49da6dd218a584a40b95dab6b84c
+  data.tar.gz: 45551eeefb495721775d139079ab737e5c6dd600
 SHA512:
-  metadata.gz: df60b6a711f9d35d993324a41036109390db09a4da859eebcfe1ec45c481b4fdd78191edd440f4fb7d838158392235ea92cff29a1f2bd6dc551cae053e88ab4a
-  data.tar.gz: 3f95e89310c6d1d7013e0243a3f97ec624af08922cd2793f3b57c48c7570031baf5884e0ec3cf20576fdda7f9a8133b6b9dfbe2891ab5fa126e16d45d1c65114
+  metadata.gz: fdd31793c16b9ce58c3506b09c6e70968272dd2cfb100b1f649fc0f6e9c7005129adf91f8492efafecee86fabc918e17dd41b6563dcc758cedb11e3c3944c838
+  data.tar.gz: 7b9b272a3016c70d326f4f51317ff6408961e8a86e5c7733b86d1fc1ffcace5b2731b185ee7a466b9a8b2dfd2e237a0421f947d9dbcb2ddb3809f9f5fde90f3e

data/config/database.yml

@@ -1,46 +1,11 @@
-# MySQL.  Versions 4.1 and 5.0 are recommended.
-#
-# Install the MYSQL driver
-#   gem install mysql2
-#
-# Ensure the MySQL gem is defined in your Gemfile
-#   gem 'mysql2'
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-development:
-  adapter: mysql2
-  encoding: utf8
-  database: test
-  pool: 5
-  username: root
-  password:
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: mysql2
+default: &default
+  adapter: postgresql
   encoding: utf8
-  database: psylog_test
   pool: 5
-  username: root
+  username: postgres
   password:
 
-production:
-  host: localhost
-  adapter: mysql2
-  encoding: utf8
-  database: psylog_infinum_co
-  pool: 5
-  username: psylog_p
-  password: DzmKmmMw
+development:
+  <<: *default
+  database: truck_development_2
 
-staging:
-  host: localhost
-  adapter: mysql2
-  encoding: utf8
-  database: psylog_staging_infinum_co
-  pool: 5
-  username: psylog_s
-  password: uRfbBD1S

data/lib/mina/data_sync/helpers.rb

@@ -1,28 +1,45 @@
-def read_conf(path, rails_env)
-  @conf ||= YAML.load(ERB.new(File.read(path)).result)[rails_env]
-end
-
-def backup_file
-  "#{@conf['database']}-#{Date.today}.sql"
-end
-
-def dump
-  case @conf['adapter']
-  when 'postgresql' then 'pg_dump'
-  when 'mysql2' then 'mysqldump'
+COMMAND = <<-RUBY
+  method = ARGV[0]
+  dc = JSON.parse(ARGV[2])
+  adapter = dc["adapter"]
+  database = dc["database"]
+  host = dc["host"]
+  username = dc["username"]
+  password = dc["password"]
+  port = dc["port"]
+  arguments = ""
+  case adapter.to_s
+  when "postgresql"
+    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"
+  when "mysql2"
+    arguments += method == "dump" ? "mysqldump" : "mysql"
+    arguments += " " + database if database
+    arguments += " -h " + host if host
+    arguments += " -u " + username if username
+    arguments += " --password=" + password if password
+    arguments += " -P " + port.to_s if port
   end
-end
+  arguments += method == "dump" ? " > " : " < "
+  arguments += ARGV[1]
+  puts arguments
+RUBY
 
-def restore
-  case @conf['adapter']
-  when 'postgresql' then 'psql -q'
-  when 'mysql2' then 'mysql'
-  end
+DATA_SYNC = <<-BASH
+  function data_sync {
+    ruby -rjson -e '#{COMMAND}' "$@"
+  };
+BASH
+
+def config
+  "#{rails} runner 'puts ActiveRecord::Base.connection.instance_variable_get(:@config).to_json'"
 end
 
-def options
-  case @conf['adapter']
-  when 'postgresql' then '-O -c'
-  when 'mysql2' then ''
-  end
+def backup_file
+  "#{repository.split('/').last.split('.').first}-#{rails_env}-#{Date.today}.sql"
 end

data/lib/mina/data_sync/tasks.rb

@@ -8,20 +8,20 @@ namespace :data_sync do
 
     queue "echo '-----> Dumping database'"
     queue "cd #{deploy_to}/#{current_path}"
-    queue "ARGS=$(#{rake} mina_data_sync:config)"
+    queue "#{DATA_SYNC}"
     queue "mkdir -p #{remote_backup_path}"
-    queue! 'echo $ARGS'
-    queue! "#{dump} $ARGS #{options} > #{remote_backup_path}/#{backup_file}"
+    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"))
 
     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 "echo '-----> Restoring database'"
       if restore_data == 'true'
-        queue "ARGS=$(#{rake} mina_data_sync:config)"
-        queue! 'echo $ARGS'
-        queue! "#{restore} $ARGS < #{local_backup_path}/#{backup_file}"
+        queue "echo '-----> Restoring database'"
+        queue "CONFIG=$(#{rails} runner 'puts ActiveRecord::Base.connection.instance_variable_get(:@config).to_json')"
+        queue %(eval $(data_sync "restore" "#{local_backup_path}/#{backup_file}" "$CONFIG"))
       end
     end
   end
@@ -31,8 +31,9 @@ namespace :data_sync do
 
     to :before_hook do
       queue "echo '-----> Dumping database'"
-      queue "ARGS=$(conf #{database_path} development)"
-      queue! "#{dump} $ARGS #{options} > #{local_backup_path}/#{backup_file}"
+      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 "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}"
     end
@@ -40,8 +41,8 @@ namespace :data_sync do
     if restore_data == 'true'
       queue "echo '-----> Restoring database'"
       queue "cd #{deploy_to}/#{current_path}"
-      queue "ARGS=$(conf #{database_path} #{rails_env})"
-      queue! "#{restore} $ARGS <  #{deploy_to}/#{current_path}/#{remote_backup_path}/#{backup_file}"
+      queue "CONFIG=$(#{rails} runner 'puts ActiveRecord::Base.connection.instance_variable_get(:@config).to_json')"
+      queue %(eval $(data_sync "restore" "#{remote_backup_path}/#{backup_file}" "$CONFIG"))
     end
   end
 end

data/lib/mina/data_sync/version.rb

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

data/lib/mina/data_sync.rb

@@ -7,13 +7,5 @@ require 'mina/data_sync/tasks'
 
 module Mina
   module DataSync
-    if defined? Rails::Railtie
-      require 'rails'
-      class Railtie < Rails::Railtie
-        rake_tasks do
-          load 'tasks/config.rake'
-        end
-      end
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mina-data_sync
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Stjepan Hadjic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,7 +85,6 @@ files:
 - lib/mina/data_sync/helpers.rb
 - lib/mina/data_sync/tasks.rb
 - lib/mina/data_sync/version.rb
-- lib/mina/tasks/config.rake
 - mina-data_sync.gemspec
 homepage: https://github.com/d4be4st/mina-data_sync
 licenses:

data/lib/mina/tasks/config.rake

@@ -1,26 +0,0 @@
-namespace :mina_data_sync do
-  task config: :environment do
-    dc = ActiveRecord::Base.configurations[Rails.env].to_yaml
-    adapter = dc['adapter']
-    database = dc['database']
-    host = dc['host']
-    username = dc['username']
-    password = dc['password']
-    port = dc['port']
-    arguments = ''
-    case adapter.to_s
-    when 'postgresql'
-      arguments += ' -d ' + database if database
-      arguments += ' -h ' + host if host
-      arguments += ' -U ' + username if username
-      arguments += ' -p ' + port.to_s if port
-    when 'mysql2'
-      arguments += ' ' + database if database
-      arguments += ' -h ' + host if host
-      arguments += ' -u ' + username if username
-      arguments += ' --password=' + password if password
-      arguments += ' -P ' + port.to_s if port
-    end
-    puts arguments
-  end
-end