diff --git a/cmd/hranoprovod-cli/go.mod b/cmd/hranoprovod-cli/go.mod index e638ad0..0bb8d2a 100644 --- a/cmd/hranoprovod-cli/go.mod +++ b/cmd/hranoprovod-cli/go.mod @@ -3,9 +3,6 @@ module github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3 go 1.17 require ( - github.com/aquilax/hranoprovod-cli/lib/filter/v3 v3.0.0 - github.com/aquilax/hranoprovod-cli/lib/parser/v3 v3.0.0 - github.com/aquilax/hranoprovod-cli/lib/resolver/v3 v3.0.0 github.com/aquilax/hranoprovod-cli/v3 v3.0.0 github.com/stretchr/testify v1.7.1 github.com/tj/go-naturaldate v1.3.0 @@ -24,6 +21,3 @@ require ( ) replace github.com/aquilax/hranoprovod-cli/v3 => ../../ -replace github.com/aquilax/hranoprovod-cli/lib/parser/v3 => ../../lib/parser -replace github.com/aquilax/hranoprovod-cli/lib/filter/v3 => ../../lib/filter -replace github.com/aquilax/hranoprovod-cli/lib/resolver/v3 => ../../lib/resolver \ No newline at end of file diff --git a/cmd/hranoprovod-cli/internal/balance/balance.go b/cmd/hranoprovod-cli/internal/balance/balance.go index e3d96e7..b0e223b 100644 --- a/cmd/hranoprovod-cli/internal/balance/balance.go +++ b/cmd/hranoprovod-cli/internal/balance/balance.go @@ -6,10 +6,10 @@ import ( "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/options" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/utils" - "github.com/aquilax/hranoprovod-cli/lib/filter/v3" - "github.com/aquilax/hranoprovod-cli/lib/parser/v3" - "github.com/aquilax/hranoprovod-cli/lib/resolver/v3" shared "github.com/aquilax/hranoprovod-cli/v3" + "github.com/aquilax/hranoprovod-cli/v3/filter" + "github.com/aquilax/hranoprovod-cli/v3/parser" + "github.com/aquilax/hranoprovod-cli/v3/resolver" "github.com/urfave/cli/v2" ) diff --git a/cmd/hranoprovod-cli/internal/csv/csv.go b/cmd/hranoprovod-cli/internal/csv/csv.go index 1c42f64..fe9169d 100644 --- a/cmd/hranoprovod-cli/internal/csv/csv.go +++ b/cmd/hranoprovod-cli/internal/csv/csv.go @@ -7,10 +7,10 @@ import ( "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/options" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/utils" - "github.com/aquilax/hranoprovod-cli/lib/filter/v3" - "github.com/aquilax/hranoprovod-cli/lib/parser/v3" - "github.com/aquilax/hranoprovod-cli/lib/resolver/v3" shared "github.com/aquilax/hranoprovod-cli/v3" + "github.com/aquilax/hranoprovod-cli/v3/filter" + "github.com/aquilax/hranoprovod-cli/v3/parser" + "github.com/aquilax/hranoprovod-cli/v3/resolver" "github.com/urfave/cli/v2" ) diff --git a/cmd/hranoprovod-cli/internal/lint/lint.go b/cmd/hranoprovod-cli/internal/lint/lint.go index b114852..6621f06 100644 --- a/cmd/hranoprovod-cli/internal/lint/lint.go +++ b/cmd/hranoprovod-cli/internal/lint/lint.go @@ -7,8 +7,8 @@ import ( "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/options" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/utils" - "github.com/aquilax/hranoprovod-cli/lib/parser/v3" shared "github.com/aquilax/hranoprovod-cli/v3" + "github.com/aquilax/hranoprovod-cli/v3/parser" "github.com/urfave/cli/v2" ) diff --git a/cmd/hranoprovod-cli/internal/options/options.go b/cmd/hranoprovod-cli/internal/options/options.go index 75b30d8..efa4ae6 100644 --- a/cmd/hranoprovod-cli/internal/options/options.go +++ b/cmd/hranoprovod-cli/internal/options/options.go @@ -6,9 +6,9 @@ import ( "time" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter" - "github.com/aquilax/hranoprovod-cli/lib/filter/v3" - "github.com/aquilax/hranoprovod-cli/lib/parser/v3" - "github.com/aquilax/hranoprovod-cli/lib/resolver/v3" + "github.com/aquilax/hranoprovod-cli/v3/filter" + "github.com/aquilax/hranoprovod-cli/v3/parser" + "github.com/aquilax/hranoprovod-cli/v3/resolver" "github.com/tj/go-naturaldate" "github.com/urfave/cli/v2" gcfg "gopkg.in/gcfg.v1" diff --git a/cmd/hranoprovod-cli/internal/print/print.go b/cmd/hranoprovod-cli/internal/print/print.go index f89fa8f..e8c7cff 100644 --- a/cmd/hranoprovod-cli/internal/print/print.go +++ b/cmd/hranoprovod-cli/internal/print/print.go @@ -6,8 +6,8 @@ import ( "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/options" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/utils" - "github.com/aquilax/hranoprovod-cli/lib/filter/v3" - "github.com/aquilax/hranoprovod-cli/lib/parser/v3" + "github.com/aquilax/hranoprovod-cli/v3/filter" + "github.com/aquilax/hranoprovod-cli/v3/parser" "github.com/urfave/cli/v2" ) diff --git a/cmd/hranoprovod-cli/internal/register/register.go b/cmd/hranoprovod-cli/internal/register/register.go index 21f3760..c2d5863 100644 --- a/cmd/hranoprovod-cli/internal/register/register.go +++ b/cmd/hranoprovod-cli/internal/register/register.go @@ -6,10 +6,10 @@ import ( "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/options" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/utils" - "github.com/aquilax/hranoprovod-cli/lib/filter/v3" - "github.com/aquilax/hranoprovod-cli/lib/parser/v3" - "github.com/aquilax/hranoprovod-cli/lib/resolver/v3" shared "github.com/aquilax/hranoprovod-cli/v3" + "github.com/aquilax/hranoprovod-cli/v3/filter" + "github.com/aquilax/hranoprovod-cli/v3/parser" + "github.com/aquilax/hranoprovod-cli/v3/resolver" "github.com/urfave/cli/v2" ) diff --git a/cmd/hranoprovod-cli/internal/report/report.go b/cmd/hranoprovod-cli/internal/report/report.go index 36fdfcb..729385d 100644 --- a/cmd/hranoprovod-cli/internal/report/report.go +++ b/cmd/hranoprovod-cli/internal/report/report.go @@ -8,10 +8,10 @@ import ( "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/options" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/utils" - "github.com/aquilax/hranoprovod-cli/lib/filter/v3" - "github.com/aquilax/hranoprovod-cli/lib/parser/v3" - "github.com/aquilax/hranoprovod-cli/lib/resolver/v3" shared "github.com/aquilax/hranoprovod-cli/v3" + "github.com/aquilax/hranoprovod-cli/v3/filter" + "github.com/aquilax/hranoprovod-cli/v3/parser" + "github.com/aquilax/hranoprovod-cli/v3/resolver" "github.com/urfave/cli/v2" ) diff --git a/cmd/hranoprovod-cli/internal/stats/stats.go b/cmd/hranoprovod-cli/internal/stats/stats.go index d79e408..c44c3b6 100644 --- a/cmd/hranoprovod-cli/internal/stats/stats.go +++ b/cmd/hranoprovod-cli/internal/stats/stats.go @@ -6,8 +6,8 @@ import ( "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/options" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/utils" - "github.com/aquilax/hranoprovod-cli/lib/parser/v3" shared "github.com/aquilax/hranoprovod-cli/v3" + "github.com/aquilax/hranoprovod-cli/v3/parser" "github.com/urfave/cli/v2" ) diff --git a/cmd/hranoprovod-cli/internal/summary/summary.go b/cmd/hranoprovod-cli/internal/summary/summary.go index 2a9f39b..e25cb1e 100644 --- a/cmd/hranoprovod-cli/internal/summary/summary.go +++ b/cmd/hranoprovod-cli/internal/summary/summary.go @@ -7,10 +7,10 @@ import ( "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/options" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/utils" - "github.com/aquilax/hranoprovod-cli/lib/filter/v3" - "github.com/aquilax/hranoprovod-cli/lib/parser/v3" - "github.com/aquilax/hranoprovod-cli/lib/resolver/v3" shared "github.com/aquilax/hranoprovod-cli/v3" + "github.com/aquilax/hranoprovod-cli/v3/filter" + "github.com/aquilax/hranoprovod-cli/v3/parser" + "github.com/aquilax/hranoprovod-cli/v3/resolver" "github.com/urfave/cli/v2" ) diff --git a/cmd/hranoprovod-cli/internal/utils/hranoprovod.go b/cmd/hranoprovod-cli/internal/utils/hranoprovod.go index ff72d8f..de24818 100644 --- a/cmd/hranoprovod-cli/internal/utils/hranoprovod.go +++ b/cmd/hranoprovod-cli/internal/utils/hranoprovod.go @@ -5,10 +5,10 @@ import ( "time" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/reporter" - "github.com/aquilax/hranoprovod-cli/lib/filter/v3" - "github.com/aquilax/hranoprovod-cli/lib/parser/v3" - "github.com/aquilax/hranoprovod-cli/lib/resolver/v3" shared "github.com/aquilax/hranoprovod-cli/v3" + "github.com/aquilax/hranoprovod-cli/v3/filter" + "github.com/aquilax/hranoprovod-cli/v3/parser" + "github.com/aquilax/hranoprovod-cli/v3/resolver" ) type ResolvedCallback = func(nl shared.DBNodeMap) error diff --git a/cmd/hranoprovod-cli/root.go b/cmd/hranoprovod-cli/root.go index 53a3889..53b079c 100644 --- a/cmd/hranoprovod-cli/root.go +++ b/cmd/hranoprovod-cli/root.go @@ -15,8 +15,8 @@ import ( "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/report" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/stats" "github.com/aquilax/hranoprovod-cli/cmd/hranoprovod-cli/v3/internal/summary" - "github.com/aquilax/hranoprovod-cli/lib/parser/v3" - "github.com/aquilax/hranoprovod-cli/lib/resolver/v3" + "github.com/aquilax/hranoprovod-cli/v3/parser" + "github.com/aquilax/hranoprovod-cli/v3/resolver" "github.com/urfave/cli/v2" ) diff --git a/lib/filter/filter.go b/filter/filter.go similarity index 100% rename from lib/filter/filter.go rename to filter/filter.go diff --git a/go.work b/go.work index 27a0ede..deac0c4 100644 --- a/go.work +++ b/go.work @@ -3,7 +3,4 @@ go 1.17 use ( ./ ./cmd/hranoprovod-cli - ./lib/filter - ./lib/resolver - ./lib/parser ) diff --git a/lib/filter/go.mod b/lib/filter/go.mod deleted file mode 100644 index bc111a6..0000000 --- a/lib/filter/go.mod +++ /dev/null @@ -1,7 +0,0 @@ -module github.com/aquilax/hranoprovod-cli/lib/filter/v3 - -go 1.17 - -require github.com/aquilax/hranoprovod-cli/v3 v3.0.0 - -replace github.com/aquilax/hranoprovod-cli/v3 => ../../ diff --git a/lib/filter/go.sum b/lib/filter/go.sum deleted file mode 100644 index ed3bf3c..0000000 --- a/lib/filter/go.sum +++ /dev/null @@ -1,10 +0,0 @@ -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/lib/parser/go.mod b/lib/parser/go.mod deleted file mode 100644 index 5fb469e..0000000 --- a/lib/parser/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module github.com/aquilax/hranoprovod-cli/lib/parser/v3 - -go 1.17 - -require ( - github.com/aquilax/hranoprovod-cli/v3 v3.0.0 - github.com/stretchr/testify v1.7.1 -) - -require ( - github.com/davecgh/go-spew v1.1.0 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect -) - -replace github.com/aquilax/hranoprovod-cli/v3 => ../../ diff --git a/lib/parser/go.sum b/lib/parser/go.sum deleted file mode 100644 index 2dca7c9..0000000 --- a/lib/parser/go.sum +++ /dev/null @@ -1,11 +0,0 @@ -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -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/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/lib/resolver/go.mod b/lib/resolver/go.mod deleted file mode 100644 index 67aaace..0000000 --- a/lib/resolver/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module github.com/aquilax/hranoprovod-cli/lib/resolver/v3 - -go 1.17 - -require ( - github.com/aquilax/hranoprovod-cli/v3 v3.0.0 - github.com/stretchr/testify v1.7.1 -) - -require ( - github.com/davecgh/go-spew v1.1.0 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect -) - -replace github.com/aquilax/hranoprovod-cli/v3 => ../../ diff --git a/lib/resolver/go.sum b/lib/resolver/go.sum deleted file mode 100644 index 2dca7c9..0000000 --- a/lib/resolver/go.sum +++ /dev/null @@ -1,11 +0,0 @@ -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -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/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/lib/parser/errors.go b/parser/errors.go similarity index 100% rename from lib/parser/errors.go rename to parser/errors.go diff --git a/lib/parser/errors_test.go b/parser/errors_test.go similarity index 100% rename from lib/parser/errors_test.go rename to parser/errors_test.go diff --git a/lib/parser/example_test.go b/parser/example_test.go similarity index 90% rename from lib/parser/example_test.go rename to parser/example_test.go index cae87d1..8009973 100644 --- a/lib/parser/example_test.go +++ b/parser/example_test.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/aquilax/hranoprovod-cli/lib/parser/v3" + "github.com/aquilax/hranoprovod-cli/v3/parser" ) func ExampleParser_ParseStream() { diff --git a/lib/parser/parser.go b/parser/parser.go similarity index 100% rename from lib/parser/parser.go rename to parser/parser.go diff --git a/lib/parser/parser_test.go b/parser/parser_test.go similarity index 100% rename from lib/parser/parser_test.go rename to parser/parser_test.go diff --git a/lib/resolver/resolver.go b/resolver/resolver.go similarity index 100% rename from lib/resolver/resolver.go rename to resolver/resolver.go diff --git a/lib/resolver/resolver_test.go b/resolver/resolver_test.go similarity index 100% rename from lib/resolver/resolver_test.go rename to resolver/resolver_test.go