resque-job_history 0.0.13 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b4301532dbe01fd400f2fdd276beab3a790ab5f4
-  data.tar.gz: 885590015fe0fda02175694da4b1e6e3fdfc75cd
+SHA256:
+  metadata.gz: 3d6d234893805d5dc55d0f0401cb4a953c7650f281823d172ef9406d5e24839b
+  data.tar.gz: 6c49a1093ebdc6ecbe04143e6b05224b67934eb4ba0cb1c0a0458af621e8c704
 SHA512:
-  metadata.gz: fad42f3ef35691176c320fe33a5c55023664b0c29dbac8484982f86fd2c9e784097bc4be5d8e98ff74c309aa576182c295c27294ceac64bbc7dbf0d266ddda75
-  data.tar.gz: 8d1d05c15bd9f3ac0f9b277737862913b45483d837bd417dc8e99b75dbbf6deea56fbdf8231ee38ea1b829fe4553bed8192fd9ec92c9911410b59e6f568ef39e
+  metadata.gz: 9b2dd615e2f827800550bd709b4d5dcecbf6cc8df3a3fab854cb76e43da02de701419d854ba91697eee0d5b0ee5c009a903ac55610f06d077df89fbdfebc0e32
+  data.tar.gz: dca26cba1bfee9f7454bed17984f03e2799bfc6f01ad699e13704b44672cd8b9ebd7444f9f564d6058823037d40f74d89c691deadd1f3487dc6a71b2c4f94744

data/lib/resque/job_history_server.rb

@@ -41,7 +41,7 @@ module Resque
         job_history_params(base)
 
         base.class_eval do
-          get "/job%20history" do
+          get "/job history" do
             set_job_history_params
 
             erb File.read(Resque::JobHistoryServer.erb_path("job_history.erb"))
@@ -67,7 +67,7 @@ module Resque
         finished_page_params(base)
 
         base.class_eval do
-          get "/job%20history/job_class_details" do
+          get "/job history/job_class_details" do
             set_class_details_params
 
             erb File.read(Resque::JobHistoryServer.erb_path("job_class_details.erb"))
@@ -107,7 +107,7 @@ module Resque
 
       def job_details(base)
         base.class_eval do
-          get "/job%20history/job_details" do
+          get "/job history/job_details" do
             @job_class_name = params[:class_name]
             @job_id         = params[:job_id]
 
@@ -118,7 +118,7 @@ module Resque
 
       def linear_list(base)
         base.class_eval do
-          get "/job%20history/linear_history" do
+          get "/job history/linear_history" do
             @page_num  = (params[:page_num] || 1).to_i
             @page_size = (params[:page_size] ||
                 Resque::Plugins::JobHistory::HistoryDetails.linear_page_size).to_i
@@ -130,7 +130,7 @@ module Resque
 
       def add_static_files(base)
         base.class_eval do
-          get %r{job_history/public/([a-z_]+\.[a-z]+)} do
+          get %r{/job_history/public/([a-z_]+\.[a-z]+)} do
             send_file Resque::JobHistoryServer.public_path(params[:captures].first)
           end
         end
@@ -150,7 +150,7 @@ module Resque
 
       def cancel_job(base)
         base.class_eval do
