Add pkg support for MacOS

Closes #26

Author: bep

.gitignore

@@ -12,6 +12,9 @@
 *.out
 
 go.work
+
+.DS_Store
+
 go.work.sum
 
 # Dependency directories (remove the comment below to include it)

cmd/archivecmd/archive.go

@@ -78,8 +78,8 @@ func (b *Archivist) Init() error {
 			// Already started.
 			return nil
 		}
-		infoCtx := c.InfoLog.WithField("plugin", p.ID)
-		client, err := plugins.StartArchivePlugin(c.InfoLog, c.Config.GoSettings, p)
+		infoCtx := c.InfoLog.WithField("cmd", fmt.Sprintf("%s %s", commandName, p.ID))
+		client, err := plugins.StartArchivePlugin(infoCtx, c.Config.GoSettings, p)
 		if err != nil {
 			return fmt.Errorf("error starting archive plugin %q: %w", p.ID, err)
 		}

cmd/corecmd/core.go

@@ -16,7 +16,6 @@ package corecmd
 
 import (
 	"context"
-	"errors"
 	"flag"
 	"fmt"
 	"io"
@@ -33,6 +32,7 @@ import (
 	"github.com/bep/logg/handlers/multi"
 	"github.com/bep/workers"
 	"github.com/gohugoio/hugoreleaser-plugins-api/archiveplugin"
+	"github.com/gohugoio/hugoreleaser/internal/common/errorsh"
 	"github.com/gohugoio/hugoreleaser/internal/common/logging"
 	"github.com/gohugoio/hugoreleaser/internal/common/matchers"
 	"github.com/gohugoio/hugoreleaser/internal/common/templ"
@@ -415,7 +415,7 @@ func (c *Core) Init() error {
 func (c *Core) Close() error {
 	for k, v := range c.PluginsRegistryArchive {
 		if err := v.Close(); err != nil {
-			if !errors.Is(err, execrpc.ErrShutdown) {
+			if !errorsh.IsShutdownError(err) {
 				c.WarnLog.Logf("error closing plugin %q: %s", k, err)
 			}
 		}

go.mod

@@ -3,7 +3,7 @@ module github.com/gohugoio/hugoreleaser
 go 1.18
 
 require (
-	github.com/bep/execrpc v0.7.0
+	github.com/bep/execrpc v0.7.1
 	github.com/bep/helpers v0.3.1
 	github.com/bep/logg v0.2.0
 	github.com/bep/workers v1.1.0
@@ -29,12 +29,14 @@ require (
 	golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 // indirect
 )
 
-require github.com/gohugoio/hugoreleaser-plugins-api v0.6.0
+require (
+	github.com/gohugoio/hugoreleaser-plugins-api v0.6.0
+	golang.org/x/sync v0.0.0-20220907140024-f12130a52804
+)
 
 require (
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
-	golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 )

go.sum

@@ -2,6 +2,8 @@ github.com/bep/clocks v0.5.0 h1:hhvKVGLPQWRVsBP/UB7ErrHYIO42gINVbvqxvYTPVps=
 github.com/bep/clocks v0.5.0/go.mod h1:SUq3q+OOq41y2lRQqH5fsOoxN8GbxSiT6jvoVVLCVhU=
 github.com/bep/execrpc v0.7.0 h1:IZneJQielOC2sdHTz/wJTfBgEDxA7WHHMwL1q7d4yB0=
 github.com/bep/execrpc v0.7.0/go.mod h1:dhMMXFX/IfDRQrp4/EHqqYbYfHS53bF/9kiHIG/ChJw=
+github.com/bep/execrpc v0.7.1 h1:ExHlNt9immvo2We9fNnNquXXlGKX1FKrvYNG1ZXd1Fg=
+github.com/bep/execrpc v0.7.1/go.mod h1:dhMMXFX/IfDRQrp4/EHqqYbYfHS53bF/9kiHIG/ChJw=
 github.com/bep/helpers v0.3.1 h1:rvwT4Zuq9VMqTh/OypjKrO/VQE1V0Eyr/PBlfQDcK8E=
 github.com/bep/helpers v0.3.1/go.mod h1:/QpHdmcPagDw7+RjkLFCvnlUc8lQ5kg4KDrEkb2Yyco=
 github.com/bep/logg v0.2.0 h1:EWKB04ea/K/V0xd/7O6x5q+1l+Grub+9N48YMcevtF4=
@@ -53,6 +55,7 @@ github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peK
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg=
 github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas=
 github.com/peterbourgon/ff/v3 v3.3.0 h1:PaKe7GW8orVFh8Unb5jNHS+JZBwWUMa2se0HM6/BI24=
@@ -84,6 +87,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc=
 golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220907140024-f12130a52804 h1:0SH2R3f1b1VmIMG7BXbEZCBUu2dKmHschSmjqGUrW8A=
+golang.org/x/sync v0.0.0-20220907140024-f12130a52804/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

hugoreleaser.env

@@ -1,4 +1,3 @@
 # Next release
-# Change counter: 6
-HUGORELEASER_TAG=v0.54.0
+HUGORELEASER_TAG=v0.55.0
 HUGORELEASER_COMMITISH=main

hugoreleaser.toml

@@ -81,14 +81,17 @@ project = "hugoreleaser"
     path = "unix"
 
     [[builds.os]]
-        goos = "darwin"
+        goos = "linux"
         [[builds.os.archs]]
-            goarch = "universal"
+            goarch = "amd64"
+
+[[builds]]
+    path = "macos"
 
     [[builds.os]]
-        goos = "linux"
+        goos = "darwin"
         [[builds.os.archs]]
-            goarch = "amd64"
+            goarch = "universal"
 
 [[builds]]
     path = "windows"
@@ -102,6 +105,35 @@ project = "hugoreleaser"
 
 [[archives]]
     paths = ["builds/unix/**"]
+[[archives]]
+    paths = ["builds/macos/**"]
+    [archives.archive_settings]
+        extra_files = []
+        [archives.archive_settings.type]
+            # When format is _plugin,
+            # archive_settings.plugin must also be configured.
+            format    = "_plugin"
+            extension = ".pkg"
+        [archives.archive_settings.plugin]
+            id   = "macospkgremote"
+            type = "gorun"
+            # Note there is a "local" variant of this that may be simpler to set up, see
+            # https://github.com/gohugoio/hugoreleaser-archive-plugins/tree/main/macospkg
+            command = "github.com/gohugoio/hugoreleaser-archive-plugins/macospkgremote@v0.1.1"
+        [archives.archive_settings.custom_settings]
+            # Package settings
+            package_identifier = "io.gohugo.hugoreleaser"
+            package_version    = "${HUGORELEASER_TAG}"
+
+            # Apple settings. Only needed in the "local" variant of this plugin.
+            # apple_signing_identity = "${BUILDPKG_APPLE_DEVELOPER_SIGNING_IDENTITY}"
+
+            # AWS Settings
+            bucket            = "s3fptest"
+            queue             = "https://sqs.eu-north-1.amazonaws.com/656975317043/s3fptest_client"
+            access_key_id     = "${S3RPC_CLIENT_ACCESS_KEY_ID}"
+            secret_access_key = "${S3RPC_CLIENT_SECRET_ACCESS_KEY}"
+
 [[archives]]
     paths = ["builds/**/linux/amd64"]
     [archives.archive_settings]
@@ -119,7 +151,7 @@ project = "hugoreleaser"
             # If the plugin source lives locally, this can also be a file path,
             # e.g. './myplugin'. In those setups you may need to set dir to the directory path,
             # and use "." for the command.
-            command = "github.com/gohugoio/hugoreleaser-archive-plugins/deb@latest"
+            command = "github.com/gohugoio/hugoreleaser-archive-plugins/deb@v0.6.1"
         [archives.archive_settings.custom_settings]
             # Custom settings as defined by the Deb plugin.
             vendor      = "gohugo.io"

internal/common/errorsh/helpers.go

@@ -0,0 +1,13 @@
+package errorsh
+
+import (
+	"context"
+	"errors"
+
+	"github.com/bep/execrpc"
+)
+
+// IsShutdownError returns true if the error is a shutdown error which we normally don't report to the user.
+func IsShutdownError(err error) bool {
+	return errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) || errors.Is(err, execrpc.ErrShutdown)
+}

internal/common/logging/defaulthandler.go

@@ -41,7 +41,7 @@ func NewDefaultHandler(outWriter, errWriter io.Writer) logg.Handler {
 	return &DefaultHandler{
 		outWriter: outWriter,
 		errWriter: errWriter,
-		Padding:   3,
+		Padding:   0,
 	}
 }
 
@@ -89,7 +89,7 @@ func (h *DefaultHandler) HandleLog(e *logg.Entry) error {
 	}
 
 	if prefix != "" {
-		prefix = strings.ToUpper(prefix) + ":\t"
+		prefix = strings.ToLower(prefix) + ": "
 	}
 
 	color.Fprintf(w, "%s %s%s", bold.Sprintf("%*s", h.Padding+1, level), color.Sprint(prefix), e.Message)

main.go

@@ -21,8 +21,10 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"os/signal"
 	"runtime/debug"
 	"strings"
+	"syscall"
 	"time"
 
 	"github.com/bep/logg"
@@ -34,9 +36,12 @@ import (
 	"github.com/gohugoio/hugoreleaser/internal/common/logging"
 	"github.com/peterbourgon/ff/v3"
 	"github.com/peterbourgon/ff/v3/ffcli"
+	"golang.org/x/sync/errgroup"
 )
 
 func main() {
+	log.SetFlags(0)
+
 	if err := parseAndRun(os.Args[1:]); err != nil {
 		log.Fatal(err)
 	}
@@ -117,18 +122,40 @@ func parseAndRun(args []string) (err error) {
 	})
 
 	ctx, cancel := context.WithTimeout(context.Background(), core.Timeout)
+	ctx, _ = signal.NotifyContext(ctx, syscall.SIGINT, syscall.SIGTERM)
 	defer cancel()
+	done := make(chan struct{})
 
-	if err := core.Init(); err != nil {
-		return fmt.Errorf("error initializing config: %w", err)
-	}
+	g, ctx := errgroup.WithContext(ctx)
 
-	if err := coreCommand.Run(ctx); err != nil {
-		if errors.Is(err, context.DeadlineExceeded) || errors.Is(err, context.Canceled) {
-			return fmt.Errorf("command timed out after %s; increase -timeout if needed", core.Timeout)
+	g.Go(func() error {
+		if err := core.Init(); err != nil {
+			return fmt.Errorf("error initializing config: %w", err)
 		}
-		return fmt.Errorf("error running command: %w", err)
-	}
+		if err := coreCommand.Run(ctx); err != nil {
+			return fmt.Errorf("error running command: %w", err)
+		}
+		done <- struct{}{}
+		return nil
+	})
+
+	g.Go(func() error {
+		for {
+			select {
+			case <-ctx.Done():
+				err := ctx.Err()
+				if errors.Is(err, context.DeadlineExceeded) {
+					log.Fatalf("command timed out after %s; increase -timeout if needed", core.Timeout)
+				}
+				return err
+			case <-done:
+				return nil
+			}
+		}
+	})
+
+	err = g.Wait()
 
 	return err
+
 }