sidekiq-fast-enq 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 42316bf316539012e9cd71544606ad581c47917d
-  data.tar.gz: 9817a10809a564cec6ab8e87612a009c2a7ed8f7
+SHA256:
+  metadata.gz: 4da5e233e31395aeb7d4c2d648d32d98a22fd8d44a9d071ff1dfdac32044dd57
+  data.tar.gz: baa9d5acec682b20f5b5fa22471e53bf7e86d42fab0c1eae93394c35193b8351
 SHA512:
-  metadata.gz: 3eb9ce115d05af9f31166b3752bbc3bd5fd8260dcfce625328bcb5be6306261f766a1f5f773559a192c267af9069d9dde2f9f0ec6943bbd16cc3821a93777d40
-  data.tar.gz: ec68435cbeb752ead5db389d518dba994af9b6f3f757c4693b620e2f668008deee51e1a5e88ca57a584312f5c7f2ada729f4b90705b0c7e8cd133b2dddb26286
+  metadata.gz: 001ebe9e5b792d3f26ac4c92bc981692e89b006b098d069fe57acba025b1b500182c56684db8ab15190b621464cebe0fb7ef7912fb0c045f3a70d40176e5d0df
+  data.tar.gz: c8423d0302b4e8afb7077fcd665f6fb671b595222a4a0acf6ecd7426c47f5fafcbff917d80c19fe860669d2059362d768620e25d4c7b849d5dc345013d98f441

data/.gitignore

@@ -1,17 +1,6 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
 pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
 tmp
+rdoc
+*.rbc
+.tm_properties
+.DS_Store

data/.travis.yml

@@ -0,0 +1,28 @@
+language: ruby
+
+rvm:
+  - "2.6"
+
+services:
+  - redis-server
+
+gemfile:
+  - Gemfile
+
+matrix:
+  include:
+  - rvm: "2.6"
+    gemfile: gemfiles/sidekiq_6.gemfile
+
+  - rvm: "2.5"
+    gemfile: gemfiles/sidekiq_5.gemfile
+
+  - rvm: "2.5"
+    gemfile: gemfiles/sidekiq_4.gemfile
+
+  - rvm: "2.4"
+    gemfile: gemfiles/sidekiq_3.gemfile
+
+script:
+  - gem list bundler
+  - bundle exec rake spec

data/Appraisals

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+SIDEKIQ_MAJOR_RELEASES = ["6", "5", "4", "3"].freeze
+
+SIDEKIQ_MAJOR_RELEASES.each do |version|
+  appraise "sidekiq-#{version}" do
+    gem "sidekiq", "~> #{version}.0"
+  end
+end

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec

data/Gemfile.lock

@@ -0,0 +1,54 @@
+PATH
+  remote: .
+  specs:
+    sidekiq-fast-enq (1.0.2)
+      sidekiq (>= 3.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    connection_pool (2.2.2)
+    diff-lcs (1.3)
+    rack (2.1.1)
+    rack-protection (2.0.8.1)
+      rack
+    rake (13.0.1)
+    redis (4.1.3)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    sidekiq (6.0.4)
+      connection_pool (>= 2.2.2)
+      rack (>= 2.0.0)
+      rack-protection (>= 2.0.0)
+      redis (>= 4.1.0)
+    thor (1.0.1)
+    timecop (0.9.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler
+  rake
+  rspec
+  sidekiq-fast-enq!
+  timecop
+
+BUNDLED WITH
+   2.1.4

data/HISTORY.md

@@ -0,0 +1,11 @@
+# 1.0.1
+
+* Compatibility with Sidekiq 6.
+
+# 1.0.1
+
+* Update gemspec to specify compatibility with sidekiq 4.
+
+# 1.0.0
+
+* Initial release.

data/README.md

@@ -1,3 +1,6 @@
+[![Build Status](https://travis-ci.org/weheartit/sidekiq-fast-enq.svg?branch=master)](https://travis-ci.org/weheartit/sidekiq-fast-enq)
+[![Maintainability](https://api.codeclimate.com/v1/badges/cafd3e45419babe96ac4/maintainability)](https://codeclimate.com/github/weheartit/sidekiq-fast-enq/maintainability)
+
 This gem provides a much more efficien implementation for checking the Sidekiq scheduled and retry queues. This can provide a significant performance boost for large sidekiq implementations that utilize many processes. It can also reduce load on the redis server.
 
 ### TL;DR
@@ -19,5 +22,4 @@ Sidekiq.options[:scheduled_enq] = SidekiqFastEnq
 Sidekiq.options[:poll_interval_average] = 30
 ```
 
-Since this gem eliminates the race condition of having too many processes processing th
 Note: this gem utilizes server side Lua scripting so you must be using Redis Server 2.6.0 or later.

data/Rakefile

@@ -1,19 +1,19 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-desc 'Default: run unit tests.'
-task :default => :test
+RSpec::Core::RakeTask.new(:spec)
 
-desc 'RVM likes to call it tests'
-task :tests => :test
+task :default => :appraisals
 
-begin
-  require 'rspec'
-  require 'rspec/core/rake_task'
-  desc 'Run the unit tests'
-  RSpec::Core::RakeTask.new(:test)
-rescue LoadError
-  task :test do
-    STDERR.puts "You must have rspec 2.0 installed to run the tests"
+desc "run the specs using appraisal"
+task :appraisals do
+  exec "bundle exec appraisal rake spec"
+end
+
+namespace :appraisals do
+  desc "install all the appraisal gemspecs"
+  task :install do
+    exec "bundle exec appraisal install"
   end
 end
 
@@ -22,36 +22,36 @@ task :load_test, [:jobs_size, :workers, :fast] do |t, args|
   require File.expand_path('../lib/sidekiq-fast-enq', __FILE__)
   require 'sidekiq/scheduled'
   require 'sidekiq/api'
-  
+
   class FastEnqLoadTestWorker
     include Sidekiq::Worker
     def perform()
     end
   end
-  
+
   jobs_size = args[:jobs_size].to_i
   workers_size = args[:workers].to_i
   klass = (args[:fast] == 'fast' ? SidekiqFastEnq : Sidekiq::Scheduled::Enq)
-  
+
   Sidekiq.configure_server do |config|
     config.redis = {:namespace => "sidekiq_fast_enq_load_test"}
   end
-  
+
   Sidekiq::ScheduledSet.new.clear
   jobs_size.times do
     FastEnqLoadTestWorker.perform_in(rand)
   end
-  
+
   t = Time.now
   workers_size.times do
     fork do
       klass.new.enqueue_jobs
     end
   end
-  
+
   workers_size.times do
     Process.wait
   end
-  
+
   puts "Enqueued #{jobs_size} jobs in #{Time.now - t} seconds"
 end

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/sidekiq_3.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sidekiq", "~> 3.0"
+
+gemspec path: "../"

data/gemfiles/sidekiq_3.gemfile.lock

@@ -0,0 +1,74 @@
+PATH
+  remote: ..
+  specs:
+    sidekiq-fast-enq (1.0.2)
+      sidekiq (>= 3.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    celluloid (0.17.4)
+      celluloid-essentials
+      celluloid-extras
+      celluloid-fsm
+      celluloid-pool
+      celluloid-supervision
+      timers (>= 4.1.1)
+    celluloid-essentials (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-extras (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-fsm (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-pool (0.20.5)
+      timers (>= 4.1.1)
+    celluloid-supervision (0.20.6)
+      timers (>= 4.1.1)
+    connection_pool (2.2.2)
+    diff-lcs (1.3)
+    json (1.8.6)
+    rake (13.0.1)
+    redis (3.3.5)
+    redis-namespace (1.7.0)
+      redis (>= 3.0.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    sidekiq (3.5.4)
+      celluloid (~> 0.17.2)
+      connection_pool (~> 2.2, >= 2.2.0)
+      json (~> 1.0)
+      redis (~> 3.2, >= 3.2.1)
+      redis-namespace (~> 1.5, >= 1.5.2)
+    thor (1.0.1)
+    timecop (0.9.1)
+    timers (4.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler
+  rake
+  rspec
+  sidekiq (~> 3.0)
+  sidekiq-fast-enq!
+  timecop
+
+BUNDLED WITH
+   2.1.4

data/gemfiles/sidekiq_4.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sidekiq", "~> 4.0"
+
+gemspec path: "../"

data/gemfiles/sidekiq_4.gemfile.lock

@@ -0,0 +1,56 @@
+PATH
+  remote: ..
+  specs:
+    sidekiq-fast-enq (1.0.2)
+      sidekiq (>= 3.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    concurrent-ruby (1.1.5)
+    connection_pool (2.2.2)
+    diff-lcs (1.3)
+    rack (2.1.1)
+    rack-protection (2.0.8.1)
+      rack
+    rake (13.0.1)
+    redis (3.3.5)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    sidekiq (4.2.10)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      rack-protection (>= 1.5.0)
+      redis (~> 3.2, >= 3.2.1)
+    thor (1.0.1)
+    timecop (0.9.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler
+  rake
+  rspec
+  sidekiq (~> 4.0)
+  sidekiq-fast-enq!
+  timecop
+
+BUNDLED WITH
+   2.1.4

data/gemfiles/sidekiq_5.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sidekiq", "~> 5.0"
+
+gemspec path: "../"

data/gemfiles/sidekiq_5.gemfile.lock

@@ -0,0 +1,55 @@
+PATH
+  remote: ..
+  specs:
+    sidekiq-fast-enq (1.0.2)
+      sidekiq (>= 3.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    connection_pool (2.2.2)
+    diff-lcs (1.3)
+    rack (2.1.1)
+    rack-protection (2.0.8.1)
+      rack
+    rake (13.0.1)
+    redis (4.1.3)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    sidekiq (5.2.7)
+      connection_pool (~> 2.2, >= 2.2.2)
+      rack (>= 1.5.0)
+      rack-protection (>= 1.5.0)
+      redis (>= 3.3.5, < 5)
+    thor (1.0.1)
+    timecop (0.9.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler
+  rake
+  rspec
+  sidekiq (~> 5.0)
+  sidekiq-fast-enq!
+  timecop
+
+BUNDLED WITH
+   2.1.4

data/gemfiles/sidekiq_6.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sidekiq", "~> 6.0"
+
+gemspec path: "../"

data/gemfiles/sidekiq_6.gemfile.lock

@@ -0,0 +1,55 @@
+PATH
+  remote: ..
+  specs:
+    sidekiq-fast-enq (1.0.2)
+      sidekiq (>= 3.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    connection_pool (2.2.2)
+    diff-lcs (1.3)
+    rack (2.1.1)
+    rack-protection (2.0.8.1)
+      rack
+    rake (13.0.1)
+    redis (4.1.3)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    sidekiq (6.0.4)
+      connection_pool (>= 2.2.2)
+      rack (>= 2.0.0)
+      rack-protection (>= 2.0.0)
+      redis (>= 4.1.0)
+    thor (1.0.1)
+    timecop (0.9.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler
+  rake
+  rspec
+  sidekiq (~> 6.0)
+  sidekiq-fast-enq!
+  timecop
+
+BUNDLED WITH
+   2.1.4

data/lib/sidekiq-fast-enq.rb

@@ -6,7 +6,7 @@ require 'sidekiq'
 # race conditions checking the scheduled queues.
 class SidekiqFastEnq
   DEFAULT_BATCH_SIZE = 1000
-  
+
   def initialize(batch_size = nil)
     batch_size ||= (Sidekiq.options[:fast_enq_batch_size] || DEFAULT_BATCH_SIZE)
     @script = lua_script(batch_size)
@@ -14,11 +14,11 @@ class SidekiqFastEnq
       @script_sha_1 = conn.script(:load, @script)
     end
   end
-  
+
   def enqueue_jobs(now = Time.now.to_f.to_s, sorted_sets = nil)
     sorted_sets ||= Sidekiq::Scheduled::SETS
-    logger = Sidekiq::Logging.logger
-    
+    logger = Sidekiq.logger
+
     # A job's "score" in Redis is the time at which it should be processed.
     # Just check Redis for the set of jobs with a timestamp before now.
     Sidekiq.redis do |conn|
@@ -29,7 +29,7 @@ class SidekiqFastEnq
         start_time = Time.now
         pop_time = 0.0
         enqueue_time = 0.0
-        
+
         # Get the next item in the queue if it's score (time to execute) is <= now.
         # We need to go through the list one at a time to reduce the risk of something
         # going wrong between the time jobs are popped from the scheduled queue and when
@@ -45,7 +45,7 @@ class SidekiqFastEnq
           jobs_count += 1
           logger.debug("enqueued #{sorted_set}: #{job}") if logger && logger.debug?
         end
-        
+
         if jobs_count > 0 && logger && logger.info?
           loop_time = Time.now - start_time
           logger.info("SidekiqFastEnq enqueued #{jobs_count} from #{sorted_set} in #{loop_time.round(3)}s (pop: #{pop_time.round(3)}s; enqueue: #{enqueue_time.round(3)}s)")
@@ -61,7 +61,7 @@ class SidekiqFastEnq
   def pop_job(conn, sorted_set, now)
     eval_script(conn, @script, @script_sha_1, [sorted_set, now])
   end
-  
+
   # Evaluate and execute a Lua script on the redis server.
   def eval_script(conn, script, sha1, argv=[])
     begin
@@ -87,7 +87,7 @@ class SidekiqFastEnq
     local sorted_set = ARGV[1]
     local now = tonumber(ARGV[2])
     local ready_cache = sorted_set .. '.cache'
-    
+
     while true do
       -- Check a cached list of jobs that are ready to execute
       local job = redis.call('lpop', ready_cache)

data/sidekiq_fast_enq.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency('sidekiq', '>=3.4')
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "timecop"
+  spec.add_development_dependency "appraisal"
 end

data/spec/spec_helper.rb

@@ -1,10 +1,8 @@
 # Breaks if not required. Sidekiq doesn't directly require in
 # the load process.
 
-sidekiq_version = Array(ENV["SIDEKIQ_VERSION"] || ">=3.4")
-gem 'sidekiq', *sidekiq_version
+require_relative '../lib/sidekiq-fast-enq'
 
-require File.expand_path('../../lib/sidekiq-fast-enq', __FILE__)
 require 'timecop'
 require 'sidekiq/version'
 require 'celluloid' if Sidekiq::VERSION.to_i < 4
@@ -20,17 +18,17 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
-  
+
   Sidekiq.configure_server do |config|
     config.redis = {:namespace => "sidekiq_fast_enq_test"}
   end
   Sidekiq.options[:scheduled_enq] = SidekiqFastEnq
-  Sidekiq::Logging.logger = Logger.new(StringIO.new)
+  Sidekiq.logger.level = Logger::FATAL
 end
 
 class FastEnqTestWorker
   include Sidekiq::Worker
-  
+
   def perform(arg)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-fast-enq
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - We Heart It
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2020-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -29,16 +29,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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'
 description: More efficient scheduled job queue implementation for sidekiq to increase
   throughput in large installations.
 email:
@@ -91,11 +105,24 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- HISTORY.txt
+- ".travis.yml"
+- Appraisals
+- Gemfile
+- Gemfile.lock
+- HISTORY.md
 - MIT_LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
+- gemfiles/.bundle/config
+- gemfiles/sidekiq_3.gemfile
+- gemfiles/sidekiq_3.gemfile.lock
+- gemfiles/sidekiq_4.gemfile
+- gemfiles/sidekiq_4.gemfile.lock
+- gemfiles/sidekiq_5.gemfile
+- gemfiles/sidekiq_5.gemfile.lock
+- gemfiles/sidekiq_6.gemfile
+- gemfiles/sidekiq_6.gemfile.lock
 - lib/sidekiq-fast-enq.rb
 - sidekiq_fast_enq.gemspec
 - spec/sidekiq-fast-enq_spec.rb
@@ -119,8 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: More efficient scheduled job queue implementation for sidekiq

data/HISTORY.txt

@@ -1,7 +0,0 @@
-1.0.1
-
-Update gemspec to specify compatibility with sidekiq 4.
-
-1.0.0
-
-Initial release.