Merge pull request #145 from ryanfowler/main-path

Move main.go to project root

Author: ryanfowler

.github/workflows/ci.yml

@@ -88,4 +88,4 @@ jobs:
           GOOS: ${{ matrix.goos }}
           GOARCH: ${{ matrix.goarch }}
           CGO_ENABLED: "0"
-        run: go install -trimpath -ldflags="-s -w" ./cmd/fetch
+        run: go install -trimpath -ldflags="-s -w"

.github/workflows/release.yml

@@ -63,7 +63,7 @@ jobs:
           GOOS: ${{ matrix.goos }}
           GOARCH: ${{ matrix.goarch }}
           CGO_ENABLED: "0"
-        run: go build -trimpath -ldflags="-s -w" -o ${{ env.BIN_NAME }} ./cmd/fetch/main.go
+        run: go build -trimpath -ldflags="-s -w" -o ${{ env.BIN_NAME }} ./main.go
 
       - name: Build archive (unix)
         if: ${{ matrix.goos != 'windows' }}

README.md

@@ -21,7 +21,7 @@ to download the binary for your operating system.
 Make sure you have Go installed, then run:
 
 ```bash
-go install -trimpath -ldflags="-s -w" github.com/ryanfowler/fetch/cmd/fetch@latest
+go install github.com/ryanfowler/fetch@latest
 ```
 
 ### Updating

internal/client/client.go

@@ -24,14 +24,16 @@ const (
 )
 
 type Client struct {
-	c *http.Client
+	c         *http.Client
+	userAgent string
 }
 
 type ClientConfig struct {
-	HTTP     HTTPVersion
-	Insecure bool
-	Proxy    *url.URL
-	Timeout  time.Duration
+	HTTP      HTTPVersion
+	Insecure  bool
+	Proxy     *url.URL
+	Timeout   time.Duration
+	UserAgent string
 }
 
 func NewClient(cfg ClientConfig) *Client {
@@ -63,6 +65,7 @@ func NewClient(cfg ClientConfig) *Client {
 			Timeout:   cfg.Timeout,
 			Transport: transport,
 		},
+		userAgent: cfg.UserAgent,
 	}
 }
 
@@ -113,7 +116,7 @@ func (c *Client) NewRequest(ctx context.Context, cfg RequestConfig) (*http.Reque
 	}
 
 	req.Header.Set("Accept", "application/json,application/xml,image/webp,*/*")
-	req.Header.Set("User-Agent", vars.UserAgent)
+	req.Header.Set("User-Agent", c.userAgent)
 
 	switch {
 	case cfg.JSON:

internal/fetch/fetch.go

@@ -41,6 +41,7 @@ type Request struct {
 	NoPager       bool
 	Output        string
 	PrinterHandle *printer.Handle
+	UserAgent     string
 	Verbosity     Verbosity
 
 	Method      string
@@ -93,10 +94,11 @@ func fetch(ctx context.Context, r *Request) (bool, error) {
 	}
 
 	c := client.NewClient(client.ClientConfig{
-		HTTP:     r.HTTP,
-		Insecure: r.Insecure,
-		Proxy:    r.Proxy,
-		Timeout:  r.Timeout,
+		HTTP:      r.HTTP,
+		Insecure:  r.Insecure,
+		Proxy:     r.Proxy,
+		Timeout:   r.Timeout,
+		UserAgent: r.UserAgent,
 	})
 	req, err := c.NewRequest(ctx, client.RequestConfig{
 		Method:      r.Method,

internal/update/update.go

@@ -14,11 +14,10 @@ import (
 
 	"github.com/ryanfowler/fetch/internal/client"
 	"github.com/ryanfowler/fetch/internal/printer"
-	"github.com/ryanfowler/fetch/internal/vars"
 )
 
-func Update(ctx context.Context, p *printer.Printer, timeout time.Duration) bool {
-	err := update(ctx, p, timeout)
+func Update(ctx context.Context, p *printer.Printer, timeout time.Duration, version string) bool {
+	err := update(ctx, p, timeout, version)
 	if err == nil {
 		return true
 	}
@@ -33,8 +32,8 @@ func Update(ctx context.Context, p *printer.Printer, timeout time.Duration) bool
 	return false
 }
 
-func update(ctx context.Context, p *printer.Printer, timeout time.Duration) error {
-	cfg := client.ClientConfig{Timeout: timeout}
+func update(ctx context.Context, p *printer.Printer, timeout time.Duration, version string) error {
+	cfg := client.ClientConfig{Timeout: timeout, UserAgent: "fetch/" + version}
 	c := client.NewClient(cfg)
 
 	writeInfo(p, "fetching latest release tag")
@@ -43,9 +42,9 @@ func update(ctx context.Context, p *printer.Printer, timeout time.Duration) erro
 		return err
 	}
 
-	if strings.TrimPrefix(latest, "v") == vars.Version {
+	if strings.TrimPrefix(latest, "v") == version {
 		p.WriteString("\n  currently using the latest version (v")
-		p.WriteString(vars.Version)
+		p.WriteString(version)
 		p.WriteString(")\n")
 		p.Flush(os.Stderr)
 		return nil
@@ -78,7 +77,7 @@ func update(ctx context.Context, p *printer.Printer, timeout time.Duration) erro
 	}
 
 	p.WriteString("\n  fetch successfully updated (v")
-	p.WriteString(vars.Version)
+	p.WriteString(version)
 	p.WriteString(" -> ")
 	p.WriteString(latest)
 	p.WriteString(")\n")

internal/vars/vars.go

@@ -3,15 +3,10 @@ package vars
 import (
 	"os"
 
-	"github.com/ryanfowler/fetch"
-
 	"golang.org/x/term"
 )
 
 var (
-	UserAgent string
-	Version   = fetch.Version
-
 	IsStderrTerm bool
 	IsStdoutTerm bool
 )
@@ -21,8 +16,6 @@ type KeyVal struct {
 }
 
 func init() {
-	UserAgent = "fetch/" + Version
-
 	IsStderrTerm = term.IsTerminal(int(os.Stderr.Fd()))
 	IsStdoutTerm = term.IsTerminal(int(os.Stdout.Fd()))
 }

cmd/fetch/main.go renamed to main.go

@@ -2,18 +2,26 @@ package main
 
 import (
 	"context"
+	_ "embed"
 	"errors"
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/ryanfowler/fetch/internal/cli"
 	"github.com/ryanfowler/fetch/internal/fetch"
 	"github.com/ryanfowler/fetch/internal/multipart"
 	"github.com/ryanfowler/fetch/internal/printer"
 	"github.com/ryanfowler/fetch/internal/update"
-	"github.com/ryanfowler/fetch/internal/vars"
 )
 
+//go:embed VERSION
+var version string
+
+func init() {
+	version = strings.TrimSpace(version)
+}
+
 func main() {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -34,12 +42,12 @@ func main() {
 		os.Exit(0)
 	}
 	if app.Version {
-		fmt.Fprintln(os.Stdout, "fetch", vars.Version)
+		fmt.Fprintln(os.Stdout, "fetch", version)
 		os.Exit(0)
 	}
 	if app.Update {
 		p := printerHandle.Stderr()
-		if ok := update.Update(ctx, p, app.Timeout); ok {
+		if ok := update.Update(ctx, p, app.Timeout, version); ok {
 			os.Exit(0)
 		}
 		os.Exit(1)
@@ -61,6 +69,7 @@ func main() {
 		NoPager:       app.NoPager,
 		Output:        app.Output,
 		PrinterHandle: printerHandle,
+		UserAgent:     "fetch/" + version,
 		Verbosity:     getVerbosity(app),
 
 		Method:      app.Method,