sidekiq-status 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db6a8c9de958b260f3c12afef53ed33781ebbc227bbdf3b14792b41fb3ad2e20
-  data.tar.gz: 9226346a24ff25fed5608d2fd75671c5f7ae4c637c44bbf096f9cd67464b4996
+  metadata.gz: 328bd95affe0aa84cd7c797f63ba97b3d93a7d60fa003d75ede0e9996b88c399
+  data.tar.gz: db96de58b9b6e45f5ec0ecc600839778b82c4956ce43de7af55fafe42478af10
 SHA512:
-  metadata.gz: fc3a3e5537f38c180df517dcb69674fa8cef9b1938b57324db8e26b41bcaf9b3c0ef0857f5b9ebbb6ee54106440e33203d2f1d8f4f5ccea4e205ae9d71b67c6f
-  data.tar.gz: c1223771b2b7d8101d7f9ae3ef602c81cb1e408d66b6411023a2f37c7b9022d2f21dbb93addb12a8327847cb2e327df5c883f909ada59d85abdfe2f333619ba5
+  metadata.gz: 8bfe5b5a0f8566f64d3778dff4f4a923103da2fb0926c4a43eb7677b689d3898641c2c0d53438cd88f8f72c1bd6bfa1e6db60326fed08cb953ede14ec7bc43d3
+  data.tar.gz: ba8f04547ff36c3c77c6cffd75f92f908afb7dd13291eaf454838a48d5a19014d6fb8e8a3fe663f6802e496e2a60588c64e477bbda97a504dd8936f8a0c37d7a

data/.gitlab-ci.yml

@@ -0,0 +1,17 @@
+dependency_scanning:
+  image: docker:stable
+  variables:
+    DOCKER_DRIVER: overlay2
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env DEP_SCAN_DISABLE_REMOTE_CHECKS="${DEP_SCAN_DISABLE_REMOTE_CHECKS:-false}"
+        --volume "$PWD:/code"
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/dependency-scanning:$SP_VERSION" /code
+  artifacts:
+    reports:
+      dependency_scanning: gl-dependency-scanning-report.json

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 rvm:
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
+  - 2.6
+  - ruby-head
 gemfile:
   - gemfiles/sidekiq_3.x.gemfile
   - gemfiles/sidekiq_4.x.gemfile
@@ -14,3 +15,7 @@ before_install:
 services: redis
 notifications:
   email: false
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+**Version 1.1.2**
+* Job detail pages now show custom data keys (#139)
+
 **Version 1.1.1**
 * Uses SCAN rather than KEYS when retrieving job ids from Redis (#139)
 

data/lib/sidekiq-status/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Status
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
   end
 end

data/lib/sidekiq-status/web.rb

@@ -8,6 +8,7 @@ module Sidekiq::Status
 
     DEFAULT_PER_PAGE_OPTS = [25, 50, 100].freeze
     DEFAULT_PER_PAGE = 25
+    COMMON_STATUS_HASH_KEYS = %w(update_time jid status worker args label pct_complete total at message)
 
     class << self
       def per_page_opts= arr
@@ -47,9 +48,14 @@ module Sidekiq::Status
         def add_details_to_status(status)
           status['label'] = status_label(status['status'])
           status["pct_complete"] ||= pct_complete(status)
+          status["custom"] = process_custom_data(status)
           return status
         end
 
+        def process_custom_data(hash)
+          hash.reject { |key, _| COMMON_STATUS_HASH_KEYS.include?(key) }
+        end
+
         def pct_complete(status)
           return 100 if status['status'] == 'complete'
           Sidekiq::Status::pct_complete(status['jid']) || 0

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

@@ -43,6 +43,17 @@ describe 'sidekiq status web' do
     expect(last_response.body).to match(/working/)
   end
 
+  it 'shows custom data for a single job' do
+    capture_status_updates(3) do
+      CustomDataJob.perform_async
+    end
+
+    get "/statuses/#{job_id}"
+    expect(last_response).to be_ok
+    expect(last_response.body).to match(/mister_cat/)
+    expect(last_response.body).to match(/meow/)
+  end
+
   it 'show an error when the requested job ID is not found' do
     get '/statuses/12345'
     expect(last_response).to be_not_found

data/spec/support/test_jobs.rb

@@ -31,6 +31,13 @@ class DataJob < StubJob
   end
 end
 
+class CustomDataJob < StubJob
+  def perform
+    store({mister_cat: 'meow'})
+    sleep 0.5
+  end
+end
+
 class ProgressJob < StubJob
   def perform
     total 500

data/web/views/status.erb

@@ -65,6 +65,24 @@
         </p>
       </div>
     </div>
+
+    <% if @status["custom"].any? %>
+      <hr>
+      <% @status["custom"].each do |key, val| %>
+        <div class="row">
+          <div class="col-sm-2">
+            <strong><%= key %></strong>
+          </div>
+          <div class="col-sm-10">
+            <% if val && val.include?("\n") %>
+              <pre><%= val %></pre>
+            <% else  %>
+              <p><%= val || "<i>none</i>" %></p>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+    <% end %>
   </div>
 </div>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-status
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Evgeniy Tsvigun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -132,6 +132,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
 - ".travis.yml"
 - Appraisals
@@ -186,8 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: An extension to the sidekiq message processing to track your jobs