Move dyff to homeport

Move `dyff` project into the `homeport` organization.
homeport · Apr 2, 2019 · 58bdfe3 · 58bdfe3
1 parent 6e68eb5
commit 58bdfe3
Show file tree

Hide file tree

Showing 33 changed files with 75 additions and 58 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-# Copyright © 2018 Matthias Diester
+# Copyright © 2019 The Homeport Team
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,10 @@
 language: go
 go:
 - 1.11.x
+- 1.12.x
 
 install:
-- curl --silent --location https://goo.gl/g1CpPX | bash -s v1.0.5
+- curl --silent --location https://goo.gl/g1CpPX | bash -s v1.0.7
 
 script:
 - GO111MODULE=on go mod download
@@ -27,5 +28,5 @@ deploy:
   file_glob: true
   file: binaries/*
   on:
-    condition: $TRAVIS_GO_VERSION =~ ^1\.11
+    condition: $TRAVIS_GO_VERSION =~ ^1\.12
     tags: true
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Matthias Diester
+Copyright (c) 2019 The Homeport Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-# Copyright © 2018 Matthias Diester
+# Copyright © 2019 The Homeport Team
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,8 +23,8 @@
 all: test
 
 clean:
-	@go clean -i -r -cache
 	@rm -rf $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/binaries
+	@go clean -i -cache $(shell go list ./...)
 
 vet:
 	$(dir $(realpath $(firstword $(MAKEFILE_LIST))))scripts/go-vet.sh

diff --git a/README.md b/README.md
@@ -1,16 +1,18 @@
-[![License](https://img.shields.io/github/license/HeavyWombat/dyff.svg)](https://github.com/HeavyWombat/dyff/blob/master/LICENSE)
-[![Go Report Card](https://goreportcard.com/badge/github.com/HeavyWombat/dyff)](https://goreportcard.com/report/github.com/HeavyWombat/dyff)
-[![Build Status](https://travis-ci.org/HeavyWombat/dyff.svg?branch=master)](https://travis-ci.org/HeavyWombat/dyff)
-[![Codecov](https://img.shields.io/codecov/c/github/HeavyWombat/dyff/master.svg)](https://codecov.io/gh/HeavyWombat/dyff)
-[![GoDoc](https://godoc.org/github.com/HeavyWombat/dyff/pkg?status.svg)](https://godoc.org/github.com/HeavyWombat/dyff/pkg)
-[![Release](https://img.shields.io/github/release/HeavyWombat/dyff.svg)](https://github.com/HeavyWombat/dyff/releases/latest)
-
 # δyƒƒ /ˈdʏf/
+
+[![License](https://img.shields.io/github/license/homeport/dyff.svg)](https://github.com/homeport/dyff/blob/master/LICENSE)
+[![Go Report Card](https://goreportcard.com/badge/github.com/homeport/dyff)](https://goreportcard.com/report/github.com/homeport/dyff)
+[![Build Status](https://travis-ci.org/homeport/dyff.svg?branch=master)](https://travis-ci.org/homeport/dyff)
+[![Codecov](https://img.shields.io/codecov/c/github/homeport/dyff/master.svg)](https://codecov.io/gh/homeport/dyff)
+[![GoDoc](https://godoc.org/github.com/homeport/dyff/pkg?status.svg)](https://godoc.org/github.com/homeport/dyff/pkg)
+[![Release](https://img.shields.io/github/release/homeport/dyff.svg)](https://github.com/homeport/dyff/releases/latest)
+
 A diff tool for YAML files, and sometimes JSON
 
 ![dyff between example](docs/images/dyff-between-example.png?raw=true "dyff between example of two cf-deployment versions")
 
 ## Description
+
 `dyff` is inspired by the way the old [BOSH v1](https://bosh.io/) deployment output reported changes from one version to another by only showing the parts of a YAML file that change.
 
 Each difference is referenced by its location in the YAML document by using either the [Spruce](https://github.com/geofffranks/spruce) or [go-patch](https://github.com/cppforlife/go-patch) path syntax. The output report aims to be as compact as possible to give a clear and simple overview of the change.
@@ -22,55 +24,69 @@ Input files can be local files (filesystem path), remote files (URI), or the sta
 All orders of keys in hashes are preserved during processing and output to the terminal, most notably in the sub-commands to convert YAML to JSON and vice versa.
 
 ## Installation
+
 On macOS, `dyff` is available via Homebrew:
+
 ```bash
-brew install HeavyWombat/tap/dyff
+brew install homeport/tap/dyff
 ```
 
-Prebuilt binaries for a lot of operating systems and architectures can be [downloaded from the releases section](https://github.com/HeavyWombat/dyff/releases/latest).
+Prebuilt binaries for a lot of operating systems and architectures can be [downloaded from the releases section](https://github.com/homeport/dyff/releases/latest).
 
 There is a convenience script to download the latest release for Linux or macOS if you want to keep it simple (you need `curl` and `jq` installed on your machine):
+
 ```bash
 curl --silent --location https://goo.gl/DRXDVN | bash
 ```
 
 And of course, you can download and build `dyff` from source using `go`:
+
 ```bash
-go get github.com/HeavyWombat/dyff
+go get github.com/homeport/dyff
 ```
 
 ## Use cases and examples
+
 - Show the differences between two versions of [`cf-deployment`](https://github.com/cloudfoundry/cf-deployment/) YAMLs:
+
     ```bash
     dyff between \
       https://raw.githubusercontent.com/cloudfoundry/cf-deployment/v1.19.0/cf-deployment.yml \
       https://raw.githubusercontent.com/cloudfoundry/cf-deployment/v1.20.0/cf-deployment.yml
     ```
 
 - Convert a JSON stream to YAML
+
     ```bash
     sometool --json | jq --raw-output '.data' | dyff yaml -
     ```
 
 - Sometimes you end up with YAML or JSON files, where the order of the keys in maps was sorted alphabetically. With `dyff` you can restructure keys in maps to a more human appealing order:
+
     ```bash
     sometool --export --json | dyff - yaml --restructure
     ```
+
     Or, rewrite a file _in place_ with the restructured order of keys.
+
     ```bash
     dyff yaml --restructure --in-place somefile.yml
     ```
 
 - Just print a YAML (or JSON) file to the terminal to look at it. By default, `dyff` will use a neat output schema which includes different colors and indent helper lines to improve readability. The colors are roughly based on the default [Atom](https://atom.io) schema and work best on dark terminal backgrounds. The neat output is disabled the output of `dyff` is redirected into a pipe, or you can disable it explicitly using the `--plain` flag.
+
     ```bash
     dyff yaml somefile.yml
     ```
 
 - Convert a YAML file to JSON and vice versa:
+
     ```bash
     dyff json https://raw.githubusercontent.com/cloudfoundry/cf-deployment/v1.19.0/cf-deployment.yml
     ```
+
     The `dyff` sub-command (`yaml`, or `json`) defines the output format, the tool automatically detects the input format itself.
+
     ```bash
-    dyff yaml https://raw.githubusercontent.com/HeavyWombat/dyff/develop/assets/bosh-yaml/manifest.json
+    dyff yaml https://raw.githubusercontent.com/homeport/dyff/develop/assets/bosh-yaml/manifest.json
     ```
diff --git a/cmd/dyff/main.go b/cmd/dyff/main.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,7 +20,7 @@
 
 package main
 
-import "github.com/HeavyWombat/dyff/internal/cmd"
+import "github.com/homeport/dyff/internal/cmd"
 
 func main() {
 	cmd.Execute()

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/HeavyWombat/dyff
+module github.com/homeport/dyff
 
 require (
 	github.com/homeport/gonvenience v1.7.0

diff --git a/internal/cmd/between.go b/internal/cmd/between.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/HeavyWombat/dyff/pkg/v1/dyff"
+	"github.com/homeport/dyff/pkg/v1/dyff"
 	"github.com/homeport/ytbx/pkg/v1/ytbx"
 	"github.com/spf13/cobra"
 )

diff --git a/internal/cmd/cmd_suite_test.go b/internal/cmd/cmd_suite_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@ import (
 	"os"
 	"testing"
 
-	. "github.com/HeavyWombat/dyff/internal/cmd"
+	. "github.com/homeport/dyff/internal/cmd"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

diff --git a/internal/cmd/json.go b/internal/cmd/json.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/internal/cmd/root.go b/internal/cmd/root.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/HeavyWombat/dyff/pkg/v1/dyff"
+	"github.com/homeport/dyff/pkg/v1/dyff"
 	"github.com/homeport/gonvenience/pkg/v1/bunt"
 	"github.com/homeport/gonvenience/pkg/v1/neat"
 	"github.com/homeport/ytbx/pkg/v1/ytbx"

diff --git a/internal/cmd/version.go b/internal/cmd/version.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/internal/cmd/yaml.go b/internal/cmd/yaml.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/pkg/v1/dyff/compare_test.go b/pkg/v1/dyff/compare_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
 package dyff_test
 
 import (
-	. "github.com/HeavyWombat/dyff/pkg/v1/dyff"
+	. "github.com/homeport/dyff/pkg/v1/dyff"
 	"github.com/homeport/ytbx/pkg/v1/ytbx"
 
 	. "github.com/onsi/ginkgo"

diff --git a/pkg/v1/dyff/core.go b/pkg/v1/dyff/core.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/pkg/v1/dyff/core_suite_test.go b/pkg/v1/dyff/core_suite_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -34,7 +34,7 @@ import (
 	. "github.com/homeport/gonvenience/pkg/v1/bunt"
 	"github.com/homeport/ytbx/pkg/v1/ytbx"
 
-	. "github.com/HeavyWombat/dyff/pkg/v1/dyff"
+	. "github.com/homeport/dyff/pkg/v1/dyff"
 	yaml "gopkg.in/yaml.v2"
 
 	. "github.com/onsi/ginkgo"

diff --git a/pkg/v1/dyff/core_test.go b/pkg/v1/dyff/core_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
 package dyff_test
 
 import (
-	. "github.com/HeavyWombat/dyff/pkg/v1/dyff"
+	. "github.com/homeport/dyff/pkg/v1/dyff"
 	"github.com/homeport/ytbx/pkg/v1/ytbx"
 	yaml "gopkg.in/yaml.v2"
 

diff --git a/pkg/v1/dyff/logs.go b/pkg/v1/dyff/logs.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/pkg/v1/dyff/models.go b/pkg/v1/dyff/models.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/pkg/v1/dyff/output.go b/pkg/v1/dyff/output.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/pkg/v1/dyff/output_brief.go b/pkg/v1/dyff/output_brief.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/pkg/v1/dyff/output_human.go b/pkg/v1/dyff/output_human.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/pkg/v1/dyff/output_human_test.go b/pkg/v1/dyff/output_human_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	. "github.com/HeavyWombat/dyff/pkg/v1/dyff"
+	. "github.com/homeport/dyff/pkg/v1/dyff"
 )
 
 var _ = Describe("human readable report", func() {

diff --git a/pkg/v1/dyff/output_test.go b/pkg/v1/dyff/output_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	. "github.com/HeavyWombat/dyff/pkg/v1/dyff"
+	. "github.com/homeport/dyff/pkg/v1/dyff"
 	. "github.com/homeport/gonvenience/pkg/v1/bunt"
 )
 

diff --git a/pkg/v1/dyff/restructure.go b/pkg/v1/dyff/restructure.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/pkg/v1/dyff/restructure_test.go b/pkg/v1/dyff/restructure_test.go
@@ -1,4 +1,4 @@
-// Copyright © 2018 Matthias Diester
+// Copyright © 2019 The Homeport Team
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
 package dyff_test
 
 import (
-	. "github.com/HeavyWombat/dyff/pkg/v1/dyff"
+	. "github.com/homeport/dyff/pkg/v1/dyff"
 	yaml "gopkg.in/yaml.v2"
 
 	. "github.com/onsi/ginkgo"

diff --git a/scripts/compile-version.sh b/scripts/compile-version.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright © 2018 Matthias Diester
+# Copyright © 2019 The Homeport Team
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -71,7 +71,7 @@ while read -r OS ARCH; do
     TARGET_FILE="${TARGET_FILE}.exe"
   fi
 
-  (cd "$BASEDIR" && GO111MODULE=on CGO_ENABLED=0 GOOS="$OS" GOARCH="$ARCH" go build -tags netgo -ldflags="-s -w -extldflags '-static' -X github.com/HeavyWombat/dyff/internal/cmd.version=${VERSION}" -o "$TARGET_FILE" cmd/dyff/main.go)
+  (cd "$BASEDIR" && GO111MODULE=on CGO_ENABLED=0 GOOS="$OS" GOARCH="$ARCH" go build -tags netgo -ldflags="-s -w -extldflags '-static' -X github.com/homeport/dyff/internal/cmd.version=${VERSION}" -o "$TARGET_FILE" cmd/dyff/main.go)
 
 done <<EOL
 darwin	386