capistrano-resque 0.0.4 → 0.0.5

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
-gem 'resque', :git => 'git@github.com:sj26/resque.git', :branch => 'logfile'
-gemspec
+
+gem 'resque', '~> 1.21.0'
+
+gemspec

data/Gemfile.lock

@@ -1,14 +1,3 @@
-GIT
-  remote: git@github.com:sj26/resque.git
-  revision: 05e4c5e6f92fe62b25db40984b20dad4b9f870d8
-  branch: logfile
-  specs:
-    resque (1.19.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.0.2)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-
 PATH
   remote: .
   specs:
@@ -25,7 +14,7 @@ GEM
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
     highline (1.6.13)
-    multi_json (1.3.4)
+    multi_json (1.3.6)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
@@ -36,9 +25,14 @@ GEM
     rack (1.4.1)
     rack-protection (1.2.0)
       rack
-    redis (2.2.2)
-    redis-namespace (1.0.3)
-      redis (< 3.0.0)
+    redis (3.0.1)
+    redis-namespace (1.2.0)
+      redis (~> 3.0.0)
+    resque (1.21.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.0)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
@@ -52,4 +46,4 @@ PLATFORMS
 
 DEPENDENCIES
   capistrano-resque!
-  resque!
+  resque (~> 1.21.0)

data/README.md

@@ -36,6 +36,9 @@ Running cap -vT | grep resque should give you...
 cap resque:start     # Start Resque workers
 cap resque:stop      # Quit running Resque workers
 cap resque:restart   # Restart running Resque workers
+cap resque:scheduler:restart # 
+cap resque:scheduler:start   # Starts resque scheduler with default configs
+cap resque:scheduler:stop    # Stops resque scheduler
 ```
 
 ### Restart on deployment
@@ -46,7 +49,3 @@ add the following line to your `deploy.rb`:
 ```
 after "deploy:restart", "resque:restart"
 ```
-
-## Logging
-
-Currently, resque doesn't log to a logfile. I'm using the 'logfile' branch of http://github.com/sj26/resque in my consuming Gemfile to achieve this functionality. Hopefully that will get merged into defunkt/resque soon.

data/lib/capistrano-resque/capistrano_integration.rb

@@ -8,7 +8,6 @@ module CapistranoResque
 
         _cset(:workers, {"*" => 1})
         _cset(:app_env, (fetch(:rails_env) rescue "production"))
-        _cset(:verbosity, 1)
 
         def remote_file_exists?(full_path)
           "true" ==  capture("if [ -e #{full_path} ]; then echo 'true'; fi").strip
@@ -24,7 +23,7 @@ module CapistranoResque
 
         namespace :resque do
           desc "See current worker status"
-          task :status do
+          task :status, :roles => :resque_worker do
             current_pids.each do |pid|
               if remote_file_exists?(pid)
                 if remote_process_exists?(pid)
@@ -37,22 +36,21 @@ module CapistranoResque
           end
 
           desc "Start Resque workers"
-          task :start do
+          task :start, :roles => :resque_worker do
             worker_id = 1
             workers.each_pair do |queue, number_of_workers|
               puts "Starting #{number_of_workers} worker(s) with QUEUE: #{queue}"
               number_of_workers.times do
                 pid = "./tmp/pids/resque_worker_#{worker_id}.pid"
                 run "cd #{current_path} && RAILS_ENV=#{app_env} QUEUE=\"#{queue}\" \
-  PIDFILE=#{pid} BACKGROUND=yes LOGFILE=./log/resque-worker#{worker_id}.log VVERBOSE=#{verbosity}  \
-  bundle exec rake environment resque:work"
+PIDFILE=#{pid} BACKGROUND=yes VERBOSE=1 bundle exec rake environment resque:work"
                 worker_id += 1
               end
             end
           end
 
           desc "Quit running Resque workers"
-          task :stop do
+          task :stop, :roles => :resque_worker do
             current_pids.each do |pid|
               if remote_file_exists?(pid)
                 if remote_process_exists?(pid)
@@ -69,10 +67,34 @@ module CapistranoResque
           end
 
           desc "Restart running Resque workers"
-          task :restart do
+          task :restart, :roles => :resque_worker do
             stop
             start
           end
+
+          namespace :scheduler do
+            desc "Starts resque scheduler with default configs"
+            task :start, :roles => :resque_scheduler do
+              run "cd #{current_path} && RAILS_ENV=#{rails_env} \
+PIDFILE=./tmp/pids/scheduler.pid BACKGROUND=yes bundle exec rake resque:scheduler"
+            end
+
+            desc "Stops resque scheduler"
+            task :stop, :roles => :resque_scheduler do
+              pid = "#{current_path}/tmp/pids/scheduler.pid"
+              if remote_file_exists?(pid)
+                logger.important("Shutting down resque scheduler...", "Resque Scheduler")
+                run remote_process_exists?(pid) ? "#{try_sudo} kill `cat #{pid}`" : "rm #{pid}"
+              else
+                logger.important("Resque scheduler not running", "Resque Scheduler")
+              end
+            end
+
+            task :restart do
+              stop
+              start
+            end
+          end
         end
       end
     end

data/lib/capistrano-resque/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-resque
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Steven Shingler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-24 00:00:00 Z
+date: 2012-07-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano