capistrano3-postgres 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 087895a85fd5bcae1fd8aa7ce96a921fc7f738e5
-  data.tar.gz: 9a919e94bea2d1b286949a0b435742b05c686041
+  metadata.gz: 5cadbc1ab83d70005145bf3b402d00603b09ec44
+  data.tar.gz: e93cb5ec0d64c3a76ce6d0f62ac8651f0275e85b
 SHA512:
-  metadata.gz: f4b852cbfd8e8eadbd784fb1eaab73a9908ea3fcf7cf94689e490f8ae85dfd5af229388fe25c2d4717fe16ea00a95be2f7ee083abd30f58ec2e0370fc82f33a4
-  data.tar.gz: b932647d0ed037a1b21c2bffeeb4720d05fde1e596acb908ce006008126f58675db5efd716e12c473bd61f897db862eb519e07ce04b0eb295dc2ef7b30fb98fd
+  metadata.gz: 1d68b4d312738cb1c84e1789b4f7c267f744434789714eebb93324ee5660d469a42eac0ed462743186b8c1060f1ff75e4c5aea7d499345ee4bd04121ac2ed159
+  data.tar.gz: f0a7127c3de88976231a06800a0c61f73608cdecf1ba421648553dbf6b13aab680036d06675148a13a6957b68ab2e3e3c95662a8b7901985e91c792fe70ff004

data/lib/capistrano3/postgres/version.rb

@@ -1,5 +1,5 @@
 module Capistrano3
   module Postgres
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/capistrano3/tasks/postgres.rb

@@ -25,7 +25,7 @@ namespace :postgres do
           set :postgres_remote_sqlc_file_path, "#{shared_path}/#{fetch(:postgres_backup_dir)}/#{file_name}"
         end
 
-        execute "PGPASSWORD=#{config['password']} pg_dump -U #{config['username'] || config['user']} -h #{config['host']} -Fc --file=#{fetch(:postgres_remote_sqlc_file_path)} #{config['database']}"
+        execute "PGPASSWORD=#{config['password']} pg_dump #{user_option(config)} -h #{config['host']} -Fc --file=#{fetch(:postgres_remote_sqlc_file_path)} #{config['database']}"
       end
     end
 
@@ -64,7 +64,7 @@ namespace :postgres do
           begin
             pgpass_path = File.join(Dir.pwd, '.pgpass')
             File.open(pgpass_path, 'w+', 0600) { |file| file.write("*:*:*:#{config['username'] || config['user']}:#{config['password']}") }
-            execute "PGPASSFILE=#{pgpass_path} pg_restore -c -U #{config['username'] || config['user']} --no-owner -h #{config['host']} -p #{config['port'] || 5432 } -d #{fetch(:database_name)} #{file_path}"
+            execute "PGPASSFILE=#{pgpass_path} pg_restore -c #{user_option(config)} --no-owner -h #{config['host']} -p #{config['port'] || 5432 } -d #{fetch(:database_name)} #{file_path}"
           rescue SSHKit::Command::Failed => e
             warn e.inspect
             info 'Import performed successfully!'
@@ -102,7 +102,7 @@ namespace :postgres do
     end
   end
 
-  desc 'Replecate database locally'
+  desc 'Replicate database locally'
   task :replicate do
     grab_local_database_config
     config = fetch(:postgres_local_database_config)
@@ -113,13 +113,21 @@ namespace :postgres do
     invoke("postgres:backup:cleanup") if fetch(:postgres_keep_local_dumps) > 0
   end
 
+  def user_option(config)
+    if config['user'] || config['username']
+      "-U #{config['user'] || config['username']}"
+    else
+      '' # assume ident auth is being used
+    end
+  end
+
   # Grabs local database config before importing dump
   def grab_local_database_config
     return if fetch(:postgres_local_database_config)
     on roles(fetch(:postgres_role)) do |role|
       run_locally do
         env = 'development'
-        yaml_content = capture "cat config/database.yml"
+        yaml_content = ERB.new(capture "cat config/database.yml").result
         set :postgres_local_database_config,  database_config_defaults.merge(YAML::load(yaml_content)[env])
       end
     end
@@ -130,13 +138,14 @@ namespace :postgres do
     return if fetch(:postgres_remote_database_config)
     on roles(fetch(:postgres_role)) do |role|
       env = fetch(:postgres_env).to_s.downcase
-      yaml_content = capture "cat #{deploy_to}/current/config/database.yml"
+      filename = "#{deploy_to}/current/config/database.yml"
+      yaml_content = capture "ruby -e \"require 'erb'; puts ERB.new(File.read('#{filename}')).result\""
       set :postgres_remote_database_config,  database_config_defaults.merge(YAML::load(yaml_content)[env])
     end
   end
 
   def database_config_defaults
-    { 'host' => 'localhost', 'user' => 'postgres' }
+    { 'host' => 'localhost' }
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-postgres
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Alex Krasynskyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano