go/goreleaser
go/goreleaser
1
0
Fork 0
mirror of https://github.com/goreleaser/goreleaser.git synced 2025-01-14 03:51:24 +02:00
Code Issues Releases Activity

refactor: rename archive.Copying to archive.Copy (#5233)

Browse Source 
This PR renames `Copying` functions in the `archive` package to `Copy`
because it is a more common method name.
This commit is contained in:
Oleksandr Redko 2024-10-31 13:53:27 +02:00 committed by GitHub
parent 7e48917d1a
commit 57365c1630
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/pipe/sourcearchive/source.go
View File

@ -97,7 +97,7 @@ func appendExtraFilesToArchive(ctx *context.Context, prefix, path, format string
}
defer af.Close()
arch, err := archive.Copying(of, af, format)
arch, err := archive.Copy(of, af, format)
if err != nil {
return err
}

10
pkg/archive/archive.go
View File

@ -40,16 +40,16 @@ func New(w io.Writer, format string) (Archive, error) {
return nil, fmt.Errorf("invalid archive format: %s", format)
}
// Copying copies the source archive into a new one, which can be appended at.
// Copy copies the source archive into a new one, which can be appended at.
// Source needs to be in the specified format.
func Copying(r *os.File, w io.Writer, format string) (Archive, error) {
func Copy(r *os.File, w io.Writer, format string) (Archive, error) {
switch format {
case "tar.gz", "tgz":
return targz.Copying(r, w)
return targz.Copy(r, w)
case "tar":
return tar.Copying(r, w)
return tar.Copy(r, w)
case "zip":
return zip.Copying(r, w)
return zip.Copy(r, w)
}
return nil, fmt.Errorf("invalid archive format: %s", format)
}

4
pkg/archive/archive_test.go
View File

@ -37,7 +37,7 @@ func TestArchive(t *testing.T) {
require.NoError(t, f1.Close())
if format == "tar.xz" || format == "txz" || format == "gz" || format == "tar.zst" || format == "tzst" {
_, err := Copying(f1, io.Discard, format)
_, err := Copy(f1, io.Discard, format)
require.Error(t, err)
return
}
@ -47,7 +47,7 @@ func TestArchive(t *testing.T) {
f2, err := os.Create(filepath.Join(t.TempDir(), "2.tar"))
require.NoError(t, err)
a, err := Copying(f1, f2, format)
a, err := Copy(f1, f2, format)
require.NoError(t, err)
require.NoError(t, f1.Close())

4
pkg/archive/tar/tar.go
View File

@ -25,8 +25,8 @@ func New(target io.Writer) Archive {
}
}
// Copying creates a new tar with the contents of the given tar.
func Copying(source io.Reader, target io.Writer) (Archive, error) {
// Copy creates a new tar with the contents of the given tar.
func Copy(source io.Reader, target io.Writer) (Archive, error) {
w := New(target)
r := tar.NewReader(source)
for {

2
pkg/archive/tar/tar_test.go
View File

@ -186,7 +186,7 @@ func TestCopying(t *testing.T) {
f1, err = os.Open(f1.Name())
require.NoError(t, err)
t2, err := Copying(f1, f2)
t2, err := Copy(f1, f2)
require.NoError(t, err)
require.NoError(t, t2.Add(config.File{
Source: "../testdata/sub1/executable",

4
pkg/archive/targz/targz.go
View File

@ -27,14 +27,14 @@ func New(target io.Writer) Archive {
}
}
func Copying(source io.Reader, target io.Writer) (Archive, error) {
func Copy(source io.Reader, target io.Writer) (Archive, error) {
// the error will be nil since the compression level is valid
gw, _ := gzip.NewWriterLevel(target, gzip.BestCompression)
srcgz, err := gzip.NewReader(source)
if err != nil {
return Archive{}, err
}
tw, err := tar.Copying(srcgz, gw)
tw, err := tar.Copy(srcgz, gw)
return Archive{
gw: gw,
tw: &tw,

3
pkg/archive/zip/zip.go
View File

@ -32,8 +32,7 @@ func New(target io.Writer) Archive {
}
}
// New zip archive.
func Copying(source *os.File, target io.Writer) (Archive, error) {
func Copy(source *os.File, target io.Writer) (Archive, error) {
info, err := source.Stat()
if err != nil {
return Archive{}, err