capistrano3-postgres 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c23d7ab59b5640be8e7f7db1ccf3f4ad5c6198a
-  data.tar.gz: 9da68ed48cc63b1036448ba8aa2e93aa704592df
+  metadata.gz: 7b52e13dd8550f0e2ee5e6e2e5ae7e1c32696011
+  data.tar.gz: 71e79f4fb7a52c8b9c4636312e68f11853ecc1fa
 SHA512:
-  metadata.gz: 270e308bd8bac7d9036f3db4adb416a8aadea9e9af6dd2dd930868b29d051023484a9bc922b186151ed15a9ca83a4e077c22901ee59567a852ef24dbb4b92c12
-  data.tar.gz: 243f91f63dcb7944478ecd3daf1b84b25455cc59901757bd3ca27d238fa8fac1272c7ab59d0a16b294239e2b850d32df7e794acfadb78c68e73641c9bcfb03d4
+  metadata.gz: 3080e89a7c506b1498c66553fec278e5bddf64796014f4d40716c615a9d675e087e25fe2f6625e3d760c7f98f264febc5bff7730ff75625027a6aa728b8cff0a
+  data.tar.gz: c0bbe266140b42fc514dbf555bf189cf6dbfc515cda4e516731a55cfb26c4a63b3b95c55308b03df2fb393c7cdcdce0d1a50657ffebae1df746524c701bbfce7

data/README.md

@@ -27,12 +27,16 @@ Or install it yourself as:
 
 then you can use ```cap -vT``` to list tasks
 ```
-cap postgres:backup:create
-cap postgres:backup:download
-cap postgres:backup:import
-cap postgres:replicate
+cap postgres:backup:create # Creates dump of a database(By default stores it to ../shared/postgres_backup directory)
+cap postgres:backup:download # Downloads dump to local server(By default stores file in ./tmp/postgres_backup directory)
+cap postgres:backup:import # Imports last dump file to local database of your choice.
+cap postgres:replicate # Performs create, download and import step by step.
 ```
 You will be prompted for password and local database name that you want to use for restore.
+In most cases you will need to provide environment
+```
+cap production postgres:replicate
+```
 
 Sometimes it's a good idea to create dump before each deploy.
 ```

data/lib/capistrano3/postgres/version.rb

@@ -1,5 +1,5 @@
 module Capistrano3
   module Postgres
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/capistrano3/tasks/postgres.rb

@@ -24,9 +24,7 @@ namespace :postgres do
           set :postgres_remote_sqlc_file_path, "#{shared_path}/#{fetch(:postgres_backup_dir)}/#{file_name}"
         end
 
-        execute :pg_dump, "-U #{config['user'] || config['username']} -h #{config['host']} -Fc --file=#{fetch(:postgres_remote_sqlc_file_path)} #{config['database']}" do |ch, stream, out|
-          ch.send_data "#{config['password']}\n" if out =~ /^Password:/
-        end
+        execute "PGPASSWORD=#{config['password']} pg_dump -U #{config['user'] || config['username']} -h #{config['host']} -Fc --file=#{fetch(:postgres_remote_sqlc_file_path)} #{config['database']}"
       end
     end
 
@@ -56,11 +54,10 @@ namespace :postgres do
           file_name = capture("ls -v tmp/#{fetch :postgres_backup_dir}").split(/\n/).last
           file_path = "tmp/#{fetch :postgres_backup_dir}/#{file_name}"
           begin
-            execute :pg_restore, "-c -U #{config['user'] || config['username']} -W --no-owner -h #{config['host']} -d #{fetch(:database_name)} #{file_path}" do |ch, stream, out|
-              ch.send_data "#{config['password']}\n" if out =~ /^Password:/
-            end
+            execute "PGPASSWORD=#{config['password']} pg_restore -c -U #{config['user'] || config['username']} -W --no-owner -h #{config['host']} -d #{fetch(:database_name)} #{file_path}"
           rescue SSHKit::Command::Failed => e
             warn e.inspect
+            info 'Import performed successfully!'
           end
         end
       end
@@ -100,7 +97,7 @@ namespace :postgres do
       run_locally do
         env = 'development'
         yaml_content = capture "cat config/database.yml"
-        set :postgres_local_database_config,  YAML::load(yaml_content)[env]
+        set :postgres_local_database_config,  database_config_defaults.merge(YAML::load(yaml_content)[env])
       end
     end
   end
@@ -111,8 +108,12 @@ namespace :postgres do
     on roles(fetch(:postgres_role)) do |role|
       env = fetch(:postgres_env).to_s.downcase
       yaml_content = capture "cat #{deploy_to}/current/config/database.yml"
-      set :postgres_remote_database_config,  YAML::load(yaml_content)[env]
+      set :postgres_remote_database_config,  database_config_defaults.merge(YAML::load(yaml_content)[env])
     end
   end
 
+  def database_config_defaults
+    { 'host' => 'localhost', 'user' => 'postgres' }
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-postgres
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alex Krasynskyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano