diff --git a/v2/go.mod b/v2/go.mod index 9913135..aeef959 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -3,6 +3,7 @@ module github.com/gobuffalo/packr/v2 require ( github.com/gobuffalo/envy v1.6.15 github.com/gobuffalo/genny v0.0.0-20190219203444-c95082806342 + github.com/gobuffalo/gogen v0.0.0-20190224213239-1c6076128bbc github.com/gobuffalo/logger v0.0.0-20190224201004-be78ebfea0fa github.com/gobuffalo/packd v0.0.0-20190224160250-d04dd98aca5b github.com/karrick/godirwalk v1.7.8 diff --git a/v2/go.sum b/v2/go.sum index 5856ca8..8f3b676 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -126,8 +126,9 @@ github.com/gobuffalo/gitgen v0.0.0-20190219185555-91c2c5f0aad5/go.mod h1:ZzGIrxB github.com/gobuffalo/github_flavored_markdown v1.0.4/go.mod h1:uRowCdK+q8d/RF0Kt3/DSalaIXbb0De/dmTqMQdkQ4I= github.com/gobuffalo/github_flavored_markdown v1.0.5/go.mod h1:U0643QShPF+OF2tJvYNiYDLDGDuQmJZXsf/bHOJPsMY= github.com/gobuffalo/github_flavored_markdown v1.0.7/go.mod h1:w93Pd9Lz6LvyQXEG6DktTPHkOtCbr+arAD5mkwMzXLI= -github.com/gobuffalo/gogen v0.0.0-20190219194924-d32a17ad9761 h1:KJFgsBn2pl82SyCJrVO1ksoJq7u5a+f1MeBvmjHtGTk= github.com/gobuffalo/gogen v0.0.0-20190219194924-d32a17ad9761/go.mod h1:v47C8sid+ZM2qK+YpQ2MGJKssKAqyTsH1wl/pTCPdz8= +github.com/gobuffalo/gogen v0.0.0-20190224213239-1c6076128bbc h1:GjmMs2PLx+rH9In421AR1RkHV5AG9lLnRpIPhWauvoI= +github.com/gobuffalo/gogen v0.0.0-20190224213239-1c6076128bbc/go.mod h1:tQqPADZKflmJCR4FHRHYNPP79cXPICyxUiUHyhuXtqg= github.com/gobuffalo/httptest v1.0.2/go.mod h1:7T1IbSrg60ankme0aDLVnEY0h056g9M1/ZvpVThtB7E= github.com/gobuffalo/licenser v0.0.0-20180924033006-eae28e638a42/go.mod h1:Ubo90Np8gpsSZqNScZZkVXXAo5DGhTb+WYFIjlnog8w= github.com/gobuffalo/licenser v0.0.0-20181025145548-437d89de4f75/go.mod h1:x3lEpYxkRG/XtGCUNkio+6RZ/dlOvLzTI9M1auIwFcw= diff --git a/v2/jam/parser/visitor.go b/v2/jam/parser/visitor.go index 8c6ce6d..47b0c9e 100644 --- a/v2/jam/parser/visitor.go +++ b/v2/jam/parser/visitor.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/gobuffalo/genny" - "github.com/gobuffalo/genny/movinglater/gotools" + "github.com/gobuffalo/gogen" "github.com/pkg/errors" ) @@ -30,7 +30,7 @@ func NewVisitor(f *File) *Visitor { func (v *Visitor) Run() (Boxes, error) { var boxes Boxes - pf, err := gotools.ParseFile(v.File) + pf, err := gogen.ParseFile(v.File) if err != nil { return boxes, errors.Wrap(err, v.File.Name()) } diff --git a/v2/jam/store/disk.go b/v2/jam/store/disk.go index 3ccae2f..99be23a 100644 --- a/v2/jam/store/disk.go +++ b/v2/jam/store/disk.go @@ -19,7 +19,7 @@ import ( "github.com/gobuffalo/envy" "github.com/gobuffalo/genny" - "github.com/gobuffalo/genny/movinglater/gotools" + "github.com/gobuffalo/gogen" "github.com/gobuffalo/packr/v2/file/resolver/encoding/hex" "github.com/gobuffalo/packr/v2/plog" "github.com/rogpeppe/go-internal/modfile" @@ -192,7 +192,7 @@ func (d *Disk) Generator() (*genny.Generator, error) { return opts.Boxes[a].Name < opts.Boxes[b].Name }) - t := gotools.TemplateTransformer(opts, template.FuncMap{ + t := gogen.TemplateTransformer(opts, template.FuncMap{ "printBox": func(ob optsBox) (template.HTML, error) { box := d.boxes[ob.Name] if box == nil { @@ -225,7 +225,7 @@ func (d *Disk) Generator() (*genny.Generator, error) { "Box": box, "Files": files, } - t := gotools.TemplateTransformer(opts, nil) + t := gogen.TemplateTransformer(opts, nil) gf, err = t.Transform(gf) if err != nil { return "", errors.WithStack(err) @@ -242,7 +242,7 @@ func (d *Disk) Generator() (*genny.Generator, error) { return g, errors.WithStack(err) } - ft := gotools.FmtTransformer() + ft := gogen.FmtTransformer() global, err = ft.Transform(global) if err != nil { return g, errors.WithStack(err) @@ -295,7 +295,7 @@ func (d *Disk) Generator() (*genny.Generator, error) { Import: ip, } - t := gotools.TemplateTransformer(o, template.FuncMap{}) + t := gogen.TemplateTransformer(o, template.FuncMap{}) f, err := t.Transform(f) if err != nil { return g, nil diff --git a/v2/jam/store/disk_test.go b/v2/jam/store/disk_test.go index 679252a..41651f6 100644 --- a/v2/jam/store/disk_test.go +++ b/v2/jam/store/disk_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/gobuffalo/genny/gentest" - "github.com/gobuffalo/genny/movinglater/gotools/gomods" + "github.com/gobuffalo/gogen/gomods" "github.com/gobuffalo/packr/v2" "github.com/gobuffalo/packr/v2/jam/parser" "github.com/markbates/oncer" diff --git a/v2/jam/store/legacy.go b/v2/jam/store/legacy.go index c1ee411..7f03153 100644 --- a/v2/jam/store/legacy.go +++ b/v2/jam/store/legacy.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" "github.com/gobuffalo/genny" - "github.com/gobuffalo/genny/movinglater/gotools" + "github.com/gobuffalo/gogen" "github.com/gobuffalo/packr/v2/jam/parser" "github.com/gobuffalo/packr/v2/plog" ) @@ -93,7 +93,7 @@ func (l *Legacy) Generator() (*genny.Generator, error) { "Boxes": b, } f := genny.NewFile(filepath.Join(bx.PackageDir, "a_"+bx.Package+"-packr.go.tmpl"), strings.NewReader(legacyTmpl)) - t := gotools.TemplateTransformer(opts, nil) + t := gogen.TemplateTransformer(opts, nil) f, err := t.Transform(f) if err != nil { return g, errors.WithStack(err) diff --git a/v2/travis.sh b/v2/travis.sh deleted file mode 100755 index 99612f2..0000000 --- a/v2/travis.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -go get -t ./... -go install -v ./packr2 -packr2 -v clean -packr2 -v -go test -v -timeout=5s -race ./... -packr2 -v clean -go test -v -timeout=5s -race ./...