Move library code from pkg/ytbx into project root

The `ytbx` project is more a library than it is a command line tool at the moment. This results in a rather long import name. Change location of library code to the project root to be more in line with the other projects in the `gonvenience` organizaation.
gonvenience · Jan 10, 2020 · 06d89ca · 06d89ca
1 parent ff5b3f5
commit 06d89ca
Show file tree

Hide file tree

Showing 19 changed files with 11 additions and 11 deletions.
diff --git a/pkg/ytbx/common.go → common.go b/pkg/ytbx/common.go → common.go
diff --git a/pkg/ytbx/convert.go → convert.go b/pkg/ytbx/convert.go → convert.go
diff --git a/pkg/ytbx/errors.go → errors.go b/pkg/ytbx/errors.go → errors.go
diff --git a/pkg/ytbx/getting.go → getting.go b/pkg/ytbx/getting.go → getting.go
diff --git a/pkg/ytbx/getting_test.go → getting_test.go b/pkg/ytbx/getting_test.go → getting_test.go
@@ -24,7 +24,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/gonvenience/ytbx/pkg/ytbx"
+	"github.com/gonvenience/ytbx"
 )
 
 var _ = Describe("getting stuff test cases", func() {

diff --git a/pkg/ytbx/input.go → input.go b/pkg/ytbx/input.go → input.go
diff --git a/pkg/ytbx/input_test.go → input_test.go b/pkg/ytbx/input_test.go → input_test.go
@@ -31,7 +31,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	. "github.com/gorilla/mux"
-	. "github.com/gonvenience/ytbx/pkg/ytbx"
+	. "github.com/gonvenience/ytbx"
 )
 
 var _ = Describe("Input test cases", func() {

diff --git a/internal/cmd/compare.go b/internal/cmd/compare.go
@@ -24,7 +24,7 @@ import (
 	"fmt"
 
 	"github.com/gonvenience/wrap"
-	"github.com/gonvenience/ytbx/pkg/ytbx"
+	"github.com/gonvenience/ytbx"
 	"github.com/spf13/cobra"
 )
 

diff --git a/internal/cmd/get.go b/internal/cmd/get.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/gonvenience/neat"
 	"github.com/gonvenience/wrap"
-	"github.com/gonvenience/ytbx/pkg/ytbx"
+	"github.com/gonvenience/ytbx"
 	"github.com/spf13/cobra"
 )
 

diff --git a/internal/cmd/paths.go b/internal/cmd/paths.go
@@ -24,7 +24,7 @@ import (
 	"fmt"
 
 	"github.com/gonvenience/wrap"
-	"github.com/gonvenience/ytbx/pkg/ytbx"
+	"github.com/gonvenience/ytbx"
 	"github.com/spf13/cobra"
 )
 

diff --git a/internal/cmd/restructure.go b/internal/cmd/restructure.go
@@ -29,7 +29,7 @@ import (
 
 	"github.com/gonvenience/bunt"
 	"github.com/gonvenience/neat"
-	"github.com/gonvenience/ytbx/pkg/ytbx"
+	"github.com/gonvenience/ytbx"
 	"github.com/spf13/cobra"
 	yamlv3 "gopkg.in/yaml.v3"
 )

diff --git a/internal/cmd/root.go b/internal/cmd/root.go
@@ -27,7 +27,7 @@ import (
 	"github.com/gonvenience/bunt"
 	"github.com/gonvenience/neat"
 	"github.com/gonvenience/wrap"
-	"github.com/gonvenience/ytbx/pkg/ytbx"
+	"github.com/gonvenience/ytbx"
 	"github.com/spf13/cobra"
 )
 

diff --git a/pkg/ytbx/list_functions.go → list_functions.go b/pkg/ytbx/list_functions.go → list_functions.go
diff --git a/pkg/ytbx/map_functions.go → map_functions.go b/pkg/ytbx/map_functions.go → map_functions.go
diff --git a/pkg/ytbx/path.go → path.go b/pkg/ytbx/path.go → path.go
diff --git a/pkg/ytbx/path_test.go → path_test.go b/pkg/ytbx/path_test.go → path_test.go
@@ -24,7 +24,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	. "github.com/gonvenience/ytbx/pkg/ytbx"
+	. "github.com/gonvenience/ytbx"
 	yamlv3 "gopkg.in/yaml.v3"
 )
 

diff --git a/pkg/ytbx/restructure.go → restructure.go b/pkg/ytbx/restructure.go → restructure.go
diff --git a/pkg/ytbx/restructure_test.go → restructure_test.go b/pkg/ytbx/restructure_test.go → restructure_test.go
@@ -24,7 +24,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	. "github.com/gonvenience/ytbx/pkg/ytbx"
+	. "github.com/gonvenience/ytbx"
 )
 
 var _ = Describe("Restructure order of map keys", func() {

diff --git a/pkg/ytbx/ytbx_suite_test.go → ytbx_suite_test.go b/pkg/ytbx/ytbx_suite_test.go → ytbx_suite_test.go
@@ -33,7 +33,7 @@ import (
 
 	"github.com/gonvenience/bunt"
 	"github.com/gonvenience/neat"
-	"github.com/gonvenience/ytbx/pkg/ytbx"
+	"github.com/gonvenience/ytbx"
 	yamlv3 "gopkg.in/yaml.v3"
 )
 
@@ -88,7 +88,7 @@ var _ = AfterSuite(func() {
 
 func assets(pathElement ...string) string {
 	targetPath := filepath.Join(append(
-		[]string{"..", "..", "assets"},
+		[]string{"assets"},
 		pathElement...,
 	)...)