mirror of
https://github.com/lukaszraczylo/harness-sync.git
synced 2026-10-12 00:45:22 +00:00
lukaszraczyloandGitHub
e01f3419ea
Three robustness fixes for the apply pipeline:
1. Silent read errors on state/target files treated 'file absent' as
'file empty' and fast-forward-overwrote user edits. Add
common.ReadExistingFile that returns (nil,nil) only on
os.IsNotExist; other I/O errors propagate. Use it from apply.Run
and from every adapter's Render (claudecode, crush, kilo,
opencode, goose, zed).
2. apply.Run required callers to pre-construct *gitx.Repo; passing
nil silently skipped the commit. Run now auto-opens a repo from
Bundle.Root, gracefully no-ops when the root is not a git repo,
and uses a new gitx.HasStagedChanges() check to skip the no-op
'nothing to commit' that triggered the original silent-skip.
3. Each of 7 adapter packages re-implemented the same 25-line
Option/WithHome/New constructor. Hoist into adapter.Base +
adapter.BaseOption + NewBase. Each adapter embeds *Base and
reduces to a 9-line constructor. Public New(WithHome(h)) API
preserved; a.home becomes a.Home.
Tests:
- apply: 5 new (propagates-read-error, auto-opens-repo,
no-repo-skips-commit, skips-no-op-commit, commit-message-counts)
- gitx: 2 new (HasStagedChanges empty/after-add)
- adapter/common: 3 new (ReadExistingFile missing/content/perm)
- adapter: 4 new (NewBase default/WithHome/order/typed)
- existing adapter tests unchanged — verify a.Home still honoured.
47 lines
1.2 KiB
Go
47 lines
1.2 KiB
Go
package adapter_test
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/lukaszraczylo/harness-sync/internal/adapter"
|
|
)
|
|
|
|
func TestNewBaseDefaultsHomeFromEnv(t *testing.T) {
|
|
b := adapter.NewBase()
|
|
// DefaultHome returns either $HOME or "". We only assert that the
|
|
// helper does not panic and that Home is a string (Go zero value is "").
|
|
// Environment-dependence: skip if HOME is unset (CI minimal envs).
|
|
if b.Home == "" {
|
|
t.Skip("HOME unset in test env; cannot verify default")
|
|
}
|
|
assert.NotEmpty(t, b.Home)
|
|
}
|
|
|
|
func TestNewBaseWithHomeOverrides(t *testing.T) {
|
|
b := adapter.NewBase(adapter.WithHome("/custom/home/path"))
|
|
assert.Equal(t, "/custom/home/path", b.Home)
|
|
}
|
|
|
|
func TestNewBaseOptionsApplyInOrder(t *testing.T) {
|
|
// Last write wins — covers the basic Apply loop in NewBase.
|
|
b := adapter.NewBase(
|
|
adapter.WithHome("/first"),
|
|
adapter.WithHome("/second"),
|
|
)
|
|
assert.Equal(t, "/second", b.Home)
|
|
}
|
|
|
|
func TestBaseOptionTypedCorrectly(t *testing.T) {
|
|
// adapter.BaseOption is the public type; WithHome must return it.
|
|
opt := adapter.WithHome("/x")
|
|
require.NotNil(t, opt)
|
|
|
|
// Apply it manually to confirm signature.
|
|
var b adapter.Base
|
|
opt(&b)
|
|
assert.Equal(t, "/x", b.Home)
|
|
}
|