sidekiq-cron 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 437dc35edb85224f5e77eaa73be4adac923adb313f755f3029a4037e92a9c523
-  data.tar.gz: 517c8dd23943edb6c1e6e3059b4b6f7044ff85d13594447dbb097ff7438afc63
+  metadata.gz: 30fae647f59944364617d071e3e37b7d2d4b8b8153d4cee4aa05a1cfbfe387e5
+  data.tar.gz: c7c6ef11245172570823464e660ce427657ec676e2593b75705deddfed744d5d
 SHA512:
-  metadata.gz: 8d943877a3c9577b060ccbc86fca6e256ac6e12e7ab4ef5428091960d82d119b8087264b3fd20afcd2a191dc722f42deab5701557aa5d1fd9e0f2cfe10357b26
-  data.tar.gz: 39f3b04c168c250f0273796fb1c6f20947114d92030d60fed74d2c5087ee401b35f0b3e1fdea00a6c7eac9116d76204ce439dae7a5ba965b60978034ae472d38
+  metadata.gz: 161fe2edda57f601085515076a2a6375bcf97018124af3993de70fe16624d7b0fcaeefb1cfeac4d0ae5dbc6292ee299faf67a443b7fd8f8e044ed58f118e98f3
+  data.tar.gz: b16fb8618c719b9e9c0d39df2e1b6eb6bbaefe8ce80d1d27fea75f84c9ffc8c3fc9df8860b3409bd3d65eb2b01b3c25917a961ea9911609ed8cff5e6912e2f70

data/Changes.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.5.0
+
+- Integrate Sidekiq v6.5 breaking changes (https://github.com/ondrejbartas/sidekiq-cron/pull/331)
+- Add portuguese translations (https://github.com/ondrejbartas/sidekiq-cron/pull/332)
+
 ## 1.4.0
 
 - Fix buttons order in job show view (https://github.com/ondrejbartas/sidekiq-cron/pull/302)

data/README.md

@@ -35,6 +35,7 @@ Before upgrading to a new version, please read our [Changelog](Changes.md).
 
 - Redis 2.8 or greater is required (Redis 3.0.3 or greater is recommended for large scale use)
 - Sidekiq 4.2 or greater is required (for Sidekiq < 4 use version sidekiq-cron 0.3.1)
+- Sidekiq 6.5 requires Sidekiq-Cron 1.5+
 
 Install the gem:
 
@@ -45,7 +46,7 @@ $ gem install sidekiq-cron
 Or add to your `Gemfile` and run `bundle install`:
 
 ```ruby
-gem "sidekiq-cron", "~> 1.3"
+gem "sidekiq-cron"
 ```
 
 **NOTE** If you are not using Rails, you need to add `require 'sidekiq-cron'` somewhere after `require 'sidekiq'`.
@@ -364,6 +365,7 @@ Sidekiq-Cron is safe to use with multiple Sidekiq processes or nodes. It uses a
 * Start a feature/bugfix branch.
 * Commit and push until you are happy with your contribution.
 * Make sure to add tests for it. This is important so we don't break it in a future version unintentionally.
+* Open a pull request!
 
 ### Testing
 

data/lib/sidekiq/cron/job.rb

@@ -1,15 +1,10 @@
 require 'fugit'
 require 'sidekiq'
-require 'sidekiq/util'
 require 'sidekiq/cron/support'
 
 module Sidekiq
   module Cron
-
     class Job
-      include Util
-      extend Util
-
       #how long we would like to store informations about previous enqueues
       REMEMBER_THRESHOLD = 24 * 60 * 60
       LAST_ENQUEUE_TIME_FORMAT = '%Y-%m-%d %H:%M:%S %z'
@@ -76,7 +71,7 @@ module Sidekiq
 
         save_last_enqueue_time
         add_jid_history jid
-        logger.debug { "enqueued #{@name}: #{@message}" }
+        Sidekiq.logger.debug { "enqueued #{@name}: #{@message}" }
       end
 
       def is_active_job?
@@ -468,7 +463,7 @@ module Sidekiq
           time = Time.now.utc
           conn.zadd(job_enqueued_key, time.to_f.to_s, formated_last_time(time).to_s) unless conn.public_send(REDIS_EXISTS_METHOD, job_enqueued_key)
         end
-        logger.info { "Cron Jobs - added job with name: #{@name}" }
+        Sidekiq.logger.info { "Cron Jobs - added job with name: #{@name}" }
       end
 
       def save_last_enqueue_time
@@ -509,7 +504,7 @@ module Sidekiq
           #delete main job
           conn.del redis_key
         end
-        logger.info { "Cron Jobs - deleted job with name: #{@name}" }
+        Sidekiq.logger.info { "Cron Jobs - deleted job with name: #{@name}" }
       end
 
       # remove all job from cron
@@ -517,7 +512,7 @@ module Sidekiq
         all.each do |job|
           job.destroy
         end
-        logger.info { "Cron Jobs - deleted all jobs" }
+        Sidekiq.logger.info { "Cron Jobs - deleted all jobs" }
       end
 
       # remove "removed jobs" between current jobs and new jobs

data/lib/sidekiq/cron/locales/pt.yml

@@ -0,0 +1,22 @@
+pt:
+  Job: Tarefa
+  Cron: Cron
+  CronJobs: Tarefas do Cron
+  EnqueueNow: Enfileirar agora
+  EnableAll: Habilitar todos
+  DisableAll: Desabilitar todos
+  EnqueueAll: Enfileirar todos
+  DeleteAll: Excluir todos
+  'Cron string': Cron
+  AreYouSureEnqueueCronJobs: Tem certeza de que deseja enfileirar TODOS as tarefas?
+  AreYouSureEnqueueCronJob: Tem certeza de que deseja enfileirar a tarefa %{job}?
+  AreYouSureDeleteCronJobs: Tem certeza de que deseja excluir TODOS as tarefas?
+  AreYouSureDeleteCronJob: Tem certeza de que deseja excluir a tarefa %{job}?
+  NoCronJobsWereFound: Nenhuma tarefa foi encontrada
+  Enable: Habilitar
+  Disable: Desabilitar
+  'Last enqueued': Último enfileirado
+  disabled: desabilitado
+  enabled: habilitado
+  NoHistoryWereFound: Nenhum histórico foi encontrado
+  Description: Descrição

data/lib/sidekiq/cron/poller.rb

@@ -1,5 +1,4 @@
 require 'sidekiq'
-require 'sidekiq/util'
 require 'sidekiq/cron'
 require 'sidekiq/scheduled'
 
@@ -9,6 +8,19 @@ module Sidekiq
 
     # The Poller checks Redis every N seconds for sheduled cron jobs
     class Poller < Sidekiq::Scheduled::Poller
+      def initialize
+        Sidekiq.configure_server do |config|
+          config[:poll_interval_average] = config[:average_scheduled_poll_interval] || POLL_INTERVAL
+        end
+
+        if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("6.5.0")
+          # Sidekiq Poller init requires a config argument
+          super(Sidekiq)
+        else
+          super
+        end
+      end
+
       def enqueue
         time = Time.now.utc
         Sidekiq::Cron::Job.all.each do |job|
@@ -32,10 +44,6 @@ module Sidekiq
         Sidekiq.logger.error "CRON JOB: #{ex.backtrace.first}"
         handle_exception(ex) if respond_to?(:handle_exception)
       end
-
-      def poll_interval_average
-         Sidekiq.options[:average_scheduled_poll_interval] || POLL_INTERVAL
-      end
     end
   end
 end

data/lib/sidekiq/cron/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Cron
-    VERSION = "1.4.0"
+    VERSION = "1.5.0"
   end
 end

data/sidekiq-cron.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name = "sidekiq-cron"
   s.version = Sidekiq::Cron::VERSION
 
-  s.required_ruby_version = ">= 2.5"
+  s.required_ruby_version = ">= 2.6"
   s.require_paths = ["lib"]
   s.authors = ["Ondrej Bartas"]
   s.description = "Enables to set jobs to be run in specified time (using CRON notation)"
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
     "README.md",
     "sidekiq-cron.gemspec",
   ]
- 
+
   s.homepage = "https://github.com/ondrejbartas/sidekiq-cron"
   s.licenses = ["MIT"]
   s.summary = "Sidekiq-Cron helps to add repeated scheduled jobs"
@@ -31,11 +31,11 @@ Gem::Specification.new do |s|
   s.add_dependency("fugit", "~> 1")
   s.add_dependency("sidekiq", ">= 4.2.1")
 
-  s.add_development_dependency("minitest")
-  s.add_development_dependency("mocha")
-  s.add_development_dependency("redis-namespace", ">= 1.5.2")
-  s.add_development_dependency("rack", "~> 2.0")
-  s.add_development_dependency("rack-test", "~> 1.0")
+  s.add_development_dependency("minitest", "~> 5.15")
+  s.add_development_dependency("mocha", "~> 1.14")
+  s.add_development_dependency("redis-namespace", "~> 1.8")
+  s.add_development_dependency("rack", "~> 2.2")
+  s.add_development_dependency("rack-test", "~> 1.1")
   s.add_development_dependency("rake", "~> 13.0")
-  s.add_development_dependency("simplecov")
+  s.add_development_dependency("simplecov", "~> 0.21")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Ondrej Bartas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-28 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fugit
@@ -42,72 +42,72 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.15'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
 description: Enables to set jobs to be run in specified time (using CRON notation)
 email: ondrej@bartas.cz
 executables: []
@@ -156,6 +156,7 @@ files:
 - lib/sidekiq/cron/locales/de.yml
 - lib/sidekiq/cron/locales/en.yml
 - lib/sidekiq/cron/locales/ja.yml
+- lib/sidekiq/cron/locales/pt.yml
 - lib/sidekiq/cron/locales/ru.yml
 - lib/sidekiq/cron/locales/zh-CN.yml
 - lib/sidekiq/cron/poller.rb
@@ -183,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="