mina-puma 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13a02952c20112fe90fea09fbfe7bb19643d4229
-  data.tar.gz: 61481a3b23aa910fa02a51a12b60106586a622a6
+  metadata.gz: 64507fce87b0467be63a81f7acfb952d19476e66
+  data.tar.gz: 7f57c5e069b956d7e9c8834fbbc3ca4a7cb8b90b
 SHA512:
-  metadata.gz: a3f525821c96e3dd497bcb5eaeaa1955e898c7c95c60f368aeb2d30d0c66d52345843a2aef3c8ac2755435e4bf06da319fbaab1ee50cbf42485cfeee818ef699
-  data.tar.gz: f25d35111cd2c192d161a1616c19d40f9d3f3a6f8b90571ca05e6b04173302ccf70111bcdfc71003f1d5442bc2dfe5e7bb4aaa0dc7a344ecfb64664978c076b3
+  metadata.gz: 143ce3a9acbc2274afe6e3605fc5254afdca9a349bda0d6120435fd794b811d8b49026b1b92668ef8900a4a56b864bf8dc3b5a260b84118444a32580e7091e61
+  data.tar.gz: 919a68331f02d374be14c005156129fb67f59f75bb6de319ae7048b86870fd04a251cc9070d5c07151b8a3814ffa1aa0b1864142cf365310db51584e4047cf24

data/README.md

@@ -15,27 +15,22 @@ Add this line to your application's Gemfile:
     require 'mina/puma'
 
     # Add pids and sockets to shared paths
-    set :shared_paths, %w(log tmp/pids tmp/sockets config/database.yml)
+    set :shared_paths, %w(log tmp/sockets config/database.yml)
 
     ...
     task :setup do
       ...
-      queue! %[mkdir -p "{deploy_to}/shared/tmp/pids/"]
       queue! %[mkdir -p "{deploy_to}/shared/tmp/sockets/"]
     end
 
     task :deploy do
       deploy do
-        to :prepare do
-         invoke :'puma:stop'
-        end
-
         invoke :'git:clone'
         ...
 
         to :launch do
          ...
-         invoke :'puma:start'
+         invoke :'puma:restart'
         end
       end
     end
@@ -48,8 +43,9 @@ Available commands:
 
 Default settings:
 
-    set :puma_pid,    "#{deploy_to}/#{shared_path}/tmp/pids/puma.pid"
-    set :puma_socket, "#{deploy_to}/#{shared_path}/tmp/sockets/puma.sock"
+    set :puma_socket, -> { "#{deploy_to}/#{shared_path}/tmp/sockets/puma.sock" }
+    set :puma_ctl,  -> { "#{deploy_to}/#{shared_path}/tmp/sockets/pumactl.sock" }
+    set :puma_state,  -> { "#{deploy_to}/#{shared_path}/tmp/sockets/puma.state" }
 
 ## Contributing
 

data/lib/mina/puma/tasks.rake

@@ -1,51 +1,35 @@
-# ## Usage example
-#     require 'mina/puma'
-#     ...
-#     task :setup do
-#       queue! %[mkdir -p "#{deploy_to}/shared/tmp/pids/"]
-#       queue! %[mkdir -p "#{deploy_to}/shared/tmp/sockets/"]
-#     end
-#
-#     task :deploy do
-#       deploy do
-#         to :prepare do
-#           invoke :'puma:stop'
-#         end
-#
-#         invoke :'git:clone'
-#         ...
-#
-#         to :launch do
-#           ...
-#           invoke :'puma:start'
-#         end
-#       end
-#     end
-
-set_default :puma_pid,    -> { "#{deploy_to}/#{shared_path}/tmp/pids/puma.pid" }
 set_default :puma_socket, -> { "#{deploy_to}/#{shared_path}/tmp/sockets/puma.sock" }
+set_default :puma_ctl,  -> { "#{deploy_to}/#{shared_path}/tmp/sockets/pumactl.sock" }
+set_default :puma_state,  -> { "#{deploy_to}/#{shared_path}/tmp/sockets/puma.state" }
+
 
 namespace :puma do
   desc 'Start puma'
   task start: :environment do
-    queue %[cd #{deploy_to}/#{current_path} && bundle exec puma -q -d -e #{rails_env} -b unix://#{puma_socket} --pidfile #{puma_pid}]
+    queue %[cd #{deploy_to}/#{current_path} && bundle exec puma #{start_options}]
   end
 
   desc 'Stop puma'
   task stop: :environment do
-    queue %{
-      if [[ -f #{puma_pid} ]]; then
-        kill -9 `cat #{puma_pid}` && rm #{puma_pid}
-      fi
-      if [[ -f #{puma_socket} ]]; then
-        rm #{puma_socket}
-      fi
-    }
+    queue %[cd #{deploy_to}/#{current_path} && bundle exec pumactl -S #{puma_state} stop]
   end
 
   desc 'Restart puma'
   task restart: :environment do
-    invoke :'puma:stop'
-    invoke :'puma:start'
+    queue %[
+      if [ -f #{puma_ctl} ]; then
+        cd #{deploy_to}/#{current_path}  && bundle exec pumactl -S #{puma_state} restart
+      else
+        cd #{deploy_to}/#{current_path} && bundle exec puma #{start_options}
+      fi
+    ]
+  end
+end
+
+def start_options
+  if File.exists?("./config/puma.rb")
+    "-q -d -e #{rails_env} -C ./config/puma.rb"
+  else
+    "-q -d -e #{rails_env} -b 'unix://#{puma_socket}' -S #{puma_state} --control 'unix://#{puma_ctl}'"
   end
 end

data/lib/mina/puma/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module Puma
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: mina-puma
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Tobias Sandelius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mina
   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'
 - !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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Puma tasks for Mina
@@ -73,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -92,17 +92,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Puma tasks for Mina