sidekiq-cron 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5929e2b3d41bf1078869e244c7b660ef7579f72
-  data.tar.gz: a3c65448ccd82839b5be5a28dfc5e03af49c65ea
+  metadata.gz: cb2f152cb3faf85dbc089e10820fd48d7c23f6ad
+  data.tar.gz: 4ced419b5c9ddaeb43a6ebd62221cdbd95eb2c91
 SHA512:
-  metadata.gz: ebe5552febba15ae6bf714c7185ac08de582a4eddd848f9abb7951e8e1385d9db0e9943ac184869d51d65f67d0c2fedf36c153c66d32ca0c742bf652cb2bfb94
-  data.tar.gz: 9c625373d217af3fe7d62a987a93bd7e01d74ea8c71c1d54a5b8728f7db643da975a4605ffe8ca27685ee9ee612c016ee92b313490b8aaa34e8464bcc90d7e66
+  metadata.gz: d882bd7a34f478fc9ea3eb591c6ffe01df2b360ba501ef2df13aa3d7631f77a97a393bc5a391ec682810766dbfe8790bb8a42ed29fc69a666623753103c4c994
+  data.tar.gz: 4bbdf927f3830a9a62e2bf622bf34492555e0a8051f303a0a712eda46a818a5dfd78b5de913e137e39b91f046a05247ae2a133cabe1573fa1b4f21307f721b24

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-  - 2.6.0
-  - 2.5.0
-  - 2.4.3
-  - 2.3.6
-  - 2.2.9
+  - 2.6
+  - 2.5
+  - 2.4
+  - 2.3
+  - 2.2
 services:
   - redis-server
 branches:
@@ -16,7 +16,3 @@ notifications:
       - ondrej@bartas.cz
 env:
   travis: 'yes'
-matrix:
-  allow_failures:
-    - rvm: jruby-19mode
-    - rvm: rbx-19mode

data/Changes.md

@@ -1,3 +1,21 @@
+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
 -------
 

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.3.1
+FROM ruby:2.4
 MAINTAINER Joao Serra <joaopfserra@gmail.com>
 
 RUN apt-get update && \

data/README.md

@@ -42,7 +42,7 @@ Installation
 
 or add to your `Gemfile`
 
-    gem "sidekiq-cron", "~> 1.0"
+    gem "sidekiq-cron", "~> 1.1"
 
 
 Getting Started

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/docker-compose.yml

@@ -18,4 +18,6 @@ services:
     - redis:redis.test
     depends_on:
     - common
-    command: dockerize -wait tcp://redis.test:6379 -timeout 60s rake test
+    command: dockerize -wait tcp://redis.test:6379 -timeout 60s bundle exec rake test
+    volumes:
+    - .:/sidekiq-cron

data/lib/sidekiq/cron/launcher.rb

@@ -1,6 +1,3 @@
-# require  Sidekiq original launcher
-require 'sidekiq/launcher'
-
 # require cron poller
 require 'sidekiq/cron/poller'
 
@@ -10,44 +7,41 @@ require 'sidekiq/cron/poller'
 # we are creating new cron poller instance and
 # adding start and stop commands to launcher
 module Sidekiq
-  class Launcher
-    # Add cron poller to launcher
-    attr_reader :cron_poller
-
-    # remember old initialize
-    alias_method :old_initialize, :initialize
-
-    # add cron poller and execute normal initialize of Sidekiq launcher
-    def initialize(options)
-      @cron_poller = Sidekiq::Cron::Poller.new
-      old_initialize options
-    end
-
-    # remember old run
-    alias_method :old_run, :run
-
-    # execute normal run of launcher and run cron poller
-    def run
-      old_run
-      cron_poller.start
-    end
-
-    # remember old quiet
-    alias_method :old_quiet, :quiet
-
-    # execute normal quiet of launcher and quiet cron poller
-    def quiet
-      cron_poller.terminate
-      old_quiet
+  module Cron
+    module Launcher
+      # Add cron poller to launcher
+      attr_reader :cron_poller
+
+      # add cron poller and execute normal initialize of Sidekiq launcher
+      def initialize(options)
+        @cron_poller = Sidekiq::Cron::Poller.new
+        super(options)
+      end
+
+      # execute normal run of launcher and run cron poller
+      def run
+        super
+        cron_poller.start
+      end
+
+      # execute normal quiet of launcher and quiet cron poller
+      def quiet
+        cron_poller.terminate
+        super
+      end
+
+      # execute normal stop of launcher and stop cron poller
+      def stop
+        cron_poller.terminate
+        super
+      end
     end
+  end
+end
 
-    # remember old stop
-    alias_method :old_stop, :stop
+Sidekiq.configure_server do
+  # require  Sidekiq original launcher
+  require 'sidekiq/launcher'
 
