remove withstack and fix windows (#187)

SHOULDERS.md

@@ -11,7 +11,7 @@ Thank you to the following **GIANTS**:
 
 * [github.com/gobuffalo/packr/v2](https://godoc.org/github.com/gobuffalo/packr/v2)
 
-* [github.com/pkg/errors](https://godoc.org/github.com/pkg/errors)
+* [errors](https://godoc.org/errors)
 
 * [github.com/spf13/cobra](https://godoc.org/github.com/spf13/cobra)
 

box.go

@@ -11,8 +11,9 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/gobuffalo/packd"
 	"github.com/pkg/errors"
+
+	"github.com/gobuffalo/packd"
 )
 
 var (

builder/box.go

@@ -21,7 +21,7 @@ type box struct {
 func (b *box) Walk(root string) error {
 	root, err := filepath.EvalSymlinks(root)
 	if err != nil {
-		return errors.WithStack(err)
+		return err
 	}
 	if _, err := os.Stat(root); err != nil {
 		// return nil
@@ -41,17 +41,17 @@ func (b *box) Walk(root string) error {
 
 		bb, err := ioutil.ReadFile(path)
 		if err != nil {
-			return errors.WithStack(err)
+			return err
 		}
 		if b.compress {
 			bb, err = compressFile(bb)
 			if err != nil {
-				return errors.WithStack(err)
+				return err
 			}
 		}
 		bb, err = json.Marshal(bb)
 		if err != nil {
-			return errors.WithStack(err)
+			return err
 		}
 		f.Contents = strings.Replace(string(bb), "\"", "\\\"", -1)
 
@@ -66,11 +66,11 @@ func compressFile(bb []byte) ([]byte, error) {
 	writer := gzip.NewWriter(&buf)
 	_, err := writer.Write(bb)
 	if err != nil {
-		return bb, errors.WithStack(err)
+		return bb, err
 	}
 	err = writer.Close()
 	if err != nil {
-		return bb, errors.WithStack(err)
+		return bb, err
 	}
 	return buf.Bytes(), nil
 }

builder/builder.go

@@ -9,7 +9,6 @@ import (
 	"sync"
 	"text/template"
 
-	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -39,7 +38,7 @@ func (b *Builder) Run() error {
 	wg := &errgroup.Group{}
 	root, err := filepath.EvalSymlinks(b.RootPath)
 	if err != nil {
-		return errors.WithStack(err)
+		return err
 	}
 	err = filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
 		if info == nil {
@@ -67,10 +66,10 @@ func (b *Builder) Run() error {
 		return nil
 	})
 	if err != nil {
-		return errors.WithStack(err)
+		return err
 	}
 	if err := wg.Wait(); err != nil {
-		return errors.WithStack(err)
+		return err
 	}
 	return b.dump()
 }
@@ -81,16 +80,16 @@ func (b *Builder) dump() error {
 		f, err := os.Create(name)
 		defer f.Close()
 		if err != nil {
-			return errors.WithStack(err)
+			return err
 		}
 		t, err := template.New("").Parse(tmpl)
 
 		if err != nil {
-			return errors.WithStack(err)
+			return err
 		}
 		err = t.Execute(f, p)
 		if err != nil {
-			return errors.WithStack(err)
+			return err
 		}
 	}
 	return nil
@@ -104,7 +103,7 @@ func (b *Builder) process(path string) error {
 
 	v := newVisitor(path)
 	if err := v.Run(); err != nil {
-		return errors.WithStack(err)
+		return err
 	}
 
 	pk := pkg{
@@ -133,7 +132,7 @@ func (b *Builder) process(path string) error {
 		DebugLog("building box %s\n", bx.Name)
 		p := filepath.Join(pk.Dir, bx.Name)
 		if err := bx.Walk(p); err != nil {
-			return errors.WithStack(err)
+			return err
 		}
 		if len(bx.Files) > 0 {
 			pk.Boxes = append(pk.Boxes, *bx)

builder/clean.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/gobuffalo/packr/v2/jam/parser"
 	"github.com/gobuffalo/packr/v2/jam/store"
-	"github.com/pkg/errors"
 )
 
 // Clean up an *-packr.go files
@@ -20,18 +19,18 @@ func Clean(root string) error {
 		IgnoreImports: true,
 	})
 	if err != nil {
-		return errors.WithStack(err)
+		return err
 	}
 
 	boxes, err := p.Run()
 	if err != nil {
-		return errors.WithStack(err)
+		return err
 	}
 
 	d := store.NewDisk("", "")
 	for _, box := range boxes {
 		if err := d.Clean(box); err != nil {
-			return errors.WithStack(err)
+			return err
 		}
 	}
 	return nil

builder/visitor.go

@@ -1,14 +1,13 @@
 package builder
 
 import (
+	"errors"
 	"go/ast"
 	"go/parser"
 	"go/token"
 	"io/ioutil"
 	"sort"
 	"strings"
-
-	"github.com/pkg/errors"
 )
 
 type visitor struct {
@@ -29,13 +28,13 @@ func newVisitor(path string) *visitor {
 func (v *visitor) Run() error {
 	b, err := ioutil.ReadFile(v.Path)
 	if err != nil {
-		return errors.WithStack(err)
+		return err
 	}
 
 	fset := token.NewFileSet()
 	file, err := parser.ParseFile(fset, v.Path, string(b), parser.ParseComments)
 	if err != nil {
-		return errors.WithStack(err)
+		return err
 	}
 
 	v.Package = file.Name.Name
@@ -81,7 +80,7 @@ func (v *visitor) eval(node ast.Node) error {
 	case *ast.GenDecl:
 		for _, n := range t.Specs {
 			if err := v.eval(n); err != nil {
-				return errors.WithStack(err)
+				return err
 			}
 		}
 	case *ast.FuncDecl:
@@ -90,14 +89,14 @@ func (v *visitor) eval(node ast.Node) error {
 		}
 		for _, b := range t.Body.List {
 			if err := v.evalStmt(b); err != nil {
-				return errors.WithStack(err)
+				return err
 			}
 		}
 		return nil
 	case *ast.ValueSpec:
 		for _, e := range t.Values {
 			if err := v.evalExpr(e); err != nil {
-				return errors.WithStack(err)
+				return err
 			}
 		}
 	}
@@ -111,7 +110,7 @@ func (v *visitor) evalStmt(stmt ast.Stmt) error {
 	case *ast.AssignStmt:
 		for _, e := range t.Rhs {
 			if err := v.evalArgs(e); err != nil {
-				return errors.WithStack(err)
+				return err
 			}
 		}
 	}
@@ -132,12 +131,12 @@ func (v *visitor) evalExpr(expr ast.Expr) error {
 				}
 
 				if err := v.evalArgs(at); err != nil {
-					return errors.WithStack(err)
+					return err
 				}
 			case *ast.CompositeLit:
 				for _, e := range at.Elts {
 					if err := v.evalExpr(e); err != nil {
-						return errors.WithStack(err)
+						return err
 					}
 				}
 			}
@@ -156,7 +155,7 @@ func (v *visitor) evalArgs(expr ast.Expr) error {
 	case *ast.CompositeLit:
 		for _, e := range at.Elts {
 			if err := v.evalExpr(e); err != nil {
-				return errors.WithStack(err)
+				return err
 			}
 		}
 	// case *ast.BasicLit:
@@ -169,14 +168,14 @@ func (v *visitor) evalArgs(expr ast.Expr) error {
 		switch st := at.Fun.(type) {
 		case *ast.SelectorExpr:
 			if err := v.evalSelector(at, st); err != nil {
-				return errors.WithStack(err)
+				return err
 			}
 		case *ast.Ident:
 			return v.evalIdent(st)
 		}
 		for _, a := range at.Args {
 			if err := v.evalArgs(a); err != nil {
-				return errors.WithStack(err)
+				return err
 			}
 		}
 	}

go.mod

@@ -3,11 +3,10 @@ module github.com/gobuffalo/packr
 require (
 	github.com/gobuffalo/envy v1.6.15
 	github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0
-	github.com/gobuffalo/packr/v2 v2.0.7
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/gobuffalo/packr/v2 v2.0.9
 	github.com/pkg/errors v0.8.1
+	github.com/rogpeppe/go-internal v1.3.0 // indirect
 	github.com/spf13/cobra v0.0.3
-	github.com/spf13/pflag v1.0.3 // indirect
 	github.com/stretchr/testify v1.3.0
 	golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6
 )

go.sum

@@ -1,28 +1,20 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
-github.com/gobuffalo/depgen v0.0.0-20190315122043-8442b3fa16db/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
 github.com/gobuffalo/envy v1.6.15 h1:OsV5vOpHYUpP7ZLS6sem1y40/lNX1BZj+ynMiRi21lQ=
 github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs=
-github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
-github.com/gobuffalo/genny v0.0.0-20190315121735-8b38fb089e88/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk=
-github.com/gobuffalo/genny v0.0.0-20190315124720-e16e52a93c79 h1:5AXgPPMHJYsMAoBnp+QHqIRl5JJ8Sq9opm50O/BrU9E=
-github.com/gobuffalo/genny v0.0.0-20190315124720-e16e52a93c79/go.mod h1:nKeefjbhYowo36ys9nG9VUvD9FRIS0p3BC2JFfcOucM=
-github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw=
+github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9 h1:lGw35M+JVpedVCf08hSiBHKpp3FPTKqt6qRdXMSVAq0=
+github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk=
 github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5 h1:f3Fpd5AqsFuTHUEhUeEMIFJkX8FpVnzdW+GpYxIyXkA=
 github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360=
 github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2 h1:8thhT+kUJMTMy3HlX4+y9Da+BNJck+p109tqqKp7WDs=
 github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8=
 github.com/gobuffalo/mapi v1.0.1 h1:JRuTiZzDEZhBHkFiHTxJkYRT6CbYuL0K/rn+1byJoEA=
 github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
-github.com/gobuffalo/packd v0.0.0-20190315122247-83d601d65093/go.mod h1:LpEu7OkoplvlhztyAEePkS6JwcGgANdgGL5pB4Knxaw=
 github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0 h1:P6naWPiHm/7R3eYx/ub3VhaW9G+1xAMJ6vzACePaGPI=
 github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
-github.com/gobuffalo/packr/v2 v2.0.6/go.mod h1:/TYKOjadT7P9jRWZtj4BRTgeXy2tIYntifGkD+aM2KY=
-github.com/gobuffalo/packr/v2 v2.0.7 h1:8Gah4OwoqvIZgsUHa07qyXNl/LtZRa4gPjtXux4fVlY=
-github.com/gobuffalo/packr/v2 v2.0.7/go.mod h1:1SBFAIr3YnxYdJRyrceR7zhOrhV/YhHzOjDwA9LLZ5Y=
+github.com/gobuffalo/packr/v2 v2.0.9 h1:g8P4tjthK0vAu2aopXlNNxCNsnGsWd+dbZLdc3fHSYk=
+github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
 github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754 h1:tpom+2CJmpzAWj5/VEHync2rJGi+epHNIeRSWjzGA+4=
 github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
@@ -46,8 +38,9 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 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/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.2.2 h1:J7U/N7eRtzjhs26d6GqMh2HBuXP8/Z64Densiiieafo=
 github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/sirupsen/logrus v1.4.0 h1:yKenngtzGh+cUSSh6GWbxW2abRqhYUSR/t/6+2QqNvE=
 github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
@@ -69,8 +62,7 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/tools v0.0.0-20190315044204-8b67d361bba2/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190318200714-bb1270c20edf h1:OVQ7iQXiQQT4WuYg+7S/bOVVlASHvL1Chsc15Qtkogo=
-golang.org/x/tools v0.0.0-20190318200714-bb1270c20edf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190329151228-23e29df326fe h1:tilCFoChsm7TcjFUH5YtBjno7wDleRO+6jICJg0WDS0=
+golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=

packr/cmd/build.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/gobuffalo/packr"
 	"github.com/gobuffalo/packr/builder"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -21,7 +20,7 @@ var buildCmd = &cobra.Command{
 		b := builder.New(context.Background(), input)
 		err := b.Run()
 		if err != nil {
-			return errors.WithStack(err)
+			return err
 		}
 
 		cargs := []string{"build"}

packr/cmd/install.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/gobuffalo/packr"
 	"github.com/gobuffalo/packr/builder"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
 
@@ -24,15 +23,15 @@ var installCmd = &cobra.Command{
 			if !strings.HasPrefix(input, ".") {
 				input = filepath.Join(packr.GoPath(), "src", input)
 				if _, err := os.Stat(input); err != nil {
-					return errors.WithStack(err)
+					return err
 				}
 			}
 		}
 		defer builder.Clean(input)
 		b := builder.New(context.Background(), input)
 		err := b.Run()
 		if err != nil {
-			return errors.WithStack(err)
+			return err
 		}
 
 		cargs := []string{"install"}

v2/SHOULDERS.md

@@ -25,7 +25,7 @@ Thank you to the following **GIANTS**:
 
 * [github.com/markbates/safe](https://godoc.org/github.com/markbates/safe)
 
-* [github.com/pkg/errors](https://godoc.org/github.com/pkg/errors)
+* [errors](https://godoc.org/errors)
 
 * [github.com/rogpeppe/go-internal](https://godoc.org/github.com/rogpeppe/go-internal)