resque-scheduler 2.4.0 → 2.5.0

data/.rubocop.yml

@@ -18,7 +18,7 @@ CaseEquality:
   Enabled: false
 
 ClassLength:
-  Max: 300
+  Max: 303
 
 ClassVars:
   Enabled: false
@@ -33,7 +33,7 @@ CommentAnnotation:
   Enabled: false
 
 CyclomaticComplexity:
-  Max: 18
+  Max: 28
 
 Documentation:
   Enabled: false
@@ -69,7 +69,7 @@ MethodCallParentheses:
   Enabled: false
 
 MethodLength:
-  Max: 90
+  Max: 180
 
 ModuleFunction:
   Enabled: false

data/AUTHORS.md

@@ -25,6 +25,7 @@ Resque Scheduler authors
 - Harry Lascelles
 - Henrik Nyh
 - James Le Cuirot
+- Jarkko Mönkkönen
 - John Crepezzi
 - John Griffin
 - Jon Larkowski and Les Hill

data/HISTORY.md

@@ -1,5 +1,10 @@
 # Resque Scheduler History / ChangeLog / Release Notes
 
+## 2.5.0 (2014-02-09)
+* Use `logger.error` when logging errors from `handle_errors`
+* Added search feature to the Delayed tab in Resque Web
+* Fix confusion with redis version requirements in `README.md`
+
 ## 2.4.0 (2014-01-14)
 
 * Including optional env name in procline

data/README.md

@@ -12,7 +12,7 @@ that adds support for queueing items in the future.
 
 This table explains the version requirements for redis
 
-| resque-scheduler version | required redis version|
+| resque-scheduler version | required redis gem version|
 |:-------------------------|----------------------:|
 | ~> 2.0                   | >= 3.0.0              |
 | >= 0.0.1                 | ~> 1.3                |

data/lib/resque/scheduler.rb

@@ -276,7 +276,7 @@ module Resque
         begin
           yield
         rescue Exception => e
-          log! "#{e.class.name}: #{e.message}"
+          log_error "#{e.class.name}: #{e.message}"
         end
       end
 
@@ -398,6 +398,10 @@ module Resque
         logger.info { msg }
       end
 
+      def log_error(msg)
+        logger.error { msg }
+      end
+
       def log(msg)
         logger.debug { msg }
       end

data/lib/resque_scheduler/server.rb

@@ -9,13 +9,49 @@ module ResqueScheduler
       base.class_eval do
         helpers do
           def format_time(t)
-            t.strftime("%Y-%m-%d %H:%M:%S %z")
+            t.strftime('%Y-%m-%d %H:%M:%S %z')
           end
 
           def queue_from_class_name(class_name)
             Resque.queue_from_class(ResqueScheduler::Util.constantize(class_name))
           end
 
+          def find_job(worker)
+            worker = worker.downcase
+            results = Array.new
+
+            # Check working jobs
+            working = Resque.working
+            working = [working] unless working.is_a?(Array)
+            work = working.select do |w|
+              w.job && w.job["payload"] && w.job['payload']['class'].downcase.include?(worker)
+            end
+            work.each do |w|
+              results += [w.job['payload'].merge({'queue' => w.job['queue'], 'where_at' => 'working'})]
+            end
+
+            # Check delayed Jobs
+            dels = Array.new
+            Resque.delayed_queue_peek(0, Resque.delayed_queue_schedule_size).each do |d|
+              Resque.delayed_timestamp_peek(d, 0, Resque.delayed_timestamp_size(d)).each do |j|
+                dels << j.merge!({'timestamp' => d})
+              end
+            end
+            results += dels.select do |j|
+              j['class'].downcase.include?(worker) && j.merge!({'where_at' => 'delayed'})
+            end
+
+            # Check Queues
+            Resque.queues.each do |queue|
+                queued = Resque.peek(queue, 0, Resque.size(queue))
+                queued = [queued] unless queued.is_a?(Array)
+                results += queued.select do |j|
+                  j['class'].downcase.include?(worker) && j.merge!({'queue' => queue, 'where_at' => 'queued'})
+                end
+            end
+            results
+          end
+
           def schedule_interval(config)
             if config['every']
               schedule_interval_every(config['every'])
@@ -104,6 +140,12 @@ module ResqueScheduler
           erb File.read(File.join(File.dirname(__FILE__), 'server/views/delayed_schedules.erb'))
         end
 
+        post "/delayed/search" do
+          # Is there a better way to specify alternate template locations with sinatra?
+          @jobs = find_job(params[:search])
+          erb File.read(File.join(File.dirname(__FILE__), 'server/views/search.erb'))
+        end
+
         get "/delayed/:timestamp" do
           # Is there a better way to specify alternate template locations with sinatra?
           erb File.read(File.join(File.dirname(__FILE__), 'server/views/delayed_timestamp.erb'))
@@ -115,6 +157,14 @@ module ResqueScheduler
           redirect u("/overview")
         end
 
+        post "/delayed/cancel_now" do
+          klass = ResqueScheduler::Util.constantize params['klass']
+          timestamp = params['timestamp']
+          args = Resque.decode params['args']
+          Resque.remove_delayed_job_from_timestamp(timestamp, klass, *args)
+          redirect u("/delayed")
+        end
+
         post "/delayed/clear" do
           Resque.reset_delayed_queue
           redirect u('delayed')

data/lib/resque_scheduler/server/views/delayed.erb

@@ -1,10 +1,7 @@
 <h1>Delayed Jobs</h1>
 <%- size = resque.delayed_queue_schedule_size %>
-<% if size > 0 %>
-  <form method="POST" action="<%=u 'delayed/clear'%>" class='clear-delayed'>
-    <input type='submit' name='' value='Clear Delayed Jobs' />
-  </form>
-<% end %>
+
+<%= erb File.read(File.join(File.dirname(__FILE__), 'server/views/search_form.erb')) %>
 
 <p class='intro'>
   This list below contains the timestamps for scheduled delayed jobs.
@@ -48,4 +45,11 @@
   <% end %>
 </table>
 
+<% if size > 0 %>
+  <br>
+  <form method="POST" action="<%=u 'delayed/clear'%>" class='clear-delayed'>
+    <input type='submit' name='' value='Clear Delayed Jobs' />
+  </form>
+<% end %>
+
 <%= partial :next_more, :start => start, :size => size %>

data/lib/resque_scheduler/server/views/search.erb

@@ -0,0 +1,72 @@
+<h1>Search Results</h1>
+<%= erb File.read(File.join(File.dirname(__FILE__), 'server/views/search_form.erb')) %>
+<hr>
+<% delayed = @jobs.select { |j| j['where_at'] == 'delayed' } %>
+<h1>Delayed jobs</h1>
+<table class='jobs'>
+  <tr>
+    <th></th>
+    <th></th>
+    <th>Timestamp</th>
+    <th>Class</th>
+    <th>Args</th>
+  </tr>
+  <% delayed.each do |job| %>
+      <tr>
+        <td>
+          <form action="<%= u "/delayed/queue_now" %>" method="post">
+            <input type="hidden" name="timestamp" value="<%= job['timestamp'].to_i %>">
+            <input type="submit" value="Queue now">
+          </form>
+        </td>
+        <td>
+          <form action="<%= u "/delayed/cancel_now" %>" method="post">
+            <input type="hidden" name="timestamp" value="<%= job['timestamp'].to_i %>">
+            <input type="hidden" name="klass" value="<%= job['class'] %>">
+            <input type="hidden" name="args" value="<%= Resque.encode job['args'] %>">
+            <input type="submit" value="Cancel Job">
+          </form>
+        </td>
+        <td class='args'><%= format_time(Time.at(job['timestamp'])) %></td>
+        <td class='class'><%= job['class'] %></td>
+        <td class='args'><%= h job['args'].inspect %></td>
+      </tr>
+  <% end %>
+</table>
+</h1>
+
+<% queued = @jobs.select { |j| j['where_at'] == 'queued' } %>
+<h1>Queued jobs</h1>
+<table class='jobs'>
+  <tr>
+    <th>Queue</th>
+    <th>Class</th>
+    <th>Args</th>
+  </tr>
+  <% queued.each do |job| %>
+  <tr>
+    <td class='class'><%= job['queue'] %></td>
+    <td class='class'><%= job['class'] %></td>
+    <td class='args'><%= h job['args'].inspect %></td>
+  </tr>
+  <% end %>
+</table>
+
+<% working = @jobs.select { |j| j['where_at'] == 'working' } %>
+<h1>Working jobs</h1>
+<table class='jobs'>
+  <tr>
+    <th>Queue</th>
+    <th>Class</th>
+    <th>Args</th>
+  </tr>
+  <% working.each do |job| %>
+  <tr>
+    <td class='class'><%= job['queue'] %></td>
+    <td class='class'><%= job['class'] %></td>
+    <td class='args'><%= h job['args'].inspect %></td>
+  </tr>
+  <% end %>
+</table>
+
+

data/lib/resque_scheduler/server/views/search_form.erb

@@ -0,0 +1,8 @@
+<form method="POST" action="<%= u 'delayed/search' %>">
+  <input type='input' name='search' value="<%= params[:search] %>"/>
+  <input type='submit' value='Search'/>
+</form>
+
+
+
+

data/lib/resque_scheduler/version.rb

@@ -1,5 +1,5 @@
 # vim:fileencoding=utf-8
 
 module ResqueScheduler
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

data/test/resque-web_test.rb

@@ -1,4 +1,4 @@
-require_relative 'test_helper'
+require File.dirname(__FILE__) + '/test_helper'
 
 # Pull in the server test_helper from resque
 require 'resque/server/test_helper.rb'
@@ -167,3 +167,33 @@ context "POST /schedule/requeue_with_params" do
     assert last_response.ok?, last_response.errors
   end
 end
+
+context "on POST to /delayed/search" do
+  setup do
+    t = Time.now + 60
+    Resque.enqueue_at(t, SomeIvarJob)
+    Resque.enqueue(SomeQuickJob)
+  end
+
+  test 'should find matching scheduled job' do
+    post "/delayed/search" , 'search' => 'ivar'
+    assert last_response.status == 200
+    assert last_response.body.include?('SomeIvarJob')
+  end
+
+  test 'should find matching queued job' do
+    post "/delayed/search" , 'search' => 'quick'
+    assert last_response.status == 200
+    assert last_response.body.include?('SomeQuickJob')
+  end
+end
+
+context "on POST to /delayed/cancel_now" do
+  setup { post "/delayed/cancel_now" }
+
+  test 'redirects to overview' do
+    assert last_response.status == 302
+    assert last_response.header['Location'].include? '/delayed'
+  end
+
+end

data/test/test_helper.rb

@@ -81,6 +81,10 @@ class SomeIvarJob < SomeJob
   @queue = :ivar
 end
 
+class SomeQuickJob < SomeJob
+  @queue = :quick
+end
+
 class SomeRealClass
   def self.queue
     :some_real_queue

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -221,6 +221,8 @@ files:
 - lib/resque_scheduler/server/views/delayed_timestamp.erb
 - lib/resque_scheduler/server/views/requeue-params.erb
 - lib/resque_scheduler/server/views/scheduler.erb
+- lib/resque_scheduler/server/views/search.erb
+- lib/resque_scheduler/server/views/search_form.erb
 - lib/resque_scheduler/tasks.rb
 - lib/resque_scheduler/util.rb
 - lib/resque_scheduler/version.rb
@@ -252,12 +254,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -949662411159458522
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -949662411159458522
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23