logcraft-sidekiq 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28452045ea7393df36c7954b72551cce39009acd50519f57e8a2987f6f492d8e
-  data.tar.gz: 5a9a2e6fd7f3b260bfa2407a546ae10d6bb37924982b7631da5e66be0faea7a7
+  metadata.gz: 32b2a15365ab6355fab09f93c4b6d51fc7421274a5fa193222f7d78a692ef6b8
+  data.tar.gz: 473b1edb267bb841c0e883eb2da58517f9c6350196cca424ac1734016f918b63
 SHA512:
-  metadata.gz: f1c1352ba7f9e634c440cfa31b5950da0842d2b3cf3f5e0e2a906fca85ffb5c92c280bbdfc70d9e59b6aa28fe337c2bbace7e30a5a37e34e1ffeea3a443a3046
-  data.tar.gz: 072b697fa207b85bb91e0c2af585a4e6a1f85310147e314842143ef225688f665d16d60f115b22d3fcaddcb86c17e52323ccac6d39d629cc584abca3a40056bd
+  metadata.gz: 3d45787db6dd443e0275566bc7c01e250f4f998f10d09ca372db7d8ea8b484bb8950c1c8ce20b2e2e4c9f2d7f78a1a67240259617b9cafa6d0932f0ca9022948
+  data.tar.gz: b24e47976c10e8ed6daa5d14f7202bd0c511f9322b74454b2e81e099d003740c0ae1230394112b1cb661010ba380b6df106b609ea11dda68227f79437e8ac52b

data/CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.0] - 2026-02-06
+### Added
+- Bumped supported Sidekiq version to 8.
+
+## [1.2.0] - 2024-07-24
+### Added
+- Added support for Sidekiq 7. Thanks to [@wfarr](https://github.com/wfarr) for contributing! ([#4](https://github.com/zormandi/logcraft-sidekiq/pull/4))
+
+### Fixed
+- Eliminated deprecation warning in preparation for Sidekiq 8. Thanks to [@wfarr](https://github.com/wfarr) for contributing! ([#3](https://github.com/zormandi/logcraft-sidekiq/pull/3))
+
 ## [1.1.0] - 2023-08-19
 ### Added
 - Added support for Sidekiq 7.

data/Gemfile

@@ -6,5 +6,5 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
-  gem 'sidekiq', '~> 7.0'
+  gem 'sidekiq', '~> 8.1.0'
 end

data/README.md

@@ -4,7 +4,7 @@
 [![Gem Version](https://badge.fury.io/rb/logcraft-sidekiq.svg)](https://badge.fury.io/rb/logcraft-sidekiq)
 
 Logcraft::Sidekiq is a structured logging solution for [Sidekiq](https://github.com/mperham/sidekiq), using
-the [Logcraft](https://github.com/zormandi/logcraft) gem. It supports (and is tested with) Sidekiq 6 and 7.
+zthe [Logcraft](https://github.com/zormandi/logcraft) gem. It supports (and is tested with) Sidekiq 6, 7 and 8.
 
 ## Installation
 

data/docker-compose.yml

@@ -2,6 +2,6 @@ version: "3"
 
 services:
   redis:
-    image: redis:6
+    image: redis:7
     ports:
       - "6379:6379"

data/gemfiles/{sidekiq_7.latest.gemfile → sidekiq_7.3.gemfile}

@@ -6,5 +6,5 @@ source "https://rubygems.org"
 gemspec path: '..'
 
 group :test do
-  gem 'sidekiq', '~> 7.0'
+  gem 'sidekiq', '~> 7.3.0'
 end

data/gemfiles/sidekiq_8.1.gemfile

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in logcraft-sidekiq.gemspec
+gemspec path: '..'
+
+group :test do
+  gem 'sidekiq', '~> 8.1.0'
+end

data/lib/logcraft/sidekiq/error_logger.rb

@@ -5,7 +5,7 @@ module Logcraft
     class ErrorLogger
       include Logcraft::LogContextHelper
 
-      def call(error, context)
+      def call(error, context, _config = nil)
         within_log_context(JobContext.from_job_hash(context[:job])) do
           ::Sidekiq.logger.warn error
         end

data/lib/logcraft/sidekiq/job_logger.rb

@@ -5,8 +5,12 @@ module Logcraft
     class JobLogger
       include Logcraft::LogContextHelper
 
-      def initialize(logger = ::Sidekiq.logger)
-        @logger = logger
+      def initialize(config_or_logger = ::Sidekiq.logger)
+        @logger = if config_or_logger.respond_to? :logger
+                    config_or_logger.logger
+                  else
+                    config_or_logger
+                  end
       end
 
       def call(job_hash, _queue)

data/lib/logcraft/sidekiq/version.rb

@@ -2,6 +2,6 @@
 
 module Logcraft
   module Sidekiq
-    VERSION = '1.1.0'
+    VERSION = '1.3.0'
   end
 end

data/lib/logcraft/sidekiq.rb

@@ -33,11 +33,12 @@ module Logcraft
 
     def self.initialize_logger
       case ::Sidekiq::VERSION.chr
-      when '7'
-        ::Sidekiq.configure_client { |config| config.logger = Logcraft.logger 'Sidekiq' }
-        ::Sidekiq.configure_server { |config| config.logger = Logcraft.logger 'Sidekiq' }
       when '6'
         ::Sidekiq.logger = Logcraft.logger 'Sidekiq'
+      else
+        require 'ostruct' unless defined? OpenStruct # Temporary workaround for new Logcraft version not being released yet
+        ::Sidekiq.configure_client { |config| config.logger = Logcraft.logger 'Sidekiq' }
+        ::Sidekiq.configure_server { |config| config.logger = Logcraft.logger 'Sidekiq' }
       end
     end
   end

data/logcraft-sidekiq.gemspec

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require_relative "lib/logcraft/sidekiq/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "logcraft-sidekiq"
+  spec.version = Logcraft::Sidekiq::VERSION
+  spec.authors = ["Zoltan Ormandi"]
+  spec.email = ["zoltan.ormandi@gmail.com"]
+
+  spec.summary = "A structured logging solution for Sidekiq, using Logcraft."
+  spec.homepage = "https://github.com/zormandi/logcraft-sidekiq"
+  spec.license = "MIT"
+  spec.required_ruby_version = ">= 2.6.0"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/zormandi/logcraft-sidekiq"
+  spec.metadata["changelog_uri"] = "https://github.com/zormandi/logcraft-sidekiq/blob/main/CHANGELOG.md"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor|Rakefile)})
+    end
+  end
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "logcraft"
+  spec.add_dependency "sidekiq", ">= 6.0", "< 9.0"
+
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", ">= 12.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: logcraft-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Zoltan Ormandi
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logcraft
@@ -33,7 +32,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +42,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +85,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
 email:
 - zoltan.ormandi@gmail.com
 executables: []
@@ -104,7 +102,8 @@ files:
 - gemfiles/sidekiq_6.4.gemfile
 - gemfiles/sidekiq_6.5.gemfile
 - gemfiles/sidekiq_7.0.gemfile
-- gemfiles/sidekiq_7.latest.gemfile
+- gemfiles/sidekiq_7.3.gemfile
+- gemfiles/sidekiq_8.1.gemfile
 - lib/logcraft/sidekiq.rb
 - lib/logcraft/sidekiq/death_logger.rb
 - lib/logcraft/sidekiq/error_logger.rb
@@ -112,6 +111,7 @@ files:
 - lib/logcraft/sidekiq/job_logger.rb
 - lib/logcraft/sidekiq/railtie.rb
 - lib/logcraft/sidekiq/version.rb
+- logcraft-sidekiq.gemspec
 - sig/logcraft/sidekiq.rbs
 homepage: https://github.com/zormandi/logcraft-sidekiq
 licenses:
@@ -120,7 +120,6 @@ metadata:
   homepage_uri: https://github.com/zormandi/logcraft-sidekiq
   source_code_uri: https://github.com/zormandi/logcraft-sidekiq
   changelog_uri: https://github.com/zormandi/logcraft-sidekiq/blob/main/CHANGELOG.md
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -135,8 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A structured logging solution for Sidekiq, using Logcraft.
 test_files: []