feat: try to clean up and simplify the file adding interface

.gitignore

@@ -1,5 +1,8 @@
 vendor
 *.rpm
+*.deb
+!dummy.deb
+*.apk
 coverage.txt
 dist
 nfpm.yaml
@@ -8,3 +11,5 @@ bin
 coverage.out
 /nfpm
 www/site
+.idea/
+testdata/acceptance/tmp/

.golangci.yml

@@ -12,6 +12,7 @@ linters:
     - gci
     - exhaustivestruct
     - wrapcheck
+    - godot
 linters-settings:
   maligned:
     # print struct with more effective memory layout or not, false by default
@@ -40,6 +41,8 @@ linters-settings:
       - style
       - performance
 issues:
+  exclude:
+    - composites
   exclude-rules:
     - text: "G104" # gosec G104 is caught by errcheck
       linters:

Makefile

@@ -2,6 +2,7 @@ SOURCE_FILES?=./...
 TEST_PATTERN?=.
 TEST_OPTIONS?=
 TEST_TIMEOUT?=15m
+TEST_PARALLEL?=2
 
 export PATH := ./bin:$(PATH)
 export GO111MODULE := on
@@ -24,7 +25,7 @@ acceptance: pull_test_imgs
 .PHONY: acceptance
 
 test:
-	go test $(TEST_OPTIONS) -v -failfast -race -coverpkg=./... -covermode=atomic -coverprofile=coverage.txt $(SOURCE_FILES) -run $(TEST_PATTERN) -timeout=$(TEST_TIMEOUT)
+	go test $(TEST_OPTIONS) -p $(TEST_PARALLEL) -v -failfast -race -coverpkg=./... -covermode=atomic -coverprofile=coverage.txt $(SOURCE_FILES) -run $(TEST_PATTERN) -timeout=$(TEST_TIMEOUT)
 .PHONY: test
 
 cover: test

acceptance/acceptance_test.go → acceptance_test.go

@@ -1,6 +1,6 @@
-//+build acceptance
+// +build acceptance
 
-package acceptance
+package nfpm_test
 
 import (
 	"fmt"
@@ -12,7 +12,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/goreleaser/nfpm"
-	// shut up
 	_ "github.com/goreleaser/nfpm/apk"
 	_ "github.com/goreleaser/nfpm/deb"
 	_ "github.com/goreleaser/nfpm/rpm"
@@ -83,10 +82,10 @@ func TestComplex(t *testing.T) {
 }
 
 func TestConfigNoReplace(t *testing.T) {
-	var target = "./testdata/tmp/noreplace_old_rpm.rpm"
-	require.NoError(t, os.MkdirAll("./testdata/tmp", 0700))
+	var target = "./testdata/acceptance/tmp/noreplace_old_rpm.rpm"
+	require.NoError(t, os.MkdirAll("./testdata/acceptance/tmp", 0700))
 
-	config, err := nfpm.ParseFile("./testdata/config-noreplace-old.yaml")
+	config, err := nfpm.ParseFile("./testdata/acceptance/config-noreplace-old.yaml")
 	require.NoError(t, err)
 
 	info, err := config.Get("rpm")
@@ -277,13 +276,13 @@ type testWriter struct {
 }
 
 func (t testWriter) Write(p []byte) (n int, err error) {
-	t.t.Logf(string(p))
+	t.t.Log(string(p))
 	return len(p), nil
 }
 
 func accept(t *testing.T, params acceptParms) {
-	var configFile = filepath.Join("./testdata", params.Conf)
-	tmp, err := filepath.Abs("./testdata/tmp")
+	var configFile = filepath.Join("./testdata/acceptance/", params.Conf)
+	tmp, err := filepath.Abs("./testdata/acceptance/tmp")
 	require.NoError(t, err)
 	var packageName = params.Name + "." + params.Format
 	var target = filepath.Join(tmp, packageName)
@@ -312,7 +311,7 @@ func accept(t *testing.T, params acceptParms) {
 		"--build-arg", "package="+filepath.Join("tmp", packageName),
 		".",
 	)
-	cmd.Dir = "./testdata"
+	cmd.Dir = "./testdata/acceptance"
 	cmd.Stderr = testWriter{t}
 	cmd.Stdout = cmd.Stderr