refactor: better code organization (#757)

* refactor: merging archive in the same repo

* refactor: merging archive in the same repo

* refactor: better organizing packages

* refactor: fixing renames

* fix: new dep version

* fix: makefile

* fix: zip/tar tests

* fix: gitigonore

* fix: s3 tests

* fix: archive test

.gitignore

@@ -1,6 +1,6 @@
 dist/
+!internal/pipeline/dist
 bin/
-!pipeline/dist
 vendor
 coverage.txt
 goreleaser

Gopkg.lock

@@ -2,36 +2,45 @@
 
 
 [[projects]]
+  digest = "1:15d017551627c8bb091bde628215b2861bed128855343fdd570c62d08871f6e1"
   name = "github.com/alecthomas/kingpin"
   packages = ["."]
+  pruneopts = ""
   revision = "947dcec5ba9c011838740e680966fd7087a71d0d"
   version = "v2.2.6"
 
 [[projects]]
   branch = "master"
+  digest = "1:a74730e052a45a3fab1d310fdef2ec17ae3d6af16228421e238320846f2aaec8"
   name = "github.com/alecthomas/template"
   packages = [
     ".",
-    "parse"
+    "parse",
   ]
+  pruneopts = ""
   revision = "a0175ee3bccc567396460bf5acd36800cb10c49c"
 
 [[projects]]
   branch = "master"
+  digest = "1:8483994d21404c8a1d489f6be756e25bfccd3b45d65821f25695577791a08e68"
   name = "github.com/alecthomas/units"
   packages = ["."]
+  pruneopts = ""
   revision = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"
 
 [[projects]]
   branch = "master"
+  digest = "1:317998b1359366dda9f69cdbd108c39c7b3813a69002246fac4e3548646c1620"
   name = "github.com/apex/log"
   packages = [
     ".",
-    "handlers/cli"
+    "handlers/cli",
   ]
+  pruneopts = ""
   revision = "941dea75d3ebfbdd905a5d8b7b232965c5e5c684"
 
 [[projects]]
+  digest = "1:27b65f2bd793139595f788a1bbc8fe0f877c89f74931b447343d856313339d9e"
   name = "github.com/aws/aws-sdk-go"
   packages = [
     "aws",
@@ -64,172 +73,222 @@
     "private/protocol/restxml",
     "private/protocol/xml/xmlutil",
     "service/s3",
-    "service/sts"
+    "service/sts",
   ]
+  pruneopts = ""
   revision = "94b80148ea4b1b136682116294b151766a3b85c2"
   version = "v1.14.27"
 
 [[projects]]
   branch = "master"
+  digest = "1:0af4b41fc8c890b24d805593ede7848615aff2b8981ab6e69390a6c607a7dffa"
   name = "github.com/blakesmith/ar"
   packages = ["."]
+  pruneopts = ""
   revision = "8bd4349a67f2533b078dbc524689d15dba0f4659"
 
 [[projects]]
+  digest = "1:14d8f78698532f9d276af4989a78081f502b2835a69d7913470eba5d88d24bea"
   name = "github.com/caarlos0/ctrlc"
   packages = ["."]
+  pruneopts = ""
   revision = "70dc48d5d792f20f684a8f1d29bbac298f4b2ef4"
   version = "v1.0.0"
 
 [[projects]]
   branch = "master"
+  digest = "1:550bdfdd1ea85541febd092df0d0d51628f0634c2b4c6436751e8389c5bf64aa"
   name = "github.com/campoy/unique"
   packages = ["."]
+  pruneopts = ""
   revision = "88950e537e7e644cd746a3102037b5d2b723e9f5"
 
 [[projects]]
+  digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b"
   name = "github.com/davecgh/go-spew"
   packages = ["spew"]
+  pruneopts = ""
   revision = "346938d642f2ec3594ed81d874461961cd0faa76"
   version = "v1.1.0"
 
 [[projects]]
+  digest = "1:e988ed0ca0d81f4d28772760c02ee95084961311291bdfefc1b04617c178b722"
   name = "github.com/fatih/color"
   packages = ["."]
+  pruneopts = ""
   revision = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
   version = "v1.7.0"
 
 [[projects]]
+  digest = "1:858b7fe7b0f4bc7ef9953926828f2816ea52d01a88d72d1c45bc8c108f23c356"
   name = "github.com/go-ini/ini"
   packages = ["."]
+  pruneopts = ""
   revision = "358ee7663966325963d4e8b2e1fbd570c5195153"
   version = "v1.38.1"
 
 [[projects]]
+  digest = "1:f958a1c137db276e52f0b50efee41a1a389dcdded59a69711f3e872757dab34b"
   name = "github.com/golang/protobuf"
   packages = ["proto"]
+  pruneopts = ""
   revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265"
   version = "v1.1.0"
 
 [[projects]]
   branch = "master"
+  digest = "1:c336d8bea62afc46474e94eb445ad1f197459443a67007cd3e99833b7e61e42c"
   name = "github.com/google/go-github"
   packages = ["github"]
+  pruneopts = ""
   revision = "b14883f2b71b5f7dd303ed96d00bfaefeaeecea2"
 
 [[projects]]
   branch = "master"
+  digest = "1:9abc49f39e3e23e262594bb4fb70abf74c0c99e94f99153f43b143805e850719"
   name = "github.com/google/go-querystring"
   packages = ["query"]
+  pruneopts = ""
   revision = "53e6ce116135b80d037921a7fdd5138cf32d7a8a"
 
 [[projects]]
+  digest = "1:20ea4614e292903a7edabb4facfa4c10a1f059d2a3faa47875c47b0eb0b67c39"
   name = "github.com/goreleaser/nfpm"
   packages = [
     ".",
     "deb",
     "glob",
-    "rpm"
+    "rpm",
   ]
+  pruneopts = ""
   revision = "923d6a7473bfdbe7a583b7f3df1f3f780b1b73ab"
   version = "v0.9.3"
 
 [[projects]]
+  digest = "1:302c6eb8e669c997bec516a138b8fc496018faa1ece4c13e445a2749fbe079bb"
   name = "github.com/imdario/mergo"
   packages = ["."]
+  pruneopts = ""
   revision = "9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
   version = "v0.3.5"
 
 [[projects]]
+  digest = "1:6f49eae0c1e5dab1dafafee34b207aeb7a42303105960944828c2079b92fc88e"
   name = "github.com/jmespath/go-jmespath"
   packages = ["."]
+  pruneopts = ""
   revision = "0b12d6b5"
 
 [[projects]]
+  digest = "1:b856d8248663c39265a764561c1a1a149783f6cc815feb54a1f3a591b91f6eca"
   name = "github.com/masterminds/semver"
   packages = ["."]
+  pruneopts = ""
   revision = "c7af12943936e8c39859482e61f0574c2fd7fc75"
   version = "v1.4.2"
 
 [[projects]]
+  digest = "1:9ea83adf8e96d6304f394d40436f2eb44c1dc3250d223b74088cc253a6cd0a1c"
   name = "github.com/mattn/go-colorable"
   packages = ["."]
+  pruneopts = ""
   revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"
   version = "v0.0.9"
 
 [[projects]]
+  digest = "1:78229b46ddb7434f881390029bd1af7661294af31f6802e0e1bedaad4ab0af3c"
   name = "github.com/mattn/go-isatty"
   packages = ["."]
+  pruneopts = ""
   revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
   version = "v0.0.3"
 
 [[projects]]
   branch = "master"
+  digest = "1:79cdce64eec1ee539878fcbf7215aa19627551356af180556ef47a5f538e749a"
   name = "github.com/mattn/go-zglob"
   packages = [
     ".",
-    "fastwalk"
+    "fastwalk",
   ]
+  pruneopts = ""
   revision = "c436403c742d0b6d8fc37e69eadf33e024fe74fa"
 
 [[projects]]
   branch = "master"
+  digest = "1:99651e95333755cbe5c9768c1b80031300acca64a80870b40309202b32585a5a"
   name = "github.com/mitchellh/go-homedir"
   packages = ["."]
+  pruneopts = ""
   revision = "3864e76763d94a6df2f9960b16a20a33da9f9a66"
 
 [[projects]]
+  digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca"
   name = "github.com/pkg/errors"
   packages = ["."]
+  pruneopts = ""
   revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
   version = "v0.8.0"
 
 [[projects]]
+  digest = "1:256484dbbcd271f9ecebc6795b2df8cad4c458dd0f5fd82a8c2fa0c29f233411"
   name = "github.com/pmezard/go-difflib"
   packages = ["difflib"]
+  pruneopts = ""
   revision = "792786c7400a136282c1664665ae0a8db921c6c2"
   version = "v1.0.0"
 
 [[projects]]
+  digest = "1:c587772fb8ad29ad4db67575dad25ba17a51f072ff18a22b4f0257a4d9c24f75"
   name = "github.com/stretchr/testify"
   packages = [
     "assert",
-    "require"
+    "require",
   ]
+  pruneopts = ""
   revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
   version = "v1.2.2"
 
 [[projects]]
   branch = "master"
+  digest = "1:7a2d59e5fc661ccf4ae7dc301c1a7332ec59b2ee435f78aa3eaa65cacb256370"
   name = "golang.org/x/net"
   packages = [
     "context",
-    "context/ctxhttp"
+    "context/ctxhttp",
   ]
+  pruneopts = ""
   revision = "d0887baf81f4598189d4e12a37c6da86f0bba4d0"
 
 [[projects]]
   branch = "master"
+  digest = "1:a6237bd1fe4eed8524971a2923fcadb54e9584b19516a35d3f76f1c53f603cf9"
   name = "golang.org/x/oauth2"
   packages = [
     ".",
-    "internal"
+    "internal",
   ]
+  pruneopts = ""
   revision = "ef147856a6ddbb60760db74283d2424e98c87bff"
 
 [[projects]]
   branch = "master"
+  digest = "1:b2ea75de0ccb2db2ac79356407f8a4cd8f798fe15d41b381c00abf3ae8e55ed1"
   name = "golang.org/x/sync"
   packages = ["errgroup"]
+  pruneopts = ""
   revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca"
 
 [[projects]]
   branch = "master"
+  digest = "1:677e38cad6833ad266ec843739d167755eda1e6f2d8af1c63102b0426ad820db"
   name = "golang.org/x/sys"
   packages = ["unix"]
+  pruneopts = ""
   revision = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"
 
 [[projects]]
+  digest = "1:c1771ca6060335f9768dff6558108bc5ef6c58506821ad43377ee23ff059e472"
   name = "google.golang.org/appengine"
   packages = [
     "internal",
@@ -238,20 +297,48 @@
     "internal/log",
     "internal/remote_api",
     "internal/urlfetch",
-    "urlfetch"
+    "urlfetch",
   ]
+  pruneopts = ""
   revision = "b1f26356af11148e710935ed1ac8a7f5702c7612"
   version = "v1.1.0"
 
 [[projects]]
+  branch = "v2"
+  digest = "1:f0620375dd1f6251d9973b5f2596228cc8042e887cd7f827e4220bc1ce8c30e2"
   name = "gopkg.in/yaml.v2"
   packages = ["."]
+  pruneopts = ""
   revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
-  version = "v2.2.1"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "c2930bf7f01a483d6510c5de94e117a16965ae17a44510c60e488da4778d77b9"
+  input-imports = [
+    "github.com/alecthomas/kingpin",
+    "github.com/apex/log",
+    "github.com/apex/log/handlers/cli",
+    "github.com/aws/aws-sdk-go/aws",
+    "github.com/aws/aws-sdk-go/aws/credentials",
+    "github.com/aws/aws-sdk-go/aws/session",
+    "github.com/aws/aws-sdk-go/service/s3",
+    "github.com/caarlos0/ctrlc",
+    "github.com/campoy/unique",
+    "github.com/fatih/color",
+    "github.com/google/go-github/github",
+    "github.com/goreleaser/nfpm",
+    "github.com/goreleaser/nfpm/deb",
+    "github.com/goreleaser/nfpm/rpm",
+    "github.com/imdario/mergo",
+    "github.com/masterminds/semver",
+    "github.com/mattn/go-zglob",
+    "github.com/mitchellh/go-homedir",
+    "github.com/pkg/errors",
+    "github.com/stretchr/testify/assert",
+    "github.com/stretchr/testify/require",
+    "golang.org/x/oauth2",
+    "golang.org/x/sync/errgroup",
+    "gopkg.in/yaml.v2",
+  ]
   solver-name = "gps-cdcl"
   solver-version = 1

Makefile

@@ -28,7 +28,7 @@ check:
 
 # Run all the tests
 test:
-	go test $(TEST_OPTIONS) -failfast -race -coverpkg=./... -covermode=atomic -coverprofile=coverage.txt $(SOURCE_FILES) -run $(TEST_PATTERN) -timeout=2m
+	go test $(TEST_OPTIONS) -v -failfast -race -coverpkg=./... -covermode=atomic -coverprofile=coverage.txt $(SOURCE_FILES) -run $(TEST_PATTERN) -timeout=2m
 .PHONY: test
 
 # Run all the tests and opens the coverage report

internal/builders/golang/build.go

@@ -10,11 +10,11 @@ import (
 	"strings"
 
 	"github.com/apex/log"
-	api "github.com/goreleaser/goreleaser/build"
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
 	"github.com/goreleaser/goreleaser/internal/tmpl"
+	api "github.com/goreleaser/goreleaser/pkg/build"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/pkg/errors"
 )
 

internal/builders/golang/build_test.go

@@ -7,12 +7,12 @@ import (
 	"strings"
 	"testing"
 
-	api "github.com/goreleaser/goreleaser/build"
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
 	"github.com/goreleaser/goreleaser/internal/testlib"
 	"github.com/goreleaser/goreleaser/internal/tmpl"
+	api "github.com/goreleaser/goreleaser/pkg/build"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/builders/golang/targets.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/apex/log"
-	"github.com/goreleaser/goreleaser/config"
+	"github.com/goreleaser/goreleaser/pkg/config"
 )
 
 type target struct {

internal/builders/golang/targets_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
+	"github.com/goreleaser/goreleaser/pkg/config"
 	"github.com/stretchr/testify/assert"
 )
 

internal/client/client.go

@@ -5,8 +5,8 @@ import (
 	"bytes"
 	"os"
 
-	"github.com/goreleaser/goreleaser/config"
+	"github.com/goreleaser/goreleaser/pkg/config"
-	"github.com/goreleaser/goreleaser/context"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 // Info of the repository

internal/client/github.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/apex/log"
 	"github.com/google/go-github/github"
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/tmpl"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"golang.org/x/oauth2"
 )
 

internal/http/http.go

@@ -14,11 +14,11 @@ import (
 	"github.com/apex/log"
 	"github.com/pkg/errors"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
 	"github.com/goreleaser/goreleaser/internal/semerrgroup"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 const (

internal/http/http_test.go

@@ -12,9 +12,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 var (

internal/pipeline/archive/archive.go

@@ -14,10 +14,10 @@ import (
 	zglob "github.com/mattn/go-zglob"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
 	"github.com/goreleaser/goreleaser/internal/tmpl"
 	"github.com/goreleaser/goreleaser/pkg/archive"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 const (

internal/pipeline/archive/archive_test.go

@@ -9,10 +9,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
 	"github.com/goreleaser/goreleaser/internal/testlib"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

internal/pipeline/artifactory/artifactory.go

@@ -7,9 +7,9 @@ import (
 	"io/ioutil"
 	h "net/http"
 
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/http"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 // artifactoryResponse reflects the response after an upload request

internal/pipeline/artifactory/artifactory_test.go

@@ -10,10 +10,10 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/before/before.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/apex/log"
 	"github.com/fatih/color"
-	"github.com/goreleaser/goreleaser/context"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 // Pipe is a global hook pipe

internal/pipeline/before/before_test.go

@@ -3,8 +3,8 @@ package before
 import (
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
+	"github.com/goreleaser/goreleaser/pkg/config"
-	"github.com/goreleaser/goreleaser/context"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/brew/brew.go

@@ -11,13 +11,13 @@ import (
 
 	"github.com/apex/log"
 
-	"github.com/goreleaser/goreleaser/checksum"
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
+	"github.com/goreleaser/goreleaser/internal/checksum"
 	"github.com/goreleaser/goreleaser/internal/client"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
 	"github.com/goreleaser/goreleaser/internal/tmpl"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 // ErrNoDarwin64Build when there is no build for darwin_amd64

internal/pipeline/brew/brew_test.go

@@ -9,10 +9,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
 	"github.com/goreleaser/goreleaser/internal/testlib"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/build/build.go

@@ -11,14 +11,14 @@ import (
 	"github.com/apex/log"
 	"github.com/pkg/errors"
 
-	builders "github.com/goreleaser/goreleaser/build"
+	"github.com/goreleaser/goreleaser/internal/semerrgroup"
-	"github.com/goreleaser/goreleaser/config"
+	"github.com/goreleaser/goreleaser/internal/tmpl"
-	"github.com/goreleaser/goreleaser/context"
+	builders "github.com/goreleaser/goreleaser/pkg/build"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 
 	// langs to init
 	_ "github.com/goreleaser/goreleaser/internal/builders/golang"
-	"github.com/goreleaser/goreleaser/internal/semerrgroup"
-	"github.com/goreleaser/goreleaser/internal/tmpl"
 )
 
 // Pipe for build

internal/pipeline/build/build_test.go

@@ -6,12 +6,12 @@ import (
 	"path/filepath"
 	"testing"
 
-	api "github.com/goreleaser/goreleaser/build"
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
 	"github.com/goreleaser/goreleaser/internal/testlib"
 	"github.com/goreleaser/goreleaser/internal/tmpl"
+	api "github.com/goreleaser/goreleaser/pkg/build"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/changelog/changelog.go

@@ -11,9 +11,10 @@ import (
 	"strings"
 
 	"github.com/apex/log"
-	"github.com/goreleaser/goreleaser/context"
+
 	"github.com/goreleaser/goreleaser/internal/git"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 // ErrInvalidSortDirection happens when the sort order is invalid

internal/pipeline/changelog/changelog_test.go

@@ -6,10 +6,11 @@ import (
 	"testing"
 
 	"github.com/apex/log"
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
-	"github.com/goreleaser/goreleaser/internal/testlib"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/goreleaser/goreleaser/internal/testlib"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 func TestDescription(t *testing.T) {

internal/pipeline/checksums/checksums.go

@@ -9,11 +9,11 @@ import (
 
 	"github.com/apex/log"
 
-	"github.com/goreleaser/goreleaser/checksum"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
+	"github.com/goreleaser/goreleaser/internal/checksum"
 	"github.com/goreleaser/goreleaser/internal/semerrgroup"
 	"github.com/goreleaser/goreleaser/internal/tmpl"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 // Pipe for checksums

internal/pipeline/checksums/checksums_test.go

@@ -5,9 +5,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
+
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/defaults/defaults.go

@@ -6,23 +6,23 @@ import (
 	"fmt"
 
 	"github.com/apex/log"
-	"github.com/goreleaser/goreleaser/context"
+	"github.com/goreleaser/goreleaser/internal/pipeline/archive"
-	"github.com/goreleaser/goreleaser/pipeline/archive"
+	"github.com/goreleaser/goreleaser/internal/pipeline/artifactory"
-	"github.com/goreleaser/goreleaser/pipeline/artifactory"
+	"github.com/goreleaser/goreleaser/internal/pipeline/brew"
-	"github.com/goreleaser/goreleaser/pipeline/brew"
+	"github.com/goreleaser/goreleaser/internal/pipeline/build"
-	"github.com/goreleaser/goreleaser/pipeline/build"
+	"github.com/goreleaser/goreleaser/internal/pipeline/checksums"
-	"github.com/goreleaser/goreleaser/pipeline/checksums"
+	"github.com/goreleaser/goreleaser/internal/pipeline/docker"
-	"github.com/goreleaser/goreleaser/pipeline/docker"
+	"github.com/goreleaser/goreleaser/internal/pipeline/env"
-	"github.com/goreleaser/goreleaser/pipeline/env"
+	"github.com/goreleaser/goreleaser/internal/pipeline/fpm"
-	"github.com/goreleaser/goreleaser/pipeline/fpm"
+	"github.com/goreleaser/goreleaser/internal/pipeline/nfpm"
-	"github.com/goreleaser/goreleaser/pipeline/nfpm"
+	"github.com/goreleaser/goreleaser/internal/pipeline/project"
-	"github.com/goreleaser/goreleaser/pipeline/project"
+	"github.com/goreleaser/goreleaser/internal/pipeline/release"
-	"github.com/goreleaser/goreleaser/pipeline/release"
+	"github.com/goreleaser/goreleaser/internal/pipeline/s3"
-	"github.com/goreleaser/goreleaser/pipeline/s3"
+	"github.com/goreleaser/goreleaser/internal/pipeline/scoop"
-	"github.com/goreleaser/goreleaser/pipeline/scoop"
+	"github.com/goreleaser/goreleaser/internal/pipeline/sign"
-	"github.com/goreleaser/goreleaser/pipeline/sign"
+	"github.com/goreleaser/goreleaser/internal/pipeline/snapcraft"
-	"github.com/goreleaser/goreleaser/pipeline/snapcraft"
+	"github.com/goreleaser/goreleaser/internal/pipeline/snapshot"
-	"github.com/goreleaser/goreleaser/pipeline/snapshot"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 // Pipe that sets the defaults

internal/pipeline/defaults/defaults_test.go

@@ -3,9 +3,10 @@ package defaults
 import (
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/testlib"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
+
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/dist/dist.go

@@ -8,7 +8,7 @@ import (
 	"os"
 
 	"github.com/apex/log"
-	"github.com/goreleaser/goreleaser/context"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 // Pipe for cleandis

internal/pipeline/dist/dist_test.go

@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
+	"github.com/goreleaser/goreleaser/pkg/config"
-	"github.com/goreleaser/goreleaser/context"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/docker/docker.go

@@ -11,13 +11,13 @@ import (
 	"github.com/apex/log"
 	"github.com/pkg/errors"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
 	"github.com/goreleaser/goreleaser/internal/deprecate"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
 	"github.com/goreleaser/goreleaser/internal/semerrgroup"
 	"github.com/goreleaser/goreleaser/internal/tmpl"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 // ErrNoDocker is shown when docker cannot be found in $PATH

internal/pipeline/docker/docker_test.go

@@ -9,10 +9,10 @@ import (
 	"syscall"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/effectiveconfig/config.go

@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 
 	"github.com/apex/log"
-	"github.com/goreleaser/goreleaser/context"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	yaml "gopkg.in/yaml.v2"
 )
 

internal/pipeline/effectiveconfig/config_test.go

@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/testlib"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/env/env.go

@@ -6,8 +6,8 @@ import (
 	"bufio"
 	"os"
 
-	"github.com/goreleaser/goreleaser/context"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	homedir "github.com/mitchellh/go-homedir"
 	"github.com/pkg/errors"
 )

internal/pipeline/env/env_test.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/testlib"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/fpm/fpm.go

@@ -2,8 +2,8 @@
 package fpm
 
 import (
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/deprecate"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 // Pipe for fpm packaging

internal/pipeline/fpm/fpm_test.go

@@ -3,8 +3,8 @@ package fpm
 import (
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
+	"github.com/goreleaser/goreleaser/pkg/config"
-	"github.com/goreleaser/goreleaser/context"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/git/git.go

@@ -6,10 +6,10 @@ import (
 	"strings"
 
 	"github.com/apex/log"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/git"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
 	"github.com/goreleaser/goreleaser/internal/tmpl"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/pkg/errors"
 )
 

internal/pipeline/git/git_test.go

@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/testlib"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/nfpm/nfpm.go

@@ -15,13 +15,13 @@ import (
 	_ "github.com/goreleaser/nfpm/deb"
 	_ "github.com/goreleaser/nfpm/rpm"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
 	"github.com/goreleaser/goreleaser/internal/linux"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
 	"github.com/goreleaser/goreleaser/internal/semerrgroup"
 	"github.com/goreleaser/goreleaser/internal/tmpl"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 const defaultNameTemplate = "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"

internal/pipeline/nfpm/nfpm_test.go

@@ -7,10 +7,10 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
 	"github.com/goreleaser/goreleaser/internal/testlib"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/project/project.go

@@ -1,7 +1,7 @@
 // Package project sets "high level" defaults related to the project.
 package project
 
-import "github.com/goreleaser/goreleaser/context"
+import "github.com/goreleaser/goreleaser/pkg/context"
 
 // Pipe implemens defaulter to set the project name
 type Pipe struct{}

internal/pipeline/project/project_test.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/goreleaser/goreleaser/config"
+	"github.com/goreleaser/goreleaser/pkg/config"
-	"github.com/goreleaser/goreleaser/context"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 func TestCustomProjectName(t *testing.T) {

internal/pipeline/put/put.go

@@ -4,9 +4,9 @@ package put
 import (
 	h "net/http"
 
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/http"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/pkg/errors"
 )
 

internal/pipeline/put/put_test.go

@@ -10,10 +10,10 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/release/body.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"text/template"
 
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 const bodyTemplateText = `{{ .ReleaseNotes }}

internal/pipeline/release/body_test.go

@@ -5,9 +5,9 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/release/release.go

@@ -5,11 +5,11 @@ import (
 
 	"github.com/apex/log"
 
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
 	"github.com/goreleaser/goreleaser/internal/client"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
 	"github.com/goreleaser/goreleaser/internal/semerrgroup"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 // Pipe for github release

internal/pipeline/release/release_test.go

@@ -9,10 +9,10 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
 	"github.com/goreleaser/goreleaser/internal/testlib"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/release/remote.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/goreleaser/goreleaser/config"
 	"github.com/goreleaser/goreleaser/internal/git"
+	"github.com/goreleaser/goreleaser/pkg/config"
 	"github.com/pkg/errors"
 )
 

internal/pipeline/s3/s3.go

@@ -10,12 +10,12 @@ import (
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
 	"github.com/goreleaser/goreleaser/internal/semerrgroup"
 	"github.com/goreleaser/goreleaser/internal/tmpl"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 // Pipe for Artifactory

internal/pipeline/s3/s3_test.go

@@ -10,10 +10,10 @@ import (
 	"time"
 
 	"github.com/apex/log"
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -120,8 +120,8 @@ func TestUpload(t *testing.T) {
 
 func setCredentials(t *testing.T) {
 	// this comes from the testdata/config/config.json file - not real aws keys
-	os.Setenv("AWS_ACCESS_KEY_ID", "IWA0WZQ1QJ2I8I1ALW64")
+	os.Setenv("AWS_ACCESS_KEY_ID", "WPXKJC7CZQCFPKY5727N")
-	os.Setenv("AWS_SECRET_ACCESS_KEY", "zcK4QQegvYwVGJaBm2E6k20WRLIQZqHOKOPP2npT")
+	os.Setenv("AWS_SECRET_ACCESS_KEY", "eHCSajxLvl94l36gIMlzZ/oW2O0rYYK+cVn5jNT2")
 	os.Setenv("AWS_REGION", "us-east-1")
 }
 

internal/pipeline/s3/testdata/config/config.json

@@ -1,11 +1,12 @@
 {
-	"version": "23",
+	"version": "25",
 	"credential": {
 		"accessKey": "WPXKJC7CZQCFPKY5727N",
 		"secretKey": "eHCSajxLvl94l36gIMlzZ/oW2O0rYYK+cVn5jNT2"
 	},
 	"region": "",
 	"browser": "on",
+	"worm": "off",
 	"domain": "",
 	"storageclass": {
 		"standard": "",

internal/pipeline/scoop/scoop.go

@@ -7,10 +7,10 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
 	"github.com/goreleaser/goreleaser/internal/client"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 // ErrNoWindows when there is no build for windows (goos doesn't contain windows)

internal/pipeline/scoop/scoop_test.go

@@ -7,12 +7,12 @@ import (
 	"os"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
 	"github.com/goreleaser/goreleaser/internal/client"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
 	"github.com/goreleaser/goreleaser/internal/testlib"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/sign/sign.go

@@ -6,9 +6,9 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 // Pipe for artifact signing.

internal/pipeline/sign/sign_test.go

@@ -9,9 +9,9 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/pipeline/sign/testdata/README.md

@@ -10,7 +10,7 @@ the local keyring file.
 
 1.  Create signing keys
 
-    cd $GOPATH/src/github.com/goreleaser/goreleaser/pipeline/sign/testdata/gnupg
+    cd $GOPATH/src/github.com/goreleaser/goreleaser/internal/pipeline/sign/testdata/gnupg
     gpg --homedir . --quick-generate-key --batch --passphrase '' nopass default default 10y
 
 1.  Check that the key exists

internal/pipeline/snapcraft/snapcraft.go

@@ -13,12 +13,12 @@ import (
 	"github.com/apex/log"
 	yaml "gopkg.in/yaml.v2"
 
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
 	"github.com/goreleaser/goreleaser/internal/linux"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
 	"github.com/goreleaser/goreleaser/internal/semerrgroup"
 	"github.com/goreleaser/goreleaser/internal/tmpl"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/context"
 )
 
 // ErrNoSnapcraft is shown when snapcraft cannot be found in $PATH

internal/pipeline/snapcraft/snapcraft_test.go

@@ -7,10 +7,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
 	"github.com/goreleaser/goreleaser/internal/artifact"
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
+	"github.com/goreleaser/goreleaser/pkg/config"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 	yaml "gopkg.in/yaml.v2"
 )

internal/pipeline/snapshot/snapshot.go

@@ -1,7 +1,7 @@
 // Package snapshot provides the snapshoting functionality to goreleaser.
 package snapshot
 
-import "github.com/goreleaser/goreleaser/context"
+import "github.com/goreleaser/goreleaser/pkg/context"
 
 // Pipe for checksums
 type Pipe struct{}

internal/pipeline/snapshot/snapshot_test.go

@@ -3,8 +3,8 @@ package snapshot
 import (
 	"testing"
 
-	"github.com/goreleaser/goreleaser/config"
+	"github.com/goreleaser/goreleaser/pkg/config"
-	"github.com/goreleaser/goreleaser/context"
+	"github.com/goreleaser/goreleaser/pkg/context"
 	"github.com/stretchr/testify/assert"
 )
 

internal/testlib/skip.go

@@ -3,7 +3,7 @@ package testlib
 import (
 	"testing"
 
-	"github.com/goreleaser/goreleaser/pipeline"
+	"github.com/goreleaser/goreleaser/internal/pipeline"
 	"github.com/stretchr/testify/assert"
 )