brunch 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfbfbc36f9114715c3b656aeeb831010e8e75e1ccc15d8c7229813b4489ceac6
-  data.tar.gz: 6a98d0331e7d758bacafad88344dd92a0a105b60c06ead342d35fb928e36cc0f
+  metadata.gz: a5f8f14648bdb686475a9218411c5359c37dcba381ef4ac358c0b5aa06a72627
+  data.tar.gz: 678a130e837c647983b4f2043ba0408121ba4d78d5697a36093af47c00cc87bf
 SHA512:
-  metadata.gz: 64bbfe38e607cf1cf8cc1e9ce042e104653a4ac0958fdeca87ff6e40e4febf0f09e287d9c55f6cb7ce75c17a3062ad6edb1cd159f18407d3a52415192360c52b
-  data.tar.gz: ea493ddaa2e3431665a0a0a0d1c42f99a3013c9ab5ccafc98b170a98dfddd20188a7bd53dc6384f99a1469a5aba1b52298b1edd9881287e4d8c3365d246719c6
+  metadata.gz: 1f20f0fa144538315abeb04ff906994ff3313248aa2ce108c80acc74eb286f38c0756145b1a11bda28a7963c0d5d0dd5abf378166a951f56abe39f4133d8d331
+  data.tar.gz: b8b4d4faa393311bc7cd851461bf9c89885f30c55875581ac34ffecdd4a7d187d616c16a69ed8920ec568d80e22905bd1354a5f911ba6cd72aeade341a8d750e

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.1.1 - 2026-10-16
+
+- Support the short port notation that older Podman Compose versions preserve
+  in rendered configuration when `ports: auto` is enabled.
+- Run Podman Compose cleanup from Brunch's control directory after a worktree
+  has been removed.
+
 ## 1.1.0 - 2026-10-16
 
 - Add opt-in `ports: auto` for Docker Compose and Podman Compose. Brunch now

data/lib/brunch/compose_ports.rb

@@ -29,7 +29,7 @@ module Brunch
           mapping = published_mapping(service, port)
           next port unless mapping
 
-          port.merge("published" => indexed.fetch(key(mapping)))
+          rewrite_port(port, mapping, indexed.fetch(key(mapping)))
         end
       end
       document
@@ -40,7 +40,9 @@ module Brunch
     end
 
     def published_mapping(service, port)
-      raise CLI::ConfigurationError, "Unsupported Compose port for #{service}; use Compose long syntax with ports: auto." unless port.is_a?(Hash)
+      return short_mapping(service, port) if port.is_a?(String)
+
+      raise CLI::ConfigurationError, "Unsupported Compose port for #{service}." unless port.is_a?(Hash)
       return unless port.key?("published") && !port["published"].to_s.empty?
 
       published = integer(port["published"], "published host port for #{service}")
@@ -53,6 +55,30 @@ module Brunch
     end
     private_class_method :published_mapping
 
+    def rewrite_port(port, mapping, host)
+      return port.merge("published" => host) if port.is_a?(Hash)
+
+      value = [mapping.fetch("host_ip"), host, mapping.fetch("target")].reject { |part| part == "" }.join(":")
+      mapping.fetch("protocol") == "tcp" ? value : "#{value}/#{mapping.fetch('protocol')}"
+    end
+    private_class_method :rewrite_port
+
+    def short_mapping(service, port)
+      value, protocol = port.split("/", 2)
+      parts = value.split(":")
+      raise CLI::ConfigurationError, "Unsupported Compose port for #{service}: #{port.inspect}." unless (2..3).cover?(parts.length)
+
+      target = integer(parts.pop, "container port for #{service}")
+      published = integer(parts.pop, "published host port for #{service}")
+      host_ip = parts.pop.to_s
+      normalized_protocol = protocol || "tcp"
+      raise CLI::ConfigurationError, "Unsupported protocol #{normalized_protocol.inspect} for #{service}." unless %w[tcp udp].include?(normalized_protocol)
+
+      { "service" => service.to_s, "target" => target, "protocol" => normalized_protocol,
+        "host_ip" => host_ip, "published" => published }
+    end
+    private_class_method :short_mapping
+
     def integer(value, description)
       Integer(value).tap do |port|
         raise CLI::ConfigurationError, "Invalid #{description}: #{value.inspect}." unless CLI::PORT_RANGE.cover?(port)

data/lib/brunch/managers.rb

@@ -99,7 +99,7 @@ module Brunch
       end
 
       def render_compose(entry)
-        output, error, status = Open3.capture3(environment(entry), *source_compose_command(entry, "config"), **compose_options(entry))
+        output, error, status = Open3.capture3(environment(entry), *source_compose_command(entry, "config"), **source_compose_options(entry))
         return [output, nil] if status.success?
 
         [nil, error]
@@ -144,6 +144,7 @@ module Brunch
       end
 
       def compose_options(_entry) = {}
+      def source_compose_options(entry) = compose_options(entry)
 
       def compose_directory(entry)
         source = entry.fetch("snapshot")
@@ -183,7 +184,8 @@ module Brunch
         ["podman", "compose", "-p", entry.fetch("project"), "-f", File.join(directory, entry.fetch("compose_file")), *arguments]
       end
 
-      def compose_options(entry) = { chdir: entry.fetch("snapshot") }
+      def compose_options(entry) = { chdir: compose_directory(entry) }
+      def source_compose_options(entry) = { chdir: entry.fetch("snapshot") }
 
       def ports_command = ["podman", "ps", "--format", "{{.Ports}}"]
 

data/lib/brunch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Brunch
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brunch
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Maciej Ciemborowicz