Merge branch 'cookiecutter-template' into feat-012

Author: jcook3701

.github/workflows/jekyll-gh-pages.yml

@@ -60,6 +60,9 @@ jobs:
           ruby-version: '3.3' # Recommended for Jekyll 4.4 in 2026
           bundler-cache: true # Runs 'bundle install' and caches gems automatically
           working-directory: ./docs/jekyll
+      - name: Install Ruby Packages
+        run: |
+          make ruby-install
       - name: Setup Pages
         uses: actions/configure-pages@v5
       - name: Build with Jekyll site in /docs/jekyll

Makefile

@@ -230,7 +230,7 @@ TOML_FILE_LIST := 	( \
 	)
 # --------------------------------------------------
 .PHONY: \
-	all list-folders venv install \
+	all list-folders venv python-install \
 	pre-commit-init security dependency-check black-formatter-check \
 	black-formatter-fix render-cookiecutter jinja2-lint-check ruff-lint-check \
 	ruff-lint-fix toml-lint-check yaml-lint-check format-check \
@@ -243,7 +243,7 @@ TOML_FILE_LIST := 	( \
 # --------------------------------------------------
 # Default: run lint, typecheck, spellcheck, tests, & docs
 # --------------------------------------------------
-all: install lint-check typecheck spellcheck test build-docs
+all: python-install lint-check typecheck spellcheck test build-docs
 # --------------------------------------------------
 # Make Internal Utilities
 # --------------------------------------------------
@@ -269,7 +269,7 @@ venv:
 	$(AT)$(CREATE_VENV)
 	$(AT)echo "✅ Virtual environment created."
 
-install: venv
+python-install: venv
 	$(AT)echo "📦 Installing project dependencies..."
 	$(AT)$(PIP) install --upgrade pip setuptools wheel
 	# $(AT)$(PIP) install -e $(DEPS)
@@ -333,7 +333,8 @@ render-cookiecutter:
 	$(AT)rm -rf $(RENDERED_COOKIE_DIR)
 	$(AT)$(COOKIECUTTER) . --no-input \
 		--output-dir $(RENDERED_COOKIE_DIR) \
-		--overwrite-if-exists
+		--overwrite-if-exists \
+		--keep-project-on-failure
 
 djlint-lint-check:
 	$(AT)echo "🔍 djlint lint..."
@@ -414,6 +415,9 @@ test:
 # --------------------------------------------------
 # 📚 Documentation (Jekyll + nutrimatic)
 # --------------------------------------------------
+ruby-install:
+	$(MAKE) -C $(JEKYLL_DIR) ruby-install;
+
 jekyll:
 	$(MAKE) -C $(JEKYLL_DIR) all;
 
@@ -479,7 +483,7 @@ git-release:
 # 📢 Release
 # --------------------------------------------------
 pre-commit: test security dependency-check format-fix lint-check spellcheck typecheck
-pre-release: clean install pre-commit build-docs changelog build
+pre-release: clean python-install pre-commit build-docs changelog build
 release: git-release bump-version-patch
 # --------------------------------------------------
 # 🧹 Clean artifacts

changelogs/CHANGELOG.md

@@ -103,6 +103,7 @@ Feat 011 cla fix (#35)
 ### 🐛 Fixed
 
 - *(template)* Updates to template cookiecutter.json file.
+- *(cla)* Fix for CLA fix for master branch.
 
 ### 🚀 Added
 

changelogs/releases/v0.1.1.md

@@ -103,6 +103,7 @@ Feat 011 cla fix (#35)
 ### 🐛 Fixed
 
 - *(template)* Updates to template cookiecutter.json file.
+- *(cla)* Fix for CLA fix for master branch.
 
 ### 🚀 Added
 

docs/cookiecutter_input.json

@@ -24,7 +24,7 @@
             "build-docs": false,
             "changelog": false,
             "git-init": false,
-            "install": false,
+            "python-install": false,
             "pre-commit-init": false
         }
     },

docs/jekyll/Makefile

@@ -41,17 +41,23 @@ PUBLISHDIR ?=
 # --------------------------------------------------
 # 📘 Documentation (Sphinx + Jekyll)
 # --------------------------------------------------
+RUBY_INSTALL := bundle install
 JEKYLL_BUILD := bundle exec jekyll build --quiet
 JEKYLL_CLEAN := bundle exec jekyll clean
 JEKYLL_SERVE := bundle exec jekyll serve
 # --------------------------------------------------
-.PHONY: all jekyll jekyll-serve build run clean help
+.PHONY: all ruby-install jekyll jekyll-serve build run clean help
 # --------------------------------------------------
 # Default:
 # --------------------------------------------------
 all: build
 # --------------------------------------------------
-# 📘 Documentation (Jekyll)
+# ♦️ Ruby
+# --------------------------------------------------
+ruby-install:
+	$(AT)$(RUBY_INSTALL)
+# --------------------------------------------------
+# 📚 Documentation (Jekyll)
 # --------------------------------------------------
 jekyll:
 	$(AT)echo "🔨 Building Jekyll site 📘..."
@@ -80,6 +86,7 @@ help:
 	$(AT)echo "   version: $(PACKAGE_VERSION)"
 	$(AT)echo ""
 	$(AT)echo "Usage:"
+	$(AT)echo "  make ruby-install           Installs Gemfile packages."
 	$(AT)echo "  make build                  Generate Jekyll documentation"
 	$(AT)echo "  make run                    Serve Jekyll site locally"
 	$(AT)echo "  make clean                  Clean Jekyll build artifacts"