search

geofffranks / spruce

A BOSH template merge tool
MIT License
433 stars 78 forks source link

Introduce dyff as the diff package #289

Closed HeavyWombat closed 5 years ago

HeavyWombat commented 5 years ago

Use dyff package to create the diff output. It supports additional checks for order changes in lists and a compact output style.

I tried to update as few dependencies as possible, but the following updates were necessary:

godep update -v github.com/smartystreets/...
godep update golang.org/x/sys/unix
godep update github.com/mattn/go-isatty
godep update gopkg.in/yaml.v2
godep save ./...

Also, I had to add context.Background() to the server test case to fix a NilPointer panic.

This should fix #285.

Example:

image
HeavyWombat commented 5 years ago

@geofffranks Have you had a chance to take a look at this PR? Thanks in advance.

geofffranks commented 5 years ago

Sorry, I thought I was waiting still for dependency updates. Will try to look tomorrow

Sent from my iPhone

On Jun 6, 2019, at 2:01 PM, Matthias Diester notifications@github.com wrote:

@geofffranks Have you had a chance to take a look at this PR? Thanks in advance.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or mute the thread.

geofffranks commented 5 years ago

Seems like there are some issues running tests now after the dependency updates. May take a little bit to get this released officially

HeavyWombat commented 5 years ago

Oh, really? I am sorry for the dependency problems. I thought with the vendor directory everything should be right where it is suppose to be.

I already started to look into a migration to Go modules. In theory, it should get better the Go modules.

geofffranks commented 5 years ago

Looks like it's a problem with just my laptop. CI looks fine, and another laptop i have works fine.