kapify 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5693bfd53c3f283033d04ee1eaddff7f698d0c53
-  data.tar.gz: 9f4a300def8ced2aff5a1c9c228df894330c5211
+  metadata.gz: 4fa1a22a78a5dedb8bbfbccb55daae3f36cd3ba0
+  data.tar.gz: a461dca9aba4e0f59380a0beaf5cb508dca7286f
 SHA512:
-  metadata.gz: 7f6c274cc6d57b73ec893b7f963b2063917ade046b33ed81d30ae9c43e9cc6bd9d97de6d46be81ea7f3ac135b07ebff4c96e6355221b9d78c086bc0387da8d05
-  data.tar.gz: 6b5637abb3bc30ad1f4e3324011f5ae3ad215ab1752900753fd5fc3a7ffa40b827722faf0b3b5993300dbaf60615a27597ea9da3bc3ea779423493dd2d79d12a
+  metadata.gz: 1597cf5812c9f3c59fe60aec5456b12eee59e0833f92d11c356128fc70f360383f57335334a9b3fe2631a89ee20ef6e035ab985585957dbeee0b4f96e7563aae
+  data.tar.gz: 57f05d0fc0d9ff06d87b1f3bf5036c0e1973c0c6381301523e0aefeda7fc6673ace23b181f21cbb976bf53c6a892fd3eb731b1427b62e17e821f10f34a672bc5

data/lib/kapify/pg/configuration.rb

@@ -14,24 +14,26 @@ Capistrano::Configuration.instance.load do
     namespace :pg do
       desc "Create user for application"
       task :create_user, roles: :pg do
-        pg_params = "-p #{pg_port}"
-        check_user = %Q[#{sudo} -u postgres psql #{pg_params} postgres -c "select * from pg_user where usename='#{pg_user}'" | grep -c '#{pg_user}']
-        add_user = %Q[#{sudo} -u postgres psql #{pg_params} -c "create user #{pg_user}"]
-        run "#{check_user} || #{add_user}"
-        run %Q{#{sudo} -u postgres psql #{pg_params} -c "alter user #{pg_user} with password '#{pg_password}'" }
+        if find_servers(roles: :pg).size > 0
+          pg_params = "-p #{pg_port}"
+          check_user = %Q[#{sudo} -u postgres psql #{pg_params} postgres -c "select * from pg_user where usename='#{pg_user}'" | grep -c '#{pg_user}']
+          add_user = %Q[#{sudo} su postgres -c "createuser -SREd #{pg_params} #{pg_user}"]
+          run "#{check_user} || #{add_user}"
+          run %Q{#{sudo} -u postgres psql #{pg_params} -c "alter user #{pg_user} with password '#{pg_password}'" }
+        end
       end
 
       desc "Create database for application"
       task :create_database, roles: :pg do
-        if pg_create_db
-          run %Q{#{sudo} -u postgres psql -c "create database #{pg_database} owner #{pg_user};"}
+        if find_servers(roles: :pg).size > 0
+          if pg_create_db
+            run %Q{#{sudo} -u postgres psql -c "create database #{pg_database} owner #{pg_user};"}
+          end
         end
       end
 
-      if find_servers(roles: :pg).size > 0
-        after "deploy:setup", "kapify:pg:create_user"
-        after "deploy:setup", "kapify:pg:create_database"
-      end
+      after "deploy:setup", "kapify:pg:create_user"
+      after "deploy:setup", "kapify:pg:create_database"
 
       desc "Generate the database.yml configuration file."
       task :setup, roles: [:app, :resque_worker] do

data/lib/kapify/version.rb

@@ -1,3 +1,3 @@
 module Kapify
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kapify
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ivan Tkalin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano