sidekiq-cron 1.2.0 → 1.7.0

metadata

@@ -1,282 +1,143 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Ondrej Bartas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2022-07-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: sidekiq
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: fugit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 4.2.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  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: redis-namespace
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.14'
 - !ruby/object:Gem::Dependency
-  name: shoulda-context
+  name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rack-test
   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: jeweler
-  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: minitest
-  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: test-unit
-  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: sdoc
-  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: slim
-  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: sinatra
-  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: mocha
-  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: coveralls
-  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: shotgun
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: guard-minitest
+  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'
-description: Enables to set jobs to be run in specified time (using CRON notation)
+        version: '0.21'
+description: Enables to set jobs to be run in specified time (using CRON notation
+  or natural language)
 email: ondrej@bartas.cz
 executables: []
 extensions: []
@@ -284,18 +145,11 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- ".document"
-- ".travis.yml"
-- Changes.md
-- Dockerfile
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
-- config.ru
-- docker-compose.yml
-- examples/web-cron-ui.png
 - lib/sidekiq-cron.rb
 - lib/sidekiq/cron.rb
 - lib/sidekiq/cron/job.rb
@@ -303,23 +157,29 @@ 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
+- lib/sidekiq/cron/schedule_loader.rb
 - lib/sidekiq/cron/support.rb
+- lib/sidekiq/cron/version.rb
 - lib/sidekiq/cron/views/cron.erb
-- lib/sidekiq/cron/views/cron.slim
 - lib/sidekiq/cron/views/cron_show.erb
-- lib/sidekiq/cron/views/cron_show.slim
 - lib/sidekiq/cron/web.rb
 - lib/sidekiq/cron/web_extension.rb
+- lib/sidekiq/options.rb
 - sidekiq-cron.gemspec
 - test/integration/performance_test.rb
 - test/test_helper.rb
+- test/unit/fixtures/schedule_array.yml
+- test/unit/fixtures/schedule_hash.yml
+- test/unit/fixtures/schedule_string.yml
 - test/unit/job_test.rb
 - test/unit/poller_test.rb
+- test/unit/schedule_loader_test.rb
 - test/unit/web_extension_test.rb
-homepage: http://github.com/ondrejbartas/sidekiq-cron
+homepage: https://github.com/ondrejbartas/sidekiq-cron
 licenses:
 - MIT
 metadata: {}
@@ -331,16 +191,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: Sidekiq Cron helps to add repeated scheduled jobs
+summary: Scheduler/Cron for Sidekiq jobs
 test_files: []

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.travis.yml

@@ -1,18 +0,0 @@
-language: ruby
-rvm:
-  - 2.6
-  - 2.5
-  - 2.4
-  - 2.3
-  - 2.2
-services:
-  - redis-server
-branches:
-  only:
-    - master
-notifications:
-  email:
-    recipients:
-      - ondrej@bartas.cz
-env:
-  travis: 'yes'

data/Changes.md

@@ -1,82 +0,0 @@
-v 1.2.0
--------
-
-- updated readme
-- fix problem with Sidekiq::Launcher and requiring it when not needed
-- better patching of Sidekiq::Launcher
-- fixed Dockerfile
-
-v 1.1.0
--------
-
-- updated readme
-- fix unit tests - changed argument error when getting invalid cron format
-- when fallbacking old job enqueued time use `Time.parse` šwithout format (so ruby can decide best method to parse it)
-- add option `date_as_argument` which will add to your job arguments on last place `Time.now.to_f` when it was eneuqued
-- add option `description` which will allow you to add notes to your jobs so in web view you can see it
-- fixed translations
-
-v 1.0.4
--------
-
-- fix problem with upgrading to 1.0.x - parsing last enqued time didn't count with old time format stored in redis
-
-v 1.0.0
--------
-
-- use [fugit](https://github.com/floraison/fugit) instead of [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler) - API of cron didn't change (rufus scheduler is using fugit)
-- better working with Timezones
-- translations for JA, zh-CN
-- cron without timezone are considered as UTC, to add Timezone to cron use format `* * * * * Europe/Berlin`
-- be aware that this release can change when your jobs are enqueued (for me it didn't change but it is in one project, in other it can shift by different timezone setup)
-
-v 0.6.0
--------
-
-- set poller to check jobs every 30s by default (possible to override by `Sidekiq.options[:poll_interval] = 10`)
-- add group actions (enqueue, enable, disable, delete) all in web view
-- fix poller to enqueu all jobs in poll start time
-- add performance test for enqueue of jobs (10 000 jobs in less than 19s)
-- fix problem with default queue
-- remove redis-namespace from dependencies
-- update ruby versions in travis
-
-v 0.5.0
--------
-- add docker support
-- all crons are now evaluated in UTC
-- fix rufus scheduler & timezones problems
-- add support for sidekiq 4.2.1
-- fix readme
-- add Russian locale
-- user Rack.env in tests
-- faster enque of jobs
-- permit to use ActiveJob::Base.queue_name_delimiter
-- fix problem with multiple times enque #84
-- fix problem with enque of unknown class
-
-v 0.4.0
--------
-
-- enable to work with sidekiq >= 4.0.0
-- fix readme
-
-v 0.3.1
--------
-
-- add CSRF tags to forms so it will work with sidekiq >= 3.4.2
-- remove tilt dependency
-
-v 0.3.0
--------
-
-- suport for Active Job
-- sidekiq cron web ui needs to be loaded by: require 'sidekiq/cron/web'
-- add load_from_hash! and load_from_array! which cleanup jobs before adding new ones
-
-v 0.1.1
--------
-
-- add Web fontend with enabled/disable job, unqueue now, delete job
-- add cron poller - enqueu cro jobs
-- add cron job - save all needed data to redis

data/Dockerfile

@@ -1,32 +0,0 @@
-FROM ruby:2.4
-MAINTAINER Joao Serra <joaopfserra@gmail.com>
-
-RUN apt-get update && \
-    apt-get install -y --force-yes \
-            curl \
-            git \
-            wget \
-            libpq-dev && \
-    apt-get autoremove -y --force-yes && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-ENV DOCKERIZE_VERSION v0.2.0
-RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
-
-RUN gem install bundler
-
-ENV APP_HOME /sidekiq-cron
-RUN mkdir $APP_HOME
-WORKDIR $APP_HOME
-
-ADD Gemfile* $APP_HOME/
-
-ENV BUNDLE_GEMFILE=$APP_HOME/Gemfile \
-  BUNDLE_JOBS=2 \
-  BUNDLE_PATH=/bundle
-
-RUN bundle install
-
-ADD . $APP_HOME

data/VERSION

@@ -1 +0,0 @@
-1.2.0

data/config.ru

@@ -1,14 +0,0 @@
-require 'sidekiq'
-
-Sidekiq.configure_client do |config|
-  config.redis = { :size => 1 }
-end
-
-require 'sidekiq/web'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'sidekiq-cron'
-
-run Sidekiq::Web

data/docker-compose.yml

@@ -1,23 +0,0 @@
-version: '2'
-services:
-  common:
-    build:
-      context: .
-    image: sidekiq-cron-test
-    environment: &environment
-    - REDIS_URL=redis://redis.test:6379/0
-    dns:
-    - 8.8.8.8
-    - 8.8.4.4
-  redis:
-    image: redis
-  tests:
-    image: sidekiq-cron-test
-    environment: *environment
-    links:
-    - redis:redis.test
-    depends_on:
-    - common
-    command: dockerize -wait tcp://redis.test:6379 -timeout 60s bundle exec rake test
-    volumes:
-    - .:/sidekiq-cron

data/lib/sidekiq/cron/views/cron.slim

@@ -1,71 +0,0 @@
-header.row
-  .span.col-sm-5.pull-left
-    h3 = t('CronJobs')
-
-  .span.col-sm-7.pull-right style="margin-top: 20px; margin-bottom: 10px;"
-    - if @cron_jobs.size > 0
-      form.pull-right action="#{root_path}cron/__all__/delete" method="post"
-        = csrf_tag if respond_to?(:csrf_tag)
-        input.btn.btn-small.pull-left.btn-danger type="submit" name="enque" value="#{t('DeleteAll')}" data-confirm="#{t('AreYouSureDeleteCronJobs')}"
-      form.pull-right action="#{root_path}cron/__all__/disable" method="post"
-        = csrf_tag if respond_to?(:csrf_tag)
-        input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('DisableAll')}"
-      form.pull-right action="#{root_path}cron/__all__/enable" method="post"
-        = csrf_tag if respond_to?(:csrf_tag)
-        input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnableAll')}"
-      form.pull-right action="#{root_path}cron/__all__/enque" method="post"
-        = csrf_tag if respond_to?(:csrf_tag)
-        input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnqueueAll')}"
-
-- if @cron_jobs.size > 0
-
-  table class="table table-hover table-bordered table-striped"
-    thead
-      th = t('Status')
-      th = t('Name')
-      th = t('Cron')
-      th = t('Last enqueued')
-      th width="180px"
-        = t('Actions')
-
-
-    - @cron_jobs.sort{|a,b| a.sort_name <=> b.sort_name }.each_with_index do |job, index|
-      - style = "#{job.status == 'disabled' ? "background: #ecc": ""}"
-      tr
-        td[style="#{style}"]= job.status
-        td[style="#{style}"]
-          a href="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}"
-            b = job.name
-          hr style="margin:3px;border:0;"
-          small
-            - if job.message and job.message.to_s.size > 100
-              button data-toggle="collapse" data-target=".worker_#{index}" class="btn btn-mini" = t('ShowAll')
-              .toggle[class="worker_#{index}" style="display: inline;"]= job.message[0..100] + "... "
-              .toggle[class="worker_#{index}" style="display: none;"]= job.message
-            - else
-              = job.message
-
-        td[style="#{style}"]
-          b == job.cron.gsub(" ", "&nbsp;")
-        td[style="#{style}"]== job.last_enqueue_time ? relative_time(job.last_enqueue_time) : "-"
-        td[style="#{style}"]
-          -if job.status == 'enabled'
-            form action="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}/enque" method="post"
-              = csrf_tag if respond_to?(:csrf_tag)
-              input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnqueueNow')}"
-            form action="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}/disable" method="post"
-              = csrf_tag if respond_to?(:csrf_tag)
-              input.btn.btn-small.pull-left type="submit" name="disable" value="#{t('Disable')}"
-          -else
-            form action="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}/enque" method="post"
-              = csrf_tag if respond_to?(:csrf_tag)
-              input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnqueueNow')}"
-            form action="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}/enable" method="post"
-              = csrf_tag if respond_to?(:csrf_tag)
-              input.btn.btn-small.pull-left type="submit" name="enable" value="#{t('Enable')}"
-            form action="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}/delete" method="post"
-              = csrf_tag if respond_to?(:csrf_tag)
-              input.btn.btn-danger.btn-small type="submit" name="delete" value="#{t('Delete')}" data-confirm="#{t('AreYouSureDeleteCronJob', :job => job.name)}"
-
-- else
-  .alert.alert-success = t('NoCronJobsWereFound')