cap-puma 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2f8f13cc63f4ebd39fc162dfd2ed26e5289351a
-  data.tar.gz: 13c52eb93d4bdf0ebbd288e10f0da371b91bd64a
+  metadata.gz: 077da3f13fdcb588d446c659932b1f1e156edec6
+  data.tar.gz: 4573f44f66fec0dcb1faea203f1b22e5c700acc8
 SHA512:
-  metadata.gz: 6b2e959c2944f513fc263a66889d91a1cb2fca03d9042af1a54802bf0a1e3fd001852572ccce088ec38a115a434f8e977efc2e45261a7d336790ad8b7f94d099
-  data.tar.gz: fbdcbc47f2db3611baac566d21cc6dd06387a8c469459cf0e69105ffa6c3866ec277dd82594a2400ba063a4febfda1010a8cb89640eb252ec1b51c7680e75d93
+  metadata.gz: f958f05bc40eb82f8d88e744a0510a1113883a22f4d1ac137967921cf657a027bed5fb215f1d52f2b31ff6aa9fd63abf1892eca718f51ad9f9080adb66f7d78e
+  data.tar.gz: cc7bc2ebb876da6ab511d9c74630432fb470210b2b228ca7756c3a95a687c25cb90b37cf1ed0197ab303b4bdc717179a349a00930e48d895f7ee6209557cd6ba

data/README.md

@@ -7,9 +7,12 @@ These tasks have been taken directly from the puma gem and upgraded to Rake
 Includes the following commands;
 
   - `cap puma:start`
-  - `cap puma:reset`
+  - `cap puma:restart`
   - `cap puma:phased_restart`
   - `cap puma:stop`
+  - `cap puma:upstart:start`
+  - `cap puma:upstart:restart`
+  - `cap puma:upstart:stop`
 
 ## Installation
 
@@ -23,12 +26,22 @@ And then execute:
     $ bundle --binstubs
     $ cap install
 
+
+To use upstart to manage the puma processes follow the instruction
+https://github.com/puma/puma/tree/master/tools/jungle/upstart
+
 ## Usage
 
 Add the following line to your Capfile
 
     require 'capistrano/puma'
 
+to use upstart to control the puma daemon set :puma_upstart to true in your
+environment file
+
+    set :puma_upstart, true
+
+
 ## Contributing
 
 1. Fork it

data/cap-puma.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "cap-puma"
-  spec.version       = '0.0.4'
+  spec.version       = '0.0.5'
   spec.authors       = ["John D'Agostino"]
   spec.email         = ["john.dagostino@gmail.com"]
   spec.description   = %q{Capistrano v3 Rake tasks for Puma}

data/lib/capistrano/tasks/puma.rake

@@ -8,16 +8,39 @@ namespace :puma do
     set :puma_role, fetch(:puma_role, :app)
   end
 
+  namespace :upstart do
+    desc 'Start puma using upstart'
+    task :start => [:defaults] do
+      on roles fetch(:puma_role) do
+        execute :service, 'puma', 'start', "app=#{current_path}"
+      end
+    end
+
+    desc 'Restart puma using upstart'
+    task :restart => [:defaults] do
+      on roles fetch(:puma_role) do
+        execute :service, 'puma', 'restart', "app=#{current_path}"
+      end
+    end
+
+    desc 'Stop puma using upstart'
+    task :stop => [:defaults] do
+      on roles fetch(:puma_role) do
+        execute :service, 'puma', 'stop', "app=#{current_path}"
+      end
+    end
+  end
+
   # https://github.com/leehambley/sshkit/blob/master/EXAMPLES.md#run-a-command-without-it-being-command-mapped
-  def execute_current_path(cmd)
-    execute "cd #{current_path} && #{cmd}"
+  def execute_current_path(*cmd)
+    send(:execute, *["cd", current_path.to_s, "&&"].concat(cmd))
   end
 
   desc 'Start puma'
   task :start => [:defaults] do
     on roles fetch(:puma_role) do
       within current_path do
-        execute_current_path("#{fetch(:puma_cmd)} #{start_options}")
+        execute_current_path(fetch(:puma_cmd), start_options)
       end
     end
   end
@@ -33,7 +56,7 @@ namespace :puma do
   task :stop => [:defaults] do
     on roles fetch(:puma_role) do
       within current_path do
-        execute_current_path("#{fetch(:pumactl_cmd)} -S #{state_path} stop")
+        execute_current_path(fetch(:pumactl_cmd), "-S", state_path, "stop")
       end
     end
   end
@@ -43,7 +66,7 @@ namespace :puma do
     on roles fetch(:puma_role) do
       within current_path do
         begin
-          execute_current_path("#{fetch(:pumactl_cmd)} -S #{state_path} restart")
+          execute_current_path(fetch(:pumactl_cmd), "-S", state_path, "restart")
         rescue SSHKit::StandardError
           Rake::Task["puma:start"].invoke
         end
@@ -55,7 +78,7 @@ namespace :puma do
   task :phased_restart => [:defaults] do
     on roles fetch(:puma_role) do
       within current_path do
-        execute_current_path("#{fetch(:pumactl_cmd)} -S #{state_path} phased-restart")
+        execute_current_path(fetch(:pumactl_cmd), "-S", state_path, "phased-restart")
       end
     end
   end
@@ -92,6 +115,7 @@ namespace :puma do
     config
   end
 
-  after 'deploy:finishing', 'puma:restart'
+  # after 'deploy:finishing', 'puma:upstart:restart'
+  # after 'deploy:finishing', 'puma:restart'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cap-puma
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - John D'Agostino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler