capistrano-resque 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcb1a22ec0a47cbb81286b69622d9ad72cbb0270
-  data.tar.gz: faa6bf544364befa0fb1cb75a2826615267cd854
+  metadata.gz: 217a147eabc162a121acad042de466b37b07023e
+  data.tar.gz: e7c3e255a950cd71be265f20cb751ade1b870ad9
 SHA512:
-  metadata.gz: 4dff079d78d320353edd58014605c777939a7391a23912bc558fca5eda02193bd75b06f256fe6bdc118e0e8573c6925b24468ff696b410ef2b2e6647f5c5a18d
-  data.tar.gz: 1ac2ad838229bce32cec733365515e2f7aba1b4793dff4309b279c69b15ec45d3a2ec15b49d4fae8bbbe042112fb9eabde4c82daa8d0298508d1d0b8e33c174f
+  metadata.gz: c962f5d4393ffbe82550656c6e439680d9b57e67a51fabe9fde8f7ad5eb11238d6edcc97699552712fd8e996ce02c6bbcf6e1ab3b6825e6bab0d742fddf7ff32
+  data.tar.gz: 54bb52b354c20675fb1b78f9b7512efa351437dca9de0de60f7a455be673b5b411e5b2066ce9650e9ef9e916a386b20121936f94be5de13b795d37999304006e

data/Changelog.md

@@ -1,3 +1,6 @@
+# 0.2.3 and newer
+* Please see the [Github Releases](https://github.com/sshingler/capistrano-resque/releases) page for changelog info
+
 # 0.2.2
 * Start all background tasks with `nohup` to avoid `SIGHUP` problems
 * Add a `:resque_verbose` option to toggle verbose output (defaults to `true`)

data/Gemfile.lock

@@ -13,7 +13,7 @@ GIT
 PATH
   remote: .
   specs:
-    capistrano-resque (0.2.2)
+    capistrano-resque (0.2.3)
       capistrano
       resque
       resque-scheduler
@@ -21,21 +21,25 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    capistrano (3.4.0)
+    airbrussh (1.1.1)
+      sshkit (>= 1.6.1, != 1.7.0)
+    capistrano (3.6.1)
+      airbrussh (>= 1.0.0)
+      capistrano-harrow
       i18n
       rake (>= 10.0.0)
-      sshkit (~> 1.3)
-    colorize (0.7.5)
+      sshkit (>= 1.9.0)
+    capistrano-harrow (0.5.3)
     i18n (0.7.0)
     mono_logger (1.1.0)
     multi_json (1.10.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
+    net-ssh (3.2.0)
     rack (1.5.2)
     rack-protection (1.5.3)
       rack
-    rake (10.4.2)
+    rake (11.3.0)
     redis (3.1.0)
     redis-namespace (1.5.1)
       redis (~> 3.0, >= 3.0.4)
@@ -50,8 +54,7 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    sshkit (1.7.1)
-      colorize (>= 0.7.0)
+    sshkit (1.11.3)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     thread_safe (0.3.4)
@@ -68,3 +71,6 @@ DEPENDENCIES
   capistrano-resque!
   resque!
   resque-scheduler
+
+BUNDLED WITH
+   1.13.4

data/README.md

@@ -63,6 +63,14 @@ The above will start five workers in total:
  * one listening on the `search_index, cache_warming` queue
  * three listening on the `mailing` queue
 
+If you need to pass arbitrary data (like other non-standard environment variables) to the "start" command, you can specify:
+
+```ruby
+set :resque_extra_env, "SEARCH_SERVER=172.18.0.52"
+```
+
+This can be useful for customizing Resque tasks in complex server environments.
+
 ### Multiple Servers/Roles
 
 You can also start up workers on multiple servers/roles:

data/lib/capistrano-resque/capistrano_integration.rb

@@ -7,12 +7,14 @@ module CapistranoResque
       capistrano_config.load do
 
         _cset(:workers, {"*" => 1})
+        _cset(:resque_extra_env, "")
         _cset(:resque_kill_signal, "QUIT")
         _cset(:interval, "5")
         _cset(:resque_environment_task, false)
         _cset(:resque_log_file, "/dev/null")
         _cset(:resque_verbose, true)
         _cset(:resque_pid_path) { File.join(shared_path, 'tmp', 'pids') }
+        _cset(:resque_dynamic_schedule, false)
 
         def rails_env
           fetch(:resque_rails_env, fetch(:rails_env, "production"))
@@ -45,7 +47,7 @@ module CapistranoResque
         end
 
         def start_command(queue, pid)
-          "cd #{current_path} && RAILS_ENV=#{rails_env} QUEUE=\"#{queue}\" \
+          "cd #{current_path} && RACK_ENV=#{rails_env} RAILS_ENV=#{rails_env} #{resque_extra_env} QUEUE=\"#{queue}\" \
            PIDFILE=#{pid} BACKGROUND=yes \
            #{"VERBOSE=1 " if fetch(:resque_verbose)}\
            INTERVAL=#{interval} \
@@ -76,10 +78,11 @@ module CapistranoResque
         end
 
         def start_scheduler(pid)
-          "cd #{current_path} && RAILS_ENV=#{rails_env} \
+          "cd #{current_path} && RACK_ENV=#{rails_env} RAILS_ENV=#{rails_env} #{resque_extra_env} \
            PIDFILE=#{pid} BACKGROUND=yes \
            #{"VERBOSE=1 " if fetch(:resque_verbose)}\
            MUTE=1 \
+           #{"DYNAMIC_SCHEDULE=yes " if fetch(:resque_dynamic_schedule)}\
            nohup #{fetch(:bundle_cmd, "bundle")} exec rake \
            #{"environment " if fetch(:resque_environment_task)}\
            resque:scheduler #{output_redirection}"

data/lib/capistrano-resque/tasks/capistrano-resque.rake

@@ -1,12 +1,14 @@
 namespace :load do
   task :defaults do
     set :workers, {"*" => 1}
+    set :resque_extra_env, ""
     set :resque_kill_signal, "QUIT"
     set :interval, "5"
     set :resque_environment_task, false
     set :resque_log_file, "/dev/null"
     set :resque_verbose, true
     set :resque_pid_path, -> { File.join(shared_path, 'tmp', 'pids') }
+    set :resque_dynamic_schedule, false
   end
 end
 
@@ -69,7 +71,7 @@ namespace :resque do
           number_of_workers.times do
             pid = "#{fetch(:resque_pid_path)}/resque_work_#{worker_id}.pid"
             within current_path do
-              execute :nohup, %{#{SSHKit.config.command_map[:rake]} RAILS_ENV=#{rails_env} QUEUE="#{queue}" PIDFILE=#{pid} BACKGROUND=yes #{"VERBOSE=1 " if fetch(:resque_verbose)}INTERVAL=#{fetch(:interval)} #{"environment " if fetch(:resque_environment_task)}resque:work #{output_redirection}}
+              execute :nohup, %{#{SSHKit.config.command_map[:rake]} RACK_ENV=#{rails_env} RAILS_ENV=#{rails_env} #{fetch(:resque_extra_env)} QUEUE="#{queue}" PIDFILE=#{pid} BACKGROUND=yes #{"VERBOSE=1 " if fetch(:resque_verbose)}INTERVAL=#{fetch(:interval)} #{"environment " if fetch(:resque_environment_task)}resque:work #{output_redirection}}
             end
             worker_id += 1
           end
@@ -129,7 +131,7 @@ namespace :resque do
         create_pid_path
         pid = "#{fetch(:resque_pid_path)}/scheduler.pid"
         within current_path do
-          execute :nohup, %{#{SSHKit.config.command_map[:rake]} RAILS_ENV=#{rails_env} PIDFILE=#{pid} BACKGROUND=yes #{"VERBOSE=1 " if fetch(:resque_verbose)}MUTE=1 #{"environment " if fetch(:resque_environment_task)}resque:scheduler #{output_redirection}}
+          execute :nohup, %{#{SSHKit.config.command_map[:rake]} RACK_ENV=#{rails_env} RAILS_ENV=#{rails_env} #{fetch(:resque_extra_env)} PIDFILE=#{pid} BACKGROUND=yes #{"VERBOSE=1 " if fetch(:resque_verbose)}MUTE=1 #{"DYNAMIC_SCHEDULE=yes " if fetch(:resque_dynamic_schedule)}#{"environment " if fetch(:resque_environment_task)}resque:scheduler #{output_redirection}}
         end
       end
     end
@@ -144,10 +146,10 @@ namespace :resque do
       end
     end
 
+    desc "Restart resque scheduler"
     task :restart do
       invoke "resque:scheduler:stop"
       invoke "resque:scheduler:start"
     end
   end
 end
-

data/lib/capistrano-resque/version.rb

@@ -1,5 +1,5 @@
 module CapistranoResque
   unless defined?(::CapistranoResque::VERSION)
-    VERSION = "0.2.2".freeze
+    VERSION = "0.2.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-resque
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Steven Shingler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Resque integration for Capistrano