sidekiq-belt 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f46a9f9e25f3ca4a020066547c25df3162a9644bd35d7a1a849d5766e0d1eac
-  data.tar.gz: 7e4153736d66d52c7f86f0721ef4239ee5a7ed51e4b4c51b41a7db2ff6e23c7d
+  metadata.gz: 7e20fc5c538638c6ec3efcc44f96a75e8a6a3a15906738e78990add18f15ff5a
+  data.tar.gz: e21c25aad43211fa210785d92c7d1e182efbec71471feb7aa48d1cc5dd802cad
 SHA512:
-  metadata.gz: a9ab0684f188afa56b7fe97c1efc88acaf381419c5d1f5f5f879eda5e22c7e7f36e7d48f5e2cf76caede6ae36381cdaf9b5429f89f0a0278269c8f31db71e24a
-  data.tar.gz: 2b07483a5a2cb6fa6d6a2af9e167857a0da4c5f7b55ee8ccce1e0e225029a71f93d39ebf94a98a39d8727614ea6e0f09445b34e7f62f89c1d27356a710efaa86
+  metadata.gz: 857d47d6d0dfbe7ffb7b2e97049c5a718877525212508afa787c506aa5497a4ac172a92bf9ee9218673f83bad99efbb076f7460a3b71d63cf2f9431bd34dfb2b
+  data.tar.gz: e14112f7c11dde264d54a5143e4d555a54206528effd0c7ae0679ef5106026b942e4e17b3d539214594b8c00e03317acd74f4514f106a526b967f17f635ee1b9

data/.rubocop.yml

@@ -1,5 +1,3 @@
-inherit_from: .rubocop_todo.yml
-
 require:
   - rubocop-rake
   - rubocop-rspec
@@ -225,3 +223,19 @@ RSpec/ExampleLength:
 
 RSpec/NestedGroups:
   Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Naming/MethodParameterName:
+  Enabled: false
+
+Naming/FileName:
+  Exclude:
+    - 'lib/sidekiq-belt.rb'
+
+RSpec/VerifiedDoubles:
+  Enabled: false
+
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.3.0] - 2023-10-07
+
+- Feature to add button to remove failed batches
+
+## [0.2.0] - 2023-10-07
+
+- Feature to Pause/Unpause Periodic Jobs
+
 ## [0.1.0] - 2023-10-07
 
-- Run manualy Periodic Jobs
+- Feature to run manualy Periodic Jobs

data/README.md

@@ -1,5 +1,13 @@
 # Sidekiq::Belt
 
+
+<a href='http://badge.fury.io/rb/sidekiq-belt'>
+    <img src="https://badge.fury.io/rb/sidekiq-belt.png" alt="Gem Version" />
+</a>
+<a href='https://github.com/dannnylo/sidekiq-belt/workflows/CI/badge.svg'>
+  <img src="https://github.com/dannnylo/sidekiq-belt/workflows/CI/badge.svg" alt="Build Status" />
+</a>
+
 This Ruby gem enhances the capabilities of Sidekiq, Sidekiq Pro, and Sidekiq Enterprise by adding essential utilities.
 
 ## Installation
@@ -14,10 +22,6 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
 ## Features
 
-GitHub Copilot: Sure, here's a rewritten version of the content that is easier to read for a developer:
-
-## Features
-
 To enable all features, add the following code to the end of the Sidekiq initializer file:
 
 ```ruby
@@ -45,52 +49,37 @@ To enable this feature, pass the `periodic_run` option:
 Sidekiq::Belt.use!([:periodic_run])
 ```
 
-![periodic_run_index](https://github.com/dannnylo/sidekiq-belt/assets/20794/1c6ceed7-c2be-447e-b61c-b1e15f002bc2)
-![periodic_run_show](https://github.com/dannnylo/sidekiq-belt/assets/20794/be8cab4b-bfb1-4e15-b01b-56c69231169b)
-
-### Pause Periodic Jobs (sidekiq-enterprise)
+![periodic_run_index](https://github.com/dannnylo/sidekiq-belt/assets/20794/0cc900bc-6925-4139-affd-f41b81318727)
+![periodic_run_show](https://github.com/dannnylo/sidekiq-belt/assets/20794/086be190-af8e-44d9-bbf6-eed94b7314a0)
 
-This feature is not yet implemented.
 
-### Delete an Unfinished Batch (sidekiq-pro)
-
-This feature is not yet implemented.
-```
-Sidekiq::Belt.use!
-```
+### Pause Periodic Jobs (sidekiq-enterprise)
 
-or
+This option adds a button to pause and unpause the cron of a periodic job.
+When a periodic job is paused, the perform is skiped and on server this content is logged.
 
 ```
-Sidekiq::Belt.use!([:all])
+2023-10-12T19:24:00.001Z pid=127183 tid=2ian INFO: Job SomeHourlyWorkerClass is paused by Periodic Pause
 ```
 
-To enable only the features you want, add the code to the Sidekiq initializer file while passing the necessary options.
+To enable this feature, pass the `periodic_pause` option:
 
+```ruby
+Sidekiq::Belt.use!([:periodic_pause])
 ```
-Sidekiq::Belt.use!([:periodic_run, :periodic_pause])
-```
-
-### Run manualy Periodic Jobs (sidekiq-enterprise)
+![periodic_pause](https://github.com/dannnylo/sidekiq-belt/assets/20794/41fbcee4-9c5b-45cd-b6f7-c359a22f3979)
+![periodic_unpause](https://github.com/dannnylo/sidekiq-belt/assets/20794/ea06ae37-068e-4f66-ab10-d83970545a59)
 
-This functionality adds a button on the Sidekiq Enterprise web page that allows manual execution of a job.
+### Delete an Unfinished Batch (sidekiq-pro)
 
-To enable this feature, pass the periodic_run option:
+This option adds a button to remove failed batches.
 
+To enable this feature, pass the `failed_batch_remove` option:
+```ruby
+Sidekiq::Belt.use!([:failed_batch_remove])
 ```
-Sidekiq::Belt.use!([:periodic_run])
-```
-
-![periodic_run_index](https://github.com/dannnylo/sidekiq-belt/assets/20794/1c6ceed7-c2be-447e-b61c-b1e15f002bc2)
-![periodic_run_show](https://github.com/dannnylo/sidekiq-belt/assets/20794/be8cab4b-bfb1-4e15-b01b-56c69231169b)
-
-### Pause Periodic Jobs (sidekiq-enterprise)
-
-It will be implemented in upcoming versions.
-
-### Delete a not finished Batch (sidekiq-pro)
+![failed_batch_remove](https://github.com/dannnylo/sidekiq-belt/assets/20794/e285a8b2-4626-48e1-b04a-5190ae51d43b)
 
-It will be implemented in upcoming versions.
 
 ## Development
 

data/lib/sidekiq/belt/community/files.rb

@@ -10,6 +10,8 @@ module Sidekiq
         def self.use!(_options = [:all])
           # all = options.include?(:all)
           # Sidekiq::Belt::Pro::Feature.load! if all || options.include?(:feature)
+
+          true
         end
       end
     end

data/lib/sidekiq/belt/ent/files.rb

@@ -16,6 +16,8 @@ module Sidekiq
 
           Sidekiq::Belt::Ent::PeriodicPause.use! if all || options.include?(:periodic_pause)
           Sidekiq::Belt::Ent::PeriodicRun.use! if all || options.include?(:periodic_run)
+
+          true
         end
       end
     end

data/lib/sidekiq/belt/ent/periodic_pause.rb

@@ -1,15 +1,84 @@
 # frozen_string_literal: true
 
+require "sidekiq/web/helpers"
+
 module Sidekiq
   module Belt
     module Ent
       module PeriodicPause
+        def paused?
+          Sidekiq.redis { |r| r.hget("PeriodicPaused", @lid.to_s) }.to_s == "p"
+        end
+
+        def pause!
+          Sidekiq.redis { |r| r.hset("PeriodicPaused", @lid.to_s, "p") }
+        end
+
+        def unpause!
+          Sidekiq.redis { |r| r.hdel("PeriodicPaused", @lid.to_s) }
+        end
+
+        module SidekiqLoopsPeriodicPause
+          PAUSE_BUTTON = <<~ERB
+            <form action="<%= root_path %>loops/<%= loup.lid %>/pause" method="post">
+              <%= csrf_tag %>
+              <input class="btn btn-danger" type="submit" name="pause" value="<%= t('Pause') %>"
+                data-confirm="Pause the job <%= loup.klass %>? <%= t('AreYouSure') %>" />
+            </form>
+          ERB
+
+          UNPAUSE_BUTTON = <<~ERB
+            <form action="<%= root_path %>loops/<%= loup.lid %>/unpause" method="post">
+              <%= csrf_tag %>
+              <input class="btn btn-danger" type="submit" name="pause" value="<%= t('Unpause') %>"
+                data-confirm="Unpause the job <%= loup.klass %>? <%= t('AreYouSure') %>" />
+            </form>
+          ERB
+
+          def self.registered(app)
+            app.replace_content("/loops") do |content|
+              # Add the top of the table
+              content.gsub!("</th>\n    </tr>", "</th><th><%= t('Pause/Unpause') %></th></th>\n    </tr>")
+
+              # Add the run button
+              content.gsub!(
+                "</td>\n      </tr>\n    <% end %>",
+                "</td>\n<td>" \
+                "<% if (loup.paused?) %>#{UNPAUSE_BUTTON}<% else %>#{PAUSE_BUTTON}<% end %>" \
+                "</td>\n      </tr>\n    <% end %>"
+              )
+            end
+
+            app.post("/loops/:lid/pause") do
+              Sidekiq::Periodic::Loop.new(params[:lid]).pause!
+
+              return redirect "#{root_path}loops"
+            end
+
+            app.post("/loops/:lid/unpause") do
+              Sidekiq::Periodic::Loop.new(params[:lid]).unpause!
+
+              return redirect "#{root_path}loops"
+            end
+          end
+        end
+
+        module PauseServer
+          def enqueue_job(cycle, ts)
+            cycle.paused? ? logger.info("Job #{cycle.klass} is paused by Periodic Pause") : super
+          end
+        end
+
         def self.use!
-          # require("sidekiq-ent/periodic")
-          # require("sidekiq-ent/periodic/static_loop")
+          require("sidekiq-ent/web")
+          require("sidekiq-ent/periodic")
+          require("sidekiq-ent/periodic/manager")
+          require("sidekiq-ent/periodic/static_loop")
 
-          # Sidekiq::Periodic::Loop.prepend(Sidekiq::Belt::Ent::PeriodicPause)
-          # Sidekiq::Periodic::StaticLoop.prepend(Sidekiq::Belt::Ent::PeriodicPause)
+          Sidekiq::Web.register(Sidekiq::Belt::Ent::PeriodicPause::SidekiqLoopsPeriodicPause)
+          Sidekiq::Periodic::Loop.prepend(Sidekiq::Belt::Ent::PeriodicPause)
+          Sidekiq::Periodic::StaticLoop.prepend(Sidekiq::Belt::Ent::PeriodicPause)
+          Sidekiq::Periodic::Manager.prepend(Sidekiq::Belt::Ent::PeriodicPause::PauseServer)
         end
       end
     end

data/lib/sidekiq/belt/pro/failed_batch_remove.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "sidekiq/web/helpers"
+
+module Sidekiq
+  module Belt
+    module Pro
+      module FailedBatchRemove
+        module SidekiqFailedBatchRemove
+          REMOVE_BUTTON = <<~ERB
+            <form action="<%= root_path %>batches/<%= bid %>/remove" method="post">
+              <%= csrf_tag %>
+              <input class="btn btn-danger" type="submit" name="remove" value="<%= t('Remove') %>"
+                data-confirm="Do you want to remove batch <%= bid %>? <%= t('AreYouSure') %>" />
+            </form>
+          ERB
+
+          def self.registered(app)
+            app.replace_content("/batches") do |content|
+              content.gsub!("</th>\n      <%", "</th><th><%= t('Delete') %></th>\n      <%")
+
+              content.gsub!(
+                "</td>\n        </tr>\n      <% end %>",
+                "</td>\n<td>#{REMOVE_BUTTON}</td>\n      </tr>\n    <% end %>"
+              )
+            end
+
+            app.post("/batches/:bid/remove") do
+              Sidekiq::Batch::Status.new(params[:bid]).delete
+
+              return redirect "#{root_path}batches"
+            end
+          end
+        end
+
+        def self.use!
+          require("sidekiq/web")
+
+          Sidekiq::Web.register(Sidekiq::Belt::Pro::FailedBatchRemove::SidekiqFailedBatchRemove)
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/belt/pro/files.rb

@@ -2,18 +2,20 @@
 
 require "sidekiq"
 
-# require_relative "feature"
+require_relative "failed_batch_remove"
 
 module Sidekiq
   module Belt
     module Pro
       module Files
-        def self.use!(_options = [:all])
+        def self.use!(options = [:all])
           return unless Sidekiq.pro?
 
+          all = options.include?(:all)
+
+          Sidekiq::Belt::Pro::FailedBatchRemove.use! if all || options.include?(:failed_batch_remove)
+
           true
-          # all = options.include?(:all)
-          # Sidekiq::Belt::Pro::Feature.load! if all || options.include?(:feature)
         end
       end
     end

data/lib/sidekiq/belt/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Belt
-    VERSION = "0.1.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/sidekiq/web_action_helper.rb

@@ -5,10 +5,6 @@ require "sidekiq/web/action"
 
 module Sidekiq
   module WebActionHelper
-    def self.blocks
-      @blocks ||= {}
-    end
-
     def render(engine, content, options = {})
       begin
         path_info = /"([^"]*)"/.match(block.source.to_s)[1]
@@ -18,7 +14,7 @@ module Sidekiq
 
       path_info ||= ::Rack::Utils.unescape(env["PATH_INFO"])
 
-      Sidekiq::WebActionHelper.blocks.fetch(path_info.to_s, []).each do |content_block|
+      Sidekiq::Config::DEFAULTS[:replace_views].fetch(path_info.to_s, []).each do |content_block|
         content_block.call(content)
       end
 

data/lib/sidekiq/web_router_helper.rb

@@ -7,8 +7,9 @@ require_relative "web_action_helper"
 module Sidekiq
   module WebRouterHelper
     def replace_content(path, &block)
-      Sidekiq::WebActionHelper.blocks[path.to_s] ||= []
-      Sidekiq::WebActionHelper.blocks[path.to_s] << block
+      Sidekiq::Config::DEFAULTS[:replace_views] ||= {}
+      Sidekiq::Config::DEFAULTS[:replace_views][path.to_s] ||= []
+      Sidekiq::Config::DEFAULTS[:replace_views][path.to_s] << block
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-belt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Danilo Jeremias da Silva
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 2023-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.1.4
 description: This Ruby gem enhances the capabilities of Sidekiq, Sidekiq Pro, and
   Sidekiq Enterprise by adding essential utilities.
 email:
@@ -34,7 +34,6 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - LICENSE
@@ -46,6 +45,7 @@ files:
 - lib/sidekiq/belt/ent/files.rb
 - lib/sidekiq/belt/ent/periodic_pause.rb
 - lib/sidekiq/belt/ent/periodic_run.rb
+- lib/sidekiq/belt/pro/failed_batch_remove.rb
 - lib/sidekiq/belt/pro/files.rb
 - lib/sidekiq/belt/version.rb
 - lib/sidekiq/web_action_helper.rb

data/.rubocop_todo.yml

@@ -1,15 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2023-10-11 15:02:29 UTC using RuboCop version 1.56.4.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-# Configuration parameters: ExpectMatchingDefinition, CheckDefinitionPathHierarchy, CheckDefinitionPathHierarchyRoots, Regex, IgnoreExecutableScripts, AllowedAcronyms.
-# CheckDefinitionPathHierarchyRoots: lib, spec, test, src
-# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
-Naming/FileName:
-  Exclude:
-    - 'lib/sidekiq-belt.rb'