capistrano-shoryuken 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDdkOTI4NTY4MmFiMmFkOTU5NDRhZDJlZTkwZjM2ZDI5MTc4YzIzMQ==
+    ZDZmODU5ZjljNGE4N2NkMWI2MjcyN2NhM2I1YjZlMTYzMTU3MTE5ZA==
   data.tar.gz: !binary |-
-    N2U5ZmY0MGNiZmQwZGI5MjVlNjAxNWIyN2UzMDhjMDMzMTFiYTA2Yw==
+    MjgwMTVjMmYzOWNkN2E5MzY5NDE1YmM5ODRiMDRiMTc2MzM1OTcwMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWNkMTVkNGMyMjk5Y2JiYzcyMjdlNGUwY2Y5YTMwOGExN2Y2NzlmZGFkNzE5
-    MTQ1NzIwMTJmNzM2ZTkxNGY0MDRjZDdmMDM5MTNiMjlhNTdlMjQ1YjMzMGJh
-    NjU3NjJmNTk4NzI0MDMxMTY4MDllMDVlZGY4MzMwMDIxMjc0NzY=
+    YWNhMTY0ZWRkZjU3MGNkYTQxY2ZhMjU2NzVmMWIzYTUyZDM1YTIzNmYzMGNk
+    NDJjYjcyODllM2I4NDU5N2JmMTBmMzczOWJhM2RmNWYzNzdmN2Q1MWIzOWZh
+    NWVkOWQ5NjI2NzdiMmMzOGEwZmIxMWViMDJiNmEzM2M4MTczYzY=
   data.tar.gz: !binary |-
-    OGU2ZTA3NTZlOWFiMWFmM2I5NmJlNjczMjJjYTlmMGI0N2JhODZiNGRkOTVl
-    YjYxOTVhYWQ5YjY3NDhjYjg0MjVhMTVmZjZhMzc5Mzg4ZGU5OGM0ZmU1NDg2
-    YzY2ZTM2MWM3MTkzYjRlOGY4MTgzMDY0Y2FjMWNhNmMzZWJmNDY=
+    ZjRjZDdlNTJhODcxOGE5OTE4ZGM3NmI4OTNmYmY5ZmFiODdjYTJiZWZmNGNl
+    MWRlYTg0NGY2YTgzN2I2NDJlMmE5YWRkNWYxYjlmMDlhYzNhMzU0NTdiZGQw
+    ODNiOGJkOTMzNjQxZWZhNmRjOGM4ODk3OTFlMzc5ZDZmNmE1YjQ=

data/lib/capistrano/shoryuken/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Shoryuken
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/lib/capistrano/tasks/capistrano2.rb

@@ -5,9 +5,8 @@ Capistrano::Configuration.instance.load do
   _cset(:shoryuken_pid) { File.join(shared_path, 'pids', 'shoryuken.pid') }
   _cset(:shoryuken_env) { fetch(:rack_env, fetch(:rails_env, 'production')) }
   _cset(:shoryuken_log) { File.join(shared_path, 'log', 'shoryuken.log') }
-
   _cset(:shoryuken_config) { "#{current_path}/config/shoryuken.yml" }
-  _cset(:shoryuken_options) { nil }
+  _cset(:shoryuken_options) { '--rails' }
   _cset(:shoryuken_queues) { nil }
 
   _cset(:shoryuken_cmd) { "#{fetch(:bundle_cmd, 'bundle')} exec shoryuken" }
@@ -39,7 +38,7 @@ Capistrano::Configuration.instance.load do
     task :start, roles: lambda { fetch(:shoryuken_role) }, on_no_matching_servers: :continue do
       pid_file = fetch(:shoryuken_pid)
       
-      args = ['--rails --daemon']
+      args = ['--daemon']
       args.push "--pidfile '#{pid_file}'"
       logfile = fetch(:shoryuken_log) and args.push "--logfile '#{logfile}'"
       config = fetch(:shoryuken_config) and args.push "--config '#{config}'"

data/lib/capistrano/tasks/shoryuken.cap

@@ -0,0 +1,131 @@
+namespace :load do
+  task :defaults do
+    set :shoryuken_default_hooks, -> { true }
+
+    set :shoryuken_pid,     -> { File.join(shared_path, 'tmp', 'pids', 'shoryuken.pid') }
+    set :shoryuken_env,     -> { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
+    set :shoryuken_log,     -> { File.join(shared_path, 'log', 'shoryuken.log') }
+    set :shoryuken_config,  -> { File.join(release_path, 'config', 'shoryuken.yml') }
+    set :shoryuken_options, -> { '--rails' }
+      
+    set :shoryuken_role,    -> { :app }
+    
+    # Rbenv and RVM integration
+    set :rbenv_map_bins, fetch(:rbenv_map_bins).to_a.concat(%w(shoryuken))
+    set :rvm_map_bins, fetch(:rvm_map_bins).to_a.concat(%w(shoryuken))
+  end
+end
+
+namespace :deploy do
+  before :starting, :check_shoryuken_hooks do
+    invoke 'shoryuken:add_default_hooks' if fetch(:shoryuken_default_hooks)
+  end
+  after :publishing, :restart_shoryuken do
+    invoke 'shoryuken:restart' if fetch(:shoryuken_default_hooks)
+  end
+end
+
+namespace :shoryuken do
+  
+  def pid_file_signal(pid_file, signal=nil, options={})
+    args = ['kill', "-#{signal}", '$(', 'cat', pid_file, ')']
+    args.delete_at(1) if args[1]=='-'
+    if options[:quiet]
+      args << '>/dev/null' << '2>&1'
+      test(*args)
+    else
+      execute(*args)
+    end
+  end
+
+  def pid_file_exists?(pid_file)
+    test('[', '-f', pid_file, ']')
+  end
+
+  def pid_process_exists?(pid_file)
+    pid_file_exists?(pid_file) and pid_file_signal(pid_file, '0', quiet: true)
+  end
+  
+  task :add_default_hooks do
+    after 'deploy:updated', 'shoryuken:stop'
+    after 'deploy:reverted', 'shoryuken:stop'
+    after 'deploy:published', 'shoryuken:start'
+  end
+
+  desc 'Stop the shoryuken process, gracefully'
+  task :stop do
+    on roles fetch(:shoryuken_role) do
+      within release_path do
+        pid_file = fetch(:shoryuken_pid)
+        if pid_file_exists?(pid_file)
+          pid_file_signal pid_file, 'USR1', quiet: true
+          
+          print 'Waiting for shoryuken to shutdown...'
+          sleep 1 while pid_process_exists?(pid_file)
+          execute :rm, '-f', pid_file
+        end
+      end
+    end
+  end
+  
+  desc 'Shutdown the shoryuken process, immediately'
+  task :shutdown do
+    on roles fetch(:shoryuken_role) do
+      within release_path do
+        pid_file = fetch(:shoryuken_pid)
+        pid_file_signal pid_file if pid_file_exists?(pid_file)
+      end
+    end
+  end
+
+  desc 'Start the shoryuken process'
+  task :start do
+    on roles fetch(:shoryuken_role) do
+      within release_path do
+        pid_file = fetch(:shoryuken_pid)
+        unless pid_process_exists?(pid_file)
+          args = ['--daemon']
+          args.push "--pidfile '#{pid_file}'"
+          logfile = fetch(:shoryuken_log) and args.push "--logfile '#{logfile}'"
+          config = fetch(:shoryuken_config) and args.push "--config '#{config}'"
+          queues = Array(fetch(:shoryuken_queues)) and queues.each{|queue| args.push "--queue #{queue}" }
+          options = fetch(:shoryuken_options) and args.push Array(options).join(' ')
+          
+          with rails_env: fetch(:shoryuken_env) do
+            execute :bundle, :exec, :shoryuken, args.compact.join(' ')
+          end
+        end
+      end
+    end
+  end
+
+  desc 'Restart shoryuken'
+  task :restart do
+    invoke 'shoryuken:stop'
+    invoke 'shoryuken:start'
+  end
+  
+  desc 'Make the shoryuken process log detailed status information'
+  task :log_status do
+    on roles fetch(:shoryuken_role) do
+      pid_file = fetch(:shoryuken_pid)
+      pid_file_signal pid_file, 'TTIN' if pid_file_exists?(pid_file)
+    end
+  end
+  
+  desc 'Tail the shoryuken log forever'
+  task :tail_log do
+    on roles fetch(:shoryuken_role) do
+      log_file = fetch(:shoryuken_log)
+      execute :tail, '-f', log_file if test('[', '-f', log_file, ']')
+    end
+  end
+
+  desc 'Tail ENV[number] lines of the shoryuken log'
+  task :tail_log_lines do
+    on roles fetch(:shoryuken_role) do
+      log_file = fetch(:shoryuken_log)
+      execute :tail, '-n', ENV.fetch('number',20).to_s, log_file if test('[', '-f', log_file, ']')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-shoryuken
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joe Khoobyar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano