capistrano3-puma 0.2.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e653eb0ed24f3635af405e9eb27304a699fd08b6
-  data.tar.gz: e85934ef3d68f2f5515dc667d2c5fd958f52a21b
+  metadata.gz: 48c6297166ac6479aff3f05e5a0ed5b14914d7cd
+  data.tar.gz: 2c7dc35a0fdae21d452184d2fa015e56ed6ebbf4
 SHA512:
-  metadata.gz: 95a013f371218024fa1c83f849599a50401e7fd274cf0d5591ee9858cbb2f4496fe6c662ec7e8a1774a7bad3d092ac4812ed4de18e7967c4a85f7a107434d521
-  data.tar.gz: afea24db1646f1daacd09da497d3b4fbfa5b85880edcb2773f4ca32b3deab351196e04a215a5991aea025853c3beed3f8d3904f47e75824d0ec4ba9a715ed6e0
+  metadata.gz: 0553ef2f9236710b405c83831345caf4c32b73fb990ff25079c8d1b27e722c2fb5063c301ef079848d4fbe11209c0c5b48bc3210398e13f25b420215a64b2901
+  data.tar.gz: 7c9848e750ab5774ef1d47a46143bc71c1aa82d23ccd4949d64e087cecacaf4f9a51a9c9c92e1d2735914e38971f7553d44feeb4d161e6282b35d2b4ba80f5a6

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 Abdelkader Boudih
+Copyright (c) 2013-2014 Abdelkader Boudih
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,7 +1,5 @@
 # Capistrano::Puma
 
-In the current version the gem will expect a puma.rb in the shared directory, if it does not find puma.rb in the expected place it will automatically generate one with sane defaults. Keep in mind this means a puma.rb in the config directory or subdirectories will be ignored. During preparation for deployment you must start the process initially with bundle exec cap $stage puma:start , after starting the process bundle exec cap $stage deploy will work without hanging. The need to start the process initially will be addressed in a future release.
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -21,6 +19,7 @@ And then execute:
     # Capfile
 
     require 'capistrano/puma'
+    require 'capistrano/puma/workers' #if you want to control the workers (in cluster mode)
     require 'capistrano/puma/jungle' #if you need the jungle tasks
     require 'capistrano/puma/monit' #if you need the monit tasks
 ```
@@ -29,6 +28,7 @@ And then execute:
 Configurable options, shown here with defaults: Please note the configuration options below are not required unless you are trying to override a default setting, for instance if you are deploying on a host on which you do not have sudo or root privileges and you need to restrict the path. These settings go in the deploy.rb file. 
 
 ```ruby
+    set :puma_rackup, -> { File.join(current_path, 'config.ru') }
     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"
@@ -52,6 +52,12 @@ Ensure that the following directories are shared (via ``linked_dirs``):
     tmp/pids tmp/sockets log
 
 ## Changelog
+- 0.3.5: Fixed a prehistoric bug
+- 0.3.4: I don't remember what i did here
+- 0.3.3: Puma jungle start fix
+- 0.3.2: Tag option support (require puma  2.8.2+)
+- 0.3.1: Typo fix
+- 0.3.0: Initial support for puma signals
 - 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
@@ -65,7 +71,6 @@ Ensure that the following directories are shared (via ``linked_dirs``):
 - 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
 

data/capistrano-puma.gemspec

@@ -18,5 +18,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'capistrano', '~> 3.0'
+  spec.add_dependency 'puma' , '~> 0'
 
 end

data/capistrano3-puma.gemspec

@@ -17,5 +17,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'capistrano', '~> 3.0'
+  spec.add_dependency 'puma' , '~> 0'
 
 end

data/lib/capistrano/puma/version.rb

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

data/lib/capistrano/puma/workers.rb

@@ -0,0 +1,2 @@
+#load monit tasks
+load File.expand_path('../../tasks/workers.cap', __FILE__)

data/lib/capistrano/tasks/jungle.cap

@@ -16,12 +16,12 @@ namespace :puma do
         template_puma 'run-puma', "#{fetch(:tmp_dir)}/run-puma", role
         execute "chmod +x #{fetch(:tmp_dir)}/run-puma"
         sudo "mv #{fetch(:tmp_dir)}/run-puma #{fetch(:puma_run_path)}"
-        if test '[ -f /etc/lsb-release ]'
-          #Debian flavor OS
-          debian_install
-        elsif test '[ -f /etc/redhat-release ]'
+        if test '[ -f /etc/redhat-release ]'
           #RHEL flavor OS
           rhel_install
+        elsif test '[ -f /etc/lsb-release ]'
+          #Debian flavor OS
+          debian_install
         else
           #Some other OS
           error 'This task is not supported for your OS'
@@ -72,7 +72,7 @@ namespace :puma do
       desc "#{command} puma"
       task command do
         on roles(fetch(:puma_role)) do
-          sudo "service puma #{command} #{current_path}"
+          sudo "service puma #{command} app=#{current_path}"
         end
       end
     end

data/lib/capistrano/tasks/puma.cap

@@ -1,11 +1,12 @@
 namespace :load do
   task :defaults do
     set :puma_role, :app
-    set :puma_env, -> { fetch(:rack_env, fetch(:rails_env, 'production')) }
+    set :puma_env, -> { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
     # Configure "min" to be the minimum number of threads to use to answer
     # requests and "max" the maximum.
     set :puma_threads, [0, 16]
     set :puma_workers, 0
+    set :puma_rackup, -> { File.join(current_path, 'config.ru') }
     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') }
@@ -35,27 +36,37 @@ namespace :puma do
     on roles (fetch(:puma_role)) do
       within current_path do
         with rack_env: fetch(:puma_env) do
+
           execute :bundle, 'exec', :puma, "-C #{fetch(:puma_conf)}"
         end
       end
     end
   end
 
-  %w[halt stop status].each do |command|
+  %w[halt stop status].map do |command|
     desc "#{command} puma"
     task command do
       on roles (fetch(:puma_role)) do
         within current_path do
           with rack_env: fetch(:puma_env) do
-            execute :bundle, 'exec', :pumactl, "-S #{fetch(:puma_state)} #{command}"
+            if test "[ -f #{fetch(:puma_pid)} ]"
+              if test "kill -0 $( cat #{fetch(:puma_pid)} )"
+                execute :bundle, 'exec', :pumactl, "-S #{fetch(:puma_state)} #{command}"
+              else
+                # delete invalid pid file , process is not running.
+                execute :rm, fetch(:puma_pid)
+              end
+            else
+              #pid file not found, so puma is probably not running or it using another pidfile
+              warn 'Puma not running'
+            end
           end
         end
       end
     end
   end
 
-
-  %w[phased-restart restart].each do |command|
+  %w[phased-restart restart].map do |command|
     desc "#{command} puma"
     task command do
       on roles (fetch(:puma_role)) do
@@ -74,7 +85,6 @@ namespace :puma do
     end
   end
 
-
   task :check do
     on roles (fetch(:puma_role)) do |role|
       #Create puma.rb for new deployments
@@ -97,10 +107,23 @@ namespace :puma do
   end
   after 'deploy:finished', 'puma:smart_restart'
 
+
   def puma_workers
     fetch(:puma_workers) || 0
   end
 
+  def puma_tag
+    if  fetch(:puma_tag)
+      # Versions(puma) prior to 2.8.2 don't support tag option
+      if Gem.loaded_specs['puma'].version >= Gem::Version.new('2.8.2')
+        return "tag '#{fetch(:puma_tag)}'"
+      else
+        warn 'Version puma 2.8.2+ required for tag option: Tag not set'
+      end
+      return
+    end
+  end
+
   def template_puma(from, to, role)
     [
         "lib/capistrano/templates/#{from}-#{role.hostname}-#{fetch(:stage)}.rb",

data/lib/capistrano/tasks/workers.cap

@@ -0,0 +1,34 @@
+namespace :puma do
+  namespace :workers do
+    desc 'Add a worker'
+    task :count do
+      on roles (fetch(:puma_role)) do
+        #TODO
+        # cleanup
+        # add host name/ip
+        workers_count = capture("ps ax | grep -c 'puma: cluster worker: `cat  #{fetch(:puma_pid)}`'").to_i - 1
+        log  "Workers count : #{workers_count}"
+      end
+    end
+
+    # TODO
+    # Add/remove workers to specific host/s
+    # Define  # of workers to add/remove
+    # Refractor
+    desc 'Worker++'
+    task :more do
+      on roles (fetch(:puma_role)) do
+        execute("kill -TTIN `cat  #{fetch(:puma_pid)}`")
+      end
+    end
+
+    desc 'Worker--'
+    task :less do
+      on roles (fetch(:puma_role)) do
+        execute("kill -TTOU `cat  #{fetch(:puma_pid)}`")
+      end
+    end
+
+
+  end
+end

data/lib/capistrano/templates/puma-rpm.erb

@@ -131,7 +131,7 @@ do_restart_one() {
 	dir=`echo $i | cut -d , -f 1`
 	if [ -e $PIDFILE ]; then
 		log_daemon_msg "--> About to restart puma $1"
-		pumactl --state $dir/tmp/pigs/puma.state restart
+		pumactl --state $dir/tmp/pids/puma.state restart
 
 	else
 		log_daemon_msg "--> Your puma was never playing... Let's get it out there first"

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

@@ -1,14 +1,19 @@
 #!/usr/bin/env puma
 
 directory '<%= current_path %>'
+rackup "<%=fetch(:puma_rackup)%>"
 environment '<%= fetch(:puma_env) %>'
+<%= puma_tag %>
 daemonize true
 pidfile "<%=fetch(:puma_pid)%>"
 state_path "<%=fetch(:puma_state)%>"
 stdout_redirect '<%=fetch(:puma_access_log)%>', '<%=fetch(:puma_error_log)%>', true
+
+
 threads <%=fetch(:puma_threads).join(',')%>
 bind "<%=fetch(:puma_bind)%>"
 
+
 workers <%= puma_workers %>
 <% if fetch(:puma_preload_app) %>
 preload_app!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Puma integration for Capistrano 3
 email:
 - Terminale@gmail.com
@@ -43,9 +57,11 @@ files:
 - lib/capistrano/puma/jungle.rb
 - lib/capistrano/puma/monit.rb
 - lib/capistrano/puma/version.rb
+- lib/capistrano/puma/workers.rb
 - lib/capistrano/tasks/jungle.cap
 - lib/capistrano/tasks/monit.cap
 - lib/capistrano/tasks/puma.cap
+- lib/capistrano/tasks/workers.cap
 - lib/capistrano/templates/puma-deb.erb
 - lib/capistrano/templates/puma-rpm.erb
 - lib/capistrano/templates/puma.rb.erb
@@ -71,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Puma integration for Capistrano