sidekiq-cron 0.6.3 → 1.10.0

data/lib/sidekiq/options.rb

@@ -0,0 +1,25 @@
+require 'sidekiq'
+
+module Sidekiq
+  module Options
+    def self.[](key)
+      options_field ? Sidekiq.public_send(options_field)[key] : Sidekiq[key]
+    end
+
+    def self.[]=(key, value)
+      options_field ? Sidekiq.public_send(options_field)[key] = value : Sidekiq[key] = value
+    end
+
+    def self.options_field
+      return @options_field unless @options_field.nil?
+      sidekiq_version = Gem::Version.new(Sidekiq::VERSION)
+      @options_field = if sidekiq_version >= Gem::Version.new('7.0')
+        :default_configuration
+      elsif sidekiq_version >= Gem::Version.new('6.5')
+        false
+      else
+        :options
+      end
+    end
+  end
+end

data/sidekiq-cron.gemspec

@@ -1,125 +1,40 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: sidekiq-cron 0.6.3 ruby lib
+# frozen_string_literal: true
+
+require './lib/sidekiq/cron/version'
 
 Gem::Specification.new do |s|
   s.name = "sidekiq-cron"
-  s.version = "0.6.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
+  s.version = Sidekiq::Cron::VERSION
+  s.summary = "Scheduler/Cron for Sidekiq jobs"
+  s.description = "Enables to set jobs to be run in specified time (using CRON notation or natural language)"
+  s.homepage = "https://github.com/sidekiq-cron/sidekiq-cron"
   s.authors = ["Ondrej Bartas"]
-  s.date = "2017-06-20"
-  s.description = "Enables to set jobs to be run in specified time (using CRON notation)"
   s.email = "ondrej@bartas.cz"
+  s.licenses = ["MIT"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
   ]
-  s.files = [
-    ".document",
-    ".travis.yml",
-    "Changes.md",
-    "Dockerfile",
+  s.files = Dir.glob('lib/**/*') + Dir.glob('test/**/*') + [
+    "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",
-    "lib/sidekiq/cron/launcher.rb",
-    "lib/sidekiq/cron/locales/de.yml",
-    "lib/sidekiq/cron/locales/en.yml",
-    "lib/sidekiq/cron/locales/ru.yml",
-    "lib/sidekiq/cron/poller.rb",
-    "lib/sidekiq/cron/support.rb",
-    "lib/sidekiq/cron/views/cron.erb",
-    "lib/sidekiq/cron/views/cron.slim",
-    "lib/sidekiq/cron/web.rb",
-    "lib/sidekiq/cron/web_extension.rb",
+    "README.md",
     "sidekiq-cron.gemspec",
-    "test/integration/performance_test.rb",
-    "test/test_helper.rb",
-    "test/unit/job_test.rb",
-    "test/unit/poller_test.rb",
-    "test/unit/web_extension_test.rb"
   ]
-  s.homepage = "http://github.com/ondrejbartas/sidekiq-cron"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.5.1"
-  s.summary = "Sidekiq Cron helps to add repeated scheduled jobs"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  s.required_ruby_version = ">= 2.7"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sidekiq>, [">= 4.2.1"])
-      s.add_runtime_dependency(%q<rufus-scheduler>, [">= 3.3.0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<redis-namespace>, [">= 1.5.2"])
-      s.add_development_dependency(%q<shoulda-context>, [">= 0"])
-      s.add_development_dependency(%q<rack>, [">= 0"])
-      s.add_development_dependency(%q<rack-test>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<minitest>, [">= 0"])
-      s.add_development_dependency(%q<test-unit>, [">= 0"])
-      s.add_development_dependency(%q<sdoc>, [">= 0"])
-      s.add_development_dependency(%q<slim>, [">= 0"])
-      s.add_development_dependency(%q<sinatra>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<coveralls>, [">= 0"])
-      s.add_development_dependency(%q<shotgun>, [">= 0"])
-      s.add_development_dependency(%q<guard>, [">= 0"])
-      s.add_development_dependency(%q<guard-minitest>, [">= 0"])
-    else
-      s.add_dependency(%q<sidekiq>, [">= 4.2.1"])
-      s.add_dependency(%q<rufus-scheduler>, [">= 3.3.0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<redis-namespace>, [">= 1.5.2"])
-      s.add_dependency(%q<shoulda-context>, [">= 0"])
-      s.add_dependency(%q<rack>, [">= 0"])
-      s.add_dependency(%q<rack-test>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<minitest>, [">= 0"])
-      s.add_dependency(%q<test-unit>, [">= 0"])
-      s.add_dependency(%q<sdoc>, [">= 0"])
-      s.add_dependency(%q<slim>, [">= 0"])
-      s.add_dependency(%q<sinatra>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<coveralls>, [">= 0"])
-      s.add_dependency(%q<shotgun>, [">= 0"])
-      s.add_dependency(%q<guard>, [">= 0"])
-      s.add_dependency(%q<guard-minitest>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<sidekiq>, [">= 4.2.1"])
-    s.add_dependency(%q<rufus-scheduler>, [">= 3.3.0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<redis-namespace>, [">= 1.5.2"])
-    s.add_dependency(%q<shoulda-context>, [">= 0"])
-    s.add_dependency(%q<rack>, [">= 0"])
-    s.add_dependency(%q<rack-test>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<minitest>, [">= 0"])
-    s.add_dependency(%q<test-unit>, [">= 0"])
-    s.add_dependency(%q<sdoc>, [">= 0"])
-    s.add_dependency(%q<slim>, [">= 0"])
-    s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<coveralls>, [">= 0"])
-    s.add_dependency(%q<shotgun>, [">= 0"])
-    s.add_dependency(%q<guard>, [">= 0"])
-    s.add_dependency(%q<guard-minitest>, [">= 0"])
-  end
-end
+  s.add_dependency("fugit", "~> 1.8")
+  s.add_dependency("sidekiq", ">= 6")
+  s.add_dependency("globalid", ">= 1.0.1")
 
+  s.add_development_dependency("minitest", "~> 5.15")
+  s.add_development_dependency("mocha", "~> 1.14")
+  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", "~> 0.21")
+  s.add_development_dependency("simplecov-cobertura", "~> 2.1")
+end

data/test/integration/performance_test.rb

@@ -1,39 +1,33 @@
-# -*- encoding : utf-8 -*-
 require './test/test_helper'
 require 'benchmark'
 
-describe 'Perfromance Poller' do
-  X = 10000
+describe 'Performance Poller' do
+  JOBS_NUMBER = 10_000
+  MAX_SECONDS = 60
+
   before do
-    Sidekiq.redis = REDIS
+    # Clear all previous saved data from Redis.
     Sidekiq.redis do |conn|
       conn.flushdb
     end
 
-    #clear all previous saved data from redis
-    Sidekiq.redis do |conn|
-      conn.keys("cron_job*").each do |key|
-        conn.del(key)
-      end
-    end
-
     args = {
       queue: "default",
       cron: "*/2 * * * *",
       klass: "CronTestClass"
     }
 
-    X.times do |i|
+    JOBS_NUMBER.times do |i|
       Sidekiq::Cron::Job.create(args.merge(name: "Test#{i}"))
     end
 
-    @poller = Sidekiq::Cron::Poller.new
-    now = Time.now.utc
-    enqueued_time = Time.new(now.year, now.month, now.day, now.hour + 1, 10, 5)
+    @poller = Sidekiq::Cron::Poller.new(Sidekiq.const_defined?(:Config) ? Sidekiq::Config.new : {})
+    now = Time.now.utc + 3600
+    enqueued_time = Time.new(now.year, now.month, now.day, now.hour, 10, 5)
     Time.stubs(:now).returns(enqueued_time)
   end
 
-  it 'should enqueue 10000 jobs in less than 30s' do
+  it "should enqueue #{JOBS_NUMBER} jobs in less than #{MAX_SECONDS}s" do
     Sidekiq.redis do |conn|
       assert_equal 0, conn.llen("queue:default"), 'Queue should be empty'
     end
@@ -43,10 +37,10 @@ describe 'Perfromance Poller' do
     }
 
     Sidekiq.redis do |conn|
-      assert_equal X, conn.llen("queue:default"), 'Queue should be full'
+      assert_equal JOBS_NUMBER, conn.llen("queue:default"), 'Queue should be full'
     end
 
-    puts "Perfomance test finished in #{bench.real}"
-    assert_operator 30, :>, bench.real
+    puts "Performance test finished in #{bench.real}"
+    assert_operator bench.real, :<, MAX_SECONDS
   end
 end

data/test/models/person.rb

@@ -0,0 +1,21 @@
+class Person
+  include GlobalID::Identification
+
+  attr_reader :id
+
+  def self.find(id)
+    new(id)
+  end
+
+  def initialize(id)
+    @id = id
+  end
+
+  def to_global_id(options = {})
+    super app: "app"
+  end
+
+  def ==(other_person)
+    other_person.is_a?(Person) && id.to_s == other_person.id.to_s
+  end
+end

data/test/test_helper.rb

@@ -1,50 +1,38 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+$TESTING = true
+ENV['RACK_ENV'] = 'test'
 
 require 'simplecov'
-SimpleCov.start do
-  add_filter "/test/"
 
-  add_group 'SidekiqCron', 'lib/'
+if ENV['CI']
+  require 'simplecov-cobertura'
+  SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
+end
+
+SimpleCov.start do
+  add_filter "test/"
+  add_group 'Sidekiq-Cron', 'lib/'
 end
-require 'coveralls'
-Coveralls.wear!
 
 require "minitest/autorun"
-require 'shoulda-context'
 require "rack/test"
-require "mocha/setup"
-
-ENV['RACK_ENV'] = 'test'
-
-#SIDEKIQ Require - need to have sidekiq running!
+require 'mocha/minitest'
 require 'sidekiq'
-require 'sidekiq/util'
 require 'sidekiq/web'
+require "sidekiq/cli"
+require 'sidekiq-cron'
+require 'sidekiq/cron/web'
 
 Sidekiq.logger.level = Logger::ERROR
-
-require 'sidekiq/redis_connection'
-redis_url = ENV['REDIS_URL'] || 'redis://0.0.0.0:6379'
-REDIS = Sidekiq::RedisConnection.create(:url => redis_url, :namespace => 'testy')
-
 Sidekiq.configure_client do |config|
-  config.redis = { :url => redis_url, :namespace => 'testy' }
+  config.redis = { url: ENV['REDIS_URL'] || 'redis://0.0.0.0:6379' }
 end
 
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'sidekiq-cron'
-require 'sidekiq/cron/web'
-require 'pp'
+# For testing symbolize args
+class Hash
+  def symbolize_keys
+    transform_keys { |key| key.to_sym rescue key }
+  end
+end
 
 class CronTestClass
   include Sidekiq::Worker
@@ -66,6 +54,13 @@ end
 
 module ActiveJob
   class Base
+    attr_accessor *%i[job_class provider_job_id queue_name arguments]
+
+    def initialize
+      yield self if block_given?
+      self.provider_job_id ||= SecureRandom.hex(12)
+    end
+
     def self.queue_name_prefix
       @queue_name_prefix
     end
@@ -80,12 +75,16 @@ module ActiveJob
       self
     end
 
+    def try(method, *args, &block)
+      send method, *args, &block if respond_to? method
+    end
+
     def self.perform_later(*args)
-      {
-        "job_class"  => self.class.name,
-        "queue_name" => @queue,
-        "args"  => [*args],
-      }
+      new do |instance|
+        instance.job_class = self.class.name
+        instance.queue_name = @queue
+        instance.arguments = [*args]
+      end
     end
   end
 end

data/test/unit/fixtures/schedule_array.yml

@@ -0,0 +1,13 @@
+---
+-
+  name: "my_first_job"
+  cron: "*/5 * * * *"
+  class: "HardWorker"
+  queue: "hard_worker"
+-
+  name: "second_job"
+  cron: "*/30 * * * *"
+  class: "HardWorker"
+  queue: "hard_worker_long"
+  args:
+    hard: "stuff"

data/test/unit/fixtures/schedule_erb.yml

@@ -0,0 +1,6 @@
+---
+default: &default
+  cron: <%= "every day at 5 pm" %>
+  class: <%= "DailyJob" %>
+
+daily_job: *default

data/test/unit/fixtures/schedule_hash.yml

@@ -0,0 +1,12 @@
+---
+my_first_job:
+  cron: "*/5 * * * *"
+  class: "HardWorker"
+  queue: hard_worker
+
+second_job:
+  cron: "*/30 * * * *"
+  class: "HardWorker"
+  queue: hard_worker_long
+  args:
+    hard: "stuff"

data/test/unit/fixtures/schedule_string.yml

@@ -0,0 +1 @@
+--- string