diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..27085bf --- /dev/null +++ b/Makefile @@ -0,0 +1,16 @@ +all: regen check + +regen: + go install ./... + make -C testdata regen + +.PHONY: check +check: errcheck + errcheck testdata/out/compress-memcopy.go + errcheck testdata/out/compress-nomemcopy.go + errcheck testdata/out/debug.go + errcheck testdata/out/nocompress-memcopy.go + errcheck testdata/out/nocompress-nomemcopy.go + +errcheck: + go get github.com/kisielk/errcheck diff --git a/release.go b/release.go index 7c33e08..f97c2cf 100644 --- a/release.go +++ b/release.go @@ -129,11 +129,14 @@ func bindata_read(data, name string) ([]byte, error) { var buf bytes.Buffer _, err = io.Copy(&buf, gz) - gz.Close() + clErr := gz.Close() if err != nil { return nil, fmt.Errorf("Read %%q: %%v", name, err) } + if clErr != nil { + return nil, err + } return buf.Bytes(), nil } @@ -164,11 +167,14 @@ func bindata_read(data []byte, name string) ([]byte, error) { var buf bytes.Buffer _, err = io.Copy(&buf, gz) - gz.Close() + clErr := gz.Close() if err != nil { return nil, fmt.Errorf("Read %%q: %%v", name, err) } + if clErr != nil { + return nil, err + } return buf.Bytes(), nil } diff --git a/testdata/Makefile b/testdata/Makefile new file mode 100644 index 0000000..2fcc757 --- /dev/null +++ b/testdata/Makefile @@ -0,0 +1,6 @@ +regen: + go-bindata -o out/compress-memcopy.go in/... + go-bindata -nomemcopy -o out/compress-nomemcopy.go in/... + go-bindata -debug -o out/debug.go in/... + go-bindata -nocompress -o out/nocompress-memcopy.go in/... + go-bindata -nocompress -nomemcopy -o out/nocompress-nomemcopy.go in/... diff --git a/testdata/out/compress-memcopy.go b/testdata/out/compress-memcopy.go index 9a48b55..a132fec 100644 --- a/testdata/out/compress-memcopy.go +++ b/testdata/out/compress-memcopy.go @@ -21,11 +21,14 @@ func bindata_read(data []byte, name string) ([]byte, error) { var buf bytes.Buffer _, err = io.Copy(&buf, gz) - gz.Close() + clErr := gz.Close() if err != nil { return nil, fmt.Errorf("Read %q: %v", name, err) } + if clErr != nil { + return nil, err + } return buf.Bytes(), nil } @@ -76,7 +79,7 @@ func in_a_test_asset() (*asset, error) { return nil, err } - info := bindata_file_info{name: "in/a/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1418006091, 0)} + info := bindata_file_info{name: "in/a/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -96,7 +99,7 @@ func in_b_test_asset() (*asset, error) { return nil, err } - info := bindata_file_info{name: "in/b/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1418006091, 0)} + info := bindata_file_info{name: "in/b/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -116,7 +119,7 @@ func in_c_test_asset() (*asset, error) { return nil, err } - info := bindata_file_info{name: "in/c/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1418006091, 0)} + info := bindata_file_info{name: "in/c/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -136,7 +139,7 @@ func in_test_asset() (*asset, error) { return nil, err } - info := bindata_file_info{name: "in/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1418006091, 0)} + info := bindata_file_info{name: "in/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -156,6 +159,17 @@ func Asset(name string) ([]byte, error) { return nil, fmt.Errorf("Asset %s not found", name) } +// MustAsset is like Asset but panics when Asset would return an error. +// It simplifies safe initialization of global variables. +func MustAsset(name string) []byte { + a, err := Asset(name) + if (err != nil) { + panic("asset: Asset(" + name + "): " + err.Error()) + } + + return a +} + // AssetInfo loads and returns the asset info for the given name. // It returns an error if the asset could not be found or // could not be loaded. diff --git a/testdata/out/compress-nomemcopy.go b/testdata/out/compress-nomemcopy.go index d897dae..20d1c86 100644 --- a/testdata/out/compress-nomemcopy.go +++ b/testdata/out/compress-nomemcopy.go @@ -31,11 +31,14 @@ func bindata_read(data, name string) ([]byte, error) { var buf bytes.Buffer _, err = io.Copy(&buf, gz) - gz.Close() + clErr := gz.Close() if err != nil { return nil, fmt.Errorf("Read %q: %v", name, err) } + if clErr != nil { + return nil, err + } return buf.Bytes(), nil } @@ -86,7 +89,7 @@ func in_a_test_asset() (*asset, error) { return nil, err } - info := bindata_file_info{name: "in/a/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1418006091, 0)} + info := bindata_file_info{name: "in/a/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -106,7 +109,7 @@ func in_b_test_asset() (*asset, error) { return nil, err } - info := bindata_file_info{name: "in/b/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1418006091, 0)} + info := bindata_file_info{name: "in/b/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -126,7 +129,7 @@ func in_c_test_asset() (*asset, error) { return nil, err } - info := bindata_file_info{name: "in/c/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1418006091, 0)} + info := bindata_file_info{name: "in/c/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -146,7 +149,7 @@ func in_test_asset() (*asset, error) { return nil, err } - info := bindata_file_info{name: "in/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1418006091, 0)} + info := bindata_file_info{name: "in/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -166,6 +169,17 @@ func Asset(name string) ([]byte, error) { return nil, fmt.Errorf("Asset %s not found", name) } +// MustAsset is like Asset but panics when Asset would return an error. +// It simplifies safe initialization of global variables. +func MustAsset(name string) []byte { + a, err := Asset(name) + if (err != nil) { + panic("asset: Asset(" + name + "): " + err.Error()) + } + + return a +} + // AssetInfo loads and returns the asset info for the given name. // It returns an error if the asset could not be found or // could not be loaded. diff --git a/testdata/out/debug.go b/testdata/out/debug.go index 8a003c9..e3a2ef2 100644 --- a/testdata/out/debug.go +++ b/testdata/out/debug.go @@ -25,7 +25,7 @@ type asset struct { // in_a_test_asset reads file data from disk. It returns an error on failure. func in_a_test_asset() (*asset, error) { - path := "/Users/iwanaga.ryosuke/golang/src/github.com/riywo/go-bindata/testdata/in/a/test.asset" + path := "/Users/tamird/src/go/src/github.com/jteeuwen/go-bindata/testdata/in/a/test.asset" name := "in/a/test.asset" bytes, err := bindata_read(path, name) if err != nil { @@ -43,7 +43,7 @@ func in_a_test_asset() (*asset, error) { // in_b_test_asset reads file data from disk. It returns an error on failure. func in_b_test_asset() (*asset, error) { - path := "/Users/iwanaga.ryosuke/golang/src/github.com/riywo/go-bindata/testdata/in/b/test.asset" + path := "/Users/tamird/src/go/src/github.com/jteeuwen/go-bindata/testdata/in/b/test.asset" name := "in/b/test.asset" bytes, err := bindata_read(path, name) if err != nil { @@ -61,7 +61,7 @@ func in_b_test_asset() (*asset, error) { // in_c_test_asset reads file data from disk. It returns an error on failure. func in_c_test_asset() (*asset, error) { - path := "/Users/iwanaga.ryosuke/golang/src/github.com/riywo/go-bindata/testdata/in/c/test.asset" + path := "/Users/tamird/src/go/src/github.com/jteeuwen/go-bindata/testdata/in/c/test.asset" name := "in/c/test.asset" bytes, err := bindata_read(path, name) if err != nil { @@ -79,7 +79,7 @@ func in_c_test_asset() (*asset, error) { // in_test_asset reads file data from disk. It returns an error on failure. func in_test_asset() (*asset, error) { - path := "/Users/iwanaga.ryosuke/golang/src/github.com/riywo/go-bindata/testdata/in/test.asset" + path := "/Users/tamird/src/go/src/github.com/jteeuwen/go-bindata/testdata/in/test.asset" name := "in/test.asset" bytes, err := bindata_read(path, name) if err != nil { @@ -110,6 +110,17 @@ func Asset(name string) ([]byte, error) { return nil, fmt.Errorf("Asset %s not found", name) } +// MustAsset is like Asset but panics when Asset would return an error. +// It simplifies safe initialization of global variables. +func MustAsset(name string) []byte { + a, err := Asset(name) + if (err != nil) { + panic("asset: Asset(" + name + "): " + err.Error()) + } + + return a +} + // AssetInfo loads and returns the asset info for the given name. // It returns an error if the asset could not be found or // could not be loaded. diff --git a/testdata/out/debug.go-bindata b/testdata/out/debug.go-bindata new file mode 100644 index 0000000..e3a2ef2 --- /dev/null +++ b/testdata/out/debug.go-bindata @@ -0,0 +1,259 @@ +package main + +import ( + "fmt" + "io/ioutil" + "strings" + "os" + "path" + "path/filepath" +) + +// bindata_read reads the given file from disk. It returns an error on failure. +func bindata_read(path, name string) ([]byte, error) { + buf, err := ioutil.ReadFile(path) + if err != nil { + err = fmt.Errorf("Error reading asset %s at %s: %v", name, path, err) + } + return buf, err +} + +type asset struct { + bytes []byte + info os.FileInfo +} + +// in_a_test_asset reads file data from disk. It returns an error on failure. +func in_a_test_asset() (*asset, error) { + path := "/Users/tamird/src/go/src/github.com/jteeuwen/go-bindata/testdata/in/a/test.asset" + name := "in/a/test.asset" + bytes, err := bindata_read(path, name) + if err != nil { + return nil, err + } + + fi, err := os.Stat(path) + if err != nil { + err = fmt.Errorf("Error reading asset info %s at %s: %v", name, path, err) + } + + a := &asset{bytes: bytes, info: fi} + return a, err +} + +// in_b_test_asset reads file data from disk. It returns an error on failure. +func in_b_test_asset() (*asset, error) { + path := "/Users/tamird/src/go/src/github.com/jteeuwen/go-bindata/testdata/in/b/test.asset" + name := "in/b/test.asset" + bytes, err := bindata_read(path, name) + if err != nil { + return nil, err + } + + fi, err := os.Stat(path) + if err != nil { + err = fmt.Errorf("Error reading asset info %s at %s: %v", name, path, err) + } + + a := &asset{bytes: bytes, info: fi} + return a, err +} + +// in_c_test_asset reads file data from disk. It returns an error on failure. +func in_c_test_asset() (*asset, error) { + path := "/Users/tamird/src/go/src/github.com/jteeuwen/go-bindata/testdata/in/c/test.asset" + name := "in/c/test.asset" + bytes, err := bindata_read(path, name) + if err != nil { + return nil, err + } + + fi, err := os.Stat(path) + if err != nil { + err = fmt.Errorf("Error reading asset info %s at %s: %v", name, path, err) + } + + a := &asset{bytes: bytes, info: fi} + return a, err +} + +// in_test_asset reads file data from disk. It returns an error on failure. +func in_test_asset() (*asset, error) { + path := "/Users/tamird/src/go/src/github.com/jteeuwen/go-bindata/testdata/in/test.asset" + name := "in/test.asset" + bytes, err := bindata_read(path, name) + if err != nil { + return nil, err + } + + fi, err := os.Stat(path) + if err != nil { + err = fmt.Errorf("Error reading asset info %s at %s: %v", name, path, err) + } + + a := &asset{bytes: bytes, info: fi} + return a, err +} + +// Asset loads and returns the asset for the given name. +// It returns an error if the asset could not be found or +// could not be loaded. +func Asset(name string) ([]byte, error) { + cannonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[cannonicalName]; ok { + a, err := f() + if err != nil { + return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err) + } + return a.bytes, nil + } + return nil, fmt.Errorf("Asset %s not found", name) +} + +// MustAsset is like Asset but panics when Asset would return an error. +// It simplifies safe initialization of global variables. +func MustAsset(name string) []byte { + a, err := Asset(name) + if (err != nil) { + panic("asset: Asset(" + name + "): " + err.Error()) + } + + return a +} + +// AssetInfo loads and returns the asset info for the given name. +// It returns an error if the asset could not be found or +// could not be loaded. +func AssetInfo(name string) (os.FileInfo, error) { + cannonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[cannonicalName]; ok { + a, err := f() + if err != nil { + return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err) + } + return a.info, nil + } + return nil, fmt.Errorf("AssetInfo %s not found", name) +} + +// AssetNames returns the names of the assets. +func AssetNames() []string { + names := make([]string, 0, len(_bindata)) + for name := range _bindata { + names = append(names, name) + } + return names +} + +// _bindata is a table, holding each asset generator, mapped to its name. +var _bindata = map[string]func() (*asset, error){ + "in/a/test.asset": in_a_test_asset, + "in/b/test.asset": in_b_test_asset, + "in/c/test.asset": in_c_test_asset, + "in/test.asset": in_test_asset, +} + +// AssetDir returns the file names below a certain +// directory embedded in the file by go-bindata. +// For example if you run go-bindata on data/... and data contains the +// following hierarchy: +// data/ +// foo.txt +// img/ +// a.png +// b.png +// then AssetDir("data") would return []string{"foo.txt", "img"} +// AssetDir("data/img") would return []string{"a.png", "b.png"} +// AssetDir("foo.txt") and AssetDir("notexist") would return an error +// AssetDir("") will return []string{"data"}. +func AssetDir(name string) ([]string, error) { + node := _bintree + if len(name) != 0 { + cannonicalName := strings.Replace(name, "\\", "/", -1) + pathList := strings.Split(cannonicalName, "/") + for _, p := range pathList { + node = node.Children[p] + if node == nil { + return nil, fmt.Errorf("Asset %s not found", name) + } + } + } + if node.Func != nil { + return nil, fmt.Errorf("Asset %s not found", name) + } + rv := make([]string, 0, len(node.Children)) + for name := range node.Children { + rv = append(rv, name) + } + return rv, nil +} + +type _bintree_t struct { + Func func() (*asset, error) + Children map[string]*_bintree_t +} +var _bintree = &_bintree_t{nil, map[string]*_bintree_t{ + "in": &_bintree_t{nil, map[string]*_bintree_t{ + "a": &_bintree_t{nil, map[string]*_bintree_t{ + "test.asset": &_bintree_t{in_a_test_asset, map[string]*_bintree_t{ + }}, + }}, + "b": &_bintree_t{nil, map[string]*_bintree_t{ + "test.asset": &_bintree_t{in_b_test_asset, map[string]*_bintree_t{ + }}, + }}, + "c": &_bintree_t{nil, map[string]*_bintree_t{ + "test.asset": &_bintree_t{in_c_test_asset, map[string]*_bintree_t{ + }}, + }}, + "test.asset": &_bintree_t{in_test_asset, map[string]*_bintree_t{ + }}, + }}, +}} + +// Restore an asset under the given directory +func RestoreAsset(dir, name string) error { + data, err := Asset(name) + if err != nil { + return err + } + info, err := AssetInfo(name) + if err != nil { + return err + } + err = os.MkdirAll(_filePath(dir, path.Dir(name)), os.FileMode(0755)) + if err != nil { + return err + } + err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode()) + if err != nil { + return err + } + err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime()) + if err != nil { + return err + } + return nil +} + +// Restore assets under the given directory recursively +func RestoreAssets(dir, name string) error { + children, err := AssetDir(name) + if err != nil { // File + return RestoreAsset(dir, name) + } else { // Dir + for _, child := range children { + err = RestoreAssets(dir, path.Join(name, child)) + if err != nil { + return err + } + } + } + return nil +} + +func _filePath(dir, name string) string { + cannonicalName := strings.Replace(name, "\\", "/", -1) + return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) +} + diff --git a/testdata/out/nocompress-memcopy.go b/testdata/out/nocompress-memcopy.go index c2d4300..645bf1f 100644 --- a/testdata/out/nocompress-memcopy.go +++ b/testdata/out/nocompress-memcopy.go @@ -53,7 +53,7 @@ func in_a_test_asset() (*asset, error) { return nil, err } - info := bindata_file_info{name: "in/a/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1418006091, 0)} + info := bindata_file_info{name: "in/a/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -71,7 +71,7 @@ func in_b_test_asset() (*asset, error) { return nil, err } - info := bindata_file_info{name: "in/b/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1418006091, 0)} + info := bindata_file_info{name: "in/b/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -89,7 +89,7 @@ func in_c_test_asset() (*asset, error) { return nil, err } - info := bindata_file_info{name: "in/c/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1418006091, 0)} + info := bindata_file_info{name: "in/c/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -107,7 +107,7 @@ func in_test_asset() (*asset, error) { return nil, err } - info := bindata_file_info{name: "in/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1418006091, 0)} + info := bindata_file_info{name: "in/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -127,6 +127,17 @@ func Asset(name string) ([]byte, error) { return nil, fmt.Errorf("Asset %s not found", name) } +// MustAsset is like Asset but panics when Asset would return an error. +// It simplifies safe initialization of global variables. +func MustAsset(name string) []byte { + a, err := Asset(name) + if (err != nil) { + panic("asset: Asset(" + name + "): " + err.Error()) + } + + return a +} + // AssetInfo loads and returns the asset info for the given name. // It returns an error if the asset could not be found or // could not be loaded. diff --git a/testdata/out/nocompress-nomemcopy.go b/testdata/out/nocompress-nomemcopy.go index 1510296..52c355d 100644 --- a/testdata/out/nocompress-nomemcopy.go +++ b/testdata/out/nocompress-nomemcopy.go @@ -69,7 +69,7 @@ func in_a_test_asset() (*asset, error) { return nil, err } - info := bindata_file_info{name: "in/a/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1418006091, 0)} + info := bindata_file_info{name: "in/a/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -89,7 +89,7 @@ func in_b_test_asset() (*asset, error) { return nil, err } - info := bindata_file_info{name: "in/b/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1418006091, 0)} + info := bindata_file_info{name: "in/b/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -109,7 +109,7 @@ func in_c_test_asset() (*asset, error) { return nil, err } - info := bindata_file_info{name: "in/c/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1418006091, 0)} + info := bindata_file_info{name: "in/c/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -129,7 +129,7 @@ func in_test_asset() (*asset, error) { return nil, err } - info := bindata_file_info{name: "in/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1418006091, 0)} + info := bindata_file_info{name: "in/test.asset", size: 15, mode: os.FileMode(420), modTime: time.Unix(1430781941, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -149,6 +149,17 @@ func Asset(name string) ([]byte, error) { return nil, fmt.Errorf("Asset %s not found", name) } +// MustAsset is like Asset but panics when Asset would return an error. +// It simplifies safe initialization of global variables. +func MustAsset(name string) []byte { + a, err := Asset(name) + if (err != nil) { + panic("asset: Asset(" + name + "): " + err.Error()) + } + + return a +} + // AssetInfo loads and returns the asset info for the given name. // It returns an error if the asset could not be found or // could not be loaded.