cap-puma 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ff6eb513d0b18870a1b47cc11aa1f2152ba322e
-  data.tar.gz: 64a27a4bd06578d529846b442096585e0440aef9
+  metadata.gz: e2f8f13cc63f4ebd39fc162dfd2ed26e5289351a
+  data.tar.gz: 13c52eb93d4bdf0ebbd288e10f0da371b91bd64a
 SHA512:
-  metadata.gz: e810cb469065f3ee15c4dd3813536f4eb45638790f8bbee5e5c823d118c450897aa7f51f96c52dec3b215a21d341277f93ef26650d145becda995eddb183c838
-  data.tar.gz: cb03d1615ae9019274277df5fb622cc9a301bdf88e15d2e949f089a82ff94cea155de7d91f03c41b9b4ae8e44b422185e16e4f14cd76802973d6b89f6bacd9d1
+  metadata.gz: 6b2e959c2944f513fc263a66889d91a1cb2fca03d9042af1a54802bf0a1e3fd001852572ccce088ec38a115a434f8e977efc2e45261a7d336790ad8b7f94d099
+  data.tar.gz: fbdcbc47f2db3611baac566d21cc6dd06387a8c469459cf0e69105ffa6c3866ec277dd82594a2400ba063a4febfda1010a8cb89640eb252ec1b51c7680e75d93

data/README.md

@@ -1,8 +1,8 @@
-# Capistrano::Puma
+# Capistrano Puma Rake Tasks
 
 Puma Rake tasks for Capistrano >= 3.0.0
 
-These tasks have been taken directly from the puma gem
+These tasks have been taken directly from the puma gem and upgraded to Rake
 
 Includes the following commands;
 
@@ -16,7 +16,7 @@ Includes the following commands;
 Add this line to your application's Gemfile:
 
     gem 'capistrano',  '~> 3.0.0'
-    gem 'capistrano-puma'
+    gem 'cap-puma'
 
 And then execute:
 

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.2'
+  spec.version       = '0.0.4'
   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

@@ -1,43 +1,61 @@
 namespace :puma do
+  task :defaults do
+    set :puma_cmd, fetch(:puma_cmd, "bundle exec puma")
+    set :pumactl_cmd, fetch(:pumactl_cmd, "bundle exec pumactl")
+    set :puma_env, fetch(:puma_env, fetch(:rack_env, fetch(:rails_env, 'production')))
+    set :puma_state, fetch(:puma_state, "#{shared_path}/sockets/puma.state")
+    set :puma_socket, fetch(:puma_socket, "unix://#{shared_path}/sockets/puma.sock")
+    set :puma_role, fetch(:puma_role, :app)
+  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}"
+  end
+
   desc 'Start puma'
-  task :start do
+  task :start => [:defaults] do
     on roles fetch(:puma_role) do
       within current_path do
-        execute fetch(:puma_cmd), "#{start_options}"
+        execute_current_path("#{fetch(:puma_cmd)} #{start_options}")
       end
     end
   end
 
   desc 'ensure directories exist'
-  task :directories do
+  task :directories => [:defaults] do
     on roles fetch(:puma_role) do
-      execute :mkdir, '-pv', shared_path, "sockets"
+      execute :mkdir, '-pv', File.join(shared_path, "sockets")
     end
   end
 
   desc 'Stop puma'
-  task :stop do
+  task :stop => [:defaults] do
     on roles fetch(:puma_role) do
       within current_path do
-        execute fetch(:pumactl_cmd), "-S #{state_path} stop"
+        execute_current_path("#{fetch(:pumactl_cmd)} -S #{state_path} stop")
       end
     end
   end
 
   desc 'Restart puma'
-  task :restart do
+  task :restart => [:defaults] do
     on roles fetch(:puma_role) do
       within current_path do
-        execute fetch(:pumactl_cmd), "-S #{state_path} restart"
+        begin
+          execute_current_path("#{fetch(:pumactl_cmd)} -S #{state_path} restart")
+        rescue SSHKit::StandardError
+          Rake::Task["puma:start"].invoke
+        end
       end
     end
   end
 
   desc 'Restart puma (phased restart)'
-  task :phased_restart do
+  task :phased_restart => [:defaults] do
     on roles fetch(:puma_role) do
       within current_path do
-        execute fetch(:pumactl_cmd), "-S #{state_path} phased-restart"
+        execute_current_path("#{fetch(:pumactl_cmd)} -S #{state_path} phased-restart")
       end
     end
   end
@@ -77,13 +95,3 @@ namespace :puma do
   after 'deploy:finishing', 'puma:restart'
 end
 
-namespace :load do
-  task :defaults do
-    set :puma_cmd, fetch(:puma_cmd, "bundle exec puma")
-    set :pumactl_cmd, fetch(:pumactl_cmd, "bundle exec pumactl")
-    set :puma_env, fetch(:puma_env, fetch(:rack_env, fetch(:rails_env, 'production')))
-    set :puma_state, fetch(:puma_state, "#{shared_path}/sockets/puma.state")
-    set :puma_socket, fetch(:puma_socket, "unix://#{shared_path}/sockets/puma.sock")
-    set :puma_role, fetch(:puma_role, :app)
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cap-puma
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - John D'Agostino