Merge pull request #270 from SPANDigital/feat/PRSDM-10268-incl-themes-in-binary

feat: PRSDM-10268 incl themes in binary

Author: Quantumplate

.github/workflows/ci.yml

@@ -16,9 +16,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
+        with:
+          submodules: true
       - uses: actions/setup-go@v6
         with:
           go-version: stable
+      - name: Prepare themes for embedding
+        run: make prepare-themes
       - name: cli-lint
         uses: golangci/golangci-lint-action@v9
         with:
@@ -29,6 +33,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
+        with:
+          submodules: true
       - name: Set up Go
         uses: actions/setup-go@v6
         with:
@@ -45,6 +51,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
+        with:
+          submodules: true
       - name: Set up Go
         uses: actions/setup-go@v6
         with:

.github/workflows/release.yml

@@ -14,10 +14,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          submodules: true
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
           go-version: 1.25.x
+      - name: Prepare themes for embedding
+        run: make prepare-themes
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:

.gitignore

@@ -9,7 +9,8 @@ presidium
 dist/
 .DS_Store
 resources/
-
 dist/
 docs/resources
-reports/
+reports/
+reports/tests-cov.out
+.claude/

Dockerfile.test

@@ -0,0 +1,80 @@
+# Multi-stage Dockerfile to test presidium with embedded themes
+# This tests that themes work without network access
+
+# Stage 1: Build presidium binary for Linux
+FROM golang:1.25-alpine AS builder
+
+# Install build dependencies
+RUN apk add --no-cache git gcc g++ musl-dev make
+
+# Copy source code
+WORKDIR /build
+COPY . .
+
+# Build presidium binary (prepare-themes renames go.mod files so they can be embedded)
+RUN make prepare-themes && go build -tags extended -o presidium .
+
+# Stage 2: Test without network access
+FROM golang:1.25-alpine AS test
+
+# Install runtime dependencies (C++ libraries required by Hugo/presidium)
+RUN apk add --no-cache curl libstdc++ libgcc
+
+# Copy the docs site
+COPY ./docs /workspace/docs
+
+# Copy the built presidium binary from builder stage
+COPY --from=builder /build/presidium /usr/local/bin/presidium
+RUN chmod +x /usr/local/bin/presidium
+
+# Set working directory to the docs site
+WORKDIR /workspace/docs
+
+# Verify presidium binary
+RUN presidium --version || echo "Presidium version check completed"
+
+# Run hugo build using presidium (this will use embedded themes)
+# This should work without network access, proving themes are embedded
+RUN echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" && \
+    echo "Building site with embedded themes..." && \
+    echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" && \
+    presidium hugo && \
+    echo "" && \
+    echo "✓ Build successful! Themes were loaded from embedded binary." && \
+    echo "" && \
+    echo "Generated files:" && \
+    ls -lh public/ | head -20
+
+# Verify the build output exists and contains expected files
+RUN test -d public && \
+    test -f public/index.html && \
+    test -f public/sitemap.xml && \
+    echo "" && \
+    echo "✓ Hugo site built successfully!" && \
+    echo "✓ All expected files generated" && \
+    echo "✓ Themes loaded from binary (no GitHub fetch required)"
+
+# Create a test script that will run with --network=none
+RUN echo '#!/bin/sh' > /test.sh && \
+    echo 'echo "╔═══════════════════════════════════════════════════════════╗"' >> /test.sh && \
+    echo 'echo "║  Network Isolation Test                                  ║"' >> /test.sh && \
+    echo 'echo "╚═══════════════════════════════════════════════════════════╝"' >> /test.sh && \
+    echo 'echo ""' >> /test.sh && \
+    echo 'echo "Testing network isolation..."' >> /test.sh && \
+    echo 'if curl -s --max-time 2 https://github.com >/dev/null 2>&1; then' >> /test.sh && \
+    echo '  echo "❌ FAIL: Network access detected!"' >> /test.sh && \
+    echo '  exit 1' >> /test.sh && \
+    echo 'else' >> /test.sh && \
+    echo '  echo "✓ Confirmed: No network access"' >> /test.sh && \
+    echo 'fi' >> /test.sh && \
+    echo 'echo ""' >> /test.sh && \
+    echo 'echo "Build artifacts:"' >> /test.sh && \
+    echo 'ls -lh public/ | head -15' >> /test.sh && \
+    echo 'echo ""' >> /test.sh && \
+    echo 'echo "╔═══════════════════════════════════════════════════════════╗"' >> /test.sh && \
+    echo 'echo "║  ✅ SUCCESS: Embedded themes work without network!       ║"' >> /test.sh && \
+    echo 'echo "╚═══════════════════════════════════════════════════════════╝"' >> /test.sh && \
+    chmod +x /test.sh
+
+# Default command runs the test script
+CMD ["/test.sh"]

Makefile

@@ -1,41 +1,69 @@
 FILENAME=presidium
 DOCSDIR=docs
 .DEFAULT_GOAL=help
-.PHONY: build test dist clean fmt vet tidy coverage_report help
+.PHONY: build test dist clean fmt vet tidy coverage_report help update-themes prepare-themes restore-themes lint checks serve-docs
 
 help: ## Display available targets
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "  %-18s %s\n", $$1, $$2}'
 
-build: ## Build the presidium binary
-	go build -tags extended -o $(FILENAME) .
+update-themes: ## Update theme submodules to their latest versions
+	@echo "Updating theme submodules to latest..."
+	@git submodule update --remote themes/presidium-styling-base themes/presidium-layouts-base themes/presidium-layouts-blog
+	@echo "Theme submodules updated."
 
-test: ## Run tests with coverage
+prepare-themes: ## Prepare themes for embedding (rename go.mod to make embeddable)
+	@echo "Preparing themes for embedding..."
+	@for theme in themes/presidium-*; do \
+		if [ -f "$$theme/go.mod" ]; then \
+			echo "  Renaming $$theme/go.mod -> go.mod.tmpl"; \
+			mv "$$theme/go.mod" "$$theme/go.mod.tmpl"; \
+		fi; \
+		if [ -f "$$theme/go.sum" ]; then \
+			echo "  Renaming $$theme/go.sum -> go.sum.tmpl"; \
+			mv "$$theme/go.sum" "$$theme/go.sum.tmpl"; \
+		fi; \
+	done
+
+restore-themes: ## Restore theme go.mod files to original names
+	@echo "Restoring theme go.mod files..."
+	@for theme in themes/presidium-*; do \
+		if [ -f "$$theme/go.mod.tmpl" ]; then \
+			echo "  Renaming $$theme/go.mod.tmpl -> go.mod"; \
+			mv "$$theme/go.mod.tmpl" "$$theme/go.mod"; \
+		fi; \
+		if [ -f "$$theme/go.sum.tmpl" ]; then \
+			echo "  Renaming $$theme/go.sum.tmpl -> go.sum"; \
+			mv "$$theme/go.sum.tmpl" "$$theme/go.sum"; \
+		fi; \
+	done
+
+build: prepare-themes ## Build the presidium binary
+	go build -tags extended -o $(FILENAME) . ; status=$$? ; $(MAKE) restore-themes ; rstatus=$$? ; if [ $$status -eq 0 ]; then status=$$rstatus; fi ; exit $$status
+
+test: prepare-themes ## Run tests with coverage
 	@mkdir -p reports
-	go test -race -timeout 120s ./... -coverprofile=reports/tests-cov.out
+	go test -race -timeout 120s ./... -coverprofile=reports/tests-cov.out ; status=$$? ; $(MAKE) restore-themes ; rstatus=$$? ; if [ $$status -eq 0 ]; then status=$$rstatus; fi ; exit $$status
 
 fmt: ## Format Go source files
 	go fmt ./...
 
