brunch 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 318ff646dd610a9647612d8ea0fcc446e5122215f4517d665fc639b5bfca740d
-  data.tar.gz: e4aeddec12c82d9b0d33caddf6a366840e3db8badd45fec4114f57bd034c3d86
+  metadata.gz: 954abfa5f0f95a57eb872a2f140b0eed41d06ccbc7ff5ed5961e12ff73b371fd
+  data.tar.gz: 650c7a5a55c2557191e35cd94da369e6d89708623963e9c2721f04664c9ecbe7
 SHA512:
-  metadata.gz: d334e9cc379f39f4866626e8801adbdc9cbe8aace2d0249b8b4a6a81020b34ec35eca8b8dcf742622e06545d58086966ed087784b077460bdc7e56e5ec150f1c
-  data.tar.gz: b34f7f1baf8dbbf6a56669ccc310846eab6aa23d891fa05e4adbe541e1ab1ccea954bfdb46c087fba7a47e3601f45f967efb1de8ff93d7678cb361abaec6eb1c
+  metadata.gz: 422d99f190dc07133f0517690a21ec2fda19f17a909b58437374bd49b982625cee2738f5fbe5ab6095898cadd758abdb83df4e21ea856f91270abe4cd16d42be
+  data.tar.gz: c328e3b0a2ba453afd8dd5beb073a221ca5d5b1ba33caafcf59ee1a5396591d5c5b374ef85999511c9b0b8dd558fe963289c2098f76aca42ed650e3ac8e43c61

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## 0.8.2 - 2026-09-29
+
+- Resume stopped branch containers without rebuilding or replacing them when
+  switching back, preserving files in their writable layers.
+- Group `brunch ports` by worktree and show stopped branch environments in gray.
+
 ## 0.8.1 - 2026-09-29
 
 - Reorganize the README into a step-by-step guide for branches, parallel

data/README.md

@@ -101,6 +101,8 @@ git switch main
 Branches checked out in the same worktree reuse that worktree's host port.
 
 With Compose, each branch keeps its own Compose project and named volumes, so persistent resources remain isolated between branches.
+Returning to a previously activated branch starts its stopped containers again,
+preserving files written inside them. The branch keeps the same host port.
 
 To manually start the environment after `brunch stop`:
 
@@ -108,12 +110,15 @@ To manually start the environment after `brunch stop`:
 brunch activate
 ```
 
-To rebuild and restart it:
+To rebuild and recreate its containers explicitly:
 
 ```bash
 brunch restart
 ```
 
+`brunch restart` may discard data stored only in a container's writable layer.
+Put important data, such as databases, in named volumes.
+
 Compose builds use files from the live worktree, including uncommitted changes.
 
 If you want source edits to appear in an already running container without rebuilding, configure a bind mount or another reload mechanism in your Compose setup.
@@ -140,7 +145,9 @@ brunch ports
 
 `brunch port` prints the current worktree's port.
 
-`brunch ports` lists ports assigned to all worktrees.
+`brunch ports` groups the current and previously activated branches under each
+worktree. Stopped branches appear in gray and retain their worktree's port for
+the next activation.
 
 Switching branches inside one worktree does not affect environments running in other worktrees.
 
@@ -282,7 +289,7 @@ Print the current worktree's port.
 brunch ports
 ```
 
-List ports assigned to all worktrees.
+List current and stopped branch environments grouped by worktree.
 
 ```bash
 brunch stop

data/lib/brunch/managers.rb

@@ -15,6 +15,8 @@ module Brunch
 
       def create(_entry) = true
 
+      def resume(entry) = start(entry)
+
       def environment(entry)
         {
           "BRUNCH_REF" => entry.fetch("ref", ""),
@@ -66,6 +68,7 @@ module Brunch
       end
 
       def start(entry) = compose(entry, "up", "--detach", "--build", "--remove-orphans")
+      def resume(entry) = compose(entry, "start")
 
       def status(entry)
         return "unavailable" unless available?

data/lib/brunch/version.rb

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

data/lib/brunch/worktree_mode.rb

@@ -100,11 +100,13 @@ module Brunch
         abort "#{config.fetch('manager')} is unavailable." unless manager.available?
 
         existing = nil
+        current_ref = nil
         with_state_lock do |data|
           record = data.fetch("worktrees", {})[id]
           existing = record&.fetch("environments", {})&.[](ref)
+          current_ref = record&.[]("current")
         end
-        return if existing && !force && existing["snapshot"] == path && existing["head"] == head && existing["status"] == "running"
+        return if existing && !force && existing["snapshot"] == path && existing["status"] == "running" && current_ref == ref
 
         previous = nil
         port = nil
@@ -120,6 +122,16 @@ module Brunch
             data.fetch("worktrees").fetch(id).fetch("environments").fetch(previous.fetch("ref"))["status"] = "stopped"
           end
         end
+        if existing && !force && existing["snapshot"] == path && existing["status"] != "starting"
+          with_state_lock { |data| data.fetch("worktrees").fetch(id)["current"] = ref }
+          abort "Could not resume environment for #{path}. Run brunch restart to rebuild it." unless worktree_manager(existing).resume(existing)
+
+          with_state_lock do |data|
+            data.fetch("worktrees").fetch(id).fetch("environments").fetch(ref)["status"] = "running"
+          end
+          puts "Resumed #{ref} in #{path} at http://127.0.0.1:#{existing.fetch('port')}"
+          return
+        end
         abort "Could not reset environment for #{path}." if existing && !worktree_manager(existing).reset(existing)
 
         project = "brunch-#{id[0, 12]}-#{Digest::SHA256.hexdigest(ref)[0, 12]}"
@@ -252,12 +264,22 @@ module Brunch
       data = state
       current_id = worktree_identity(repo_root)
       data.fetch("worktrees", {}).sort_by { |_id, record| record.fetch("path") }.each do |id, record|
-        entry = record.fetch("environments", {})[record["current"]]
-        next unless entry
+        environments = record.fetch("environments", {})
+        next if environments.empty?
 
-        marker = id == current_id ? color("●", 32) : "○"
-        name = id == current_id ? color(entry.fetch("ref"), 32) : entry.fetch("ref")
-        puts "#{marker} #{name}  #{record.fetch('port')}  #{record.fetch('path')}"
+        path = record.fetch("path")
+        puts(id == current_id ? color("● #{path}", 32) : "○ #{path}")
+        branches = environments.sort_by { |ref, _entry| [ref == record["current"] ? 0 : 1, ref] }
+        branches.each_with_index do |(ref, entry), index|
+          prefix = index == branches.length - 1 ? "  └─" : "  ├─"
+          running = ref == record["current"] && entry["status"] == "running"
+          unless running
+            puts color("#{prefix} ○ #{ref}  #{entry.fetch('port')}", 90)
+            next
+          end
+
+          puts "#{prefix} #{color("● #{ref}", 32)}  #{entry.fetch('port')}"
+        end
       end
     end
 

metadata

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