brunch 0.9.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f7a05f3aae716ba9e82f616156c85380fad4437a5d0d440056a834999830fc6
-  data.tar.gz: dccd1027c1fb0a185807427cfe0ffbe06bc94362f656de08a064f52786c39ee2
+  metadata.gz: c9e410a84d1fd30ba484345f2027d5253ed9596f0b5f26efa1add8d2b863a750
+  data.tar.gz: 75cf5154603bf83bf8a439f16a2489ff4bf5dda9ce9bb7dc6340e2591559458c
 SHA512:
-  metadata.gz: 550ae4c541eabe5196634628561c094e28039a578ccbb795c97ee41bb67b20fd48a58d4742bd685b877da57654784daa6a57004697422ad5b15f633199e9dc33
-  data.tar.gz: b6e4d92569d518d6ba19a8eb2b326996d0351a00cae53a03e4eecd23f0653a3cf5a6247a0db199b34050a47c49d8434e3ff6148860136dc99856fe8616f97ddc
+  metadata.gz: 7cfe235dfe3e43525d0a5fcaf6c8e9fa0e26d31816eec9dde3b57a2474b5b92624f069465a6b8f5b0be580ac97aeadccf44eb9441afeb54e99ea73f77d225316
+  data.tar.gz: 909b5e6ebb1f6cb14395dc68636db0e24cb26fe24acfedc45def14dd37ea0989b0500e07d8362fb04b92361d3b6d90f954df3edfa783b72fe1f7edcc23f3c49e

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 1.0.0 - 2026-10-16
+
+- Recover automatically when a stopped Compose environment cannot resume: Brunch
+  recreates the failed environment instead of leaving its worktree unavailable.
+- Correctly reconcile forced branch renames such as `git branch -M source target`
+  when the destination already has an environment.
+- Keep the 100% line and branch coverage gate for the regular test suite while
+  allowing manager integration jobs to report functional failures directly.
+- Clarify the lifecycle of stopped Compose containers, Rails PID files, forced
+  branch renames, and `brunch cleanup`.
+
 ## 0.9.2 - 2026-10-05
 
 - Settle branch deletions automatically after the Git process exits, preserving

data/README.md

@@ -140,6 +140,15 @@ With Compose, each branch keeps its own Compose project and named volumes, so pe
 Returning to a previously activated branch starts its stopped containers again,
 preserving files written inside them. The branch keeps the same host port.
 
+If a resumed Compose application exits immediately, Brunch recreates that
+environment automatically. This recovers the worktree but discards files kept
+only in the container's writable layer; named volumes remain intact.
+
+Applications that write a PID file inside the container should remove it before
+starting. For example, a Rails Compose command can begin with
+`rm -f /tmp/rails-server.pid &&`. A stopped container keeps its writable layer,
+including a stale PID file, until it is recreated.
+
 To manually start the environment after `brunch stop`:
 
 ```bash
@@ -194,6 +203,10 @@ brunch watch
 
 Switching branches inside one worktree does not affect environments running in other worktrees.
 
+For reliable automatic handling of forced branch renames such as
+`git branch -M source target`, use a Git version supported by `ghe doctor` and
+run `brunch install` after upgrading git-hooks-ext.
+
 If you create a worktree with plain Git:
 
 ```bash
@@ -214,6 +227,9 @@ brunch cleanup
 ```
 
 Brunch never deletes the worktree source directory.
+It removes environments for worktrees that Git no longer reports; it does not
+act as a general-purpose command for deleting the current worktree's stopped
+containers or volumes.
 
 ## Managers
 

data/lib/brunch/version.rb

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

data/lib/brunch/worktree_mode.rb

@@ -130,16 +130,16 @@ module Brunch
         end
         if existing && !force && existing["snapshot"] == path && existing["status"] != "starting"
           with_state_lock { |data| data.fetch("worktrees").fetch(id)["current"] = ref }
-          unless worktree_manager(existing).resume(existing)
-            abort "Could not resume environment for #{path}; the container may have exited. Check brunch logs. " \
-                  "If dependencies changed, rebuild with brunch restart (this replaces the container)."
+          if 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
 
-          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
+          warn "Could not resume #{ref}; recreating its environment."
+          force = true
         end
         abort "Could not reset environment for #{path}." if existing && !worktree_manager(existing).reset(existing)
 
@@ -331,7 +331,7 @@ module Brunch
         renamed = renamed_branch(ref, nil, refs)
         next if renamed == :unknown
 
-        renamed ? rename_branch_environments(ref, renamed) : remove_branch_environments(ref)
+        renamed ? rename_branch_environments(ref, renamed, replace_existing: true) : remove_branch_environments(ref)
       end
     end
 

metadata

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