-    # execute normal stop of launcher and stop cron poller
-    def stop
-      cron_poller.terminate
-      old_stop
-    end
-  end
+  ::Sidekiq::Launcher.prepend(Sidekiq::Cron::Launcher)
 end

data/lib/sidekiq/cron/poller.rb

@@ -17,8 +17,8 @@ module Sidekiq
       rescue => ex
         # Most likely a problem with redis networking.
         # Punt and try again at the next interval
-        logger.error ex.message
-        logger.error ex.backtrace.first
+        Sidekiq.logger.error ex.message
+        Sidekiq.logger.error ex.backtrace.first
         handle_exception(ex) if respond_to?(:handle_exception)
       end
 
@@ -28,8 +28,8 @@ module Sidekiq
         job.test_and_enque_for_time! time if job && job.valid?
       rescue => ex
         # problem somewhere in one job
-        logger.error "CRON JOB: #{ex.message}"
-        logger.error "CRON JOB: #{ex.backtrace.first}"
+        Sidekiq.logger.error "CRON JOB: #{ex.message}"
+        Sidekiq.logger.error "CRON JOB: #{ex.backtrace.first}"
         handle_exception(ex) if respond_to?(:handle_exception)
       end
 

data/lib/sidekiq/cron/web_extension.rb

@@ -25,7 +25,7 @@ module Sidekiq
           view_path = File.join(File.expand_path("..", __FILE__), "views")
 
           @job = Sidekiq::Cron::Job.find(route_params[:name])
-          if @job.present?
+          if @job
             #if Slim renderer exists and sidekiq has layout.slim in views
             if defined?(Slim) && File.exists?(File.join(settings.views,"layout.slim"))
               render(:slim, File.read(File.join(view_path, "cron_show.slim")))

data/sidekiq-cron.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sidekiq-cron 1.1.0 ruby lib
+# stub: sidekiq-cron 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sidekiq-cron".freeze
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Ondrej Bartas".freeze]
-  s.date = "2019-01-16"
+  s.date = "2020-04-03"
   s.description = "Enables to set jobs to be run in specified time (using CRON notation)".freeze
   s.email = "ondrej@bartas.cz".freeze
   s.extra_rdoc_files = [
@@ -57,7 +57,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/ondrejbartas/sidekiq-cron".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.5.2.1".freeze
+  s.rubygems_version = "2.5.2.3".freeze
   s.summary = "Sidekiq Cron helps to add repeated scheduled jobs".freeze
 
   if s.respond_to? :specification_version then

data/test/integration/performance_test.rb

@@ -6,9 +6,7 @@ describe 'Performance Poller' do
   X = 10000
   before do
     Sidekiq.redis = REDIS
-    Sidekiq.redis do |conn|
-      conn.flushdb
-    end
+    Redis.current.flushdb
 
     #clear all previous saved data from redis
     Sidekiq.redis do |conn|
@@ -33,7 +31,7 @@ describe 'Performance Poller' do
     Time.stubs(:now).returns(enqueued_time)
   end
 
-  it 'should enqueue 10000 jobs in less than 30s' do
+  it 'should enqueue 10000 jobs in less than 40s' do
     Sidekiq.redis do |conn|
       assert_equal 0, conn.llen("queue:default"), 'Queue should be empty'
     end
@@ -47,6 +45,6 @@ describe 'Performance Poller' do
     end
 
     puts "Performance test finished in #{bench.real}"
-    assert_operator bench.real, :<, 30
+    assert_operator bench.real, :<, 40
   end
 end

data/test/test_helper.rb

@@ -20,7 +20,7 @@ Coveralls.wear!
 require "minitest/autorun"
 require 'shoulda-context'
 require "rack/test"
-require "mocha/setup"
+require 'mocha/minitest'
 
 ENV['RACK_ENV'] = 'test'
 

data/test/unit/poller_test.rb

@@ -5,9 +5,7 @@ require './test/test_helper'
 describe 'Cron Poller' do
   before do
     Sidekiq.redis = REDIS
-    Sidekiq.redis do |conn|
-      conn.flushdb
-    end
+    Redis.current.flushdb
 
     #clear all previous saved data from redis
     Sidekiq.redis do |conn|

data/test/unit/web_extension_test.rb

@@ -9,7 +9,7 @@ describe 'Cron web' do
 
   before do
     Sidekiq.redis = REDIS
-    Sidekiq.redis {|c| c.flushdb }
+    Redis.current.flushdb
 
     #clear all previous saved data from redis
     Sidekiq.redis do |conn|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ondrej Bartas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -339,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Sidekiq Cron helps to add repeated scheduled jobs