From b9cc820e1dc13b62477194812ebdb36d502925b7 Mon Sep 17 00:00:00 2001
From: Carlos Alexandro Becker <caarlos0@gmail.com>
Date: Sun, 17 Dec 2017 15:24:49 -0200
Subject: [PATCH] refactor: changed code on build pipe

---
 internal/artifact/artifact.go       |  2 +-
 pipeline/{build => archive}/name.go |  2 +-
 pipeline/build/build.go             | 34 +++++++++++++----------------
 3 files changed, 17 insertions(+), 21 deletions(-)
 rename pipeline/{build => archive}/name.go (98%)

diff --git a/internal/artifact/artifact.go b/internal/artifact/artifact.go
index 81451728a..a832eb4d9 100644
--- a/internal/artifact/artifact.go
+++ b/internal/artifact/artifact.go
@@ -20,7 +20,7 @@ const (
 // Artifact represents an artifact and its relevant info
 type Artifact struct {
 	Name   string
-	Folder string
+	Path   string
 	Goos   string
 	Goarch string
 	Goarm  string
diff --git a/pipeline/build/name.go b/pipeline/archive/name.go
similarity index 98%
rename from pipeline/build/name.go
rename to pipeline/archive/name.go
index 5cd155103..4748ed543 100644
--- a/pipeline/build/name.go
+++ b/pipeline/archive/name.go
@@ -1,4 +1,4 @@
-package build
+package archive
 
 import (
 	"bytes"
diff --git a/pipeline/build/build.go b/pipeline/build/build.go
index 1aef8e5a1..b6985f518 100644
--- a/pipeline/build/build.go
+++ b/pipeline/build/build.go
@@ -7,12 +7,14 @@ import (
 	"strings"
 
 	"github.com/apex/log"
-	"github.com/goreleaser/goreleaser/config"
-	"github.com/goreleaser/goreleaser/context"
-	"github.com/goreleaser/goreleaser/internal/buildtarget"
-	"github.com/goreleaser/goreleaser/internal/ext"
 	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"
+
+	"github.com/goreleaser/goreleaser/config"
+	"github.com/goreleaser/goreleaser/context"
+	"github.com/goreleaser/goreleaser/internal/artifact"
+	"github.com/goreleaser/goreleaser/internal/buildtarget"
+	"github.com/goreleaser/goreleaser/internal/ext"
 )
 
 // Pipe for build
@@ -105,21 +107,15 @@ func runHook(env []string, hook string) error {
 
 func doBuild(ctx *context.Context, build config.Build, target buildtarget.Target) error {
 	var binaryName = build.Binary + ext.For(target)
-	var prettyName = binaryName
-	if ctx.Config.Archive.Format == "binary" {
-		var err error
-		binaryName, err = nameFor(ctx, target, build.Binary)
-		if err != nil {
-			return err
-		}
-		binaryName = binaryName + ext.For(target)
-	}
-	folder, err := nameFor(ctx, target, ctx.Config.ProjectName)
-	if err != nil {
-		return err
-	}
-	var binary = filepath.Join(ctx.Config.Dist, folder, binaryName)
-	ctx.AddBinary(target.String(), folder, prettyName, binary)
+	var binary = filepath.Join(ctx.Config.Dist, target.String(), binaryName)
+	ctx.Artifacts.Add(artifact.Artifact{
+		Type:   artifact.Binary,
+		Path:   binary,
+		Name:   binaryName,
+		Goos:   target.OS,
+		Goarch: target.Arch,
+		Goarm:  target.Arm,
+	})
 	log.WithField("binary", binary).Info("building")
 	cmd := []string{"go", "build"}
 	if build.Flags != "" {