deploy_mate 0.16 → 0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14882d055c45f84057957cb143d5126ee0c12006
-  data.tar.gz: b78d5446177e2e0e24ad63714a42185c6cf3c786
+  metadata.gz: ae6895fb5acfee39aecb5dd14ff231ff47891840
+  data.tar.gz: 6f2c7602e56dfbc5e41220711678e471b7a96cb8
 SHA512:
-  metadata.gz: be7b2f88daea3077d8db2f78e45a88108e3e894802ae5aeab5e23b778df467d32cbeb0765184a630a2fa99dc2c25119717e511e345c6e88fc5c62af1dde856ba
-  data.tar.gz: 90a21e17e5d3ffce0571495c7b4abb48a98ca3429c9dd7db18f2920233c7cfa71234331bb2b4cc26a6f030c1d1d72853df4a8e6951091c4a6967a3fcdad42e4d
+  metadata.gz: 322fdd71820287f568da9d662424ec22fe7720ca5f40e0ebf00de52e07cb8b4b838019220ced1f07beb1cfe6450310e5d1faaf1dccb2e6c8b57e5fa6ec1f6536
+  data.tar.gz: 8761dbedb7b643e8baadf76555a23a8ee8a33376c47ed2b2a5f9a73d6474b6ece3fa05abdf1d226c9af83d40d945a8aeb7efe699dbf5ac33e78bac5001a1c632

data/README.md

@@ -29,6 +29,7 @@ It uses the following Capistrano-roles to divide the installed components:
 - **cronjobs**: [OPTIONAL] For environments where `whenever` should manage/run cronjobs
 
 ## Changelog
+* **2015-08-06**: Support for optional Sidekiq
 * **2015-06-23**: Support for optional ElasticSearch
 * **2015-06-23**: Support for optional `whenever`
 * **2015-06-23**: Support for optional `imagemagick`

data/deploy-mate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                      = "deploy_mate"
-  s.version                   = "0.16"
+  s.version                   = "0.17"
 
   s.authors                   = ["Tim Adler"]
   s.date                      = %q{2015-06-23}

data/lib/capistrano/configs/application.pill.erb

@@ -28,12 +28,11 @@ Bluepill.application("<%= fetch(:application) %>", :log_file => "#{shared_path}/
   <% if fetch(:sidekiq) %>
   app.process("sidekiq") do |process|
     process.pid_file = "#{shared_path}/system/pids/sidekiq.pid"
-
-    process.start_command = "/home/ubuntu/.rvm/wrappers/default/bundle exec sidekiq -e <%= fetch(:environment) %> -C #{current_path}/config/sidekiq.yml -i 0 -P #{shared_path}/pids/sidekiq.pid"
-    process.stop_command = "kill -QUIT {{PID}}"
-
-    process.start_grace_time = 10.seconds
-    process.stop_grace_time = 10.seconds
+    process.start_command = "/home/ubuntu/.rvm/wrappers/default/bundle exec sidekiq -e <%= fetch(:environment) %> -P #{process.pid_file} -d -i 0 -L #{shared_path}/log/sidekiq.log -C #{current_path}/config/sidekiq.yml"
+    process.start_grace_time = 30.seconds
+    process.stop_command = "/home/ubuntu/.rvm/wrappers/default/bundle exec sidekiqctl stop #{process.pid_file}"
+    process.stop_grace_time = 15.seconds
+    process.restart_grace_time = 45.seconds
   end
   <% end %>
 

data/lib/capistrano/deploy_mate_defaults.rb

@@ -23,7 +23,7 @@ namespace :deploy do
   desc 'Restart application'
   task :restart do
     on roles(:app), in: :sequence, wait: 5 do
-      invoke "unicorn:phased_restart"
+      invoke "bluepill:restart"
     end
   end
 

data/lib/capistrano/tasks/bluepill.rake

@@ -22,6 +22,21 @@ namespace :bluepill do
     end
   end
 
-
+  desc "Restarts/Reloads app gracefully"
+  task :restart do
+    on roles(:app) do
+      if bluepill_running?
+        if pill_running?(:unicorn)
+          execute :rvmsudo, :bluepill, fetch(:application), :restart
+        else
+          execute :rvmsudo, :bluepill, fetch(:application), :start
+        end
+      else
+        invoke "bluepill:start"
+        invoke "nginx:reload"
+      end
+    end
+  end
+  before :restart, 'rvm:hook'
 end
 

data/lib/capistrano/tasks/elasticsearch.rake

@@ -1,3 +1,5 @@
+set_default(:elasticsearch_version, "1.7")
+
 namespace :elasticsearch do
   include Aptitude
   task :install do
@@ -5,11 +7,12 @@ namespace :elasticsearch do
       unless is_package_installed?("elasticsearch")
         apt_get_install("openjdk-7-jre-headless") unless is_package_installed?("openjdk-7-jre-headless")
         execute "wget -qO - https://packages.elasticsearch.org/GPG-KEY-elasticsearch | sudo apt-key add -"
-        sudo 'add-apt-repository "deb http://packages.elasticsearch.org/elasticsearch/1.5/debian stable main"'
-        apt_get_install("elasticsearch") 
+        sudo "add-apt-repository 'deb http://packages.elasticsearch.org/elasticsearch/#{fetch(:elasticsearch_version)}/debian stable main'"
+        apt_get_update
+        apt_get_install("elasticsearch")
         sudo "update-rc.d elasticsearch defaults 95 10"
         sudo :service, :elasticsearch, :start
       end
     end
   end
-end
+end

data/lib/capistrano/tasks/unicorn.rake

@@ -13,21 +13,4 @@ namespace :unicorn do
     end
   end
 
-  desc "Gracefully restarts unicorn"
-  task :phased_restart do
-    on roles(:app) do
-      if bluepill_running?
-        if pill_running?(:unicorn)
-          execute :rvmsudo, :bluepill, :restart, :unicorn
-        else
-          execute :rvmsudo, :bluepill, :start, :unicorn
-        end
-      else
-        invoke "bluepill:start"
-        invoke "nginx:reload"
-      end
-    end
-  end
-  before :phased_restart, 'rvm:hook'
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy_mate
 version: !ruby/object:Gem::Version
-  version: '0.16'
+  version: '0.17'
 platform: ruby
 authors:
 - Tim Adler