mina-puma 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7154bd6439bcb482781051875994f1be4f4accfc
-  data.tar.gz: 9ecf6aaa9bba1df43bbcb4484b5f5782030cea5a
+  metadata.gz: cbed1e584caa959bbc8ce546e651e978dd073c39
+  data.tar.gz: 416d5036fef3276f518566f6bb3621160eacb029
 SHA512:
-  metadata.gz: 2ed89a5bd08c17de9a3c70e96aba2d42098b0e3865beea8696708953ad9298056b2d67f9297091d6e9a4685bc4dce9731dbf3b80862dabd57f4f075c5473dd66
-  data.tar.gz: 49a88bd9c1b722a9c247cce5d32183d3605ae038490a4f6348bcb451cfab6a16481f71d300d00d0e2885c518a5420cfe48133a4dbc802ec1ccbbe797ac8a1074
+  metadata.gz: 6d67de609987ad03db27f5d58560dfc344cf55cf708ad4d9b56f0d1fd158d89bd925a08a84970e2900a86b62325424aba234de4657a6a4345323a5d261d98491
+  data.tar.gz: 431f8c240baf07e03e4084a953d3dfb671ebfc72bd3fd4448f1eef8631c2f0f318a0048cd4e30dfabcadd8300e0fc899c6bf33a7e8130f40bd6603fd75be3b8f

data/README.md

@@ -5,8 +5,9 @@
 
 This gem provides several mina tasks:
 
-    mina puma:phased_restart  # Restart puma (with zero-downtime)
-    mina puma:restart         # Restart puma
+    mina puma:phased_restart  # Restart puma (using phased restart)
+    mina puma:hard_restart    # Restart puma (using stop, then start)
+    mina puma:restart         # Restart puma (using pumactl)
     mina puma:start           # Start puma
     mina puma:stop            # Stop puma
 
@@ -55,32 +56,36 @@ $ mina puma:start
 ```
 
 ## Example
+```ruby
+require 'mina/puma'
 
-    require 'mina/puma'
+task :setup => :environment do
+  # Puma needs a place to store its pid file and socket file.
+  queue! %(mkdir -p "#{deploy_to}/#{shared_path}/tmp/sockets")
+  queue! %(chmod g+rx,u+rwx "#{deploy_to}/#{shared_path}/tmp/sockets")
+  queue! %(mkdir -p "#{deploy_to}/#{shared_path}/tmp/pids")
+  queue! %(chmod g+rx,u+rwx "#{deploy_to}/#{shared_path}/tmp/pids")
 
-    task :setup => :environment do
-      # Puma needs a place to store its pid file and socket file.
-      queue! %(mkdir -p "#{deploy_to}/#{shared_path}/tmp/sockets")
-      queue! %(chmod g+rx,u+rwx "#{deploy_to}/#{shared_path}/tmp/sockets")
-      queue! %(mkdir -p "#{deploy_to}/#{shared_path}/tmp/pids")
-      queue! %(chmod g+rx,u+rwx "#{deploy_to}/#{shared_path}/tmp/pids")
+  ...
 
-      ...
+end
 
-    end
+# Add pids and sockets directories to shared paths
+set :shared_paths, ['config/database.yml', 'tmp/pids', 'tmp/sockets']
 
-    task :deploy do
-      deploy do
-        invoke :'git:clone'
-        invoke :'deploy:link_shared_paths'
-        ...
-
-        to :launch do
-          ...
-          invoke :'puma:phased_restart'
-        end
-      end
+task :deploy do
+  deploy do
+    invoke :'git:clone'
+    invoke :'deploy:link_shared_paths'
+    ...
+
+    to :launch do
+      ...
+      invoke :'puma:phased_restart'
     end
+  end
+end
+```
 
 ## Contributing
 

data/lib/mina/puma/tasks.rake

@@ -23,7 +23,7 @@ namespace :puma do
         if [ -e '#{puma_config}' ]; then
           cd #{deploy_to}/#{current_path} && #{puma_cmd} -q -d -e #{puma_env} -C #{puma_config}
         else
-          cd #{deploy_to}/#{current_path} && #{puma_cmd} -q -d -e #{puma_env} -b 'unix://#{puma_socket}' -S #{puma_state} --control 'unix://#{pumactl_socket}'
+          cd #{deploy_to}/#{current_path} && #{puma_cmd} -q -d -e #{puma_env} -b 'unix://#{puma_socket}' -S #{puma_state} --pidfile #{puma_pid} --control 'unix://#{pumactl_socket}'
         fi
       fi
     ]
@@ -31,27 +31,34 @@ namespace :puma do
 
   desc 'Stop puma'
   task stop: :environment do
-    queue! %[
-      if [ -e '#{pumactl_socket}' ]; then
-        cd #{deploy_to}/#{current_path} && #{pumactl_cmd} -S #{puma_state} stop
-        rm -f '#{pumactl_socket}'
-      else
-        echo 'Puma is not running!';
-      fi
-    ]
+    pumactl_command 'stop'
+    queue! %[rm -f '#{pumactl_socket}']
   end
 
   desc 'Restart puma'
   task restart: :environment do
-    invoke :'puma:stop'
-    invoke :'puma:start'
+    pumactl_command 'restart'
   end
 
   desc 'Restart puma (phased restart)'
   task phased_restart: :environment do
+    pumactl_command 'phased-restart'
+  end
+
+  desc 'Restart puma (hard restart)'
+  task hard_restart: :environment do
+    invoke 'puma:stop'
+    invoke 'puma:start'
+  end
+
+  def pumactl_command(command)
     queue! %[
       if [ -e '#{pumactl_socket}' ]; then
-        cd #{deploy_to}/#{current_path} && #{pumactl_cmd} -S #{puma_state} phased-restart
+        if [ -e '#{puma_config}' ]; then
+          cd #{deploy_to}/#{current_path} && #{pumactl_cmd} -F #{puma_config} #{command}
+        else
+          cd #{deploy_to}/#{current_path} && #{pumactl_cmd} -S #{puma_state} -C 'unix://#{pumactl_socket}' --pidfile #{puma_pid} #{command}
+        fi
       else
         echo 'Puma is not running!';
       fi

data/lib/mina/puma/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module Puma
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/mina-puma.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'mina'
+  spec.add_dependency 'puma', '>= 2.13'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mina-puma
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tobias Sandelius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mina
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Puma tasks for Mina