-vet: ## Run go vet
-	go vet ./...
+vet: prepare-themes ## Run go vet
+	go vet ./... ; status=$$? ; $(MAKE) restore-themes ; rstatus=$$? ; if [ $$status -eq 0 ]; then status=$$rstatus; fi ; exit $$status
 
 tidy: ## Tidy and verify module dependencies
 	go mod tidy && go mod verify
 
-clean: ## Remove build artifacts
-	rm -fr "dist"
+clean: restore-themes ## Remove build artifacts and restore themes
+	rm -fr "dist" "$(FILENAME)" "presidium-test"
 
 coverage_report: ## Open coverage report in browser
 	@go tool cover -html=reports/tests-cov.out
 
-dist: ## Build distribution binary
-	mkdir -p "dist"
-	go build -trimpath -o "dist/presidium" --tags extended
-
-checks: tidy fmt vet lint test build
+dist: prepare-themes ## Build distribution binary
+	mkdir -p "dist" && go build -trimpath -o "dist/presidium" --tags extended ; status=$$? ; $(MAKE) restore-themes ; rstatus=$$? ; if [ $$status -eq 0 ]; then status=$$rstatus; fi ; exit $$status
 
 serve-docs:
 	cd $(DOCSDIR) && make serve
 
-lint:
-	golangci-lint run --timeout 10m
+lint: prepare-themes ## Run golangci-lint
+	golangci-lint run --timeout 10m ; status=$$? ; $(MAKE) restore-themes ; rstatus=$$? ; if [ $$status -eq 0 ]; then status=$$rstatus; fi ; exit $$status

cmd/hugo.go

@@ -1,19 +1,28 @@
 package cmd
 
 import (
+	"os"
+
 	"github.com/SPANDigital/presidium-hugo/pkg/domain/service/hugo"
+	"github.com/SPANDigital/presidium-hugo/pkg/log"
 	"github.com/spf13/cobra"
 )
 
 var (
 	// hugoCommand wraps hugo into Presidium.  This allows you to run hugo
 	// in Presidium, and makes it easier to debug etc.
+	// All arguments and flags are passed through to Hugo unchanged.
 	hugoCommand = &cobra.Command{
-		Use:   "hugo",
-		Short: "Runs hugo against your presidium site",
+		Use:                "hugo",
+		Short:              "Runs hugo with full access to all Hugo commands and flags",
+		DisableFlagParsing: true, // Don't parse flags - let Hugo handle them
 		Run: func(cmd *cobra.Command, args []string) {
-			hugo := hugo.New()
-			hugo.Execute(args...)
+			hugoService := hugo.New()
+			err := hugoService.Execute(args...)
+			if err != nil {
+				log.Error(err)
+				os.Exit(1)
+			}
 		},
 	}
 )

embedded.go

@@ -4,3 +4,6 @@ import "embed"
 
 //go:embed all:templates
 var templatesFS embed.FS
+
+//go:embed all:themes
+var themesFS embed.FS

main.go

@@ -3,9 +3,11 @@ package main
 import (
 	"github.com/SPANDigital/presidium-hugo/cmd"
 	"github.com/SPANDigital/presidium-hugo/pkg/domain/service/template"
+	"github.com/SPANDigital/presidium-hugo/pkg/domain/service/themes"
 )
 
 func main() {
 	template.SetFS(templatesFS)
+	themes.SetFS(themesFS)
 	cmd.Execute()
 }

pkg/domain/service/conversion/conversion.go

@@ -3,16 +3,17 @@ package conversion
 import (
 	"errors"
 	"fmt"
-	"github.com/SPANDigital/presidium-hugo/pkg/config"
-	"github.com/SPANDigital/presidium-hugo/pkg/domain/service/hugo"
-	"github.com/SPANDigital/presidium-hugo/pkg/utils"
 	"io"
 	"io/fs"
 	"log"
 	"os"
 	"path/filepath"
 	"strings"
 
+	"github.com/SPANDigital/presidium-hugo/pkg/config"
+	"github.com/SPANDigital/presidium-hugo/pkg/domain/service/hugo"
+	"github.com/SPANDigital/presidium-hugo/pkg/utils"
+
 	"github.com/SPANDigital/presidium-hugo/pkg/configtranslation"
 	"github.com/SPANDigital/presidium-hugo/pkg/domain/service/conversion/fileactions"
 	"github.com/SPANDigital/presidium-hugo/pkg/domain/service/conversion/resources"
@@ -408,10 +409,14 @@ func (c *Converter) generateHugoModule() {
 	}
 
 	c.messageUser(infoMessage("Adding Hugo GO module to site").withContentStyle(colors.Labels.Wanted))
-	hugo.New().Execute("--source", c.stagingDir, "mod", "init", c.moduleName())
+	if err := hugo.New().Execute("--source", c.stagingDir, "mod", "init", c.moduleName()); err != nil {
+		log.Fatalf("failed to initialize Hugo Go module in staging directory %q: %v", c.stagingDir, err)
+	}
 	srcModFile := filepath.Join(c.stagingDir, "go.mod")
 	dstModFile := filepath.Join(c.destinationRepoDir, "go.mod")
-	_ = c.fs.Copy(srcModFile, dstModFile, fs.ModePerm)
+	if err := c.fs.Copy(srcModFile, dstModFile, fs.ModePerm); err != nil {
+		log.Fatalf("failed to copy generated go.mod from %q to %q: %v", srcModFile, dstModFile, err)
+	}
 	c.messageUser(infoMessage("Copied over hugo mod file"))
 
 }

pkg/domain/service/hugo/hugo.go

@@ -1,6 +1,14 @@
 package hugo
 
-import "github.com/gohugoio/hugo/commands"
+import (
+	"fmt"
+	"os"
+
+	"github.com/SPANDigital/presidium-hugo/pkg/domain/service/themes"
+	"github.com/SPANDigital/presidium-hugo/pkg/filesystem"
+	"github.com/SPANDigital/presidium-hugo/pkg/log"
+	"github.com/gohugoio/hugo/commands"
+)
 
 type Service struct {
 }
@@ -9,6 +17,37 @@ func New() Service {
 	return Service{}
 }
 
-func (s Service) Execute(args ...string) {
-	_ = commands.Execute(args)
+func (s Service) Execute(args ...string) error {
+	// Initialize themes service
+	themesService, err := themes.New()
+	if err != nil {
+		log.Warn(fmt.Sprintf("Failed to initialize themes service, falling back to remote theme fetch: %v", err))
+		return commands.Execute(args)
+	}
+
+	// Extract embedded themes to temp directory
+	tmpDir, replacements, err := themesService.Extract()
+	if err != nil {
+		log.Warn(fmt.Sprintf("Failed to extract embedded themes, falling back to remote theme fetch: %v", err))
+		return commands.Execute(args)
+	}
+
+	// Capture the previous value (if any) so we can restore it after execution
+	prevReplacements, hadPrevReplacements := os.LookupEnv("HUGO_MODULE_REPLACEMENTS")
+
+	// Ensure cleanup happens regardless of how Hugo execution ends
+	defer func() {
+		_ = filesystem.AFS.RemoveAll(tmpDir)
+		if hadPrevReplacements {
+			os.Setenv("HUGO_MODULE_REPLACEMENTS", prevReplacements)
+		} else {
+			os.Unsetenv("HUGO_MODULE_REPLACEMENTS")
+		}
+	}()
+
+	// Set environment variable to point Hugo to local themes
+	os.Setenv("HUGO_MODULE_REPLACEMENTS", replacements)
+
+	// Execute Hugo with local themes - return the error to preserve Hugo's exit behavior
+	return commands.Execute(args)
 }