atomic-sidekiq 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1af076c37beeb362724591b736eca75821223033
-  data.tar.gz: a8ffb7fcfafa8ee3f70e24e13b728703ad55e4c8
+  metadata.gz: 3071f88191cdf61f92a11d1ffde7f5cab21db595
+  data.tar.gz: 850929d672c23bbfdd6ed645467ec2e49c4b4a99
 SHA512:
-  metadata.gz: 6ae93a470419fac19638dd02a0f92f7f6972a9129ac11fba26265062a3ab186dfb1962ed4718fdce84cf2a2c1ef0ecae07d0fb6df79d6316d78224cd33d6b755
-  data.tar.gz: 4ca5974dc84bd4d8fa1b8efbbf4bb5a862022039cc8336b149ba0287665324d5565846da977b21eaf1fd9574d666f03f455f15643d7713fa5168018946a53004
+  metadata.gz: cd7312265115acc03dd613e0623a74fdbc8ec3996de8177966af68300fad1a6d6e6a0aaf4e21d24a219ad0c189078fea097ce1d9d76550902fd87f0189076ef2
+  data.tar.gz: 5720a6e7b38226ee37cae38df9c94d49fe459d3890da868c3185415c822ff3dce8cb90dfbed4ade9d263b2f0ee418b868973995c85d9e6d232df638b3ad773ed

data/.gitignore

@@ -1 +1,4 @@
 .byebug_history
+*.gem
+*.bak
+coverage

data/.rubocop.yml

@@ -0,0 +1,28 @@
+AllCops:
+  TargetRubyVersion: 2.2
+  Exclude:
+    - bin/**/*
+    - spec/spec_helper.rb
+    - ./*.gemspec
+    - vendor/**/*
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Naming/FileName:
+  Exclude:
+    - "lib/atomic-sidekiq.rb"
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*.rb
+
+Metrics/LineLength:
+  Exclude:
+    - spec/**/*.rb

data/.travis.yml

@@ -0,0 +1,16 @@
+language: ruby
+sudo: false
+cache: bundler
+services:
+  - redis-server
+before_install:
+  - gem install bundler
+  - gem update bundler
+rvm:
+  - 2.2.2
+  - 2.3.5
+  - 2.4.2
+  - 2.5.0
+script:
+  - bundle exec rubocop
+  - bundle exec rspec

data/Gemfile

@@ -3,3 +3,8 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem "codecov"
+gem "rspec"
+gem "rubocop"
+gem "timecop"

data/Gemfile.lock

@@ -8,10 +8,15 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
-    byebug (10.0.2)
+    codecov (0.1.10)
+      json
+      simplecov
+      url
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     diff-lcs (1.3)
+    docile (1.3.0)
+    json (2.1.0)
     parallel (1.12.1)
     parser (2.5.0.5)
       ast (~> 2.4.0)
@@ -48,8 +53,14 @@ GEM
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     timecop (0.9.1)
     unicode-display_width (1.3.0)
+    url (0.3.2)
 
 PLATFORMS
   ruby
@@ -57,11 +68,11 @@ PLATFORMS
 DEPENDENCIES
   atomic-sidekiq!
   bundler (~> 1.12)
-  byebug (~> 10.0)
+  codecov
   rake (~> 11.3)
