capistrano3-puma 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a679889b02439d9d7f8f47a715cd9159a941c292
-  data.tar.gz: 3433bd1dd4baad82ea8faa9c6e359d6b75e95e78
+  metadata.gz: 1abd86de25bfabf43b77b3968938ac1cf4f3791c
+  data.tar.gz: 4b944a60a84f810899c2d2aa51f688923bcc8e3a
 SHA512:
-  metadata.gz: 6d86063f615d26cb1b20163277a16431ef6158fbaa0c3b31e2049a0b4603543f994f9bc77d6ce260cb29fd9b3457633111abd25bee79dd49bf0688e42fb5b869
-  data.tar.gz: a4e1c85f04fc1552e20d794e627edf6cb5f197f9dfa3294c09d31b5316c86614851f2e9aa7ca8534545dd53fee12d70ee3643e7cfe4c043040c6939d00c901c8
+  metadata.gz: 502c4c5c598ce04f6dd5ba94baef6977f77db7535af5109190125ba040c9332dabfdab88a32ed3ab17a032f84a532cd451a618665b89f83907d98dfecad1aae5
+  data.tar.gz: 714afaa7aa7bdbeb47e83ebf3c456e1147c5fc6beb2fe4aed0aa1493f24bb7f5c081272249196c61c4078112a301e81de5606b1eb44070f14f80f0528c58fc49

data/README.md

@@ -58,6 +58,7 @@ Configurable options, shown here with defaults: Please note the configuration op
     set :puma_state, "#{shared_path}/tmp/pids/puma.state"
     set :puma_pid, "#{shared_path}/tmp/pids/puma.pid"
     set :puma_bind, "unix://#{shared_path}/tmp/sockets/puma.sock"    #accept array for multi-bind
+    set :puma_default_control_app, "unix://#{shared_path}/tmp/sockets/pumactl.sock"
     set :puma_conf, "#{shared_path}/puma.rb"
     set :puma_access_log, "#{shared_path}/log/puma_access.log"
     set :puma_error_log, "#{shared_path}/log/puma_error.log"
@@ -93,6 +94,7 @@ Ensure that the following directories are shared (via ``linked_dirs``):
     tmp/pids tmp/sockets log
 
 ## Changelog
+- 1.0.0: Add activate control app @askagirl
 - 0.8.5: Fix smart_restart task to check if puma preloads app
 - 0.8.4: Allow patch method (Nginx template) @lonre
 - 0.8.2: Start task creates a conf file if none exists @stevemadere

data/lib/capistrano/puma/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Puma
-    VERSION = '0.9.0'
+    VERSION = '1.0.0'
   end
 end

data/lib/capistrano/tasks/puma.cap

@@ -12,6 +12,7 @@ namespace :load do
     set :puma_state, -> { File.join(shared_path, 'tmp', 'pids', 'puma.state') }
     set :puma_pid, -> { File.join(shared_path, 'tmp', 'pids', 'puma.pid') }
     set :puma_bind, -> { File.join("unix://#{shared_path}", 'tmp', 'sockets', 'puma.sock') }
+    set :puma_default_control_app, -> { File.join("unix://#{shared_path}", 'tmp', 'sockets', 'pumactl.sock') }
     set :puma_conf, -> { File.join(shared_path, 'puma.rb') }
     set :puma_access_log, -> { File.join(shared_path, 'log', 'puma_access.log') }
     set :puma_error_log, -> { File.join(shared_path, 'log', 'puma_error.log') }

data/lib/capistrano/templates/puma.rb.erb

@@ -14,6 +14,9 @@ stdout_redirect '<%=fetch(:puma_access_log)%>', '<%=fetch(:puma_error_log)%>', t
 threads <%=fetch(:puma_threads).join(',')%>
 
 <%= puma_bind %>
+<% if fetch(:puma_control_app) %>
+activate_control_app "<%= fetch(:puma_default_control_app) %>"
+<% end %>
 workers <%= puma_workers %>
 <% if fetch(:puma_worker_timeout) %>
 worker_timeout <%= fetch(:puma_worker_timeout).to_i %>
@@ -27,7 +30,7 @@ on_restart do
   ENV["BUNDLE_GEMFILE"] = "<%= fetch(:bundle_gemfile, "#{current_path}/Gemfile") %>"
 end
 <% else %>
-prune_bundle
+prune_bundler
 <% end %>
 
 <% if fetch(:puma_init_active_record) %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano