sidecloq 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 369b9ecaad14a3f613c3c2a4afef4d3b439ceed861525ca99286668293fa61c8
-  data.tar.gz: 75f2d86e8ccaea4b089407eef5cf834f9ee7c0f31251b6a1acb72c5b43a15e78
+  metadata.gz: 1a6c13b2ea0bb666923cce6ad6e6113a6c4c51daebbaf1ecff8fce54c78deb6a
+  data.tar.gz: ef6a198c02e995dd5b68abf21e9fe31f5f2e3782b2bda635a1ec44e3b640d855
 SHA512:
-  metadata.gz: 3b60ac764c22dbff7d9519a0f9ce8b8484da0b775e3b875506332d71d17bf377ab6655c92f966a3140a258fb684a440638d8941e0eba0a72e3b58d4dbbd75c2f
-  data.tar.gz: f5877e191dd1cbca6650e3f293c3a601aee96029a8034ecc6490bfd9badc3492d340b75aa2d508b6270decf8da75f46a3dce28d739ca75fe759d14a01e74bbc0
+  metadata.gz: 3cfd40a72a8f9d8a471eb985063e1294dba1643cf449c6ec5f3df1ef75e157f104be57ea9e86552fb9c62aad19022ada1b1d705948d763db8ac78a79ec263200
+  data.tar.gz: b95e48e480c0d9db46216c0cef0290a9d6210803a85c5de6769524a10cded46f9b26c8d5ceb42e53113a689d2c5f121d17c35571d0a567ffc3a081e4fb889c0c

data/.gitignore

@@ -9,3 +9,5 @@
 /tmp/
 /.ruby-version
 /.ruby-gemset
+gemfiles/*.lock
+.bundle/

data/.travis.yml

@@ -5,38 +5,32 @@ cache: bundler
 services:
   - redis-server
 rvm:
-  - 2.0.0
-  - 2.1.10
-  - 2.2.10
-  - 2.3.8
   - 2.4.5
   - 2.5.3
-  - 2.6.1
+  - 2.6.5
   - jruby-9.1.17.0
-  - jruby-9.2.5.0
+  - jruby-9.2.8.0
 env:
   - "sidekiq=3.5.4"
   - "sidekiq=4.2.10"
   - "sidekiq=5.1.3"
-  - "sidekiq=5.2.5"
+  - "sidekiq=5.2.7"
+  - "sidekiq=6.0.1"
   - "sidekiq=master"
 matrix:
   allow_failures:
     - env: "sidekiq=master"
   exclude:
-    # sidekiq 5 does not support < ruby 2.2.2
-    - rvm: 2.0.0
+    # sidekiq 6 does not support < ruby 2.5
+    - rvm: 2.4.5
+      env: sidekiq=6.0.1
+    - rvm: 2.4.5
       env: sidekiq=master
-    - rvm: 2.0.0
-      env: sidekiq=5.1.3
-    - rvm: 2.0.0
-      env: sidekiq=5.2.5
-    - rvm: 2.1.10
+    - rvm: jruby-9.1.17.0
+      env: sidekiq=6.0.1
+    - rvm: jruby-9.1.17.0
       env: sidekiq=master
-    - rvm: 2.1.10
-      env: sidekiq=5.1.3
-    - rvm: 2.1.10
-      env: sidekiq=5.2.5
+
   fast_finish: true
 after_success:
   - bundle exec codeclimate-test-reporter

data/Appraisals

@@ -0,0 +1,19 @@
+appraise "sidekiq-3.5" do
+  gem "sidekiq", "3.5.4"
+end
+
+appraise "sidekiq-4.2" do
+  gem "sidekiq", "4.2.10"
+end
+
+appraise "sidekiq-5.1" do
+  gem "sidekiq", "5.1.3"
+end
+
+appraise "sidekiq-5.2" do
+  gem "sidekiq", "5.2.7"
+end
+
+appraise "sidekiq-6.0" do
+  gem "sidekiq", "6.0.1"
+end

data/Rakefile

@@ -36,6 +36,7 @@ task :web do
   end
 
   class DoWork
+    include Sidekiq::Worker
   end
 
   require 'sidekiq/web'

data/gemfiles/sidekiq_3.5.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sidekiq", "3.5.4"
+
+group :test do
+  gem "simplecov"
+  gem "codeclimate-test-reporter", "~> 1.0.0"
+end
+
+platforms :mri, :rbx do
+  gem "pry"
+  gem "minitest-utils"
+end
+
+gemspec path: "../"

data/gemfiles/sidekiq_4.2.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sidekiq", "4.2.10"
+
+group :test do
+  gem "simplecov"
+  gem "codeclimate-test-reporter", "~> 1.0.0"
+end
+
+platforms :mri, :rbx do
+  gem "pry"
+  gem "minitest-utils"
+end
+
+gemspec path: "../"

data/gemfiles/sidekiq_5.1.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sidekiq", "5.1.3"
+
+group :test do
+  gem "simplecov"
+  gem "codeclimate-test-reporter", "~> 1.0.0"
+end
+
+platforms :mri, :rbx do
+  gem "pry"
+  gem "minitest-utils"
+end
+
+gemspec path: "../"

data/gemfiles/sidekiq_5.2.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sidekiq", "5.2.7"
+
+group :test do
+  gem "simplecov"
+  gem "codeclimate-test-reporter", "~> 1.0.0"
+end
+
+platforms :mri, :rbx do
+  gem "pry"
+  gem "minitest-utils"
+end
+
+gemspec path: "../"

data/gemfiles/sidekiq_6.0.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sidekiq", "6.0.1"
+
+group :test do
+  gem "simplecov"
+  gem "codeclimate-test-reporter", "~> 1.0.0"
+end
+
+platforms :mri, :rbx do
+  gem "pry"
+  gem "minitest-utils"
+end
+
+gemspec path: "../"

data/lib/sidecloq/utils.rb

@@ -8,15 +8,34 @@ module Sidecloq
         @context = ctx
       end
 
+      def sidekiq_logging_context_method
+        @sidekiq_logging_context_method ||=
+          begin
+            if defined? Sidekiq::Logging
+              # sidekiq < 6
+              Sidekiq::Logging.method(:with_context)
+            elsif defined?(Sidekiq::Context)
+              # sidekiq 6, <= 6.0.1
+              Sidekiq::Context.method(:with)
+            else
+              # sidekiq 6, master
+              Sidekiq.logger.method(:with_context)
+            end
+          end
+      end
+
       def method_missing(meth, *args)
-        Sidekiq::Logging.with_context(@context) do
+        sidekiq_logging_context_method.call(@context) do
           Sidekiq.logger.send(meth, *args)
         end
       end
     end
 
+
     def logger
-      @logger ||= ContextLogger.new('Sidecloq')
+      @logger ||= ContextLogger.new(
+        defined?(Sidekiq::Logging) ? 'Sidecloq' : {sidecloq: true}
+      )
     end
 
     def redis(&block)

data/lib/sidecloq/version.rb

@@ -1,3 +1,3 @@
 module Sidecloq
-  VERSION = '0.4.7'
+  VERSION = '0.4.8'
 end

data/sidecloq.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'sidekiq', '>= 3.5.4', '< 6'
+  spec.add_dependency 'sidekiq', '>= 3.5.4', '< 7'
   spec.add_dependency 'redlock', '>= 0.2.0', '< 2'
   # mimics some dev dependencies of sidekiq:
   spec.add_dependency 'concurrent-ruby'
@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'rake', '>= 10.0'
   spec.add_development_dependency 'minitest'
+  spec.add_development_dependency "appraisal"
   spec.add_development_dependency 'redis-namespace', '~> 1.5', '>= 1.5.3'
   spec.add_development_dependency 'activejob'
 end

data/web/views/recurring.erb

@@ -26,7 +26,7 @@
           <td>
             <form action="<%= root_path %>recurring/<%= CGI.escape(name).gsub('+', '%20') %>/enqueue" method="post">
               <%= csrf_tag if respond_to?(:csrf_tag) %>
-              <input class='btn btn-xs pull-left' type="submit" name="enque" value="<%= t('Enqueue Now') %>"/>
+              <input class='btn btn-primary btn-xs' type="submit" name="enque" value="<%= t('Enqueue Now') %>"/>
             </form>
           </td>
         </tr>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidecloq
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Matt Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -19,7 +19,7 @@ dependencies:
         version: 3.5.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 3.5.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: redlock
   requirement: !ruby/object:Gem::Requirement
@@ -112,6 +112,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'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -155,10 +169,16 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/sidekiq_3.5.gemfile
+- gemfiles/sidekiq_4.2.gemfile
+- gemfiles/sidekiq_5.1.gemfile
+- gemfiles/sidekiq_5.2.gemfile
+- gemfiles/sidekiq_6.0.gemfile
 - lib/sidecloq.rb
 - lib/sidecloq/job_enqueuer.rb
 - lib/sidecloq/locker.rb
@@ -189,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Recurring / Periodic / Scheduled / Cron job extension for Sidekiq