-          post "/job%20history/cancel_job" do
+          post "/job history/cancel_job" do
             Resque::Plugins::JobHistory::Job.new(params[:class_name], params[:job_id]).cancel
 
             redirect u("job history/job_details?#{{ class_name: params[:class_name],
@@ -161,7 +161,7 @@ module Resque
 
       def delete_job(base)
         base.class_eval do
-          post "/job%20history/delete_job" do
+          post "/job history/delete_job" do
             Resque::Plugins::JobHistory::Job.new(params[:class_name], params[:job_id]).purge
 
             redirect u("job history/job_class_details?#{{ class_name: params[:class_name] }.to_param}")
@@ -171,7 +171,7 @@ module Resque
 
       def retry_job(base)
         base.class_eval do
-          post "/job%20history/retry_job" do
+          post "/job history/retry_job" do
             Resque::Plugins::JobHistory::Job.new(params[:class_name], params[:job_id]).retry
 
             redirect u("job history/job_class_details?#{{ class_name: params[:class_name] }.to_param}")
@@ -181,7 +181,7 @@ module Resque
 
       def purge_class(base)
         base.class_eval do
-          post "/job%20history/purge_class" do
+          post "/job history/purge_class" do
             Resque::Plugins::JobHistory::Cleaner.purge_class(params[:class_name])
 
             redirect u("job history")
@@ -191,7 +191,7 @@ module Resque
 
       def purge_all(base)
         base.class_eval do
-          post "/job%20history/purge_all" do
+          post "/job history/purge_all" do
             Resque::Plugins::JobHistory::Cleaner.purge_all_jobs
 
             redirect u("job history")
@@ -201,7 +201,7 @@ module Resque
 
       def purge_linear_history(base)
         base.class_eval do
-          post "/job%20history/purge_linear_history" do
+          post "/job history/purge_linear_history" do
             Resque::Plugins::JobHistory::Cleaner.purge_linear_history
 
             redirect u("job history")
@@ -211,7 +211,7 @@ module Resque
 
       def search_all(base)
         base.class_eval do
-          post "/job%20history/search_all" do
+          post "/job history/search_all" do
             @job_search = Resque::Plugins::JobHistory::JobSearch.new(params)
 
             @job_search.search
@@ -223,7 +223,7 @@ module Resque
 
       def search_job(base)
         base.class_eval do
-          post "/job%20history/search_job" do
+          post "/job history/search_job" do
             @job_search = Resque::Plugins::JobHistory::JobSearch.new(params)
 
             @job_search.search
@@ -235,7 +235,7 @@ module Resque
 
       def search_linear_history(base)
         base.class_eval do
-          post "/job%20history/search_linear_history" do
+          post "/job history/search_linear_history" do
             @job_search = Resque::Plugins::JobHistory::JobSearch.new(params)
 
             @job_search.search

data/lib/resque/plugins/job_history.rb

@@ -10,7 +10,7 @@ module Resque
     module JobHistory
       extend ActiveSupport::Concern
 
-      # Redis mapp:
+      # Redis map:
       #   job_history - a set of all of the class names of all jobs
       #   job_history..linear_jobs - a list of the IDs for all jobs that have run in the order
       #                                          they were started.

data/lib/resque/plugins/job_history/cleaner.rb

@@ -48,6 +48,8 @@ module Resque
               purge_class class_name
             end
 
+            purge_linear_history
+
             del_key(Resque::Plugins::JobHistory::HistoryDetails.job_history_key, "Purging job_history_key")
 
             redis.keys("*").each do |key|

data/lib/resque/plugins/job_history/history_list.rb

@@ -86,11 +86,13 @@ module Resque
         end
 
         def delete_old_jobs(job_count)
-          while job_count > max_jobs
-            job_id = redis.rpop(job_list_key)
+          while num_jobs > max_jobs
+            job_id         = redis.rpop(job_list_key)
+            job_class_name = job_class(job_id)
+
             remove_job_data(job_id)
 
-            Resque::Plugins::JobHistory::Job.new(job_class(job_id), job_id).safe_purge
+            Resque::Plugins::JobHistory::Job.new(job_class_name, job_id).safe_purge
 
             job_count -= 1
           end

data/lib/resque/plugins/job_history/job.rb

@@ -115,8 +115,7 @@ module Resque
 
         def exception_message(exception)
           if exception.is_a?(Resque::DirtyExit)
-            ("#{exception.message}\n\n#{exception.process_status&.message}\n\n" +
-                Array.wrap(exception.process_status&.backtrace).join("\n")).strip
+            "#{exception.message}\n\n#{exception.process_status.to_s}".strip
           else
             exception.message
           end

data/lib/resque/server/views/_job_summary_rows.erb

@@ -26,7 +26,7 @@
     <td>
       <% if class_info.last_run %>
         <% if class_info.last_run.finished? %>
-          <%= distance_of_time_in_words(class_info.last_run.start_time, class_info.last_run.end_time) %>
+          <%= distance_of_time_in_words((class_info.last_run.start_time || Time.now), (class_info.last_run.end_time || Time.now)) %>
           (<%= class_info.last_run.end_time %>)
         <% else %>
           Still running...

metadata

@@ -1,45 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: resque-job_history
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.18
 platform: ruby
 authors:
 - RealNobody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis-namespace
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.7
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,13 +53,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activejob
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,33 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
@@ -252,7 +252,6 @@ files:
 - lib/resque/plugins/job_history/job.rb
 - lib/resque/plugins/job_history/job_list.rb
 - lib/resque/plugins/job_history/job_search.rb
-- lib/resque/plugins/version.rb
 - lib/resque/server/public/job_history.css
 - lib/resque/server/views/_job_class_pagination.erb
 - lib/resque/server/views/_job_list_table.erb
@@ -286,8 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Keeps a history of run jobs by job.

data/lib/resque/plugins/version.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Resque
-  module Plugins
-    module JobHistory
-      VERSION = "0.0.13"
-    end
-  end
-end