capistrano-psw 1.0.0.pre3 → 1.0.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a10cca1d8a1806c683e492e54abc5fb57ba8248f
-  data.tar.gz: 74f6da6da16df0e2bdecc741fd0b7587660a56bf
+  metadata.gz: 18cc9cbde5f8fc0016f6d2848aba4fcefb9c8a8c
+  data.tar.gz: 279af90d9d6dec0b321b13416d81495e8cd76a60
 SHA512:
-  metadata.gz: 3e198392eb2b804942382e258ccdb2c505701889dfcbf253f15d2f8693644f2ca578f2fe082f7fe38af10bbd7991c6c4e6f17167fa2cdae799d3de771b731216
-  data.tar.gz: 120e51e2790d3826031e1da4fdf7f5432f394ae2f63340e36d1e816ea151ad625009673501d46c7a95b1bf2148431e94ad2e1b2818d5330ce4971a1e8290ed49
+  metadata.gz: 82f12b6366d83184b020411d3dffb6ad1d2708dabcbc0574766b6182cca828f938828cc61538987aa9ba2c045000ae74760e3647d634f886205549d3fed7ff6c
+  data.tar.gz: a66c0d46129b6128ee29ffa11cc2d3f9bb5a95db536f0afa32cac9c5ef9aa2a391c4c9ed5e44a53516cb5d4320eb1c9fed72f0d0367ddbfa2d18b406536e7415

data/README.md

@@ -10,6 +10,7 @@ it; however the v3 branch is a requirement for using these tasks.
 
 Add this line to your application's Gemfile:
 
+    gem 'rake'
     gem 'capistrano-psw'
 
 And then execute:

data/lib/capistrano/psw/version.rb

@@ -10,6 +10,6 @@
 
 module Capistrano
   module Psw
-    VERSION = "1.0.0.pre3"
+    VERSION = "1.0.0.pre4"
   end
 end

data/resources/lib/capistrano/tasks/psw-sidekiq.cap

@@ -37,7 +37,13 @@
 # Copyright:: 2013 Lexmark International Technology S.A.  All rights reserved.
 # License::   3-Clause BSD
 
- require 'find'
+require 'find'
+
+class String
+  def self.blank?(str)
+    str.nil? or str.empty?
+  end
+end
 
 namespace :psw_sidekiq do
 
@@ -64,6 +70,14 @@ namespace :psw_sidekiq do
     "#{base_pid_dir}/sidekiq-#{idx}.pid"
   end
 
+  def get_rbenv_prefix()
+    if !String.blank?(fetch(:default_env)) and !String.blank?(fetch(:default_env)[:path]) and !String.blank?(fetch(:rbenv_path)) and !String.blank?(fetch(:rbenv_ruby))
+      return "PATH=#{fetch(:default_env)[:path]} RBENV_ROOT=#{fetch(:rbenv_path)} RBENV_VERSION=#{fetch(:rbenv_ruby)}"
+    end
+
+    ''
+  end
+
   desc "Start sidekiq server(s)..."
   task :start do
     on roles(:all) do |host|  
@@ -83,6 +97,7 @@ namespace :psw_sidekiq do
       info "Creating log file (#{sidekiq_log_file})..."
       execute :rm, '-rf', "#{sidekiq_log_file}"
       execute :touch, "", "#{sidekiq_log_file}"
+      rbenv_prefix = get_rbenv_prefix()
 
       idx = 0
       for pid_file in pid_file_names do
@@ -94,7 +109,7 @@ namespace :psw_sidekiq do
         start_command="cd #{current_path} && nohup #{sidekiq_command} -d -e #{rails_env} -i #{idx} -P #{pid_file} -L #{sidekiq_log_file} >> #{sidekiq_log_file} 2>&1"
         info "Executing command:  #{start_command}"
 
-        execute :cd, "#{current_path}", "&& sudo nohup #{sidekiq_command} -d -e #{rails_env} -i #{idx} -P #{pid_file} -L #{sidekiq_log_file} >> #{sidekiq_log_file} 2>&1"
+        execute "cd #{current_path} && #{rbenv_prefix} nohup #{fetch(:rbenv_path)}/bin/rbenv exec #{sidekiq_command} -d -e #{rails_env} -i #{idx} -P #{pid_file} -L #{sidekiq_log_file} >> #{sidekiq_log_file} 2>&1"
 
         idx = idx + 1
       end
@@ -121,7 +136,9 @@ namespace :psw_sidekiq do
             begin
               sudo :kill, "-0", "$(cat #{pid_file})"
               sidekiq_command="#{fetch(:psw_sidekiq_bundle_cmd)} exec sidekiqctl"
-              execute :cd, "#{current_path}", "&& sudo #{sidekiq_command} stop #{pid_file} 10"
+              rbenv_prefix = get_rbenv_prefix()
+
+              execute "cd #{current_path} && #{rbenv_prefix} #{fetch(:rbenv_path)}/bin/rbenv exec #{sidekiq_command} stop #{pid_file} 10"
             rescue
               info "An error occurred stopping #{pid_file}.  Cleaning up remaining artifacts..."
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-psw
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre3
+  version: 1.0.0.pre4
 platform: ruby
 authors:
 - Lexmark International Technology S.A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler