capistrano-atlas 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f9d7c95be322c289f9d921b97092aaba8921eb4
-  data.tar.gz: d0665aef469b7e9fd7be3e6058eafa0a3b7b52e1
+  metadata.gz: 9d629e2e88266758e7f3ac773a06fb75f66ae277
+  data.tar.gz: d969ed5b74cb60a8b652310724733f07021c04e1
 SHA512:
-  metadata.gz: 17d49d59fa5fbb90183b70a292729db18f398507230a8dde17ccd65fc0f816192907fa0d106790165055d7aa60c2e9ec5d942732426f63656067d5207a7bfb2b
-  data.tar.gz: e417f5800dfdbb4b68da467661c26f035207a1f4bc1f6800834bfe25a6b4b1771a9ccaffb59b57c4f798a32b39daf087855d9355e92586d7324e307501dd40e8
+  metadata.gz: 26d91a334306695c3bb9db50fc46495b89740716427954b12828c0a4d8c5b5a86dd35e6e883541c6cb573032eb8f2aaf8818287840e51b08b063eec5c5d24bd1
+  data.tar.gz: 650aabaa3bd44587d31ca610a647c082e901ca1ead7140f5d25e3e979b53337554cf3001ef6b02a760f53444226a5a3d3716cbc11f8ca9edc8d69a4d8f3ed6ed

data/lib/capistrano/atlas/templates/puma_init.erb

@@ -25,16 +25,16 @@ pumactl () {
 
 case "$1" in
 start)
-  pumactl "start"
+  $PUMACTL_CMD "start"
   ;;
 stop)
-  pumactl "stop"
+  $PUMACTL_CMD "stop"
   ;;
 restart|reload)
-  pumactl "phased-restart"
+  $PUMACTL_CMD "phased-restart"
   ;;
 status)
-  pumactl "status"
+  $PUMACTL_CMD "status"
   ;;
 *)
   echo >&2 "Usage: $0 <start|stop|restart|status>"

data/lib/capistrano/atlas/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Atlas
-    VERSION = "0.0.5".freeze
+    VERSION = "0.0.7".freeze
   end
 end

data/lib/capistrano/tasks/postgresql.rake

@@ -15,10 +15,10 @@ namespace :atlas do
       privileged_on primary(:db) do
         user = fetch(:atlas_postgresql_user)
 
-        unless test("sudo -u postgres psql -c '\\du' | grep -q #{user}")
+        unless test("sudo -Hiu postgres psql -c '\\du' | grep -q #{user}")
           passwd = fetch(:atlas_postgresql_password)
           md5 = Digest::MD5.hexdigest(passwd + user)
-          execute "sudo -u postgres psql -c " +
+          execute "sudo -Hiu postgres psql -c " +
                   %Q["CREATE USER #{user} PASSWORD 'md5#{md5}';"]
         end
       end
@@ -30,8 +30,8 @@ namespace :atlas do
         user = fetch(:atlas_postgresql_user)
         db = fetch(:atlas_postgresql_database)
 
-        unless test("sudo -u postgres psql -l | grep -w -q #{db}")
-          execute "sudo -u postgres createdb -O #{user} #{db}"
+        unless test("sudo -Hiu postgres psql -l | grep -w -q #{db}")
+          execute "sudo -Hiu postgres createdb -O #{user} #{db}"
         end
       end
     end

data/lib/capistrano/tasks/puma.rake

@@ -1,10 +1,9 @@
 atlas_recipe :puma do
   during "deploy:starting", "starting"
   during :provision, %w(init_d nginx_site config_rb)
-  during "deploy:start", "start"
-  during "deploy:stop", "stop"
+
   during "deploy:restart", "restart"
-  during "deploy:publishing", "restart"
+  after  "deploy:publishing", "restart"
 end
 
 namespace :atlas do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-atlas
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - John McDowall