process_bot 0.1.29 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26b4a49cb5489140c90c0712ed2a9b686a43d531ab1290ee63fec7710371ca31
-  data.tar.gz: 857a0fc1d15a79dbb87a92f25ded46706953b0215e64f47d135eb96ba9cf90d3
+  metadata.gz: c2183ea1e8ec1a90a39ec3d3d7d2753150f99e164f31e3650d83a40a784d1a67
+  data.tar.gz: 0b009604dcd29677832a88cd814b29e7259cef2709d22f5ef140673d298a0981
 SHA512:
-  metadata.gz: 9d14944e3d8976d0077f20e83560558bd9af1d58247c849ef7cc03d4205c017925108fc2360cdd99059480f7aaf05e5fdaf464ea19fded430a540f168136963b
-  data.tar.gz: d22b2ec8c5c7483bad6bee7ab51060164f811b601f448e1f81bdd8b86e2c0b57eae39779e05347984c065a45449b59058586b490f3a3ebf421fc80f1a865998d
+  metadata.gz: f6239960b599dc220ab6e8519f7edd7061556b69e0918d48cd655a25bd1239307b6f7b836599811cc3b69dd72ad40a830988aef00d3cb92fdfbbd9ebf02428c2
+  data.tar.gz: 4566c50a189d90b5c638369db712d63355700894a6643f17b44e4b0544bee9fdb949e13046c9f24c21652742e4352d8139bf80a5c79612d007a8114f06a4fe9c

data/.rubocop.yml

@@ -2,7 +2,7 @@ AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
   NewCops: enable
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.2
 
 plugins:
   - rubocop-performance

data/.ruby-version

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

data/AGENTS.md

@@ -14,3 +14,8 @@
 - Always add or update tests for new/changed functionality, and run them.
 - Added coverage for graceful_no_wait and Capistrano wait defaults.
 - Bumped version to 0.1.20 for log streaming updates.
+
+## Release policy
+- Do not bump the version in `lib/process_bot/version.rb` (and do not touch the `process_bot (x.y.z)` line in `Gemfile.lock`) as part of a feature or fix PR.
+- Version bumps, CHANGELOG version headings, and the rubygems push are driven by the release rake tasks (`bundle exec rake release:patch`, `release:minor`, or `release:major`), run by the release maintainer after the PR lands on master.
+- PRs should land their code change and add CHANGELOG notes under the `## [Unreleased]` heading only. Leave version numbers to the release workflow.

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 ## [Unreleased]
+- 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.29)
+    process_bot (0.1.31)
       knjrbfw (>= 0.0.116)
       pry
       rake
@@ -18,7 +18,7 @@ GEM
     http2 (0.0.36)
       string-cases (~> 0)
     io-console (0.8.2)
-    json (2.19.3)
+    json (2.19.5)
     knjrbfw (0.0.116)
       datet
       http2
@@ -29,7 +29,7 @@ GEM
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     method_source (1.1.0)
-    parallel (1.27.0)
+    parallel (1.28.0)
     parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
@@ -44,9 +44,9 @@ GEM
       reline (>= 0.6.0)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.3.1)
+    rake (13.4.2)
     ref (2.0.0)
-    regexp_parser (2.11.3)
+    regexp_parser (2.12.0)
     reline (0.6.3)
       io-console (~> 0.5)
     rspec (3.13.2)
@@ -62,11 +62,11 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.86.0)
+    rubocop (1.86.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)

data/lib/process_bot/capistrano/sidekiq_helpers.rb

@@ -23,12 +23,12 @@ module ProcessBot::Capistrano::SidekiqHelpers # rubocop:disable Metrics/ModuleLe
     fetch(:sidekiq_log)
   end
 
-  def switch_user(role, &block)
+  def switch_user(role, &)
     su_user = sidekiq_user(role)
     if su_user == role.user
       yield
     else
-      as su_user, &block
+      as(su_user, &)
     end
   end
 

data/lib/process_bot/control_socket.rb

@@ -28,6 +28,8 @@ class ProcessBot::ControlSocket
   end
 
   def start_tcp_server
+    ensure_no_duplicate_id!
+
     used_ports = used_process_bot_ports
     attempts = 0
 
@@ -50,6 +52,63 @@ class ProcessBot::ControlSocket
     end
   end
 
+  # Prevent a second process_bot with the same `--id` under the same
+  # application from starting while the first is still alive. The
+  # `start_tcp_server` loop silently drifts to a free port when the
+  # requested one is in use; drift is intentional when unrelated
+  # process_bots share a host, but it's a bug when a Capistrano deploy's
+  # stop failed to clean up the previous release's process_bot and the
+  # new release's start drifts around the zombie. Scope the match by
+  # `application_basename` (derived from `release_path`) so that two
+  # unrelated apps on the same host can reuse a generic id like
+  # `sidekiq-main` without falsely blocking each other.
+  def ensure_no_duplicate_id!
+    id = options[:id]
+    return if id.nil? || id.to_s.strip.empty?
+
+    duplicates = find_duplicate_id_entries(id.to_s, safe_application_basename)
+    return if duplicates.empty?
+
+    raise duplicate_id_error_message(id, duplicates)
+  end
+
+  def find_duplicate_id_entries(id, basename)
+    running_process_bot_entries.select do |entry|
+      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]
+    handler = options.fetch(:handler, "custom")
+    release_path = options.fetch(:release_path, "/")
+
+    "Another process_bot with id=#{id.inspect} is already running for this application (#{details}). " \
+      "Stop it (e.g. `process_bot --command stop --port #{example_port} --id #{id} " \
+      "--handler #{handler} --release-path #{release_path}`) " \
+      "or kill that PID before starting a new instance."
+  end
+
+  def safe_application_basename
+    options.application_basename
+  rescue KeyError
+    nil
+  end
+
   def actually_start_tcp_server(host, port)
     TCPServer.new(host, port)
   end
@@ -169,7 +228,14 @@ class ProcessBot::ControlSocket
   end
 
   def used_process_bot_ports
-    ports = []
+    running_process_bot_entries.filter_map { |entry| entry[:port] }.uniq
+  end
+
+  # Parsed `{application_basename:, id:, pid:, port:}` entries for every
+  # running process_bot visible to `ps`, extracted from each instance's
+  # JSON process title.
+  def running_process_bot_entries
+    entries = []
 
     Knj::Unix_proc.list("grep" => "ProcessBot") do |process|
       process_command = process.data.fetch("cmd")
@@ -182,10 +248,19 @@ class ProcessBot::ControlSocket
         next
       end
 
-      port = process_data["port"]
-      ports << port.to_i if port
+      entries << process_bot_entry_from_process_data(process, process_data)
     end
 
-    ports.uniq
+    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/handlers/custom.rb

@@ -25,8 +25,8 @@ class ProcessBot::Process::Handlers::Custom
     !value || value == "false"
   end
 
-  def fetch(*args, **opts)
-    options.fetch(*args, **opts)
+  def fetch(*, **)
+    options.fetch(*, **)
   end
 
   def logger
@@ -39,8 +39,8 @@ class ProcessBot::Process::Handlers::Custom
     set(key, value)
   end
 
-  def set(*args, **opts)
-    options.set(*args, **opts)
+  def set(*, **)
+    options.set(*, **)
   end
 
   def start_command

data/lib/process_bot/process/handlers/sidekiq.rb

@@ -56,8 +56,8 @@ class ProcessBot::Process::Handlers::Sidekiq
     update_current_pid(new_pid)
   end
 
-  def fetch(*args, **opts)
-    options.fetch(*args, **opts)
+  def fetch(*, **)
+    options.fetch(*, **)
   end
 
   def logger
@@ -70,8 +70,8 @@ class ProcessBot::Process::Handlers::Sidekiq
     set(key, value)
   end
 
-  def set(*args, **opts)
-    options.set(*args, **opts)
+  def set(*, **)
+    options.set(*, **)
   end
 
   def send_tstp_or_return

data/lib/process_bot/process.rb

@@ -163,11 +163,31 @@ class ProcessBot::Process # rubocop:disable Metrics/ClassLength
   end
 
   def update_process_title
-    process_args = {application: options[:application], handler: handler_name, id: options[:id], pid: current_pid, port: port}
+    process_args = {
+      application: options[:application],
+      application_basename: safe_application_basename,
+      handler: handler_name,
+      id: options[:id],
+      pid: current_pid,
+      port: port
+    }
     @current_process_title = "ProcessBot #{JSON.generate(process_args)}"
     Process.setproctitle(current_process_title)
   end
 
+  # Capistrano-style release paths (`.../<app>/releases/<timestamp>`)
+  # resolve to a stable per-app basename like `awesome-tasks` that is
+  # consistent across deploys of the same app and distinct across apps
+  # sharing a host. `ControlSocket#ensure_no_duplicate_id!` uses it to
+  # scope the duplicate-id guard by `(application_basename, id)` so an
+  # unrelated app on the same host can safely reuse an id like
+  # `sidekiq-main`. Returns nil when release_path isn't set.
+  def safe_application_basename
+    options.application_basename
+  rescue KeyError
+    nil
+  end
+
   def with_control_command
     control_command_monitor.synchronize do
       @control_commands_in_flight += 1
@@ -314,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.29".freeze
+  VERSION = "0.1.31".freeze
 end

data/lib/tasks/release.rake

@@ -104,7 +104,8 @@ private
       )
     )
 
-    run!("git", "add", VERSION_FILE.to_s)
+    run!("bundle", "lock")
+    run!("git", "add", VERSION_FILE.to_s, "Gemfile.lock")
   end
 
   def commit!(next_version)

data/peak_flow.yml

@@ -2,19 +2,25 @@ rvm: true
 builds:
   build_1:
     environment:
-      RUBY_VERSION: 2.7.8
-    name: Ruby 2.7.8
+      RUBY_VERSION: 3.2.5
+    name: Ruby 3.2.5
     script:
       - bundle exec rspec
   build_2:
     environment:
-      RUBY_VERSION: 3.2.2
-    name: Ruby 3.2.2
+      RUBY_VERSION: 3.3.5
+    name: Ruby 3.3.5
     script:
       - bundle exec rspec
   build_3:
     environment:
-      RUBY_VERSION: 2.7.8
+      RUBY_VERSION: 3.4.5
+    name: Ruby 3.4.5
+    script:
+      - bundle exec rspec
+  build_4:
+    environment:
+      RUBY_VERSION: 3.4.5
     name: Rubocop
     script:
       - bundle exec rubocop

data/process_bot.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = "Run and control processes."
   spec.homepage = "https://github.com/kaspernj/process_bot"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.2.0"
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: process_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.31
 platform: ruby
 authors:
 - kaspernj
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-13 00:00:00.000000000 Z
+date: 2026-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knjrbfw
@@ -195,14 +195,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Run and control processes.