capistrano3-puma 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41eb524bebbe9f9aa005da420778c2957381122f
-  data.tar.gz: 01e0b3ce4ae3c5d700941d2f042caea4452f8f90
+  metadata.gz: e653eb0ed24f3635af405e9eb27304a699fd08b6
+  data.tar.gz: e85934ef3d68f2f5515dc667d2c5fd958f52a21b
 SHA512:
-  metadata.gz: 5715a489f013dfdabb8dc3b7733fb7c3abf7ac1937938845683116d32e10ca43931b09f22aab672e9dc42c000bd60d4da0c8a6d0f777e9229a16b81355498e72
-  data.tar.gz: ee48a9b9ee95fd7d31dfa723e1d22d23a76b21c81017934e31c7e799833d0d8b2b393e670f390233b1830763fcd71b8e21358101fdfbb452b89f0d54fee43462
+  metadata.gz: 95a013f371218024fa1c83f849599a50401e7fd274cf0d5591ee9858cbb2f4496fe6c662ec7e8a1774a7bad3d092ac4812ed4de18e7967c4a85f7a107434d521
+  data.tar.gz: afea24db1646f1daacd09da497d3b4fbfa5b85880edcb2773f4ca32b3deab351196e04a215a5991aea025853c3beed3f8d3904f47e75824d0ec4ba9a715ed6e0

data/README.md

@@ -40,6 +40,7 @@ Configurable options, shown here with defaults: Please note the configuration op
     set :puma_threads, [0, 16]
     set :puma_workers, 0
     set :puma_init_active_record, false
+    set :puma_preload_app, true
 ```
 For Jungle tasks (beta), these options exist:
 ```ruby
@@ -51,7 +52,8 @@ Ensure that the following directories are shared (via ``linked_dirs``):
     tmp/pids tmp/sockets log
 
 ## Changelog
-
+- 0.2.2: Application pre-loading is optional now (set puma_preload_app to false to turn it off)
+- 0.2.1: Tasks are run within rack context
 - 0.2.0: Support for puma `ActiveRecord::Base.establish_connection` on
   boot
 - 0.1.3: Capistrano 3.1 support
@@ -62,6 +64,9 @@ Ensure that the following directories are shared (via ``linked_dirs``):
 - 0.0.8: puma.rb is automatically generated if not present. Fixed RVM issue.
 - 0.0.7: Gem pushed to rubygems as capistrano3-puma. Support of Redhat based OS for Jungle init script.
 
+## TODO
+- Support to https://github.com/puma/puma/pull/399 with puma:workers:more, puma:workers:less
+
 ## Contributors
 
 - [Ruohan Chen] (https://github.com/crhan)

data/lib/capistrano/puma/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Puma
-    VERSION = '0.2.0'
+    VERSION = '0.2.2'
   end
 end

data/lib/capistrano/tasks/puma.cap

@@ -13,6 +13,7 @@ namespace :load do
     set :puma_access_log, -> { File.join(shared_path, 'log', 'puma_error.log') }
     set :puma_error_log, -> { File.join(shared_path, 'log', 'puma_access.log') }
     set :puma_init_active_record, false
+    set :puma_preload_app, true
 
     # Rbenv and RVM integration
     set :rbenv_map_bins, fetch(:rbenv_map_bins).to_a.concat(%w{ puma pumactl })
@@ -33,7 +34,9 @@ namespace :puma do
   task :start do
     on roles (fetch(:puma_role)) do
       within current_path do
-        execute :bundle, 'exec', :puma, "-C #{fetch(:puma_conf)}"
+        with rack_env: fetch(:puma_env) do
+          execute :bundle, 'exec', :puma, "-C #{fetch(:puma_conf)}"
+        end
       end
     end
   end
@@ -43,7 +46,9 @@ namespace :puma do
     task command do
       on roles (fetch(:puma_role)) do
         within current_path do
-          execute :bundle, 'exec', :pumactl, "-S #{fetch(:puma_state)} #{command}"
+          with rack_env: fetch(:puma_env) do
+            execute :bundle, 'exec', :pumactl, "-S #{fetch(:puma_state)} #{command}"
+          end
         end
       end
     end
@@ -55,12 +60,14 @@ namespace :puma do
     task command do
       on roles (fetch(:puma_role)) do
         within current_path do
-          if test "[ -f #{fetch(:puma_pid)} ]" and test "kill -0 $( cat #{fetch(:puma_pid)} )"
-            # NOTE pid exist but state file is nonsense, so ignore that case
-            execute :bundle, 'exec', :pumactl, "-S #{fetch(:puma_state)} #{command}"
-          else
-            # Puma is not running or state file is not present : Run it
-            execute :bundle, 'exec', :puma, "-C #{fetch(:puma_conf)}"
+          with rack_env: fetch(:puma_env) do
+            if test "[ -f #{fetch(:puma_pid)} ]" and test "kill -0 $( cat #{fetch(:puma_pid)} )"
+              # NOTE pid exist but state file is nonsense, so ignore that case
+              execute :bundle, 'exec', :pumactl, "-S #{fetch(:puma_state)} #{command}"
+            else
+              # Puma is not running or state file is not present : Run it
+              execute :bundle, 'exec', :puma, "-C #{fetch(:puma_conf)}"
+            end
           end
         end
       end

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

@@ -10,10 +10,12 @@ threads <%=fetch(:puma_threads).join(',')%>
 bind "<%=fetch(:puma_bind)%>"
 
 workers <%= puma_workers %>
+<% if fetch(:puma_preload_app) %>
 preload_app!
+<% end %>
 
 on_restart do
-  puts 'On restart...Refresh ENV["BUNDLE_GEMFILE"]'
+  puts 'Refreshing Gemfile'
   ENV["BUNDLE_GEMFILE"] = "<%= fetch(:bundle_gemfile, "#{current_path}/Gemfile") %>"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano