atomic-sidekiq 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeb25fc1520ae4298c7643e5e012bd08afa767332db6422f1cbf5a9b2e2569af
-  data.tar.gz: d4588254c282b2e07c9c35858c351436d848be87d2b94b2bf295b489f71b4f5b
+  metadata.gz: f2e3936ff2625051b6102d8c81955b3b1cc2dd1641da22b1b4c6a620905a75d6
+  data.tar.gz: 95b7b83cec90170ee4f382e083a881ed414b0005a2e9e3481dd7b85788a57ae9
 SHA512:
-  metadata.gz: ced404ab64bc0598c8bcabbcf9e75268f4351e0900de85468e655178f4cb0f2cda9481f93725529fbccfdc6d25cd1c9d66052a16f5f54b0ccda496e85c1deee6
-  data.tar.gz: 05cdd96f7a3ab054a8a55128913738ed8baa2ef3377d5a85b6fa87d1422322d92a1b7a80ccae96bf6fcb3e4ec31026ebdb516373cbede0a98dfbfc442966753d
+  metadata.gz: cbcc5bc369abbf5557b085c3dcbd7aefa0e51413e4530ed2f59ed7569514706ae5671f891787cb4b06a7070653944c0e141879bf695e4760365e180cd7e98265
+  data.tar.gz: 6d0ee3f0031cecb1e54b88e11652a9905dc204a52d18cc16a8f4cb4dfd0c5e907277fc84bed8b082863166a6c06c662c5969c7a6683122d137911a5d06d2eee7

data/.travis.yml

@@ -3,6 +3,16 @@ sudo: false
 cache: bundler
 services:
   - redis-server
+addons:
+  chrome: stable
+  apt:
+    packages:
+      - chromium-chromedriver
+before_script:
+  # include ChromeDriver in PATH
+  - ln --symbolic /usr/lib/chromium-browser/chromedriver "${HOME}/bin/chromedriver"
+  # start Chrome and listen on localhost
+  - google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost &
 before_install:
   - gem install bundler
   - gem update bundler

data/Dockerfile

@@ -1,22 +1,28 @@
 # Choose the official Ruby 2.3.4 image as our starting point
 FROM ruby:2.5.1
 
