capistrano3-postgres 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4e80a92bd0f933cc263c8a2147450b111c4aa47d
-  data.tar.gz: bc269fdedb5ae903c724e822dab203bdf52850bc
+SHA256:
+  metadata.gz: b432337df094358906c4d46a45c6365d820accfd62dd6c0a085a95ebc905014d
+  data.tar.gz: db1306a7b51ac53b30c5efbe999bf2d81873dc990baaf329fddc1d77fd2c1b81
 SHA512:
-  metadata.gz: 1d2556abe85c3a4f1d0391aa672654e258ee6464b882c462c002d975673c588e46fb5f9008f73e6d3a233a36ed1a2824c91448b4f232e47e3debb637ae78bfd9
-  data.tar.gz: 14377d6bc96bae2775703a212d1e6bf45a95e3bf337c7ac54ac1efba437313f906de852c473759eefdaf40660bac976bda41184a51bcf80ea8c9d47d5b850da0
+  metadata.gz: e64ad68263d7047df31f05ebf8c75ef1b0b3abcd4d4dc3e7b5a02c90adb66b8a237339d551993d5abc14b35242a616dcfd243db1f668cd2454854a7d7bb09ea8
+  data.tar.gz: f879125f07576d98beb42250b842cd1329f4d1319f5d958b52586a086d605158163c5e28eb8af868a18a7ba49a4731fb03c35910bcd0fd4685b4f1a25a86adfd

data/README.md

@@ -74,6 +74,12 @@ If you need only specific tables to be dumped:
 set :postgres_backup_table, -> { ['users', 'orders'] }
 ```
 
+If you need to support rails 6+ multiple database support, please set database_name to use:
+
+```
+set :postgres_database, 'primary'
+```
+
 ## Contributing
 
 1. Fork it ( http://github.com/spilin/capistrano3-postgres/fork )

data/lib/capistrano3/postgres/version.rb

@@ -1,5 +1,5 @@
 module Capistrano3
   module Postgres
-    VERSION = "0.2.4"
+    VERSION = "0.2.5"
   end
 end

data/lib/capistrano3/tasks/postgres.rb

@@ -12,6 +12,7 @@ namespace :load do
     set :postgres_backup_exclude_table_data, -> { [] }
     set :postgres_backup_exclude_table, -> { [] }
     set :postgres_backup_table, -> { [] }
+    set :postgres_database, -> { nil }
   end
 end
 
@@ -120,8 +121,7 @@ namespace :postgres do
   desc 'Replicate database locally'
   task :replicate do
     grab_local_database_config
-    config = fetch(:postgres_local_database_config)
-    ask(:database_name, config['database'])
+    ask(:database_name, fetch(:postgres_local_database_config)['database'])
     invoke "postgres:backup:create"
     invoke "postgres:backup:download"
     invoke "postgres:backup:import"
@@ -144,7 +144,7 @@ namespace :postgres do
         env = 'development'
         preload_env_variables(env)
         yaml_content = ERB.new(capture 'cat config/database.yml').result
-        set :postgres_local_database_config,  database_config_defaults.merge(YAML::load(yaml_content)[env])
+        set_postgres_database_config(yaml_content, env, :postgres_local_database_config)
       end
     end
   end
@@ -164,7 +164,7 @@ namespace :postgres do
 
         capture_config_cmd = "ruby -e \"#{eval_yaml_with_erb}\""
         yaml_content = test('ruby -v') ? capture(capture_config_cmd) : capture(:bundle, :exec, capture_config_cmd)
-        set :postgres_remote_database_config,  database_config_defaults.merge(YAML::load(yaml_content)[env])
+        set_postgres_database_config(yaml_content, env, :postgres_remote_database_config)
       end
     end
   end
@@ -173,6 +173,12 @@ namespace :postgres do
     { 'host' => 'localhost' }
   end
 
+  def set_postgres_database_config(yaml_content, env, key)
+    database_config = YAML::load(yaml_content)[env]
+    database_config = database_config[fetch(:postgres_database)] if fetch(:postgres_database)
+    set key, database_config_defaults.merge(database_config)
+  end
+
   # Load environment variables for configurations.
   # Useful for such gems as Dotenv, Figaro, etc.
   def preload_env_variables(env)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-postgres
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Alex Krasynskyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -60,8 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Create, download and restore postgres database.