From 031091c978793bb2797e9a8ce9988e4de922ba11 Mon Sep 17 00:00:00 2001 From: Hau Nguyen Date: Tue, 31 May 2022 16:24:33 +0700 Subject: [PATCH] feat: use make-go-great/diff-go to support diff dir --- go.mod | 3 ++- go.sum | 6 ++++-- internal/config/config_real.go | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 5bcbb4c..e0c2046 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,8 @@ go 1.18 require ( github.com/make-go-great/color-go v0.3.0 - github.com/make-go-great/copy-go v0.8.0 + github.com/make-go-great/copy-go v0.9.0 + github.com/make-go-great/diff-go v0.0.3 github.com/urfave/cli/v2 v2.8.1 ) diff --git a/go.sum b/go.sum index c9cce07..be14862 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,10 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/make-go-great/color-go v0.3.0 h1:ZVtVk/wVVsZZwSJG7PZpsY5zwIyGao5VoN48yKfSzYA= github.com/make-go-great/color-go v0.3.0/go.mod h1:G5G8IJ3PUo+vSQ+UvnfaswF8O/piVIhFJKv1mQjBGpI= -github.com/make-go-great/copy-go v0.8.0 h1:AgMSCm4E6+2oZPQv9UR59nc0y1Q0TaYl88ypPJxjA4k= -github.com/make-go-great/copy-go v0.8.0/go.mod h1:QQii7A48OAcQMloNG5YV0USARmxHf3JLS9ieONO1WQA= +github.com/make-go-great/copy-go v0.9.0 h1:RTqVypNIa6liItFg6kORP93ZhgSck8+pupvGrnSzrSI= +github.com/make-go-great/copy-go v0.9.0/go.mod h1:J1ihIqaX3O/lGAaL23d+1GXSQwJX3RpStmUIUdh4xyw= +github.com/make-go-great/diff-go v0.0.3 h1:LEBt+oJ3KR8DDDIVKC7H/oONf+eKmQfUgQOTzskZfTc= +github.com/make-go-great/diff-go v0.0.3/go.mod h1:vRXh6owtk7WrPoIooBGYEzUIRT67fVUPZwqYDu7jt44= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= diff --git a/internal/config/config_real.go b/internal/config/config_real.go index 5bc5c70..cfeef0f 100644 --- a/internal/config/config_real.go +++ b/internal/config/config_real.go @@ -6,6 +6,7 @@ import ( "path/filepath" "github.com/make-go-great/copy-go" + "github.com/make-go-great/diff-go" ) type configReal struct { @@ -61,7 +62,7 @@ func (c *configReal) Clean() error { func (c *configReal) Compare() error { for _, app := range c.Apps { for _, p := range app.Paths { - if err := copy.Compare(p.Internal, p.External); err != nil { + if err := diff.Diff(p.Internal, p.External); err != nil { return fmt.Errorf("failed to compare %s with %s: %w", p.Internal, p.External, err) } }