Skip to content
This repository was archived by the owner on Aug 22, 2022. It is now read-only.

Commit 0273362

Browse files
authored
Merge pull request #102 from requaos/requaos/gzip
Remove hepa library for revision at a later date
2 parents 992ea93 + c78e87a commit 0273362

File tree

14 files changed

+21
-6265
lines changed

14 files changed

+21
-6265
lines changed

README.md

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ Paths:
2424
* Packages can specified in at the beginning of a path with a `:` seperator.
2525
github.com/markbates/pkger:/cmd/pkger/main.go
2626
* There are no relative paths. All paths are absolute to the modules root.
27+
* Fully-qualified paths are embedded into the metadata of your static assets. If this behavior is undesirable, a preference is to build in a containerized environ, like docker, where the path strings are not ex-filtrating data about your development environment.
2728

2829
```
29-
"github.com/gobuffalo/buffalo:/go.mod" => $GOPATH/pkg/mod/github.com/gobuffalo/buffalo@v0.14.7/go.mod
30+
"github.com/gobuffalo/buffalo:/go.mod" => /go/pkg/mod/github.com/gobuffalo/buffalo@v0.14.7/go.mod
3031
```
3132

3233
## CLI
@@ -284,26 +285,26 @@ $ pkger parse
284285
".": [
285286
{
286287
"file": {
287-
"Abs": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/foo/bar/baz",
288+
"Abs": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/foo/bar/baz",
288289
"Path": {
289290
"Pkg": "app",
290291
"Name": "/foo/bar/baz"
291292
},
292293
"Here": {
293-
"Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref",
294+
"Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref",
294295
"ImportPath": "app",
295296
"Module": {
296297
"Path": "app",
297298
"Main": true,
298-
"Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref",
299-
"GoMod": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod",
299+
"Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref",
300+
"GoMod": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod",
300301
"GoVersion": "1.13"
301302
},
302303
"Name": "main"
303304
}
304305
},
305306
"pos": {
306-
"Filename": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/main.go",
307+
"Filename": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/main.go",
307308
"Offset": 629,
308309
"Line": 47,
309310
"Column": 27
@@ -313,26 +314,26 @@ $ pkger parse
313314
},
314315
{
315316
"file": {
316-
"Abs": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/foo/bar/baz/biz.txt",
317+
"Abs": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/foo/bar/baz/biz.txt",
317318
"Path": {
318319
"Pkg": "app",
319320
"Name": "/foo/bar/baz/biz.txt"
320321
},
321322
"Here": {
322-
"Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref",
323+
"Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref",
323324
"ImportPath": "app",
324325
"Module": {
325326
"Path": "app",
326327
"Main": true,
327-
"Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref",
328-
"GoMod": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod",
328+
"Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref",
329+
"GoMod": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod",
329330
"GoVersion": "1.13"
330331
},
331332
"Name": "main"
332333
}
333334
},
334335
"pos": {
335-
"Filename": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/main.go",
336+
"Filename": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/main.go",
336337
"Offset": 706,
337338
"Line": 51,
338339
"Column": 25
@@ -388,38 +389,38 @@ $ pkger list -json
388389
"ImportPath": "app",
389390
"Files": [
390391
{
391-
"Abs": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets",
392+
"Abs": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets",
392393
"Path": {
393394
"Pkg": "app",
394395
"Name": "/assets"
395396
},
396397
"Here": {
397-
"Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets",
398+
"Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets",
398399
"ImportPath": "",
399400
"Module": {
400401
"Path": "app",
401402
"Main": true,
402-
"Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref",
403-
"GoMod": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod",
403+
"Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref",
404+
"GoMod": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod",
404405
"GoVersion": "1.13"
405406
},
406407
"Name": "assets"
407408
}
408409
},
409410
{
410-
"Abs": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets/css",
411+
"Abs": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets/css",
411412
"Path": {
412413
"Pkg": "app",
413414
"Name": "/assets/css"
414415
},
415416
"Here": {
416-
"Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets",
417+
"Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/assets",
417418
"ImportPath": "",
418419
"Module": {
419420
"Path": "app",
420421
"Main": true,
421-
"Dir": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref",
422-
"GoMod": "$GOPATH/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod",
422+
"Dir": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref",
423+
"GoMod": "/go/src/github.com/markbates/pkger/pkging/pkgtest/testdata/ref/go.mod",
423424
"GoVersion": "1.13"
424425
},
425426
"Name": "assets"

cmd/pkger/cmds/list.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import (
99
"path/filepath"
1010

1111
"github.com/markbates/pkger"
12-
"github.com/markbates/pkger/internal/takeon/github.com/markbates/hepa"
13-
"github.com/markbates/pkger/internal/takeon/github.com/markbates/hepa/filters"
1412
"github.com/markbates/pkger/parser"
1513
)
1614

@@ -71,15 +69,7 @@ func (e *listCmd) Exec(args []string) error {
7169
return err
7270
}
7371

74-
hep := hepa.New()
75-
hep = hepa.With(hep, filters.Home())
76-
hep = hepa.With(hep, filters.Golang())
77-
78-
b, err := hep.Filter(bb.Bytes())
79-
if err != nil {
80-
return err
81-
}
82-
_, err = os.Stdout.Write(b)
72+
_, err = os.Stdout.Write(bb.Bytes())
8373
return err
8474
}
8575

internal/takeon/github.com/markbates/hepa/LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

internal/takeon/github.com/markbates/hepa/filter.go

Lines changed: 0 additions & 35 deletions
This file was deleted.

internal/takeon/github.com/markbates/hepa/filters/env.go

Lines changed: 0 additions & 42 deletions
This file was deleted.

internal/takeon/github.com/markbates/hepa/filters/filters.go

Lines changed: 0 additions & 12 deletions
This file was deleted.

internal/takeon/github.com/markbates/hepa/filters/golang.go

Lines changed: 0 additions & 51 deletions
This file was deleted.

internal/takeon/github.com/markbates/hepa/filters/home.go

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)