diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fe181d1..417e2c5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,16 +12,16 @@ jobs: go 1.10: go_version: "1.10" go 1.11 (on): - go_version: "1.11" + go_version: "1.11.5" GO111MODULE: "on" go 1.11 (off): - go_version: "1.11" + go_version: "1.11.5" GO111MODULE: "off" go 1.12 (on): - go_version: "1.11" + go_version: "1.12" GO111MODULE: "on" go 1.12 (off): - go_version: "1.11" + go_version: "1.12" GO111MODULE: "off" steps: - template: azure-tests.yml @@ -34,16 +34,16 @@ jobs: go 1.10: go_version: "1.10" go 1.11 (on): - go_version: "1.11" + go_version: "1.11.5" GO111MODULE: "on" go 1.11 (off): - go_version: "1.11" + go_version: "1.11.5" GO111MODULE: "off" go 1.12 (on): - go_version: "1.11" + go_version: "1.12" GO111MODULE: "on" go 1.12 (off): - go_version: "1.11" + go_version: "1.12" GO111MODULE: "off" steps: - template: azure-tests.yml @@ -56,16 +56,16 @@ jobs: go 1.10: go_version: "1.10" go 1.11 (on): - go_version: "1.11" + go_version: "1.11.5" GO111MODULE: "on" go 1.11 (off): - go_version: "1.11" + go_version: "1.11.5" GO111MODULE: "off" go 1.12 (on): - go_version: "1.11" + go_version: "1.12" GO111MODULE: "on" go 1.12 (off): - go_version: "1.11" + go_version: "1.12" GO111MODULE: "off" steps: - template: azure-tests.yml diff --git a/v2/go.mod b/v2/go.mod index 4b7a990..4307ae2 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -2,21 +2,21 @@ module github.com/gobuffalo/packr/v2 require ( github.com/gobuffalo/envy v1.6.15 - github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9 + github.com/gobuffalo/genny v0.0.0-20190329153409-7be1b23270eb github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5 github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2 - github.com/gobuffalo/mapi v1.0.1 // indirect github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0 - github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/karrick/godirwalk v1.8.0 + github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2 github.com/markbates/safe v1.0.1 github.com/pkg/errors v0.8.1 github.com/rogpeppe/go-internal v1.2.2 github.com/sirupsen/logrus v1.4.0 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/crypto v0.0.0-20190325154230-a5d413f7728c // indirect golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 - golang.org/x/tools v0.0.0-20190329151228-23e29df326fe + golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65 // indirect + golang.org/x/tools v0.0.0-20190330163440-a68386b9fffe ) diff --git a/v2/go.sum b/v2/go.sum index e595441..ce03a79 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -1,18 +1,28 @@ 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-20190329151759-d478694a28d3/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-20190329151137-27723ad26ef9 h1:lGw35M+JVpedVCf08hSiBHKpp3FPTKqt6qRdXMSVAq0= github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk= +github.com/gobuffalo/genny v0.0.0-20190329153409-7be1b23270eb h1:IUtUgwYRIQOHgmCP8uAUjKQNJKUxICmptd1gMggAytA= +github.com/gobuffalo/genny v0.0.0-20190329153409-7be1b23270eb/go.mod h1:WGiyExKBGcMizwBYYmNL3LIyTRMP6wJQaD7MEYuM7Zk= +github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw= 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/mapi v1.0.2 h1:fq9WcL1BYrm36SzK6+aAnZ8hcp+SrmnDyAxhNx8dvJk= +github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= 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.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= @@ -23,6 +33,8 @@ github.com/karrick/godirwalk v1.8.0 h1:ycpSqVon/QJJoaT1t8sae0tp1Stg21j+dyuS7Ooag github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -52,6 +64,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c h1:Vj5n4GlwjmQteupaxJ9+0FNOmBrHfq7vN4btdGoDZgI= +golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI= @@ -59,8 +73,12 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 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/sys v0.0.0-20190329044733-9eb1bfa1ce65 h1:hOY+O8MxdkPV10pNf7/XEHaySCiPKxixMKUshfHsGn0= +golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= 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= +golang.org/x/tools v0.0.0-20190330163440-a68386b9fffe h1:TSwzZtGyXzhKPLhVz/4DSkDWaEwA5tC5kFS0Y4QXaSE= +golang.org/x/tools v0.0.0-20190330163440-a68386b9fffe/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= diff --git a/v2/packr2/cmd/root.go b/v2/packr2/cmd/root.go index 6d3dd13..8709212 100644 --- a/v2/packr2/cmd/root.go +++ b/v2/packr2/cmd/root.go @@ -1,8 +1,11 @@ package cmd import ( + "errors" "os" + "github.com/gobuffalo/envy" + "github.com/gobuffalo/genny" "github.com/gobuffalo/logger" "github.com/gobuffalo/packr/v2/jam" @@ -21,7 +24,10 @@ var globalOptions = struct { var rootCmd = &cobra.Command{ Use: "packr2", Short: "Packr is a simple solution for bundling static assets inside of Go binaries.", - PersistentPreRun: func(cmd *cobra.Command, args []string) { + PersistentPreRunE: func(cmd *cobra.Command, args []string) error { + if !envy.Mods() && !envy.InGoPath() { + return errors.New(outsideGoPath) + } genny.DefaultLogLvl = logger.ErrorLevel for _, a := range args { if a == "--legacy" { @@ -41,6 +47,7 @@ var rootCmd = &cobra.Command{ genny.DefaultLogLvl = logger.FatalLevel plog.Logger = logger.New(logger.FatalLevel) } + return nil }, RunE: func(cmd *cobra.Command, args []string) error { opts := globalOptions.PackOptions @@ -51,6 +58,13 @@ var rootCmd = &cobra.Command{ }, } +const outsideGoPath = `You appear to be working outside of your GOPATH and do not have GO111MODULE set to "on". + +Packr, and all of the github.com/gobuffalo projects, require you to opt-in to using Go modules. + +Set GO111MODULE=on to enable modules support or work inside of your GOPATH. +` + // Execute adds all child commands to the root command and sets flags appropriately. // This is called by main.main(). It only needs to happen once to the rootCmd. func Execute() {