From 5d1eb98f8626ac0496bce52df1a7162e613aeccb Mon Sep 17 00:00:00 2001 From: plastikfan Date: Thu, 24 Oct 2024 15:31:32 +0100 Subject: [PATCH] chore(deps): upgrade nefilim and li18ngo --- director.go | 4 ++-- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- internal/laboratory/test-traverse-fs.go | 5 +++++ internal/persist/marshaler-local-fs_test.go | 3 ++- tapable/tapable_test.go | 3 +-- traverse-api.go | 2 +- 7 files changed, 23 insertions(+), 18 deletions(-) diff --git a/director.go b/director.go index 7d758ac..7eff353 100644 --- a/director.go +++ b/director.go @@ -83,7 +83,7 @@ func Prime(using *pref.Using, settings ...pref.Option) *Builders { return using.GetTraverseFS(root) } - return nef.NewTraverseFS(nef.At{ + return nef.NewTraverseFS(Rel{ Root: root, Overwrite: noOverwrite, }) @@ -134,7 +134,7 @@ func Resume(was *Was, settings ...pref.Option) *Builders { return was.Using.GetTraverseFS(root) } - return nef.NewTraverseFS(nef.At{ + return nef.NewTraverseFS(Rel{ Root: root, Overwrite: noOverwrite, }) diff --git a/go.mod b/go.mod index 11e3f20..084f232 100644 --- a/go.mod +++ b/go.mod @@ -13,12 +13,12 @@ require ( github.com/go-logr/logr v1.4.2 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect + github.com/google/pprof v0.0.0-20241023014458-598669927662 // indirect github.com/nicksnyder/go-i18n/v2 v2.4.1 github.com/pkg/errors v0.9.1 - github.com/rogpeppe/go-internal v1.12.0 // indirect - github.com/snivilised/li18ngo v0.1.6 - github.com/snivilised/nefilim v0.1.1 + github.com/rogpeppe/go-internal v1.13.1 // indirect + github.com/snivilised/li18ngo v0.1.7 + github.com/snivilised/nefilim v0.1.4 github.com/snivilised/pants v0.1.2 golang.org/x/net v0.30.0 // indirect golang.org/x/sys v0.26.0 // indirect diff --git a/go.sum b/go.sum index 047616e..2018215 100644 --- a/go.sum +++ b/go.sum @@ -10,8 +10,8 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA= -github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/pprof v0.0.0-20241023014458-598669927662 h1:SKMkD83p7FwUqKmBsPdLHF5dNyxq3jOWwu9w9UyH5vA= +github.com/google/pprof v0.0.0-20241023014458-598669927662/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -26,12 +26,12 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/snivilised/li18ngo v0.1.6 h1:ADwEttoi6VU//P6vS6HVGhyaBI9KwQXmkfsOReEl5B0= -github.com/snivilised/li18ngo v0.1.6/go.mod h1:+3P8NGIGXNaKFHSwP54q2UawhfUEqPfqPXPiB0pBihg= -github.com/snivilised/nefilim v0.1.1 h1:uMhLSfj5prGr2bahwzSM50rpd22fiiv0ZDLSzxYWsgg= -github.com/snivilised/nefilim v0.1.1/go.mod h1:+4/hKxgfvE8eNjLMJC+3ropEZSQuiR/NqfPtIuw7ZMw= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= +github.com/snivilised/li18ngo v0.1.7 h1:XRYpmP7jSAxzRyg5WH0PViFb9ycWGFcDkQQqd2GsjzQ= +github.com/snivilised/li18ngo v0.1.7/go.mod h1:NVOexqt/aIhnenNPQDqbJchLNte92io87j5o2l+HNqs= +github.com/snivilised/nefilim v0.1.4 h1:bhiENDl/T6ZQO146eF8UnxtXLQenSzEyjwuTeWScImw= +github.com/snivilised/nefilim v0.1.4/go.mod h1:+4/hKxgfvE8eNjLMJC+3ropEZSQuiR/NqfPtIuw7ZMw= github.com/snivilised/pants v0.1.2 h1:6Abj02gV5rFYyKfCsmeEiOi1pLdRyITKUY5oDoRgYuU= github.com/snivilised/pants v0.1.2/go.mod h1:BOZa24yLxVjjnTCFWQeCzUWL8eK4TLtXtkz3pMdEFQM= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= diff --git a/internal/laboratory/test-traverse-fs.go b/internal/laboratory/test-traverse-fs.go index d5789ac..6dd73a6 100644 --- a/internal/laboratory/test-traverse-fs.go +++ b/internal/laboratory/test-traverse-fs.go @@ -6,6 +6,7 @@ import ( "strings" "testing/fstest" + nef "github.com/snivilised/nefilim" "github.com/snivilised/traverse/internal/third/lo" "github.com/snivilised/traverse/locale" ) @@ -103,3 +104,7 @@ func (f *TestTraverseFS) WriteFile(name string, data []byte, perm os.FileMode) e return nil } + +func (f *TestTraverseFS) Ensure(_ nef.PathAs) (string, error) { + panic("NOT-IMPL: TestTraverseFS.Ensure") +} diff --git a/internal/persist/marshaler-local-fs_test.go b/internal/persist/marshaler-local-fs_test.go index f78fc1c..e4aeeca 100644 --- a/internal/persist/marshaler-local-fs_test.go +++ b/internal/persist/marshaler-local-fs_test.go @@ -8,6 +8,7 @@ import ( . "github.com/onsi/gomega" //nolint:revive // ok "github.com/snivilised/li18ngo" nef "github.com/snivilised/nefilim" + tv "github.com/snivilised/traverse" "github.com/snivilised/traverse/enums" lab "github.com/snivilised/traverse/internal/laboratory" "github.com/snivilised/traverse/internal/opts" @@ -49,7 +50,7 @@ var _ = Describe("Marshaler", Ordered, func() { ) Expect(err).To(Succeed()) - writerFS := nef.NewWriteFileFS(nef.At{ + writerFS := nef.NewWriteFileFS(tv.Rel{ Root: testPath, Overwrite: NoOverwrite, }) diff --git a/tapable/tapable_test.go b/tapable/tapable_test.go index 6d3d77d..2db827a 100644 --- a/tapable/tapable_test.go +++ b/tapable/tapable_test.go @@ -6,7 +6,6 @@ import ( . "github.com/onsi/ginkgo/v2" //nolint:revive // ok . "github.com/onsi/gomega" //nolint:revive // ok - nef "github.com/snivilised/nefilim" tv "github.com/snivilised/traverse" "github.com/snivilised/traverse/core" lab "github.com/snivilised/traverse/internal/laboratory" @@ -211,7 +210,7 @@ var _ = Describe("Tapable", Ordered, func() { }, ) - sys := tv.NewReadDirFS(nef.At{ + sys := tv.NewReadDirFS(tv.Rel{ Root: root, }) _, _ = o.Hooks.ReadDirectory.Default()(sys, root) diff --git a/traverse-api.go b/traverse-api.go index 7004a9b..88a265e 100644 --- a/traverse-api.go +++ b/traverse-api.go @@ -55,9 +55,9 @@ type ( ResumeStrategy = enums.ResumeStrategy // 🌀 nef - At = nef.At ExistsInFS = nef.ExistsInFS FileSystems = nef.FileSystems + Rel = nef.Rel RenameFS = nef.RenameFS TraverseFS = nef.TraverseFS WriteFileFS = nef.WriteFileFS