Merge pull request #19714 from Homebrew/bundle-sim-services-2

Reland "bundle: handle simultaneous exec --services better"

Author: Bo98

Library/Homebrew/bundle/commands/exec.rb

@@ -179,6 +179,7 @@ def self.run(*args, global: false, file: nil, subcommand: "", services: false)
           params(
             entries: T::Array[Homebrew::Bundle::Dsl::Entry],
             _block:  T.proc.params(
+              entry:                Homebrew::Bundle::Dsl::Entry,
               info:                 T::Hash[String, T.anything],
               service_file:         Pathname,
               conflicting_services: T::Array[T::Hash[String, T.anything]],
@@ -195,6 +196,8 @@ def self.run(*args, global: false, file: nil, subcommand: "", services: false)
             [entry, formula]
           end.to_h
 
+          return if entries_formulae.empty?
+
           conflicts = entries_formulae.to_h do |entry, formula|
             [
               entry,
@@ -245,15 +248,20 @@ def self.run(*args, global: false, file: nil, subcommand: "", services: false)
 
             raise "Failed to get service info for #{entry.name}" if info.nil?
 
-            yield info, service_file, conflicting_services
+            yield entry, info, service_file, conflicting_services
           end
         end
 
         sig { params(entries: T::Array[Homebrew::Bundle::Dsl::Entry], _block: T.nilable(T.proc.void)).void }
         private_class_method def self.run_services(entries, &_block)
+          entries_to_stop = []
           services_to_restart = []
 
-          map_service_info(entries) do |info, service_file, conflicting_services|
+          map_service_info(entries) do |entry, info, service_file, conflicting_services|
+            # Don't restart if already running this version
+            loaded_file = Pathname.new(info["loaded_file"].to_s)
+            next if info["running"] && loaded_file&.file? && loaded_file&.realpath == service_file.realpath
+
             if info["running"] && !Bundle::BrewServices.stop(info["name"], keep: true)
               opoo "Failed to stop #{info["name"]} service"
             end
@@ -269,6 +277,8 @@ def self.run(*args, global: false, file: nil, subcommand: "", services: false)
             unless Bundle::BrewServices.run(info["name"], file: service_file)
               opoo "Failed to start #{info["name"]} service"
             end
+
+            entries_to_stop << entry
           end
 
           return unless block_given?
@@ -277,7 +287,7 @@ def self.run(*args, global: false, file: nil, subcommand: "", services: false)
             yield
           ensure
             # Do a full re-evaluation of services instead state has changed
-            stop_services(entries)
+            stop_services(entries_to_stop)
 
             services_to_restart.each do |service|
               next if Bundle::BrewServices.run(service)
@@ -289,7 +299,7 @@ def self.run(*args, global: false, file: nil, subcommand: "", services: false)
 
         sig { params(entries: T::Array[Homebrew::Bundle::Dsl::Entry]).void }
         private_class_method def self.stop_services(entries)
-          map_service_info(entries) do |info, _, _|
+          map_service_info(entries) do |_, info, _, _|
             next unless info["loaded"]
 
             # Try avoid services not started by `brew bundle services`

Library/Homebrew/test/bundle/commands/exec_spec.rb

@@ -185,6 +185,7 @@
         allow(pkgconf).to receive(:any_version_installed?).and_return(false)
 
         allow_any_instance_of(Pathname).to receive(:file?).and_return(true)
+        allow_any_instance_of(Pathname).to receive(:realpath) { |path| path }
 
         allow(described_class).to receive(:exit!).and_return(nil)
       end