sidekiq-process_manager 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 149acc96c73b7de540d72ceab383a1991658970fb6e8952c91b0ee2edf7c70af
-  data.tar.gz: '0628de42b334f06da28369196ab919bec2264f87bd4a5db373fe946c3104ad16'
+  metadata.gz: c2a78729234d036fa287b95df003baddd2916c2158a15e82b1ef5c73c601f7de
+  data.tar.gz: 294f84dc31697ef19f19a96d3d860e68d7334aaf69c9f62539c4f3ca71b32907
 SHA512:
-  metadata.gz: 2561e359c28d9a3daeed3e8c89c6a97767f536027feb2ce0223a20d97737da4ad4f12afba8941593deed007056c90aa05478ac6b4cd7ffc489ae0b4392b92718
-  data.tar.gz: 2c943e65d8e770fec8824e323fab3abdc37e2f5558ec8397d1278e5ba8e3bc9edff3fd9dcd61f4fae5af2b4b91d259ddcae686f27a0d3f24d6e9b8616a9b2af1
+  metadata.gz: 8bcc7015f1f41308ce67d6bdb3feecf5db53b6b690a7f876af190da8bf3ef76ce088784f2019a79156faf14417d5e087da782f18a6e53ac8d0da6228cea73014
+  data.tar.gz: 1f5a94f60260e94bb0a1c0a2203eab6380d97a60c8b7690a4bb7bf510e923074b019a2fe62763795b4003b36c4da80b109683a4d4026d33258359a7a5c96aa23

data/CHANGELOG.md

@@ -1,7 +1,25 @@
-# 1.0.1
+# Changelog
+All notable changes to this project will be documented in this file.
 
-* Remove auto require of `sidekiq/cli` so `require: false` does not need to be specified in a Gemfile.
+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.0.0
 
-* Initial release
+## [1.0.3] - 2021-05-19
+### Fixed
+- Restore bin dir to gem distribution
+
+## [1.0.2] - 2021-05-19
+### Added
+- Support for sidekiq >= 6.1
+- Set $0 to "sidekiq" so instrumentation libraries detecting sidekiq server from the command line will work.
+
+### Changed
+- Minimum Ruby version 2.3
+
+## [1.0.1] - 2020-02-20
+### Changed
+- Remove auto require of `sidekiq/cli` so `require: false` does not need to be specified in a Gemfile.
+
+## [1.0.0] - 2019-11-27
+- Initial release

data/README.md

@@ -1,7 +1,8 @@
 # Sidekiq::ProcessManager
 
-[![Build Status](https://travis-ci.com/bdurand/sidekiq-process_manager.svg?branch=master)](https://travis-ci.com/bdurand/sidekiq-process_manager)
+[![Continuous Integration](https://github.com/bdurand/sidekiq-process_manager/actions/workflows/continuous_integration.yml/badge.svg)](https://github.com/bdurand/sidekiq-process_manager/actions/workflows/continuous_integration.yml)
 [![Maintainability](https://api.codeclimate.com/v1/badges/ed89164d480af0e1442e/maintainability)](https://codeclimate.com/github/bdurand/sidekiq-process_manager/maintainability)
+[![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)
 
 This gem provides a command line script for managing [sidekiq](https://github.com/mperham/sidekiq) processes. It starts up a process that then forks multiple sidekiq processes and manages their life cycle. This is important for large sidekiq installations, since without it on MRI ruby, sidekiq will only use one CPU core. By starting multiple processes you make all cores available.
 

data/lib/sidekiq/process_manager/manager.rb

@@ -5,12 +5,11 @@ require "sidekiq"
 module Sidekiq
   module ProcessManager
     class Manager
-
       attr_reader :cli
 
       def initialize(process_count: 1, prefork: false, preboot: nil, mode: nil, silent: false)
         require "sidekiq/cli"
-        
+
         # Get the number of processes to fork
         @process_count = process_count
         raise ArgumentError.new("Process count must be greater than 1") if @process_count < 1
@@ -128,7 +127,12 @@ module Sidekiq
         Sidekiq.options[:pidfile] = false
         if @prefork
           log_info("Pre-forking application")
-          @cli.send(:boot_system)
+          # Prior to sidekiq 6.1 the method to boot the application was boot_system
+          if @cli.methods.include?(:boot_application) || @cli.private_methods.include?(:boot_application)
+            @cli.send(:boot_application)
+          else
+            @cli.send(:boot_system)
+          end
           Sidekiq::ProcessManager.run_before_fork_hooks
         elsif @preboot && !@preboot.empty?
           if ::File.exist?(@preboot)
@@ -145,6 +149,8 @@ module Sidekiq
 
       def start_child_process!
         @pids << fork do
+          # Set $0 so instrumentation libraries detecting sidekiq from the command run will work properly.
+          $0 = File.join(File.dirname($0), "sidekiq")
           @process_count = 0
           @pids.clear
           Sidekiq::ProcessManager.run_after_fork_hooks
@@ -156,7 +162,7 @@ module Sidekiq
 
       def send_signal_to_children(signal)
         log_info("Process manager trapped signal #{signal}")
-        @process_count = 0 if (signal == :INT || signal == :TERM)
+        @process_count = 0 if signal == :INT || signal == :TERM
         @pids.each do |pid|
           begin
             log_info("Sending signal #{signal} to sidekiq process #{pid}")

data/lib/sidekiq/process_manager/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module ProcessManager
-    VERSION = "1.0.1"
+    VERSION = "1.0.3"
   end
 end

data/lib/sidekiq/process_manager.rb

@@ -5,7 +5,6 @@ require_relative "process_manager/manager"
 
 module Sidekiq
   module ProcessManager
-
     class << self
       def before_fork(&block)
         @before_fork ||= []
@@ -35,6 +34,5 @@ module Sidekiq
         @after_fork = nil
       end
     end
-
   end
 end

data/sidekiq-process_manager.gemspec

@@ -3,40 +3,37 @@
 require_relative "lib/sidekiq/process_manager/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "sidekiq-process_manager"
-  spec.version       = Sidekiq::ProcessManager::VERSION
-  spec.authors       = ["Brian Durand"]
-  spec.email         = ["bbdurand@gmail.com"]
+  spec.name = "sidekiq-process_manager"
+  spec.version = Sidekiq::ProcessManager::VERSION
+  spec.authors = ["Brian Durand"]
+  spec.email = ["bbdurand@gmail.com"]
 
-  spec.summary       = "Process manager for forking and monitoring multiple sidekiq processes."
-  spec.homepage      = "https://github.com/bdurand/sidekiq-process_manager"
-  spec.license       = "MIT"
+  spec.summary = "Process manager for forking and monitoring multiple sidekiq processes."
+  spec.homepage = "https://github.com/bdurand/sidekiq-process_manager"
+  spec.license = "MIT"
 
   # 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.
-  ignore_files = %w(
-    .gitignore
-    .travis.yml
+  ignore_files = %w[
+    .
     Appraisals
     Gemfile
     Gemfile.lock
     Rakefile
     gemfiles/
     spec/
-  )
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject{ |f| ignore_files.any?{ |path| f.start_with?(path) } }
+  ]
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| ignore_files.any? { |path| f.start_with?(path) } }
   end
-  spec.bindir        = "bin"
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+
+  spec.bindir = "bin"
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.2.2'
+  spec.required_ruby_version = ">= 2.3"
 
   spec.add_dependency "sidekiq", ">= 3.0"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "appraisal"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-process_manager
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Brian Durand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -38,48 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.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: 
 email:
 - bbdurand@gmail.com
@@ -109,7 +67,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="