Skip to content

Commit

Permalink
Rename all homeport occurrences with gonvenience
Browse files Browse the repository at this point in the history
With the move into the `gonvenience` organization, all Go imports that
use the old path lead to the wrong location.

Replace all occurrences of `homeport/ytbx` with `gonvenience/ytbx`.

Replace spaces in Makefile to have consistent whitespaces.
  • Loading branch information
HeavyWombat committed Jan 10, 2020
1 parent 73e47d4 commit a74b9d4
Show file tree
Hide file tree
Showing 16 changed files with 25 additions and 29 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ test: $(sources)

binaries/ytbx-linux-amd64: $(sources)
@GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \
-tags netgo \
-ldflags='-s -w -extldflags "-static" -X github.com/homeport/ytbx/internal/cmd.version=$(version)' \
-tags netgo \
-ldflags='-s -w -extldflags "-static" -X github.com/gonvenience/ytbx/internal/cmd.version=$(version)' \
-o binaries/ytbx-linux-amd64 \
cmd/ytbx/main.go

binaries/ytbx-darwin-amd64: $(sources)
@GO111MODULE=on CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build \
-tags netgo \
-ldflags='-s -w -extldflags "-static" -X github.com/homeport/ytbx/internal/cmd.version=$(version)' \
-tags netgo \
-ldflags='-s -w -extldflags "-static" -X github.com/gonvenience/ytbx/internal/cmd.version=$(version)' \
-o binaries/ytbx-darwin-amd64 \
cmd/ytbx/main.go

Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# ytbx

[![License](https://img.shields.io/github/license/homeport/ytbx.svg)](https://github.com/homeport/ytbx/blob/master/LICENSE)
[![Go Report Card](https://goreportcard.com/badge/github.com/homeport/ytbx)](https://goreportcard.com/report/github.com/homeport/ytbx)
[![Build Status](https://travis-ci.org/homeport/ytbx.svg?branch=master)](https://travis-ci.org/homeport/ytbx)
[![Codecov](https://img.shields.io/codecov/c/github/homeport/ytbx/master.svg)](https://codecov.io/gh/homeport/ytbx)
[![GoDoc](https://godoc.org/github.com/homeport/ytbx/pkg?status.svg)](https://godoc.org/github.com/homeport/ytbx/pkg)
[![Release](https://img.shields.io/github/release/homeport/ytbx.svg)](https://github.com/homeport/ytbx/releases/latest)
[![License](https://img.shields.io/github/license/gonvenience/ytbx.svg)](https://github.com/gonvenience/ytbx/blob/master/LICENSE)
[![Go Report Card](https://goreportcard.com/badge/github.com/gonvenience/ytbx)](https://goreportcard.com/report/github.com/gonvenience/ytbx)
[![Build Status](https://travis-ci.org/gonvenience/ytbx.svg?branch=master)](https://travis-ci.org/gonvenience/ytbx)
[![Codecov](https://img.shields.io/codecov/c/github/gonvenience/ytbx/master.svg)](https://codecov.io/gh/gonvenience/ytbx)
[![GoDoc](https://godoc.org/github.com/gonvenience/ytbx/pkg?status.svg)](https://godoc.org/github.com/gonvenience/ytbx/pkg)
[![Release](https://img.shields.io/github/release/gonvenience/ytbx.svg)](https://github.com/gonvenience/ytbx/releases/latest)

YAML tool box

Expand Down
2 changes: 1 addition & 1 deletion cmd/ytbx/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

package main

import "github.com/homeport/ytbx/internal/cmd"
import "github.com/gonvenience/ytbx/internal/cmd"

func main() {
cmd.Execute()
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/homeport/ytbx
module github.com/gonvenience/ytbx

go 1.12

Expand Down
4 changes: 0 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/gonvenience/bunt v1.1.1 h1:isYxOpDqbRMOSRhZtoux1tYvhhQ/AIbVDFrs24l6t0M=
github.com/gonvenience/bunt v1.1.1/go.mod h1:lsyhkmNpSAzhVx059BD0fQy5F29rWcS6AHb7UWNlT/s=
github.com/gonvenience/neat v1.1.2 h1:jWWmBSnIQtwAzHs3rHhbYbWVB90ELPqnn5xy5/Ii80M=
github.com/gonvenience/neat v1.1.2/go.mod h1:Yb+9Jlr04pbtcRU8EGosVheOEBs//Lw/OXvgDyQfLTQ=
github.com/gonvenience/neat v1.2.1 h1:c7UF/t2TWxzleRlMNIuRlXgkkamFUrNUkL/nRpN8QO8=
github.com/gonvenience/neat v1.2.1/go.mod h1:Yb+9Jlr04pbtcRU8EGosVheOEBs//Lw/OXvgDyQfLTQ=
github.com/gonvenience/term v1.0.0 h1:joCB/j0Ngmdakd3muuLgAGPMf7DNKdoe708c1I6RiBs=
Expand Down Expand Up @@ -45,7 +43,6 @@ github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
github.com/onsi/gomega v1.8.1 h1:C5Dqfs/LeauYDX0jJXIe2SWmwCbGzx9yF8C8xy3Lh34=
github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
Expand Down Expand Up @@ -81,7 +78,6 @@ golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/compare.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"fmt"

"github.com/gonvenience/wrap"
"github.com/homeport/ytbx/pkg/ytbx"
"github.com/gonvenience/ytbx/pkg/ytbx"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"github.com/gonvenience/neat"
"github.com/gonvenience/wrap"
"github.com/homeport/ytbx/pkg/ytbx"
"github.com/gonvenience/ytbx/pkg/ytbx"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/paths.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"fmt"

"github.com/gonvenience/wrap"
"github.com/homeport/ytbx/pkg/ytbx"
"github.com/gonvenience/ytbx/pkg/ytbx"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/restructure.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

"github.com/gonvenience/bunt"
"github.com/gonvenience/neat"
"github.com/homeport/ytbx/pkg/ytbx"
"github.com/gonvenience/ytbx/pkg/ytbx"
"github.com/spf13/cobra"
yamlv3 "gopkg.in/yaml.v3"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/gonvenience/bunt"
"github.com/gonvenience/neat"
"github.com/gonvenience/wrap"
"github.com/homeport/ytbx/pkg/ytbx"
"github.com/gonvenience/ytbx/pkg/ytbx"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/ytbx/getting_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"github.com/homeport/ytbx/pkg/ytbx"
"github.com/gonvenience/ytbx/pkg/ytbx"
)

var _ = Describe("getting stuff test cases", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/ytbx/input_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
. "github.com/onsi/gomega"

. "github.com/gorilla/mux"
. "github.com/homeport/ytbx/pkg/ytbx"
. "github.com/gonvenience/ytbx/pkg/ytbx"
)

var _ = Describe("Input test cases", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/ytbx/path_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "github.com/homeport/ytbx/pkg/ytbx"
. "github.com/gonvenience/ytbx/pkg/ytbx"
yamlv3 "gopkg.in/yaml.v3"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/ytbx/restructure_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

. "github.com/homeport/ytbx/pkg/ytbx"
. "github.com/gonvenience/ytbx/pkg/ytbx"
)

var _ = Describe("Restructure order of map keys", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/ytbx/ytbx_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (

"github.com/gonvenience/bunt"
"github.com/gonvenience/neat"
"github.com/homeport/ytbx/pkg/ytbx"
"github.com/gonvenience/ytbx/pkg/ytbx"
yamlv3 "gopkg.in/yaml.v3"
)

Expand Down
6 changes: 3 additions & 3 deletions scripts/download-latest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if ! hash curl 2>/dev/null; then
fi

if [[ "$(uname -m)" != "x86_64" ]]; then
echo -e "Unsupported machine type \\033[1m$(uname -m)\\033[0m: Please check \\033[4;94mhttps://api.github.com/repos/homeport/ytbx/releases\\033[0m manually"
echo -e "Unsupported machine type \\033[1m$(uname -m)\\033[0m: Please check \\033[4;94mhttps://api.github.com/repos/gonvenience/ytbx/releases\\033[0m manually"
exit 1
fi

Expand All @@ -39,7 +39,7 @@ if [[ $# -eq 0 ]]; then
fi

# Find the latest ytbx version using the GitHub API
SELECTED_TAG="$(curl --silent --location https://api.github.com/repos/homeport/ytbx/releases | jq --raw-output '.[0].tag_name')"
SELECTED_TAG="$(curl --silent --location https://api.github.com/repos/gonvenience/ytbx/releases | jq --raw-output '.[0].tag_name')"
else
# Use provided argument as tag to download
SELECTED_TAG="$1"
Expand All @@ -63,7 +63,7 @@ fi
case "${SYSTEM_UNAME}" in
darwin | linux)
TARGET_FILE="${TARGET_DIR}/ytbx"
DOWNLOAD_URI="https://github.com/homeport/ytbx/releases/download/${SELECTED_TAG}/ytbx-${SYSTEM_UNAME}-amd64"
DOWNLOAD_URI="https://github.com/gonvenience/ytbx/releases/download/${SELECTED_TAG}/ytbx-${SYSTEM_UNAME}-amd64"

echo -e "Downloading \\033[4;94m${DOWNLOAD_URI}\\033[0m to \\033[1m${TARGET_DIR}\\033[0m"
if (curl --progress-bar --location "${DOWNLOAD_URI}" --output "${TARGET_FILE}" && chmod a+rx "${TARGET_FILE}"); then
Expand Down

0 comments on commit a74b9d4

Please sign in to comment.