Misc fixes and improvements to the publish command

Author: bep

cmd/publishcmd/publish.go

@@ -17,8 +17,11 @@ package publishcmd
 import (
 	"bytes"
 	"context"
+	"crypto/sha256"
+	"encoding/hex"
 	"flag"
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
 	"strings"
@@ -187,6 +190,8 @@ type HomebrewCaskSettings struct {
 	TemplateFilename string `mapstructure:"template_filename"`
 	Description      string `mapstructure:"description"`
 	Homepage         string `mapstructure:"homepage"`
+	BinaryName       string `mapstructure:"binary_name"`
+	BinaryLocation   string `mapstructure:"binary_location"`
 }
 
 // HomebrewCaskContext holds data for the Homebrew cask template.
@@ -200,6 +205,9 @@ type HomebrewCaskContext struct {
 	Homepage         string
 	PkgFilename      string
 	BundleIdentifier string
+
+	// TODO(bep) check how goreleaser does this.
+	BinaryPath string // Full path to binary, e.g. /usr/local/bin/hugoreleaser
 }
 
 func (p *Publisher) updateHomebrewCask(
@@ -231,6 +239,12 @@ func (p *Publisher) updateHomebrewCask(
 	if settings.CaskPath == "" {
 		settings.CaskPath = fmt.Sprintf("Casks/%s.rb", settings.Name)
 	}
+	if settings.BinaryName == "" {
+		settings.BinaryName = p.core.Config.BuildSettings.Binary
+	}
+	if settings.BinaryLocation == "" {
+		settings.BinaryLocation = "/usr/local/bin"
+	}
 
 	// Find the first .pkg archive matching the archive paths pattern.
 	pkgInfo, err := p.findPkgArchive(release, pub.ArchivePathsCompiled)
@@ -249,6 +263,12 @@ func (p *Publisher) updateHomebrewCask(
 		pkgInfo.Name,
 	)
 
+	// Build binary path if binary_name is configured.
+	var binaryPath string
+	if settings.BinaryName != "" {
+		binaryPath = filepath.Join(settings.BinaryLocation, settings.BinaryName)
+	}
+
 	// Build cask context.
 	caskCtx := HomebrewCaskContext{
 		Name:             settings.Name,
@@ -260,6 +280,7 @@ func (p *Publisher) updateHomebrewCask(
 		Homepage:         settings.Homepage,
 		PkgFilename:      pkgInfo.Name,
 		BundleIdentifier: settings.BundleIdentifier,
+		BinaryPath:       binaryPath,
 	}
 
 	// Render cask template.
@@ -337,12 +358,42 @@ func (p *Publisher) findPkgArchive(release *config.Release, archivePathsMatcher
 
 		// Check if it's a .pkg file.
 		if strings.HasSuffix(archPath.Name, ".pkg") {
+			// Calculate SHA256 from the actual file.
+			archiveFile := filepath.Join(
+				p.core.DistDir,
+				p.core.Config.Project,
+				p.core.Tag,
+				p.core.DistRootArchives,
+				filepath.FromSlash(archPath.Path),
+				archPath.Name,
+			)
+
+			checksum, err := calculateSHA256(archiveFile)
+			if err != nil {
+				return pkgArchiveInfo{}, fmt.Errorf("failed to calculate SHA256 for %s: %w", archPath.Name, err)
+			}
+
 			return pkgArchiveInfo{
 				Name:   archPath.Name,
-				SHA256: archPath.SHA256,
+				SHA256: checksum,
 			}, nil
 		}
 	}
 
 	return pkgArchiveInfo{}, fmt.Errorf("no .pkg archive found for darwin")
 }
+
+// calculateSHA256 calculates the SHA256 checksum of a file.
+func calculateSHA256(filename string) (string, error) {
+	f, err := os.Open(filename)
+	if err != nil {
+		return "", err
+	}
+	defer f.Close()
+
+	h := sha256.New()
+	if _, err := io.Copy(h, f); err != nil {
+		return "", err
+	}
+	return hex.EncodeToString(h.Sum(nil)), nil
+}

hugoreleaser.env

@@ -1,3 +1,3 @@
 # Next release
-HUGORELEASER_TAG=v0.61.0
+HUGORELEASER_TAG=v0.61.1
 HUGORELEASER_COMMITISH=main

hugoreleaser.yaml

@@ -142,3 +142,5 @@ publishers:
       format: homebrew_cask
     custom_settings:
       bundle_identifier: io.gohugo.hugoreleaser
+      homepage: "https://github.com/gohugoio/hugoreleaser"
+      description: "Build, archive and release Go programs."

staticfiles/templates/homebrew-cask.rb.gotmpl

@@ -8,6 +8,10 @@ cask "{{ .Name }}" do
   homepage "{{ .Homepage }}"
 
   pkg "{{ .PkgFilename }}"
+{{- if .BinaryPath }}
+
+  binary "{{ .BinaryPath }}"
+{{- end }}
 
   uninstall pkgutil: "{{ .BundleIdentifier }}"
 end

testscripts/commands/publish.txt

@@ -58,6 +58,10 @@ publishers:
 -- dist/hugo/v1.2.0/releases/myrelease/hugo_1.2.0_checksums.txt --
 abc123def456  hugo_1.2.0_darwin-universal.pkg
 
+# The actual pkg archive (needed for SHA256 calculation)
+-- dist/hugo/v1.2.0/archives/mac/darwin/universal/hugo_1.2.0_darwin-universal.pkg --
+dummy pkg content for testing
+
 -- go.mod --
 module foo
 -- main.go --