mirror of
https://github.com/goreleaser/goreleaser.git
synced 2025-02-09 13:36:56 +02:00
singularized clients package
This commit is contained in:
parent
7a778d4eb9
commit
cfb27f8eb0
@ -1,5 +1,5 @@
|
||||
// Package clients contains the client implementations for several providers.
|
||||
package clients
|
||||
// Package client contains the client implementations for several providers.
|
||||
package client
|
||||
|
||||
import (
|
||||
"bytes"
|
@ -1,4 +1,4 @@
|
||||
package clients
|
||||
package client
|
||||
|
||||
import (
|
||||
"testing"
|
@ -1,4 +1,4 @@
|
||||
package clients
|
||||
package client
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
@ -13,8 +13,8 @@ type githubClient struct {
|
||||
client *github.Client
|
||||
}
|
||||
|
||||
// NewGitHubClient impl
|
||||
func NewGitHubClient(ctx *context.Context) Client {
|
||||
// NewGitHub returns a github client implementation
|
||||
func NewGitHub(ctx *context.Context) Client {
|
||||
ts := oauth2.StaticTokenSource(
|
||||
&oauth2.Token{AccessToken: ctx.Token},
|
||||
)
|
@ -11,7 +11,7 @@ import (
|
||||
"text/template"
|
||||
|
||||
"github.com/goreleaser/goreleaser/checksum"
|
||||
"github.com/goreleaser/goreleaser/clients"
|
||||
"github.com/goreleaser/goreleaser/client"
|
||||
"github.com/goreleaser/goreleaser/config"
|
||||
"github.com/goreleaser/goreleaser/context"
|
||||
)
|
||||
@ -90,11 +90,10 @@ func (Pipe) Description() string {
|
||||
|
||||
// Run the pipe
|
||||
func (Pipe) Run(ctx *context.Context) error {
|
||||
client := clients.NewGitHubClient(ctx)
|
||||
return doRun(ctx, client)
|
||||
return doRun(ctx, client.NewGitHub(ctx))
|
||||
}
|
||||
|
||||
func doRun(ctx *context.Context, client clients.Client) error {
|
||||
func doRun(ctx *context.Context, client client.Client) error {
|
||||
// TODO: remove this block in next release cycle
|
||||
if ctx.Config.Brew.Repo != "" {
|
||||
log.Println("The `brew.repo` syntax is deprecated and will soon be removed. Please check the README for more info.")
|
||||
@ -116,7 +115,7 @@ func doRun(ctx *context.Context, client clients.Client) error {
|
||||
return client.CreateFile(ctx, content, path)
|
||||
}
|
||||
|
||||
func buildFormula(ctx *context.Context, client clients.Client) (bytes.Buffer, error) {
|
||||
func buildFormula(ctx *context.Context, client client.Client) (bytes.Buffer, error) {
|
||||
data, err := dataFor(ctx, client)
|
||||
if err != nil {
|
||||
return bytes.Buffer{}, err
|
||||
@ -134,7 +133,7 @@ func doBuildFormula(data templateData) (bytes.Buffer, error) {
|
||||
return out, err
|
||||
}
|
||||
|
||||
func dataFor(ctx *context.Context, client clients.Client) (result templateData, err error) {
|
||||
func dataFor(ctx *context.Context, client client.Client) (result templateData, err error) {
|
||||
file := ctx.Archives["darwinamd64"]
|
||||
if file == "" {
|
||||
return result, ErrNoDarwin64Build
|
||||
@ -173,7 +172,7 @@ func dataFor(ctx *context.Context, client clients.Client) (result templateData,
|
||||
|
||||
func getInfo(
|
||||
ctx *context.Context,
|
||||
client clients.Client,
|
||||
client client.Client,
|
||||
) (homepage string, description string, err error) {
|
||||
info, err := client.GetInfo(ctx)
|
||||
if err != nil {
|
||||
|
@ -7,7 +7,7 @@ import (
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"github.com/goreleaser/goreleaser/clients"
|
||||
"github.com/goreleaser/goreleaser/client"
|
||||
"github.com/goreleaser/goreleaser/config"
|
||||
"github.com/goreleaser/goreleaser/context"
|
||||
"github.com/stretchr/testify/assert"
|
||||
@ -147,7 +147,7 @@ type DummyClient struct {
|
||||
CreatedFile bool
|
||||
}
|
||||
|
||||
func (client *DummyClient) GetInfo(ctx *context.Context) (info clients.Info, err error) {
|
||||
func (client *DummyClient) GetInfo(ctx *context.Context) (info client.Info, err error) {
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -7,7 +7,7 @@ import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/goreleaser/goreleaser/clients"
|
||||
"github.com/goreleaser/goreleaser/client"
|
||||
"github.com/goreleaser/goreleaser/context"
|
||||
"golang.org/x/sync/errgroup"
|
||||
)
|
||||
@ -22,11 +22,10 @@ func (Pipe) Description() string {
|
||||
|
||||
// Run the pipe
|
||||
func (Pipe) Run(ctx *context.Context) error {
|
||||
client := clients.NewGitHubClient(ctx)
|
||||
return doRun(ctx, client)
|
||||
return doRun(ctx, client.NewGitHub(ctx))
|
||||
}
|
||||
|
||||
func doRun(ctx *context.Context, client clients.Client) error {
|
||||
func doRun(ctx *context.Context, client client.Client) error {
|
||||
log.Println("Creating or updating release", ctx.Git.CurrentTag, "on", ctx.Config.Release.GitHub.String())
|
||||
releaseID, err := client.CreateRelease(ctx)
|
||||
if err != nil {
|
||||
@ -42,7 +41,7 @@ func doRun(ctx *context.Context, client clients.Client) error {
|
||||
return g.Wait()
|
||||
}
|
||||
|
||||
func upload(ctx *context.Context, client clients.Client, releaseID int, artifact string) error {
|
||||
func upload(ctx *context.Context, client client.Client, releaseID int, artifact string) error {
|
||||
var path = filepath.Join(ctx.Config.Dist, artifact)
|
||||
file, err := os.Open(path)
|
||||
if err != nil {
|
||||
|
@ -7,7 +7,7 @@ import (
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"github.com/goreleaser/goreleaser/clients"
|
||||
"github.com/goreleaser/goreleaser/client"
|
||||
"github.com/goreleaser/goreleaser/config"
|
||||
"github.com/goreleaser/goreleaser/context"
|
||||
"github.com/stretchr/testify/assert"
|
||||
@ -74,7 +74,7 @@ type DummyClient struct {
|
||||
UploadedFile bool
|
||||
}
|
||||
|
||||
func (client *DummyClient) GetInfo(ctx *context.Context) (info clients.Info, err error) {
|
||||
func (client *DummyClient) GetInfo(ctx *context.Context) (info client.Info, err error) {
|
||||
return
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user