sidekiq-status 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c3bd23f9fe0e80f8354ca3860fbeb5e5f7ca44d
-  data.tar.gz: 1ad626cad36a7f56fab5f4ca89350c55879a2d86
+  metadata.gz: 1750cf2e429082ad9d404598e45fe7bf15bb31cc
+  data.tar.gz: 708de7f5f0a83d59fec644600f2a4e70e99c89d5
 SHA512:
-  metadata.gz: 46cbab187b63bc2fb458e7530180a7f0b41858067213346297ec45dc62bdd04db997b2e2031205cf426d3e6eafe9921c4d22491cbcb7f86be0dda4875e3ac8d6
-  data.tar.gz: e187d76f19d38d903df4258d8a55627da09e5cf4a9faf20b51ce16f682206cbe526142a4c88b8abb3fa993ab2bca7e21866dcd9e5e4591fe937fb3ce7c1810cb
+  metadata.gz: 7228891c5252a1df3da9ad85942552f5426a466d18ddc6b9e963ad3ec6f91512ecaadeb8e0ff00c09f36d2c9a044cfb44619271b772637b88c044868d15fdc4c
+  data.tar.gz: 56a416d652d875528fd64cebaa490fc3ae173ba96d8ea080c7d2d202a67ecdc11d365c66d3d4cac4691977a5d8d2b006addc0f84cbb2a7fca52ad3fa5cb07530

data/.travis.yml

@@ -1,16 +1,11 @@
 language: ruby
 rvm:
-  - 2.0
-  - 2.1
   - 2.2
-  - rbx-2
+  - 2.3
+  - 2.4
 gemfile:
-  - gemfiles/Gemfile.sidekiq-2
   - Gemfile
 before_install:
   - gem update --system
   - gem update bundler
 services: redis
-matrix:
-  allow_failures:
-    - rvm: rbx-2

data/CHANGELOG.md

@@ -1,16 +1,26 @@
+Version 0.7.0
++ Sidekiq 4.2 and 5 now supported
++ Added full support for ActiveJob
++ Updated Web UI
+  + Styling updated to stay consistent with Sidekiq UI
+  + Added header sorting
+  + Fixed argument formatting
+  + Times now display using natural language via ChronicDuration
++ Test suite fixed
+
 Version 0.6.0
-+ Updated Web UI 
++ Updated Web UI
   + Will have all job statuses, previously it was showing only :working status
-  + Bootstrap lables instead of badges for status 
-  + Added Arguments column to statuses page 
-+ New :interrupted status added 
+  + Bootstrap lables instead of badges for status
+  + Added Arguments column to statuses page
++ New :interrupted status added
 + Added way to specify :expiration for Sidekiq::Status::ClientMiddleware
-+ Bug fixes & Code cleaup 
++ Bug fixes & Code cleaup
 
-Version 0.5.3 
+Version 0.5.3
 + some tweaks in web UI, separate redis namespace
 
-Version 0.5.2 
+Version 0.5.2
 + Sidekiq versions up to 3.3.* supported, jobs sorting options in web UI, more ruby versions
 
 Version 0.5.1
@@ -20,4 +30,4 @@ Version 0.5.0
 + Sidekiq v3 support, redis pools support
 
 Version 0.4.0
-+ WebUI added, per-worker expiration setting enabled
++ WebUI added, per-worker expiration setting enabled

data/Gemfile

@@ -2,7 +2,3 @@
 source "https://rubygems.org"
 
 gemspec
-
-group :test do 
-  gem 'celluloid'
-end

data/README.md

@@ -10,7 +10,18 @@ by [resque-status](http://github.com/quirkey/resque-status) and mostly copying i
 
 ## Installation
 
-gem install sidekiq-status
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'sidekiq-status'
+```
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    gem install sidekiq-status
 
 ## Usage
 
@@ -115,7 +126,7 @@ class MyJob
     store vino: 'veritas'
 
     # a way of retrieving said data
-    # remember that retrieved data is always is String|nil
+    # remember that retrieved data is always String|nil
     vino = retrieve :vino
   end
 end
@@ -145,10 +156,18 @@ Sidekiq::Status.unschedule '' #=> false
 ```
 Important: If you try any of the status method after the expiration time for scheduled jobs, will result into `nil` or `false`. But job will be in sidekiq's scheduled queue and will execute normally, once job is started on scheduled time you will get status info for job till expiration time defined on `Sidekiq::Status::ServerMiddleware`.
 
+### Deleting Status by Job ID
+```ruby
+# returns number of keys/jobs that were removed
+Sidekiq::Status.delete(job_id) #=> 1
+Sidekiq::Status.delete(bad_job_id) #=> 0
+```
+
 ### Sidekiq web integration
 
-Sidekiq::Status also provides an extension to Sidekiq web interface with a `/statuses`.
-![Sidekiq Status Web](https://raw.github.com/utgarda/sidekiq-status/master/web/sidekiq-status-web.png)
+Sidekiq::Status also provides an extension to Sidekiq web interface with an index at `/statuses` and a single job at `/statuses/123`.
+![Sidekiq Status Web](web/sidekiq-status-web.png)
+![Sidekiq Status Web](web/sidekiq-status-single-web.png)
 
 Setup Sidekiq web interface according to Sidekiq documentation and add the Sidekiq::Status::Web require:
 
@@ -177,9 +196,16 @@ To use `sidekiq-status` inlining, require it too in your `{test,spec}_helper.rb`
 
 `require 'sidekiq-status/testing/inline'`
 
+## Contributing
+
+Bug reports and pull requests are welcome. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
-### Features coming
-* Stopping jobs by id
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes along with test cases (`git commit -am 'Add some feature'`)
+4. If possible squash your commits to one commit if they all belong to same feature.
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create new Pull Request.
 
 ## Thanks
 * Pramod Shinde
@@ -194,4 +220,4 @@ To use `sidekiq-status` inlining, require it too in your `{test,spec}_helper.rb`
 
 ## License
 MIT License , see LICENSE for more details.
-© 2012 - 2015 Evgeniy Tsvigun
+© 2012 - 2016 Evgeniy Tsvigun

data/lib/sidekiq-status.rb

@@ -4,6 +4,7 @@ require 'sidekiq-status/worker'
 require 'sidekiq-status/client_middleware'
 require 'sidekiq-status/server_middleware'
 require 'sidekiq-status/web' if defined?(Sidekiq::Web)
+require 'chronic_duration'
 
 module Sidekiq::Status
   extend Storage
@@ -21,8 +22,8 @@ module Sidekiq::Status
     # Get all status fields for a job
     # @params [String] id job id returned by async_perform
     # @return [Hash] hash of all fields stored for the job
-    def get_all(id)
-      read_hash_for_id(id)
+    def get_all(job_id)
+      read_hash_for_id(job_id)
     end
 
     def status(job_id)
@@ -34,6 +35,10 @@ module Sidekiq::Status
       delete_and_unschedule(job_id, job_unix_time)
     end
 
+    def delete(job_id)
+      delete_status(job_id)
+    end
+
     alias_method :unschedule, :cancel
 
     STATUS.each do |name|

data/lib/sidekiq-status/client_middleware.rb

@@ -1,3 +1,4 @@
+require 'sidekiq/api'
 module Sidekiq::Status
 # Should be in the client middleware chain
   class ClientMiddleware
@@ -17,14 +18,22 @@ module Sidekiq::Status
     # @param [String] queue the queue's name
     # @param [ConnectionPool] redis_pool optional redis connection pool
     def call(worker_class, msg, queue, redis_pool=nil)
-      initial_metadata = { 
+      initial_metadata = {
         jid: msg['jid'],
         status: :queued,
-        worker: worker_class, 
-        args: msg['args'].to_a.empty? ? nil : msg['args'].to_json
+        worker: Sidekiq::Job.new(msg, queue).display_class,
+        args: display_args(msg, queue)
       }
       store_for_id msg['jid'], initial_metadata, @expiration, redis_pool
       yield
     end
+
+    def display_args(msg, queue)
+      job = Sidekiq::Job.new(msg, queue)
+      return job.display_args.to_a.empty? ? nil : job.display_args.to_json
+    rescue Exception => e
+      # For Sidekiq ~> 2.7
+      return msg['args'].to_a.empty? ? nil : msg['args'].to_json
+    end
   end
-end
+end

data/lib/sidekiq-status/storage.rb

@@ -52,6 +52,15 @@ module Sidekiq::Status::Storage
     false
   end
 
+  # Deletes status hash info for given job id
+  # @param[String] job id
+  # @retrun [Integer] number of keys that were removed
+  def delete_status(id)
+    redis_connection do |conn|
+      conn.del(key(id))
+    end
+  end
+
   # Gets a single valued from job status hash
   # @param [String] id job id
   # @param [String] Symbol field fetched field name

data/lib/sidekiq-status/testing/inline.rb

@@ -6,5 +6,11 @@ module Sidekiq
       end
     end
   end
+  
+  module Storage
+    def store_status(id, status, expiration = nil, redis_pool=nil)
+      'ok'
+    end
+  end
 end
 

data/lib/sidekiq-status/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Status
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

data/lib/sidekiq-status/web.rb

@@ -22,7 +22,7 @@ module Sidekiq::Status
 
         def pct_complete(status)
           return 100 if status['status'] == 'complete'
-          Sidekiq::Status::pct_complete(status['jid'])
+          Sidekiq::Status::pct_complete(status['jid']) || 0
         end
 
         def status_label(status)
@@ -64,20 +64,22 @@ module Sidekiq::Status
           sort_dir = "desc"
           @statuses = @statuses.sort { |y,x| x.send(sort_by) <=> y.send(sort_by) }
         end
-        
+
         working_jobs = @statuses.select{|job| job.status == "working"}
-        if working_jobs.size >= 25
-          @statuses = working_jobs
+        size = params[:size] ? params[:size].to_i : 25
+        if working_jobs.size >= size
+         @statuses = working_jobs
         else
-          @statuses = (@statuses.size >= 25) ? @statuses.take(25) : @statuses 
+         @statuses = (@statuses.size >= size) ? @statuses.take(size) : @statuses
         end
-        
+
+
         @headers = [
-          { id: "worker", name: "Worker/jid", class: nil, url: nil},
+          { id: "worker", name: "Worker / JID", class: nil, url: nil},
+          { id: "args", name: "Arguments", class: nil, url: nil},
           { id: "status", name: "Status", class: nil, url: nil},
           { id: "update_time", name: "Last Updated", class: nil, url: nil},
           { id: "pct_complete", name: "Progress", class: nil, url: nil},
-          { id: "message", name: "Message", class: nil, url: nil}
         ]
 
         @headers.each do |h|
@@ -89,6 +91,17 @@ module Sidekiq::Status
 
         erb(sidekiq_status_template(:statuses))
       end
+
+      app.get '/statuses/:jid' do
+        job = Sidekiq::Status::get_all params['jid']
+
+        if job.empty?
+          halt [404, {"Content-Type" => "text/html"}, [erb(sidekiq_status_template(:status_not_found))]]
+        else
+          @status = OpenStruct.new(add_details_to_status(job))
+          erb(sidekiq_status_template(:status))
+        end
+      end
     end
   end
 end

data/lib/sidekiq-status/worker.rb

@@ -11,14 +11,14 @@ module Sidekiq::Status::Worker
   # @param [Hash] status_updates updated values
   # @return [String] Redis operation status code
   def store(hash)
-    store_for_id @jid, hash, @expiration
+    store_for_id @provider_job_id || @job_id || @jid, hash, @expiration
   end
 
   # Read value from job status hash
   # @param String|Symbol hask key
   # @return [String]
   def retrieve(name)
-    read_field_for_id @jid, name
+    read_field_for_id @provider_job_id || @job_id || @jid, name
   end
 
   # Sets current task progress

data/sidekiq-status.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   gem.version       = Sidekiq::Status::VERSION
 
   gem.add_dependency                  'sidekiq', '>= 2.7'
+  gem.add_dependency                  'chronic_duration'
   gem.add_development_dependency      'rack-test'
   gem.add_development_dependency      'rake'
   gem.add_development_dependency      'rspec'

data/spec/environment.rb

@@ -0,0 +1 @@
+# This file has been intentionally left blank

data/spec/lib/sidekiq-status/client_middleware_spec.rb

@@ -5,9 +5,6 @@ describe Sidekiq::Status::ClientMiddleware do
   let!(:redis) { Sidekiq.redis { |conn| conn } }
   let!(:job_id) { SecureRandom.hex(12) }
 
-  # Clean Redis before each test
-  before { redis.flushall }
-
   describe "#call" do
     before { client_middleware }
     it "sets queued status" do

data/spec/lib/sidekiq-status/server_middleware_spec.rb

@@ -5,11 +5,6 @@ describe Sidekiq::Status::ServerMiddleware do
   let!(:redis) { Sidekiq.redis { |conn| conn } }
   let!(:job_id) { SecureRandom.hex(12) }
 
-  # Clean Redis before each test
-  # Seems like flushall has no effect on recently published messages,
-  # so we should wait till they expire
-  before { redis.flushall; sleep 0.1 }
-
   describe "#call" do
     it "sets working/complete status" do
       thread = confirmations_thread 4, "status_updates", "job_messages_#{job_id}"
@@ -35,8 +30,8 @@ describe Sidekiq::Status::ServerMiddleware do
       expect(Sidekiq::Status::failed?(job_id)).to be_truthy
     end
 
-    context "sets interrupted status" do 
-      it "on system exit signal" do 
+    context "sets interrupted status" do
+      it "on system exit signal" do
         allow(SecureRandom).to receive(:hex).once.and_return(job_id)
         start_server do
           expect(capture_status_updates(3) {
@@ -47,7 +42,7 @@ describe Sidekiq::Status::ServerMiddleware do
         expect(Sidekiq::Status::interrupted?(job_id)).to be_truthy
       end
 
-      it "on interrupt signal" do 
+      it "on interrupt signal" do
         allow(SecureRandom).to receive(:hex).once.and_return(job_id)
         start_server do
           expect(capture_status_updates(3) {
@@ -79,7 +74,7 @@ describe Sidekiq::Status::ServerMiddleware do
       start_server(:expiration => huge_expiration) do
         StubJob.perform_async(:arg1 => 'val1')
       end
-      expect((Sidekiq::Status::DEFAULT_EXPIRY+1)..huge_expiration).to cover redis.ttl("sidekiq:status:#{job_id}")
+      expect((Sidekiq::Status::DEFAULT_EXPIRY-1)..huge_expiration).to cover redis.ttl("sidekiq:status:#{job_id}")
     end
 
     it "can be overwritten by worker expiration method" do

data/spec/lib/sidekiq-status/web_spec.rb

@@ -8,30 +8,44 @@ describe 'sidekiq status web' do
   let!(:redis) { Sidekiq.redis { |conn| conn } }
   let!(:job_id) { SecureRandom.hex(12) }
 
-  # Clean Redis before each test
-  # Seems like flushall has no effect on recently published messages,
-  # so we should wait till they expire
-  before { redis.flushall; sleep 0.1 }
-
   def app
     Sidekiq::Web
   end
 
-  it 'shows a job in progress' do
+  before do
     client_middleware
     allow(SecureRandom).to receive(:hex).and_return(job_id)
+  end
+
+  around { |example| start_server(&example) }
+
+  it 'shows the list of jobs in progress' do
+    capture_status_updates(2) do
+      expect(LongJob.perform_async(1)).to eq(job_id)
+    end
 
-    start_server do
-      capture_status_updates(2) do
-        expect(LongJob.perform_async(1)).to eq(job_id)
-      end
+    get '/statuses'
+    expect(last_response).to be_ok
+    expect(last_response.body).to match(/#{job_id}/)
+    expect(last_response.body).to match(/LongJob/)
+    expect(last_response.body).to match(/working/)
+  end
 
-      get '/statuses'
-      expect(last_response).to be_ok
-      expect(last_response.body).to match(/#{job_id}/)
-      expect(last_response.body).to match(/LongJob/)
-      expect(last_response.body).to match(/working/)
+  it 'shows a single job in progress' do
+    capture_status_updates(2) do
+      LongJob.perform_async(1, 'another argument')
     end
+
+    get "/statuses/#{job_id}"
+    expect(last_response).to be_ok
+    expect(last_response.body).to match(/#{job_id}/)
+    expect(last_response.body).to match(/1,"another argument"/)
+    expect(last_response.body).to match(/working/)
   end
 
+  it 'show an error when the requested job ID is not found' do
+    get '/statuses/12345'
+    expect(last_response).to be_not_found
+    expect(last_response.body).to match(/That job can't be found/)
+  end
 end

data/spec/lib/sidekiq-status_spec.rb

@@ -9,11 +9,6 @@ describe Sidekiq::Status do
   let!(:plain_sidekiq_job_id) { SecureRandom.hex(12) }
   let!(:retried_job_id) { SecureRandom.hex(12) }
 
-  # Clean Redis before each test
-  # Seems like flushall has no effect on recently published messages,
-  # so we should wait till they expire
-  before { redis.flushall; sleep 0.1 }
-
   describe ".status, .working?, .complete?" do
     it "gets job status by id as symbol" do
       allow(SecureRandom).to receive(:hex).once.and_return(job_id)
@@ -82,6 +77,23 @@ describe Sidekiq::Status do
     end
   end
 
+  describe '.delete' do
+    it 'deletes the status hash for given job id' do
+      allow(SecureRandom).to receive(:hex).once.and_return(job_id)
+      start_server do
+        expect(capture_status_updates(2) {
+          expect(LongJob.perform_async(1)).to eq(job_id)
+        }).to eq([job_id]*2)
+      end
+      expect(Sidekiq::Status.delete(job_id)).to eq(1)
+    end
+
+    it 'should not raise error while deleting status hash if invalid job id' do
+      allow(SecureRandom).to receive(:hex).once.and_return(job_id)
+      expect(Sidekiq::Status.delete(job_id)).to eq(0)
+    end
+  end
+
   describe ".cancel" do
     it "cancels a job by id" do
       allow(SecureRandom).to receive(:hex).twice.and_return(job_id, job_id_1)

data/spec/spec_helper.rb

@@ -1,15 +1,21 @@
 require "rspec"
 
-require 'celluloid'
 require 'sidekiq'
 require 'sidekiq/processor'
 require 'sidekiq/manager'
 require 'sidekiq-status'
 
+# Clears jobs before every test
+RSpec.configure do |config|
+  config.before(:each) do
+    Sidekiq.redis { |conn| conn.flushall }
+    sleep 0.05
+  end
+end
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-def client_middleware(client_middleware_options={}) 
+def client_middleware(client_middleware_options={})
   Sidekiq.configure_client do |config|
     config.client_middleware do |chain|
       chain.add Sidekiq::Status::ClientMiddleware, client_middleware_options
@@ -52,7 +58,9 @@ def start_server(server_middleware_options={})
     $stderr.reopen File::NULL, 'w'
     require 'sidekiq/cli'
     Sidekiq.options[:queues] << 'default'
-    Sidekiq.options[:require] =  File.expand_path('../support/test_jobs.rb', __FILE__)
+    Sidekiq.options[:require] = File.expand_path('environment.rb', File.dirname(__FILE__))
+    Sidekiq.options[:timeout] = 1
+    Sidekiq.options[:concurrency] = 5
     Sidekiq.configure_server do |config|
       config.redis = Sidekiq::RedisConnection.create
       config.server_middleware do |chain|
@@ -65,7 +73,7 @@ def start_server(server_middleware_options={})
   yield
   sleep 0.1
   Process.kill 'TERM', pid
-  Timeout::timeout(10) { Process.wait pid } rescue Timeout::Error
+  Timeout::timeout(5) { Process.wait pid } rescue Timeout::Error
 ensure
   Process.kill 'KILL', pid rescue "OK" # it's OK if the process is gone already
 end

data/spec/support/test_jobs.rb

@@ -1,3 +1,5 @@
+require 'sidekiq-status'
+
 class StubJob
   include Sidekiq::Worker
   include Sidekiq::Status::Worker
@@ -10,7 +12,7 @@ end
 
 class LongJob < StubJob
   def perform(*args)
-    sleep args[0] || 1
+    sleep args[0] || 0.25
   end
 end
 

data/web/views/status.erb

@@ -0,0 +1,73 @@
+<style>
+  .progress {
+    background-color: #C8E1ED;
+  }
+  .progress-percentage {
+    margin: 5px;
+    padding-left: 4px;
+    color: #333;
+    text-align: left;
+    text-shadow: 0 0 5px white;
+    font-weight: bold;
+    font-size: 14px;
+  }
+</style>
+
+<h3>
+  Job Status: <%= @status.jid %>
+  <span class='label label-<%= @status.label %>'>
+    <%= @status.status %>
+  </span>
+</h3>
+
+<div class="progress" style="height: 30px;">
+  <div class="progress-bar" role="progressbar" aria-valuenow="<%= @status.pct_complete.to_i %>" aria-valuemin="0" aria-valuemax="100" style="width: <%= @status.pct_complete.to_i %>%">
+    <div class="progress-percentage">
+      <%= @status.pct_complete.to_i %>%
+    </div>
+  </div>
+</div>
+
+<div class="panel panel-default">
+  <div class="panel-body">
+    <h4><%= @status.worker %></h4>
+
+    <div class="row">
+      <div class="col-sm-2">
+        <strong>Arguments</strong>
+      </div>
+      <div class="col-sm-10">
+        <p><%= @status.args.empty? ? "<i>none</i>" : @status.args %></p>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-sm-2">
+        <strong>Message</strong>
+      </div>
+      <div class="col-sm-10">
+        <p><%= @status.message || "<i>none</i>" %></p>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-sm-2">
+        <strong>Last Updated</strong>
+      </div>
+      <div class="col-sm-10">
+        <p>
+          <% secs = Time.now.to_i - @status.update_time.to_i %>
+          <% if secs > 0 %>
+            <%= secs %> sec<%= secs == 1 ? '' : 's' %> ago
+          <% else %>
+            Now
+          <% end %>
+        </p>
+      </div>
+    </div>
+  </div>
+</div>
+
+<a href="<%= root_path %>statuses">
+  <small>&larr; back to all statuses</small>
+</a>

data/web/views/status_not_found.erb

@@ -0,0 +1,5 @@
+<h3>Job Status: <%= params[:jid] %></h3>
+
+<div class="alert alert-danger" role="alert">
+  <strong>Uh oh!</strong> That job can't be found. It may have expired already.
+</div>

data/web/views/statuses.erb

@@ -4,8 +4,8 @@
   background-color: #C8E1ED;
 }
 .bar {
-  background-color: #2897cb; 
-  color: white; 
+  background-color: #2897cb;
+  color: white;
   text-shadow: 0 0 0;
 }
 .message {
@@ -16,21 +16,28 @@
 .header{
   text-align: center;
 }
+.header_update_time{
+  width: 10%;
+}
+.header_pct_complete{
+  width: 45%;
+}
+
 </style>
 
 <h3 class="wi">Recent job statuses</h3>
-<table class="table table-hover table-bordered table-striped table-white">  
+<table class="table table-hover table-bordered table-striped table-white">
   <tr>
-    <th class="header">Worker/jid</th>
-    <th class="header">Arguments</th>
-    <th class="header">Status</th>
-    <th class="header" style="width: 10%;">Last Updated</th>
-    <th class="header" style="width: 45%;">Progress</th>
+    <% @headers.each do |h| %>
+      <th class="header <%= h[:class] %> header_<%= h[:id] %>">
+        <a href="<%= h[:url] %>"><%= h[:name] %></a>
+      </th>
+    <% end %>
   </tr>
   <% @statuses.each do |container| %>
     <tr>
       <td>
-        <div title='<%= container.jid %>'><%= container.worker %></div>
+        <div title='<%= container.jid %>'><a href="<%= root_path %>statuses/<%= container.jid %>"><%= container.worker %></a></div>
       </td>
       <td>
         <div class='args' title='<%= container.jid %>'><%= container.args %></div>
@@ -39,9 +46,9 @@
         <div class='label label-<%= container.label %>'><%= container.status %></div>
       </td>
       <% secs = Time.now.to_i - container.update_time.to_i %>
-      <td style='text-align: center;'>
+      <td style='text-align: center; white-space: nowrap;' title="<%= Time.at(container.update_time.to_i) %>">
         <% if secs > 0 %>
-          <%= secs %> sec<%= secs == 1 ? '' : 's' %> ago
+          <%= ChronicDuration.output(secs, :weeks => true, :units => 2) %> ago
         <% else %>
           Now
         <% end %>
@@ -65,4 +72,4 @@
       <td colspan="6"></td>
     </tr>
   <% end %>
-</table>
+</table>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-status
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Evgeniy Tsvigun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-27 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: chronic_duration
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +109,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/Gemfile.sidekiq-2
 - lib/sidekiq-status.rb
 - lib/sidekiq-status/client_middleware.rb
 - lib/sidekiq-status/server_middleware.rb
@@ -105,6 +118,7 @@ files:
 - lib/sidekiq-status/web.rb
 - lib/sidekiq-status/worker.rb
 - sidekiq-status.gemspec
+- spec/environment.rb
 - spec/lib/sidekiq-status/client_middleware_spec.rb
 - spec/lib/sidekiq-status/server_middleware_spec.rb
 - spec/lib/sidekiq-status/testing_spec.rb
@@ -113,7 +127,10 @@ files:
 - spec/lib/sidekiq-status_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_jobs.rb
+- web/sidekiq-status-single-web.png
 - web/sidekiq-status-web.png
+- web/views/status.erb
+- web/views/status_not_found.erb
 - web/views/statuses.erb
 homepage: http://github.com/utgarda/sidekiq-status
 licenses:
@@ -135,11 +152,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: An extension to the sidekiq message processing to track your jobs
 test_files:
+- spec/environment.rb
 - spec/lib/sidekiq-status/client_middleware_spec.rb
 - spec/lib/sidekiq-status/server_middleware_spec.rb
 - spec/lib/sidekiq-status/testing_spec.rb

data/gemfiles/Gemfile.sidekiq-2

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: '..'
-
-gem 'sidekiq', '~> 2.17'