+# Run updates
+RUN apt-get update -qq && apt-get install -y build-essential locales chromedriver
+
+ENV DEBIAN_FRONTEND noninteractive
+RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
+    locale-gen en_US.UTF-8 && \
+    dpkg-reconfigure locales && \
+    /usr/sbin/update-locale LANG=en_US.UTF-8 && \
+    rm -rf /var/lib/apt/lists/*
+
 ENV LC_ALL en_US.UTF-8
 
-# install locked bundler version (1.16.1)
-RUN gem install bundler -v 1.16.1
+# install locked bundler version (1.16.4)
+RUN gem install bundler -v 1.16.4
 ENV BUNDLE_PATH=/bundle BUNDLE_JOBS=4
 
 # Set up working directory
 ENV APP_HOME /sidekiq-atomic
 
 RUN mkdir $APP_HOME
+ADD . $APP_HOME
 
 WORKDIR $APP_HOME
 
-ADD Gemfile .
-ADD Gemfile.lock .
-
 RUN bundle install
-
-ADD . $APP_HOME

data/Gemfile.lock

@@ -7,52 +7,75 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
-    codecov (0.1.10)
+    capybara (3.1.1)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      xpath (~> 3.0)
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
+    codecov (0.1.14)
       json
       simplecov
       url
-    concurrent-ruby (1.0.5)
-    connection_pool (2.2.1)
-    daemons (1.2.6)
+    connection_pool (2.2.2)
+    daemons (1.3.1)
     diff-lcs (1.3)
-    docile (1.3.0)
-    eventmachine (1.2.5)
+    docile (1.3.1)
+    eventmachine (1.2.7)
+    ffi (1.9.25)
+    jaro_winkler (1.5.1)
     json (2.1.0)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    nokogiri (1.9.1)
+      mini_portile2 (~> 2.4.0)
     parallel (1.12.1)
-    parser (2.5.0.5)
+    parser (2.5.3.0)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
-    rack (2.0.4)
-    rack-protection (2.0.1)
+    powerpack (0.1.2)
+    public_suffix (3.0.3)
+    rack (2.0.6)
+    rack-protection (2.0.5)
       rack
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
     rainbow (3.0.0)
     rake (11.3.0)
-    redis (4.0.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    redis (4.1.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.54.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubocop (0.62.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    sidekiq (5.1.2)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
+      unicode-display_width (~> 1.4.0)
+    ruby-progressbar (1.10.0)
+    rubyzip (1.2.2)
+    selenium-webdriver (3.141.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.2, >= 1.2.2)
+    sidekiq (5.2.3)
+      connection_pool (~> 2.2, >= 2.2.2)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
     simplecov (0.16.1)
@@ -65,8 +88,10 @@ GEM
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     timecop (0.9.1)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.4.1)
     url (0.3.2)
+    xpath (3.1.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
@@ -74,12 +99,15 @@ PLATFORMS
 DEPENDENCIES
   atomic-sidekiq!
   bundler (~> 1.12)
+  capybara (~> 3.1.1)
   codecov
   rake (~> 11.3)
   rspec
   rubocop
+  selenium-webdriver
   thin
   timecop
+  xpath (~> 3.1.0)
 
 BUNDLED WITH
-   1.16.1
+   1.16.6

data/atomic-sidekiq.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name          = "atomic-sidekiq"
-  s.version       = "1.2.0"
-  s.date          = "2018-12-20"
+  s.version       = "1.3.0"
+  s.date          = "2019-01-03"
   s.summary       = "Reliable fetcher for Sidekiq"
   s.description   = "Reliable fetcher for Sidekiq"
   s.homepage      = "https://github.com/Colex/atomic-sidekiq"
@@ -22,6 +22,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "timecop", "~> 0.9"
   s.add_development_dependency "codecov", ">= 0.1.10"
   s.add_development_dependency "thin"
+  s.add_development_dependency "capybara", "~> 3.1.1"
+  s.add_development_dependency "xpath", "~> 3.1.0"
+  s.add_development_dependency "selenium-webdriver"
 
   s.add_runtime_dependency "sidekiq", "~> 5.0"
 end

data/docker-compose.yml

@@ -1,18 +1,22 @@
 version: '2'
 
 services:
-  test:
+  base:
     build: .
-    command: bin/test
     env_file:
       - docker.env
+    volumes:
+      - .:/sidekiq-atomic
+    image: sidekiq-atomic
+
+  test:
+    extends:
+      service: base
+    command: bin/test
     depends_on:
       - redis
     ports:
       - 3000:3000
-    volumes:
-      - .:/sidekiq-atomic
-    image: sidekiq-atomic
     volumes_from:
       - bundle
 

data/lib/atomic_sidekiq/in_flight_queue.rb

@@ -9,6 +9,14 @@ module AtomicSidekiq
       retrieve_jobs(keys)
     end
 
+    def delete_job(jid)
+      job_matcher = keymaker.job_matcher(jid)
+      job_keys = retrieve_keys(job_matcher)
+      return 0 if job_keys.empty?
+
+      Sidekiq.redis { |conn| conn.del(*job_keys) }
+    end
+
     private
 
     attr_reader :keymaker
@@ -31,5 +39,9 @@ module AtomicSidekiq
         keys.map { |key| JSON.parse(conn.get(key)) }
       end
     end
+
+    def retrieve_keys(key_wildcard)
+      Sidekiq.redis { |conn| conn.keys(key_wildcard) }
+    end
   end
 end

data/lib/atomic_sidekiq/web.rb

@@ -4,6 +4,7 @@ module AtomicSidekiq
 
     def self.registered(app)
       register_inflight(app)
+      register_delete_inflight(app)
       register_recovered(app)
     end
 
@@ -16,12 +17,20 @@ module AtomicSidekiq
 
         start_idx = (@current_page - 1) * @count
         end_idx = (@current_page * @count) - 1
-        @jobs = @jobs[start_idx..end_idx]
+        @jobs = @jobs[start_idx..end_idx] || []
 
         erb File.read(File.join(VIEW_PATH, "in_flight.erb"))
       end
     end
 
+    def self.register_delete_inflight(app)
+      app.post "/in-flight/:jid/delete" do
+        AtomicSidekiq::InFlightQueue.new.delete_job(route_params[:jid])
+
+        redirect "#{root_path}in-flight"
+      end
+    end
+
     def self.register_recovered(app)
       app.get "/recovered" do
         @queues = AtomicSidekiq::RecoveredStats.new.stats_by_queue

data/web/views/in_flight.erb

@@ -8,37 +8,48 @@
 </header>
 
 <div class="table_container">
-  <table class="inflight table table-hover table-bordered table-striped table-white">
+  <table id="inflight-stats" class="inflight table table-hover table-bordered table-striped table-white">
     <thead>
       <th><%= t("Total In-flight") %></th>
       <th><%= t("Estimated Lost") %></th>
     </thead>
+    <tbody>
       <tr>
         <td><%= number_with_delimiter(@total_size) %> </td>
         <td><%= number_with_delimiter(@total_size - workers.size) %> </td>
       </tr>
+    </tbody>
   </table>
 </div>
 
 <div class="table_container">
-  <table class="inflight table table-hover table-bordered table-striped table-white">
+  <table id="inflight-jobs" class="inflight table table-hover table-bordered table-striped table-white">
     <thead>
       <th><%= t("Job") %></th>
       <th><%= t("Args") %></th>
       <th><%= t("Queue") %></th>
       <th><%= t("Expires at") %></th>
+      <th><%= t("Actions") %></th>
     </thead>
-    <% @jobs&.each do |job| %>
-      <tr>
-        <td><%= h job["class"] %> </td>
-        <td><%= h job["args"] %> </td>
-        <td>
-          <a href="<%= root_path %>queues/<%= CGI.escape(job["queue"]) %>"><%= h job["queue"] %></a>
-        </td>
-        <td>
-          <%= relative_time(Time.at(job["expire_at"]))  %>
-        </td>
-      </tr>
-    <% end %>
+    <tbody>
+      <% @jobs.each do |job| %>
+        <tr>
+          <td><%= h job["class"] %> </td>
+          <td><%= h job["args"] %> </td>
+          <td>
+            <a href="<%= root_path %>queues/<%= CGI.escape(job["queue"]) %>"><%= h job["queue"] %></a>
+          </td>
+          <td>
+            <%= relative_time(Time.at(job["expire_at"]))  %>
+          </td>
+          <td>
+            <form action="<%= root_path %>in-flight/<%= CGI.escape(job["jid"]) %>/delete" method="post">
+              <%= csrf_tag if respond_to?(:csrf_tag) %>
+              <input id="jid-<%= job["jid"] %>" class='btn btn-xs btn-danger pull-left' type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('Are you sure?', :jid => job["jid"]) %>"/>
+            </form>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
   </table>
 </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atomic-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Alex Correia Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2019-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+- !ruby/object:Gem::Dependency
+  name: xpath
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement