capistrano-postgresql 4.8.1 → 4.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99782e17f1cfadc9a7bef273471fc8c0d9327badfb8cc1aaabd0e5d1d71b1e16
-  data.tar.gz: b243ef51314de1d4924727f9a693e086893f05180d736c0a2789d125f6d16a9f
+  metadata.gz: 375eca70ee0863b2ac3397cb4405ed44cd64f4039e563e7022ee254b4c804221
+  data.tar.gz: efc67d023365b4c9d106d176c7cd3874b6911bf6b1ca0a2fb60d1f1eeff6a3b4
 SHA512:
-  metadata.gz: 158247310972ce9e07dd08a3cf1d6f9d169149d110121bf62b56a0af8be85cd3860c9e7b114be14dd68460631eaa09bd406910a5a41bac39671908b5c04d89c2
-  data.tar.gz: 6e9b98484fae0fd73af2cd2a97c03a1318e0ece3422d33b483633d3e6f1492c77e6bb2cbf4315db97c4793ae83f5b2c532100f2dec8c60db6da93657cfc22775
+  metadata.gz: c7cd4f58152e609273af9732f6e2bdffde273c4c2ce3c7f0e4d674bcd1026d9ae14f85a81a13ddbc455f031531b2ac8b01b34ba36f94532c1b050d1ad19732ca
+  data.tar.gz: 4a16961feefadef88c15d545e20a0ea0274e7c3d3c7dd194186a66d3180d0e58f93f10b08d378a92adaaaf05a5100e301bede93f217d8497416cddc50a720d54

data/README.md

@@ -42,20 +42,17 @@ Then:
 If you're deploying a standard rails app, all you need to do is put
 the following in `Capfile` file:
 
-    require 'capistrano/postgresql'
+```
+require 'capistrano/postgresql' 
+```
 
-Make sure the `deploy_to` path exists and has the right privileges on the
-server (i.e. `/var/www/myapp`). Warning: The ~ symbol (i.e. `~/myapp`) is not supported.<br/>
-Or just install
-[capistrano-safe-deploy-to](https://github.com/capistrano-plugins/capistrano-safe-deploy-to)
-plugin and don't think about it.
+* Make sure the `deploy_to` path exists and has the right privileges on the
+server (i.e. `/var/www/myapp`). Warning: The ~ symbol (i.e. `~/myapp`) is not supported.
+* Within your app/config/deploy/{env}.rb files, you need to specify at least one :app and one :db server. 
+* It's also suggested to specify `:primary => true` on the end of your primary :db server line.
+* Optionally, you can run psql commands WITHOUT sudo if needed. Set the following (which defaults to false): `set :pg_without_sudo, true`
 
-    
-Optionally, you can run psql commands WITHOUT sudo if needed. Set the following:
-
-    set :pg_without_sudo, true # defaults to false
-
-To setup the server(s), run:
+Finally, to setup the server(s), run:
 
     $ bundle exec cap production setup
 

data/lib/capistrano/postgresql/helper_methods.rb

@@ -49,13 +49,13 @@ module Capistrano
 
       # location of database.yml file on clients
       def database_yml_file
-        raise(":deploy_to in your app/config/deploy/\#{environment}.rb file cannot contain ~") if shared_path.to_s.include?('~') # issues/27
+        raise(":deploy_to in your app/config/deploy/#{fetch(:rails_env)}.rb file cannot contain ~") if shared_path.to_s.include?('~') # issues/27
         shared_path.join('config/database.yml')
       end
 
-      # location of archetypical database.yml file created on primary db role when user and database are first created
+      # location of archetypal database.yml file created on primary db role when user and database are first created
       def archetype_database_yml_file
-        raise(":deploy_to in your app/config/deploy/\#{environment}.rb file cannot contain ~") if shared_path.to_s.include?('~') # issues/27
+        raise(":deploy_to in your app/config/deploy/#{fetch(:rails_env)}.rb file cannot contain ~") if shared_path.to_s.include?('~') # issues/27
         deploy_path.join('db/database.yml')
       end
     end

data/lib/capistrano/postgresql/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Postgresql
-    VERSION = '4.8.1'
+    VERSION = '4.9.0'
   end
 end

data/lib/capistrano/tasks/postgresql.rake

@@ -123,7 +123,7 @@ namespace :postgresql do
       next if db_user_exists?
       # If you use CREATE USER instead of CREATE ROLE the LOGIN right is granted automatically; otherwise you must specify it in the WITH clause of the CREATE statement.
       unless psql_on_db fetch(:pg_system_db), '-c', %Q{"CREATE USER \\"#{fetch(:pg_username)}\\" PASSWORD '#{fetch(:pg_password)}';"}
-        error 'postgresql: creating database user failed!'
+        error "postgresql: creating database user \"#{fetch(:pg_username)}\" failed!"
         exit 1
       end
     end
@@ -165,14 +165,22 @@ namespace :postgresql do
 
   desc 'Postgresql setup tasks'
   task :setup do
-    puts "* ============================= * \n All psql commands will be run #{fetch(:pg_without_sudo) ? 'without sudo' : 'with sudo'}\n You can modify this in your deploy/{env}.rb by setting the pg_without_sudo boolean \n* ============================= *"
-    invoke 'postgresql:remove_app_database_yml_files' # Deletes old yml files from all app role servers. Allows you to avoid having to manually delete the files on your app servers to get a new pool size for example. Don't touch the archetype file to avoid deleting generated passwords
-    invoke 'postgresql:create_db_user'
-    invoke 'postgresql:create_database'
-    invoke 'postgresql:add_hstore'
-    invoke 'postgresql:add_extensions'
-    invoke 'postgresql:generate_database_yml_archetype'
-    invoke 'postgresql:generate_database_yml'
+    puts "* ============================= * \n All psql commands will be run #{fetch(:pg_without_sudo) ? 'without sudo' : 'with sudo'}\n You can modify this in your app/config/deploy/#{fetch(:rails_env)}.rb by setting the pg_without_sudo boolean \n* ============================= *"
+    if release_roles(:app).empty?
+      puts "There are no servers in your app/config/deploy/#{fetch(:rails_env)}.rb with a :app role... Skipping Postgresql setup."
+    else
+      invoke 'postgresql:remove_app_database_yml_files' # Deletes old yml files from all servers. Allows you to avoid having to manually delete the files on your app servers to get a new pool size for example. Don't touch the archetype file to avoid deleting generated passwords.
+      if release_roles(:db).empty? # Test to be sure we have a :db role host
+        puts "There is no server in your app/config/deploy/#{fetch(:rails_env)}.rb with a :db role... Skipping Postgresql setup."
+      else
+        invoke 'postgresql:create_db_user'
+        invoke 'postgresql:create_database'
+        invoke 'postgresql:add_hstore'
+        invoke 'postgresql:add_extensions'
+        invoke 'postgresql:generate_database_yml_archetype'
+        invoke 'postgresql:generate_database_yml'
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-postgresql
 version: !ruby/object:Gem::Version
-  version: 4.8.1
+  version: 4.9.0
 platform: ruby
 authors:
 - Bruno Sutic
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano