resque-history 1.7.1 → 1.8.2

data/Changelog.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+## 1.7.0 (May 7, 2012)
+
+Features:
+
+  - Record execution time
+
 ## 1.7.0 (April 17, 2012)
 
 Features:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    resque-history (1.6.0)
+    resque-history (1.7.1)
       rake
       resque
       resque-history

data/VERSION

@@ -1 +1 @@
-1.7.1
+1.8.2

data/lib/resque-history/helpers/helper.rb

@@ -0,0 +1,24 @@
+module Resque
+  module History
+    module Helper
+
+      def format_execution(seconds)
+        if seconds.nil?
+          ""
+        elsif seconds < 60
+          "#{seconds} secs"
+        elsif seconds < 60 * 60
+          "#{(seconds/60).to_i} minutes"
+        elsif seconds < 60 * 60 * 24
+          "#{(((seconds.to_f/60/60)*100).truncate.to_f)/100} hours"
+        elsif seconds < 60 * 60 * 24 * 7
+          "#{(((seconds.to_f/60/60/24)*100).truncate.to_f)/100} days"
+        else
+          "too long"
+        end
+      end
+
+    end
+  end
+
+end

data/lib/resque-history/plugins/history.rb

@@ -9,10 +9,16 @@ module Resque
         @max_history ||= MAX_HISTORY_SIZE
       end
 
+      def before_perform_hsitory(*args)
+        @start_time = Time.now
+      end
+
       def after_perform_history(*args)
+        elapsed_seconds = (Time.now - @start_time).to_i
         Resque.redis.lpush(HISTORY_SET_NAME, {"class"=>"#{self}",
                                               "args"=>args,
-                                              "time"=>Time.now.strftime("%Y-%m-%d %H:%M")
+                                              "time"=>Time.now.strftime("%Y-%m-%d %H:%M"),
+                                              "execution"=>elapsed_seconds
         }.to_json)
 
         if Resque.redis.llen(HISTORY_SET_NAME) > maximum_history_size

data/lib/resque-history/server/views/history.erb

@@ -19,6 +19,7 @@
     <th>Job</th>
     <th>Arguments</th>
     <th>Time</th>
+    <th>Execution</th>
   </tr>
   <% history.each do |history| %>
       <% j = JSON.parse(history) %>
@@ -26,6 +27,7 @@
         <td class='queue'><%= j["class"] %></td>
         <td class='args'><%= j["args"] %></td>
         <td class='args'><%= j["time"] %></td>
+        <td class='args'><%= format_execution(j["execution"]) %></td>
       </tr>
   <% end %>
 </table>

data/lib/resque-history/server.rb

@@ -1,11 +1,13 @@
 require 'resque'
 require 'resque/server'
+require 'resque-history'
 
 # Extends Resque Web Based UI.
 # Structure has been borrowed from ResqueScheduler.
 module ResqueHistory
   module Server
     include Resque::Helpers
+    include Resque::History::Helper
 
     def self.erb_path(filename)
       File.join(File.dirname(__FILE__), 'server', 'views', filename)

data/lib/resque-history.rb

@@ -1,2 +1,3 @@
 require 'resque'
 require File.expand_path(File.join('resque-history', 'plugins', 'history'), File.dirname(__FILE__))
+require File.expand_path(File.join('resque-history', 'helpers', 'helper'), File.dirname(__FILE__))

data/resque-history.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "resque-history"
-  s.version = "1.7.1"
+  s.version = "1.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Katzmopolitan"]
-  s.date = "2012-05-01"
+  s.date = "2012-05-07"
   s.description = "Show history of recently executed jobs"
   s.email = "ilyakatz@gmail.com"
   s.extra_rdoc_files = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/resque-history.rb",
+    "lib/resque-history/helpers/helper.rb",
     "lib/resque-history/plugins/history.rb",
     "lib/resque-history/server.rb",
     "lib/resque-history/server/views/history.erb",
@@ -40,6 +41,7 @@ Gem::Specification.new do |s|
     "resque-history.gemspec",
     "spec/redis-test.conf",
     "spec/resque-history/plugins/history_spec.rb",
+    "spec/resque-history/resque_history_helper_spec.rb",
     "spec/resque-web_spec.rb",
     "spec/spec_helper.rb",
     "test/helper.rb",

data/spec/resque-history/plugins/history_spec.rb

@@ -18,7 +18,6 @@ class MaxHistoryJob
   end
 end
 
-
 describe Resque::Plugins::History do
   it "should be compliance with Resqu::Plugin document" do
     expect { Resque::Plugin.lint(Resque::Plugins::History) }.to_not raise_error
@@ -34,7 +33,7 @@ describe Resque::Plugins::History do
       arr = Resque.redis.lrange(Resque::Plugins::History::HISTORY_SET_NAME, 0, -1)
 
       arr.count.should == 1
-      JSON.parse(arr.first).should == {"class"=>"HistoryJob", "args"=>[12], "time"=>"2000-09-01 12:00"}
+      JSON.parse(arr.first).should == {"class"=>"HistoryJob", "args"=>[12], "time"=>"2000-09-01 12:00", "execution"=>0}
     end
   end
 
@@ -70,9 +69,9 @@ describe Resque::Plugins::History do
 
       arr.count.should == 3
       arr.should == [
-          {"class"=>"HistoryJob", "args"=>[11], "time"=>"2000-09-01 12:00"},
-          {"class"=>"HistoryJob", "args"=>[12], "time"=>"2000-09-01 12:00"},
-          {"class"=>"HistoryJob", "args"=>[13], "time"=>"2000-09-01 12:00"}
+          {"class"=>"HistoryJob", "args"=>[11], "time"=>"2000-09-01 12:00", "execution"=>0},
+          {"class"=>"HistoryJob", "args"=>[12], "time"=>"2000-09-01 12:00", "execution"=>0},
+          {"class"=>"HistoryJob", "args"=>[13], "time"=>"2000-09-01 12:00", "execution"=>0}
       ].collect(&:to_json)
     end
 
@@ -101,4 +100,95 @@ describe Resque::Plugins::History do
 
   end
 
+
+  describe "record execution time" do
+
+    it "should record execution time" do
+
+      Resque.enqueue(SlowHistoryJob, 10)
+
+      Timecop.freeze(Time.local(2000, 9, 1, 12, 0, 0)) do
+        job = Resque.reserve('test')
+        job.perform
+      end
+
+      arr = Resque.redis.lrange(Resque::Plugins::History::HISTORY_SET_NAME, 0, -1)
+
+      arr.count.should == 1
+      arr.should == [
+          {"class"=>"SlowHistoryJob", "args"=>[10], "time"=>"2000-09-01 12:10", "execution"=>600}
+      ].collect(&:to_json)
+
+    end
+
+    it "should not confuse different job times" do
+
+      Resque.enqueue(SlowHistoryJob, 10)
+      Resque.enqueue(SlowHistoryJob, 5)
+
+      Timecop.freeze(Time.local(2000, 9, 1, 12, 0, 0)) do
+        job = Resque.reserve('test')
+        job.perform
+
+        job = Resque.reserve('test')
+        job.perform
+
+      end
+
+      arr = Resque.redis.lrange(Resque::Plugins::History::HISTORY_SET_NAME, 0, -1)
+
+      arr.count.should == 2
+      arr.should == [
+          {"class"=>"SlowHistoryJob", "args"=>[5], "time"=>"2000-09-01 12:15", "execution"=>300},
+          {"class"=>"SlowHistoryJob", "args"=>[10], "time"=>"2000-09-01 12:10", "execution"=>600}
+      ].collect(&:to_json)
+
+    end
+
+    it "should record times in the order of completion not in order of starting" do
+
+      #start the longer job first but it should finish last
+      Resque.enqueue(SleepyHistoryJob, 3)
+      Resque.enqueue(SleepyHistoryJob, 1)
+
+      job = Resque.reserve('test')
+      job.perform
+
+      job = Resque.reserve('test')
+      job.perform
+
+      arr = Resque.redis.lrange(Resque::Plugins::History::HISTORY_SET_NAME, 0, -1)
+
+
+      JSON.parse(arr.first)["class"].should =="SleepyHistoryJob"
+      JSON.parse(arr.first)["args"].should ==[1]
+      JSON.parse(arr.first)["execution"].should ==1
+
+
+      JSON.parse(arr.last)["class"].should =="SleepyHistoryJob"
+      JSON.parse(arr.last)["args"].should ==[3]
+      JSON.parse(arr.last)["execution"].should ==3
+
+    end
+
+  end
+
+end
+
+class SlowHistoryJob
+  extend Resque::Plugins::History
+  @queue = :test
+
+  def self.perform(time_in_minutes)
+    Timecop.travel(Time.now + 60*time_in_minutes)
+  end
+end
+
+class SleepyHistoryJob
+  extend Resque::Plugins::History
+  @queue = :test
+
+  def self.perform(time_in_seconds)
+    sleep(time_in_seconds)
+  end
 end

data/spec/resque-history/resque_history_helper_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+require 'resque-history/helpers/helper'
+
+describe Resque::History::Helper do
+
+  include  Resque::History::Helper
+
+  it "should show correct number of seconds" do
+    format_execution(40).should == "40 secs"
+  end
+
+  it "should show correct number of minutes" do
+    format_execution(600).should == "10 minutes"
+    format_execution(659).should == "10 minutes"
+    format_execution(660).should == "11 minutes"
+  end
+
+  it "should show correct number of hours" do
+    format_execution(3600).should == "1.0 hours"
+    format_execution(7200).should == "2.0 hours"
+    format_execution(5400).should == "1.5 hours"
+    format_execution(5403).should == "1.5 hours"
+    format_execution(5703).should == "1.58 hours"
+  end
+
+  it "should show correct number of days" do
+    format_execution(86400).should == "1.0 days"
+    format_execution(129600).should == "1.5 days"
+    format_execution(518400).should == "6.0 days"
+  end
+
+  it "should show that job is too long" do
+    format_execution(604800).should == "too long"
+  end
+
+end

data/spec/resque-web_spec.rb

@@ -15,6 +15,9 @@ describe ResqueHistory::Server do
 
   before do
     queues
+    Resque.enqueue(HistoryJob, 12)
+    job = Resque.reserve('test')
+    job.perform
   end
 
   it "should respond to /history" do
@@ -28,3 +31,11 @@ describe ResqueHistory::Server do
   end
 
 end
+
+class HistoryJob
+  extend Resque::Plugins::History
+  @queue = :test
+
+  def self.perform(*args)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-history
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque-history
@@ -146,6 +146,7 @@ files:
 - Rakefile
 - VERSION
 - lib/resque-history.rb
+- lib/resque-history/helpers/helper.rb
 - lib/resque-history/plugins/history.rb
 - lib/resque-history/server.rb
 - lib/resque-history/server/views/history.erb
@@ -154,6 +155,7 @@ files:
 - resque-history.gemspec
 - spec/redis-test.conf
 - spec/resque-history/plugins/history_spec.rb
+- spec/resque-history/resque_history_helper_spec.rb
 - spec/resque-web_spec.rb
 - spec/spec_helper.rb
 - test/helper.rb