Skip to content
This repository has been archived by the owner on Jun 25, 2022. It is now read-only.

replace movinglater #165

Merged
merged 3 commits into from
Feb 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions v2/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion v2/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
4 changes: 2 additions & 2 deletions v2/jam/parser/visitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"

"github.com/gobuffalo/genny"
"github.com/gobuffalo/genny/movinglater/gotools"
"github.com/gobuffalo/gogen"
"github.com/pkg/errors"
)

Expand All @@ -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())
}
Expand Down
10 changes: 5 additions & 5 deletions v2/jam/store/disk.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion v2/jam/store/disk_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions v2/jam/store/legacy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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)
Expand Down
9 changes: 0 additions & 9 deletions v2/travis.sh

This file was deleted.