process_bot 0.1.30 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e091db49a7e39df21edb300dc0ebb57cb5b98a73be033b220d24f72a7f72c36
-  data.tar.gz: 59e9442735c2a07cc568e8f9b0f1ed3c3660fa407d1f85ed7326348722ed7dbc
+  metadata.gz: aa6d1ed1467a0ed8b7f59f249d4bd8223e5f4a9a3de588672bb1c288c8f9958a
+  data.tar.gz: 75e6da0f1d23bbbb54fcc0c0ad4d1feab4eeecb8ad1360bb0ab574a0ab541e0a
 SHA512:
-  metadata.gz: 3459f12d21d2d221c152ed047cd51dc4c9134e285cfc52847997099ace48a1ddd60fc8c7c54d5a6b6ca8535b2054e47f9ae5b72da010188e56eca304194b30e6
-  data.tar.gz: 8b7bd9482806698b84f3ea356b00c2f71d58850249fb0e2aabb28591495094e727324eb6bad5f0e5ee4740adef932c58f91f232d90e8ea8488f7f453a9bde138
+  metadata.gz: 8937bdd16d154473da1b528c9b99ef5f0ec606201615cb4669e3b251bfa01d3d67edd835e01b91709824a4c660ebda3d54e6db8d43f58804804ccfdd807a20e4
+  data.tar.gz: 9dfad8adee572aed628f93fabb211f2e76d9372a201804e89b00e7a8ef5af92683d21ef29db7d34d231b131bb06f2629b776aac6be01e2e0c901d6980020f01d

data/.ruby-version

@@ -1 +1 @@
-2.7.8
+3.2.5

data/CHANGELOG.md

@@ -1,6 +1,8 @@
 ## [Unreleased]
+- Add `process_bot:sidekiq:start_current` so failed deploys restart Sidekiq from the currently published release.
 - Drop Ruby 2.x support. Minimum Ruby is now 3.2; CI covers 3.2/3.3/3.4 and RuboCop's `TargetRubyVersion` follows. Shorthand anonymous forwarding (`*, **, &`) is applied where it replaces redundant `*args, **opts, &block` pass-throughs.
 - Fail `start_tcp_server` when another ProcessBot with the same `--id` is already running instead of silently drifting to a new port. Port drift across unrelated services is still supported; drift for a duplicate id was the root cause of Capistrano deploys leaving a stale previous-release ProcessBot alive on a drifted port while every subsequent `stop --port X` hit the wrong instance.
+- Treat legacy ProcessBot titles without `application_basename` as duplicates when they share the same `--id` and control port, and include the same legacy match in forced stop diagnostics.
 - Stop accepting new control commands during shutdown so in-flight responses complete reliably.
 - Stream ProcessBot logs to connected control clients for Capistrano output.
 - Sanitize broadcast log output to keep JSON encoding safe.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    process_bot (0.1.30)
+    process_bot (0.1.34)
       knjrbfw (>= 0.0.116)
       pry
       rake
@@ -17,8 +17,8 @@ GEM
     diff-lcs (1.6.2)
     http2 (0.0.36)
       string-cases (~> 0)
-    io-console (0.8.2)
-    json (2.19.3)
+    io-console (0.9.2)
+    json (2.21.2)
     knjrbfw (0.0.116)
       datet
       http2
@@ -26,11 +26,11 @@ GEM
       ruby_process
       tsafe
       wref (>= 0.0.8)
-    language_server-protocol (3.17.0.5)
+    language_server-protocol (3.17.0.6)
     lint_roller (1.1.0)
     method_source (1.1.0)
     parallel (1.28.0)
-    parser (3.3.11.1)
+    parser (3.3.12.0)
       ast (~> 2.4.1)
       racc
     php4r (0.0.4)
@@ -47,7 +47,7 @@ GEM
     rake (13.4.2)
     ref (2.0.0)
     regexp_parser (2.12.0)
-    reline (0.6.3)
+    reline (0.7.0)
       io-console (~> 0.5)
     rspec (3.13.2)
       rspec-core (~> 3.13.0)
@@ -62,7 +62,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.86.1)
+    rubocop (1.89.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -73,12 +73,12 @@ GEM
       rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.1)
+    rubocop-ast (1.50.0)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-performance (1.26.1)
+    rubocop-performance (1.27.0)
       lint_roller (~> 1.1)
-      rubocop (>= 1.75.0, < 2.0)
+      rubocop (>= 1.89.0, < 2.0)
       rubocop-ast (>= 1.47.1, < 2.0)
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)

data/README.md

@@ -26,7 +26,7 @@ Add to your `deploy.rb`:
 ```ruby
 after "deploy:starting", "process_bot:sidekiq:graceful"
 after "deploy:published", "process_bot:sidekiq:start"
-after "deploy:failed", "process_bot:sidekiq:start"
+after "deploy:failed", "process_bot:sidekiq:start_current"
 ```
 
 ## Usage
@@ -41,6 +41,7 @@ cap production process_bot:sidekiq:graceful
 
 ProcessBot provides these Sidekiq tasks:
 - `process_bot:sidekiq:start`
+- `process_bot:sidekiq:start_current` (starts from the currently published release after a failed deploy)
 - `process_bot:sidekiq:stop`
 - `process_bot:sidekiq:graceful` (stops fetching new jobs and waits for running jobs by default)
 - `process_bot:sidekiq:graceful_no_wait` (stops fetching new jobs and returns immediately)

data/lib/process_bot/capistrano/sidekiq.rake

@@ -71,6 +71,18 @@ namespace :process_bot do
       end
     end
 
+    desc "Start Sidekiq and ProcessBot from the currently published release"
+    task :start_current do
+      on roles fetch(:sidekiq_roles) do |role|
+        git_plugin.switch_user(role) do
+          fetch(:sidekiq_processes).times do |idx|
+            puts "Starting Sidekiq with ProcessBot #{idx} from the currently published release"
+            git_plugin.start_current_sidekiq(idx)
+          end
+        end
+      end
+    end
+
     desc "Ensure the configured number of Sidekiq ProcessBots are running (starts replacements for graceful shutdowns)"
     task :ensure_running do
       on roles fetch(:sidekiq_roles) do |role|

data/lib/process_bot/capistrano/sidekiq_helpers.rb

@@ -140,12 +140,26 @@ module ProcessBot::Capistrano::SidekiqHelpers # rubocop:disable Metrics/ModuleLe
     backend.capture(:echo, SSHKit.config.command_map[:bundle]).strip
   end
 
-  def start_sidekiq(idx = 0) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+  def start_current_sidekiq(idx = 0)
+    current_release_path = backend.capture(:readlink, "-f", current_path).strip
+
+    start_sidekiq(
+      idx,
+      sidekiq_release_path: current_release_path,
+      sidekiq_release_version: File.basename(current_release_path)
+    )
+  end
+
+  def start_sidekiq( # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    idx = 0,
+    sidekiq_release_path: release_path,
+    sidekiq_release_version: nil
+  )
     releases = backend.capture(:ls, "-x", releases_path).split
     releases << release_timestamp.to_s if release_timestamp
     releases.uniq
 
-    latest_release_version = releases.last
+    latest_release_version = sidekiq_release_version || releases.last
     raise "Invalid release timestamp: #{release_timestamp}" unless latest_release_version
 
     args = [
@@ -156,7 +170,7 @@ module ProcessBot::Capistrano::SidekiqHelpers # rubocop:disable Metrics/ModuleLe
       "--bundle-prefix", SSHKit.config.command_map.prefix[:bundle].join(" "),
       "--sidekiq-environment", fetch(:sidekiq_env),
       "--port", idx + 7050,
-      "--release-path", release_path
+      "--release-path", sidekiq_release_path
     ]
 
     # Use screen for logging everything which is why this is disabled
@@ -184,7 +198,8 @@ module ProcessBot::Capistrano::SidekiqHelpers # rubocop:disable Metrics/ModuleLe
     process_bot_args = args.compact.map { |arg| "\"#{arg}\"" }
 
     command = "/usr/bin/screen #{screen_args.join(" ")} " \
-      "bash -c 'cd #{release_path} && exec #{SSHKit.config.command_map.prefix[:bundle].join(" ")} bundle exec process_bot #{process_bot_args.join(" ")}'"
+      "bash -c 'cd #{sidekiq_release_path} && exec " \
+      "#{SSHKit.config.command_map.prefix[:bundle].join(" ")} bundle exec process_bot #{process_bot_args.join(" ")}'"
 
     puts "WARNING: A known bug prevents Sidekiq from starting when pty is set (which it is)" if fetch(:pty)
     puts "ProcessBot Sidekiq command: #{command}"

data/lib/process_bot/control_socket.rb

@@ -74,10 +74,23 @@ class ProcessBot::ControlSocket
 
   def find_duplicate_id_entries(id, basename)
     running_process_bot_entries.select do |entry|
-      entry[:id] == id && entry[:application_basename] == basename
+      duplicate_id_entry_matches?(entry, id, basename)
     end
   end
 
+  def duplicate_id_entry_matches?(entry, id, basename)
+    return false unless entry[:id] == id
+    return true if basename && entry[:application_basename] == basename
+
+    entry[:application_basename].nil? && same_control_port?(entry)
+  end
+
+  def same_control_port?(entry)
+    return false unless entry[:port] && options[:port]
+
+    entry[:port].to_i == options[:port].to_i
+  end
+
   def duplicate_id_error_message(id, duplicates)
     details = duplicates.map { |entry| "PID #{entry[:pid]} on port #{entry[:port]}" }.join(", ")
     example_port = duplicates.first[:port]
@@ -235,15 +248,19 @@ class ProcessBot::ControlSocket
         next
       end
 
-      pid = process.data["pid"] || process.pid
-      entries << {
-        application_basename: process_data["application_basename"],
-        id: process_data["id"]&.to_s,
-        pid: pid,
-        port: process_data["port"]&.to_i
-      }
+      entries << process_bot_entry_from_process_data(process, process_data)
     end
 
     entries
   end
+
+  def process_bot_entry_from_process_data(process, process_data)
+    {
+      application: process_data["application"],
+      application_basename: process_data["application_basename"],
+      id: process_data["id"]&.to_s,
+      pid: process.data["pid"] || process.pid,
+      port: process_data["port"]&.to_i
+    }
+  end
 end

data/lib/process_bot/options.rb

@@ -36,17 +36,19 @@ class ProcessBot::Options
   end
 
   def application_basename
-    @application_basename ||= begin
-      app_path_parts = release_path.split("/")
+    @application_basename ||= application_basename_from_release_path
+  end
 
-      if release_path.include?("/releases/")
-        app_path_parts.pop(2)
-      elsif release_path.end_with?("/current")
-        app_path_parts.pop
-      end
+  def application_basename_from_release_path
+    app_path_parts = release_path.split("/")
+    deployment_marker_index = [
+      app_path_parts.rindex("releases"),
+      app_path_parts.rindex("current")
+    ].compact.max
 
-      app_path_parts.last
-    end
+    return app_path_parts[0...deployment_marker_index].last if deployment_marker_index
+
+    app_path_parts.last
   end
 
   def possible_process_titles

data/lib/process_bot/process.rb

@@ -334,9 +334,35 @@ class ProcessBot::Process # rubocop:disable Metrics/ClassLength
   end
 
   def process_bot_process_line_matches?(line)
-    line.include?("ProcessBot {") &&
-      line.include?("\"application\":\"#{options[:application]}\"") &&
-      line.include?("\"id\":\"#{options[:id]}\"")
+    process_data = process_bot_data_from_line(line)
+    return false unless process_data
+    return false unless process_data["id"]&.to_s == options[:id].to_s
+
+    process_bot_application_matches?(process_data) || legacy_process_bot_port_matches?(process_data)
+  end
+
+  def process_bot_data_from_line(line)
+    match = line.match(/ProcessBot (\{.+\})/)
+    return unless match
+
+    JSON.parse(match[1])
+  rescue JSON::ParserError
+    nil
+  end
+
+  def process_bot_application_matches?(process_data)
+    application = options[:application]
+    return true if application && process_data["application"] == application
+
+    basename = safe_application_basename
+    basename && process_data["application_basename"] == basename
+  end
+
+  def legacy_process_bot_port_matches?(process_data)
+    return false unless process_data["port"] && options[:port]
+
+    process_data["application_basename"].nil? &&
+      process_data["port"].to_i == options[:port].to_i
   end
 
   def force_stop_process_bot_if_configured(matching_processes)

data/lib/process_bot/version.rb

@@ -1,3 +1,3 @@
 module ProcessBot
-  VERSION = "0.1.30".freeze
+  VERSION = "0.1.34".freeze
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: process_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.34
 platform: ruby
 authors:
 - kaspernj
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knjrbfw
@@ -186,6 +187,7 @@ metadata:
   source_code_uri: https://github.com/kaspernj/process_bot
   changelog_uri: https://github.com/kaspernj/process_bot/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -200,7 +202,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Run and control processes.
 test_files: []