-  rspec (~> 3.6)
-  rubocop (~> 0.54)
-  timecop (~> 0.9)
+  rspec
+  rubocop
+  timecop
 
 BUNDLED WITH
    1.16.1

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/atomic-sidekiq.svg)](https://badge.fury.io/rb/atomic-sidekiq) [![Build Status](https://travis-ci.org/Colex/atomic-sidekiq.svg?branch=master)](https://travis-ci.org/Colex/atomic-sidekiq) [![codecov](https://codecov.io/gh/Colex/atomic-sidekiq/branch/master/graph/badge.svg)](https://codecov.io/gh/Colex/atomic-sidekiq)
+
 # AtomicSidekiq
 AtomicSidekiq implements a reliable way of processing jobs using Sidekiq. By default, Sidekiq will retrieve jobs from the queue by removing it from Redis. If the job fails to complete (e.g. the process terminates unexpectdly mid-job), the job will be lost forever. This can be acceptable in many applications, but some application require higher levels of reliability, hence AtomicSidekiq will not erase any job from Redis until it's acknowledged that they have finished - otherwise, they are re-scheduled.
 
@@ -29,6 +31,23 @@ Sidekiq.configure_server do |config|
 end
 ```
 
+## Heartbeat
+For long running jobs that may run for an unpredictable amounts of time, you may send periodic heartbeats to reset the expiration time and allow the job to run for longer (if the job stops sending heartbeats and the expiration date run out, the job will be assumed lost and recovered). Example:
+
+```ruby
+class LongRunningWorker
+  include Sidekiq::Worker
+  include AtomicSidekiq::Heartbeat
+
+  def perform
+    (1..10_000).each do
+      ExampleClass.long_running_action!
+      heartbeat! # You can also give a specific timeout period, e.g. heartbeat!(1.hour)
+    end
+  end
+end
+```
+
 ## Benchmark
 ### Reliability
 This benchmark tests Sidekiq's ability to recover from unexpected failures. The test script forces a failure randomly 1% of the time it's running a job and measures how many jobs are able to be completed:

data/atomic-sidekiq.gemspec

@@ -2,25 +2,25 @@
 
 Gem::Specification.new do |s|
   s.name          = "atomic-sidekiq"
-  s.version       = "1.0.0"
-  s.date          = "2018-04-01"
+  s.version       = "1.1.0"
+  s.date          = "2018-04-02"
   s.summary       = "Reliable fetcher for Sidekiq"
   s.description   = "Reliable fetcher for Sidekiq"
   s.homepage      = "https://github.com/Colex/atomic-sidekiq"
   s.authors       = ["Alex Correia Santos"]
   s.email         = ["alex.santios@visiblealpha.com"]
-  s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec)/}) }
   s.require_paths = ["lib"]
   s.license       = "MIT"
 
-  s.required_ruby_version = ">= 2.3"
+  s.required_ruby_version = ">= 2.2"
 
   s.add_development_dependency "bundler", "~> 1.12"
   s.add_development_dependency "rake", "~> 11.3"
   s.add_development_dependency "rspec", "~> 3.6"
   s.add_development_dependency "rubocop", "~> 0.54"
-  s.add_development_dependency "byebug", "~> 10.0"
   s.add_development_dependency "timecop", "~> 0.9"
+  s.add_development_dependency "codecov", ">= 0.1.10"
 
   s.add_runtime_dependency "sidekiq", "~> 5.0"
 end

data/bin/sidekiqload

@@ -5,7 +5,6 @@
 $TESTING = false
 
 #require 'ruby-prof'
-Bundler.require(:default)
 
 require 'sidekiq/cli'
 require 'sidekiq/launcher'

data/lib/atomic-sidekiq.rb

@@ -1 +1 @@
-require_relative './atomic_sidekiq'
+require_relative "./atomic_sidekiq"

data/lib/atomic_sidekiq/atomic_fetch.rb

@@ -1,26 +1,30 @@
+# rubocop:disable Style/ClassVars
 module AtomicSidekiq
   class AtomicFetch
-    IN_FLIGHT_KEY_PREFIX = "flight:"
-    DEFAULT_POLL_INTERVAL = 10 # seconds
+    IN_FLIGHT_KEY_PREFIX = "flight".freeze
+    DEFAULT_POLL_INTERVAL = 5 # seconds
     DEFAULT_EXPIRATION_TIME = 3600 # seconds
     DEFAULT_COLLECTION_INTERVAL = 60 # seconds
 
-    def initialize(options)
-      @retrieve_op = AtomicOperation::Retrieve.new(in_flight_prefix: IN_FLIGHT_KEY_PREFIX)
-      @strictly_ordered_queues = !!options[:strict]
+    def initialize(options, in_flight_keymaker: nil)
+      @keymaker = in_flight_keymaker ||
+                  InFlightKeymaker.new(IN_FLIGHT_KEY_PREFIX)
+
+      @retrieve_op = AtomicOperation::Retrieve.new(
+        in_flight_keymaker: keymaker
+      )
 
-      atomic_fetch_opts = options.fetch(:atomic_fetch, {})
-      @expiration_time = atomic_fetch_opts.fetch(:expiration_time, DEFAULT_EXPIRATION_TIME)
-      @collection_interval = atomic_fetch_opts.fetch(:collection_wait_time, DEFAULT_COLLECTION_INTERVAL)
-      @poll_interval = atomic_fetch_opts.fetch(:poll_interval, DEFAULT_POLL_INTERVAL)
+      @queues ||= options[:queues].map { |q| "queue:#{q}" }
+      @strictly_ordered_queues = !!options[:strict]
       @@next_collection ||= Time.now
-      set_queues(options)
+
+      configure_atomic_fetch(options.fetch(:atomic_fetch, {}))
     end
 
     def retrieve_work
       collect_dead_jobs!
       work = retrieve_op.perform(ordered_queues, expire_at)
-      return UnitOfWork.new(*work) if work
+      return UnitOfWork.new(*work, in_flight_keymaker: keymaker) if work
       sleep(poll_interval)
       nil
     end
@@ -28,10 +32,14 @@ module AtomicSidekiq
     private
 
     attr_reader :retrieve_op, :queues, :strictly_ordered_queues,
-    :collection_interval, :poll_interval, :expiration_time
+                :collection_interval, :poll_interval, :expiration_time,
+                :keymaker
 
-    def set_queues(options)
-      @queues ||= options[:queues].map { |q| "queue:#{q}" }
+    def configure_atomic_fetch(options)
+      @expiration_time = options[:expiration_time] || DEFAULT_EXPIRATION_TIME
+      @collection_interval = options[:collection_wait_time] ||
+                             DEFAULT_COLLECTION_INTERVAL
+      @poll_interval = options[:poll_interval] || DEFAULT_POLL_INTERVAL
     end
 
     def ordered_queues
@@ -45,7 +53,7 @@ module AtomicSidekiq
     def collect_dead_jobs!
       return if @@next_collection > Time.now
       @@next_collection = Time.now + collection_interval
-      DeadJobCollector.collect!(ordered_queues)
+      DeadJobCollector.collect!(ordered_queues, in_flight_keymaker: keymaker)
     end
 
     def expire_at
@@ -53,3 +61,4 @@ module AtomicSidekiq
     end
   end
 end
+# rubocop:enable Style/ClassVars

data/lib/atomic_sidekiq/atomic_operation/acknowledge.rb

@@ -1,9 +1,9 @@
 module AtomicSidekiq
   module AtomicOperation
     class Acknowledge < Base
-      def perform(queue:, job:)
+      def perform(job:)
         redis do |conn|
-          conn.del(in_flight_job_key(queue, job))
+          conn.del(in_flight_keymaker.job_key(job))
         end
       end
     end

data/lib/atomic_sidekiq/atomic_operation/base.rb

@@ -1,21 +1,16 @@
 module AtomicSidekiq
   module AtomicOperation
     class Base
-      def initialize(in_flight_prefix:)
-        @in_flight_prefix = in_flight_prefix
+      def initialize(in_flight_keymaker:)
+        @in_flight_keymaker = in_flight_keymaker
       end
 
       protected
 
-      attr_reader :in_flight_prefix
+      attr_reader :in_flight_keymaker
 
-      def redis(&block)
-        Sidekiq.redis { |conn| block.call(conn) }
-      end
-
-      def in_flight_job_key(queue, job)
-        jid = JSON.parse(job)['jid']
-        "#{in_flight_prefix}#{queue}:#{jid}"
+      def redis
+        Sidekiq.redis { |conn| yield(conn) }
       end
     end
   end

data/lib/atomic_sidekiq/atomic_operation/expire.rb

@@ -1,8 +1,13 @@
 module AtomicSidekiq
   module AtomicOperation
     class Expire < Base
+      EXPIRE_SCRIPT = File.read(
+        File.join(File.dirname(__FILE__),
+                  "./lua_scripts/expire.lua")
+      )
+
       def initialize
-        super(in_flight_prefix: nil)
+        super(in_flight_keymaker: nil)
       end
 
       def perform(queue, in_flight_key)
@@ -10,10 +15,6 @@ module AtomicSidekiq
           conn.eval(EXPIRE_SCRIPT, [queue, in_flight_key], [Time.now.utc.to_i])
         end
       end
-
-      private
-
-      EXPIRE_SCRIPT = File.read(File.join(File.dirname(__FILE__), './lua_scripts/expire.lua'))
     end
   end
 end

data/lib/atomic_sidekiq/atomic_operation/heartbeat.rb

@@ -0,0 +1,35 @@
+module AtomicSidekiq
+  module AtomicOperation
+    class Heartbeat < Base
+      HEARTBEAT_SCRIPT = File.read(
+        File.join(File.dirname(__FILE__),
+                  "./lua_scripts/heartbeat.lua")
+      )
+
+      def perform(jid:, timeout:)
+        key = in_flight_job_key(jid)
+        return unless key
+        redis do |conn|
+          conn.eval(HEARTBEAT_SCRIPT, [key], [expiration_date(timeout)])
+        end
+      end
+
+      private
+
+      def expiration_date(timeout)
+        Time.now.utc.to_i + timeout
+      end
+
+      def in_flight_job_key(jid)
+        matcher = in_flight_keymaker.job_matcher(jid)
+        it = 0
+        loop do
+          it, keys = redis { |conn| conn.scan(it, match: matcher) }
+          return keys[0] if keys.count > 0
+          it = it.to_i
+          return if it.zero?
+        end
+      end
+    end
+  end
+end

data/lib/atomic_sidekiq/atomic_operation/lua_scripts/heartbeat.lua

@@ -0,0 +1,10 @@
+local in_flight_key = KEYS[1]
+local expire_at = ARGV[1]
+
+local job = redis.call('get', in_flight_key)
+if (not job) then return nil end
+
+job = string.gsub(job, '("expire_at":)[0-9]*', '%1'..expire_at)
+redis.call('set', in_flight_key, job)
+
+return job

data/lib/atomic_sidekiq/atomic_operation/lua_scripts/retrieve.lua

@@ -6,6 +6,6 @@ local job = redis.call('lpop', queue)
 if (not job) then return nil end
 job = job:sub(1,-2)..',"expire_at":'..expire_at.."}"
 
-local flight_key = flight..queue..':'..string.match(job, '"jid":"([^"]*)"')
+local flight_key = flight..string.match(job, '"jid":"([^"]*)"')
 redis.call('set', flight_key, job)
 return { queue, job }

data/lib/atomic_sidekiq/atomic_operation/requeue.rb

@@ -12,7 +12,7 @@ module AtomicSidekiq
       def requeue(conn, queue:, job:)
         conn.multi do
           conn.rpush(queue, job)
-          conn.del(in_flight_job_key(queue, job))
+          conn.del(in_flight_keymaker.job_key(job))
         end
       end
     end

data/lib/atomic_sidekiq/atomic_operation/retrieve.rb

@@ -1,6 +1,11 @@
 module AtomicSidekiq
   module AtomicOperation
     class Retrieve < Base
+      RETRIEVE_SCRIPT = File.read(
+        File.join(File.dirname(__FILE__),
+                  "./lua_scripts/retrieve.lua")
+      )
+
       def perform(queues, expire_at)
         queues.each do |queue|
           res = retrieve_from_queue(queue, expire_at.to_i)
@@ -11,9 +16,8 @@ module AtomicSidekiq
 
       private
 
-      RETRIEVE_SCRIPT = File.read(File.join(File.dirname(__FILE__), './lua_scripts/retrieve.lua'))
-
       def retrieve_from_queue(queue, expire_at)
+        in_flight_prefix = in_flight_keymaker.queue_prefix(queue)
         redis do |conn|
           conn.eval(RETRIEVE_SCRIPT, [queue, in_flight_prefix], [expire_at])
         end

data/lib/atomic_sidekiq/dead_job_collector.rb

@@ -1,15 +1,17 @@
 module AtomicSidekiq
   class DeadJobCollector
     class << self
-      def collect!(queues)
-        queues.each { |q| new(q).collect! }
+      def collect!(queues, in_flight_keymaker:)
+        queues.each do |q|
+          new(q, in_flight_keymaker: in_flight_keymaker).collect!
+        end
       end
     end
 
-    def initialize(queue, in_flight_prefix: AtomicFetch::IN_FLIGHT_KEY_PREFIX)
-      @queue            = queue
-      @in_flight_prefix = in_flight_prefix
-      @expire_op        = AtomicOperation::Expire.new
+    def initialize(queue, in_flight_keymaker:)
+      @queue              = queue
+      @in_flight_keymaker = in_flight_keymaker
+      @expire_op          = AtomicOperation::Expire.new
     end
 
     def collect!
@@ -18,26 +20,26 @@ module AtomicSidekiq
 
     private
 
-    attr_reader :queue, :in_flight_prefix, :expire_op
+    attr_reader :queue, :in_flight_keymaker, :expire_op
 
     def expire!(job_key)
       expire_op.perform(queue, job_key)
     end
 
-    def each_keys(&block)
+    def each_keys
       it = 0
       Sidekiq.redis do |conn|
         loop do
           it, job_keys = conn.scan(it, match: keys_prefix)
           it = it.to_i
-          job_keys.each { |job_key| block.call(job_key) }
-          break if it == 0
+          job_keys.each { |job_key| yield(job_key) }
+          break if it.zero?
         end
       end
     end
 
     def keys_prefix
-      "#{in_flight_prefix}#{queue}:*"
+      in_flight_keymaker.queue_matcher(queue)
     end
   end
 end

data/lib/atomic_sidekiq/heartbeat.rb

@@ -0,0 +1,34 @@
+module AtomicSidekiq
+  module Heartbeat
+    def self.included(base)
+      base.send :include, InstanceMethods
+    end
+
+    module InstanceMethods
+      def heartbeat!(timeout = nil)
+        heartbeat_operation.perform(
+          jid: jid,
+          timeout: timeout || default_heartbeat_timeout
+        )
+      end
+
+      private
+
+      def default_heartbeat_timeout
+        AtomicSidekiq::AtomicFetch::DEFAULT_EXPIRATION_TIME
+      end
+
+      def heartbeat_operation
+        @heartbeat_operation ||= AtomicSidekiq::AtomicOperation::Heartbeat.new(
+          in_flight_keymaker: keymaker
+        )
+      end
+
+      def keymaker
+        @keymaker ||= AtomicSidekiq::InFlightKeymaker.new(
+          AtomicSidekiq::AtomicFetch::IN_FLIGHT_KEY_PREFIX
+        )
+      end
+    end
+  end
+end

data/lib/atomic_sidekiq/in_flight_keymaker.rb

@@ -0,0 +1,30 @@
+module AtomicSidekiq
+  class InFlightKeymaker
+    def initialize(key_prefix)
+      @key_prefix = key_prefix
+    end
+
+    def queue_prefix(queue)
+      normalized_name = queue.gsub(/queue:/, "")
+      "#{key_prefix}:#{normalized_name}:"
+    end
+
+    def queue_matcher(queue)
+      "#{queue_prefix(queue)}*"
+    end
+
+    def job_key(job)
+      obj = job
+      obj = JSON.parse(obj) if job.is_a?(String)
+      "#{key_prefix}:#{obj['queue']}:#{obj['jid']}"
+    end
+
+    def job_matcher(jid)
+      "#{key_prefix}:*:#{jid}"
+    end
+
+    private
+
+    attr_reader :key_prefix
+  end
+end

data/lib/atomic_sidekiq/sidekiq/sidekiq.rb

@@ -0,0 +1,6 @@
+module Sidekiq
+  def self.atomic_fetch!(opts = {})
+    options[:fetch] = AtomicSidekiq::AtomicFetch
+    options[:atomic_fetch] = opts
+  end
+end

data/lib/atomic_sidekiq/unit_of_work.rb

@@ -2,15 +2,19 @@ module AtomicSidekiq
   class UnitOfWork
     attr_reader :queue, :job
 
-    def initialize(queue = nil, job = nil, in_flight_prefix: AtomicFetch::IN_FLIGHT_KEY_PREFIX)
+    def initialize(queue = nil, job = nil, in_flight_keymaker:)
       @queue          = queue
       @job            = job
-      @acknowledge_op = AtomicOperation::Acknowledge.new(in_flight_prefix: in_flight_prefix)
-      @requeue_op     = AtomicOperation::Requeue.new(in_flight_prefix: in_flight_prefix)
+      @acknowledge_op = AtomicOperation::Acknowledge.new(
+        in_flight_keymaker: in_flight_keymaker
+      )
+      @requeue_op = AtomicOperation::Requeue.new(
+        in_flight_keymaker: in_flight_keymaker
+      )
     end
 
     def acknowledge
-      acknowledge_op.perform(queue: queue, job: job)
+      acknowledge_op.perform(job: job)
     end
 
     def queue_name

data/lib/atomic_sidekiq.rb

@@ -1,13 +1,16 @@
-require 'sidekiq'
-require_relative 'atomic_sidekiq/sidekiq'
-require_relative 'atomic_sidekiq/unit_of_work'
-require_relative 'atomic_sidekiq/atomic_fetch'
-require_relative 'atomic_sidekiq/dead_job_collector'
-require_relative 'atomic_sidekiq/atomic_operation/base'
-require_relative 'atomic_sidekiq/atomic_operation/acknowledge'
-require_relative 'atomic_sidekiq/atomic_operation/requeue'
-require_relative 'atomic_sidekiq/atomic_operation/retrieve'
-require_relative 'atomic_sidekiq/atomic_operation/expire'
+require "sidekiq"
+require_relative "atomic_sidekiq/sidekiq/sidekiq"
+require_relative "atomic_sidekiq/in_flight_keymaker"
+require_relative "atomic_sidekiq/unit_of_work"
+require_relative "atomic_sidekiq/atomic_fetch"
+require_relative "atomic_sidekiq/dead_job_collector"
+require_relative "atomic_sidekiq/heartbeat"
+require_relative "atomic_sidekiq/atomic_operation/base"
+require_relative "atomic_sidekiq/atomic_operation/acknowledge"
+require_relative "atomic_sidekiq/atomic_operation/requeue"
+require_relative "atomic_sidekiq/atomic_operation/retrieve"
+require_relative "atomic_sidekiq/atomic_operation/expire"
+require_relative "atomic_sidekiq/atomic_operation/heartbeat"
 
 module AtomicSidekiq
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atomic-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alex Correia Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-01 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.54'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.1.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.1.10
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +117,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Dockerfile
 - Gemfile
 - Gemfile.lock
@@ -135,12 +137,16 @@ files:
 - lib/atomic_sidekiq/atomic_operation/acknowledge.rb
 - lib/atomic_sidekiq/atomic_operation/base.rb
 - lib/atomic_sidekiq/atomic_operation/expire.rb
+- lib/atomic_sidekiq/atomic_operation/heartbeat.rb
 - lib/atomic_sidekiq/atomic_operation/lua_scripts/expire.lua
+- lib/atomic_sidekiq/atomic_operation/lua_scripts/heartbeat.lua
 - lib/atomic_sidekiq/atomic_operation/lua_scripts/retrieve.lua
 - lib/atomic_sidekiq/atomic_operation/requeue.rb
 - lib/atomic_sidekiq/atomic_operation/retrieve.rb
 - lib/atomic_sidekiq/dead_job_collector.rb
-- lib/atomic_sidekiq/sidekiq.rb
+- lib/atomic_sidekiq/heartbeat.rb
+- lib/atomic_sidekiq/in_flight_keymaker.rb
+- lib/atomic_sidekiq/sidekiq/sidekiq.rb
 - lib/atomic_sidekiq/unit_of_work.rb
 homepage: https://github.com/Colex/atomic-sidekiq
 licenses:
@@ -154,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/atomic_sidekiq/sidekiq.rb

@@ -1,6 +0,0 @@
-module Sidekiq
-  def self.atomic_fetch!(opts = {})
-    self.options[:fetch] = AtomicSidekiq::AtomicFetch
-    self.options[:atomic_fetch] = opts
-  end
-end