diff --git a/cmd/pkger/cmds/pack.go b/cmd/pkger/cmds/pack.go index 5b5f226..d91e4cf 100644 --- a/cmd/pkger/cmds/pack.go +++ b/cmd/pkger/cmds/pack.go @@ -8,8 +8,8 @@ import ( "sort" "strings" - "github.com/gobuffalo/here" "github.com/markbates/pkger" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/parser" "github.com/markbates/pkger/pkging/pkgutil" ) diff --git a/cmd/pkger/cmds/parse.go b/cmd/pkger/cmds/parse.go index e9ecb3f..ead6334 100644 --- a/cmd/pkger/cmds/parse.go +++ b/cmd/pkger/cmds/parse.go @@ -5,7 +5,7 @@ import ( "flag" "os" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/parser" ) diff --git a/cmd/pkger/cmds/path.go b/cmd/pkger/cmds/path.go index 49d4a48..e185fff 100644 --- a/cmd/pkger/cmds/path.go +++ b/cmd/pkger/cmds/path.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/gobuffalo/here" "github.com/markbates/pkger" + "github.com/markbates/pkger/here" ) type pathCmd struct { diff --git a/here/here.go b/here/here.go index 81d349c..f87a061 100644 --- a/here/here.go +++ b/here/here.go @@ -8,6 +8,7 @@ type Info = here.Info type Module = here.Module type Path = here.Path -var Dir = here.Dir -var Package = here.Package -var Current = here.Current +var Here = here.New() +var Dir = Here.Dir +var Package = Here.Package +var Current = Here.Current diff --git a/internal/maps/files.go b/internal/maps/files.go index fd32fff..3b3b6ac 100644 --- a/internal/maps/files.go +++ b/internal/maps/files.go @@ -8,7 +8,7 @@ import ( "sort" "sync" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging" ) diff --git a/internal/maps/infos.go b/internal/maps/infos.go index cfc0604..0eed02f 100644 --- a/internal/maps/infos.go +++ b/internal/maps/infos.go @@ -8,7 +8,7 @@ import ( "sort" "sync" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) // Infos wraps sync.Map and uses the following types: diff --git a/parser/file.go b/parser/file.go index 45c9748..4b626ed 100644 --- a/parser/file.go +++ b/parser/file.go @@ -3,7 +3,7 @@ package parser import ( "encoding/json" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) type File struct { diff --git a/parser/include.go b/parser/include.go index afe9433..cb95500 100644 --- a/parser/include.go +++ b/parser/include.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) var _ Decl = IncludeDecl{} diff --git a/parser/parser.go b/parser/parser.go index f16c6ef..72fd023 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) var defaultIgnoredFolders = []string{".", "_", "vendor", "node_modules", "testdata"} diff --git a/parser/parser_test.go b/parser/parser_test.go index 7563456..baaeaa1 100644 --- a/parser/parser_test.go +++ b/parser/parser_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging/pkgtest" "github.com/markbates/pkger/pkging/stdos" "github.com/stretchr/testify/require" diff --git a/parser/source.go b/parser/source.go index adab985..184cb1c 100644 --- a/parser/source.go +++ b/parser/source.go @@ -8,7 +8,7 @@ import ( "strconv" "sync" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) type Source struct { diff --git a/parser/walk.go b/parser/walk.go index 51343b0..eed6d91 100644 --- a/parser/walk.go +++ b/parser/walk.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) var _ Decl = WalkDecl{} diff --git a/pkger.go b/pkger.go index 96d1c32..5f56a51 100644 --- a/pkger.go +++ b/pkger.go @@ -6,7 +6,7 @@ import ( "path/filepath" "sync" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging" "github.com/markbates/pkger/pkging/stdos" ) diff --git a/pkging/embed/embed.go b/pkging/embed/embed.go index 25d6838..29dfdf5 100644 --- a/pkging/embed/embed.go +++ b/pkging/embed/embed.go @@ -6,7 +6,7 @@ import ( "encoding/hex" "io" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/internal/takeon/github.com/markbates/hepa" "github.com/markbates/pkger/internal/takeon/github.com/markbates/hepa/filters" ) diff --git a/pkging/embed/file.go b/pkging/embed/file.go index 964af15..af239f8 100644 --- a/pkging/embed/file.go +++ b/pkging/embed/file.go @@ -1,7 +1,7 @@ package embed import ( - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging" ) diff --git a/pkging/file.go b/pkging/file.go index 6d49cca..c7d12a1 100644 --- a/pkging/file.go +++ b/pkging/file.go @@ -4,7 +4,7 @@ import ( "net/http" "os" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) type File interface { diff --git a/pkging/file_info_test.go b/pkging/file_info_test.go index c0c3fec..6751c0e 100644 --- a/pkging/file_info_test.go +++ b/pkging/file_info_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging" "github.com/stretchr/testify/require" ) diff --git a/pkging/mem/add.go b/pkging/mem/add.go index b21c2d5..a77379a 100644 --- a/pkging/mem/add.go +++ b/pkging/mem/add.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging" ) diff --git a/pkging/mem/add_test.go b/pkging/mem/add_test.go index 924d753..342d048 100644 --- a/pkging/mem/add_test.go +++ b/pkging/mem/add_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging/mem" "github.com/stretchr/testify/require" ) diff --git a/pkging/mem/embed.go b/pkging/mem/embed.go index 76e1db7..a7086ed 100644 --- a/pkging/mem/embed.go +++ b/pkging/mem/embed.go @@ -3,7 +3,7 @@ package mem import ( "encoding/json" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/internal/maps" "github.com/markbates/pkger/pkging" "github.com/markbates/pkger/pkging/embed" diff --git a/pkging/mem/file.go b/pkging/mem/file.go index 18fd2b8..2d4d244 100644 --- a/pkging/mem/file.go +++ b/pkging/mem/file.go @@ -10,7 +10,7 @@ import ( "path/filepath" "time" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging" ) diff --git a/pkging/mem/file_test.go b/pkging/mem/file_test.go index 986c7fb..5ebb32b 100644 --- a/pkging/mem/file_test.go +++ b/pkging/mem/file_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "testing" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/stretchr/testify/require" ) diff --git a/pkging/mem/mem.go b/pkging/mem/mem.go index dfa3a99..1590e3e 100644 --- a/pkging/mem/mem.go +++ b/pkging/mem/mem.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/internal/maps" "github.com/markbates/pkger/pkging" ) diff --git a/pkging/pkger.go b/pkging/pkger.go index 4a7a2fa..b2076f6 100644 --- a/pkging/pkger.go +++ b/pkging/pkger.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) type Pkger interface { diff --git a/pkging/pkgtest/load_ref.go b/pkging/pkgtest/load_ref.go index 331b093..e04ce7b 100644 --- a/pkging/pkgtest/load_ref.go +++ b/pkging/pkgtest/load_ref.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging" ) diff --git a/pkging/pkgtest/pkgtest.go b/pkging/pkgtest/pkgtest.go index 11585b7..d852fda 100644 --- a/pkging/pkgtest/pkgtest.go +++ b/pkging/pkgtest/pkgtest.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging" "github.com/stretchr/testify/require" ) diff --git a/pkging/pkgtest/ref.go b/pkging/pkgtest/ref.go index e7f5986..5fe1a0a 100644 --- a/pkging/pkgtest/ref.go +++ b/pkging/pkgtest/ref.go @@ -8,7 +8,7 @@ import ( "path/filepath" "runtime" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) type Ref struct { diff --git a/pkging/pkgutil/dump.go b/pkging/pkgutil/dump.go index ce23c82..128161a 100644 --- a/pkging/pkgutil/dump.go +++ b/pkging/pkgutil/dump.go @@ -6,7 +6,7 @@ import ( "io" "os" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging" ) diff --git a/pkging/pkgutil/stuff.go b/pkging/pkgutil/stuff.go index c81a83e..0fbf02d 100644 --- a/pkging/pkgutil/stuff.go +++ b/pkging/pkgutil/stuff.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/parser" "github.com/markbates/pkger/pkging/embed" "github.com/markbates/pkger/pkging/mem" diff --git a/pkging/stdos/file.go b/pkging/stdos/file.go index 51559f8..35845cf 100644 --- a/pkging/stdos/file.go +++ b/pkging/stdos/file.go @@ -5,7 +5,7 @@ import ( "os" "path" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/pkging" ) diff --git a/pkging/stdos/file_test.go b/pkging/stdos/file_test.go index 9a475bd..a33f29d 100644 --- a/pkging/stdos/file_test.go +++ b/pkging/stdos/file_test.go @@ -3,7 +3,7 @@ package stdos import ( "testing" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/stretchr/testify/require" ) diff --git a/pkging/stdos/stdos.go b/pkging/stdos/stdos.go index 30481ea..b811702 100644 --- a/pkging/stdos/stdos.go +++ b/pkging/stdos/stdos.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" "github.com/markbates/pkger/internal/maps" "github.com/markbates/pkger/pkging" ) diff --git a/pkging/wrap.go b/pkging/wrap.go index dee4b0a..438f955 100644 --- a/pkging/wrap.go +++ b/pkging/wrap.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/gobuffalo/here" + "github.com/markbates/pkger/here" ) func Wrap(parent, with Pkger) Pkger {