➕ prism-merge for Ruby template merging

.envrc

@@ -38,6 +38,10 @@ export FLOSS_CFG_FUND_LOGFILE=tmp/log/debug.log
 # Concurrently developing the rubocop-lts suite?
 export RUBOCOP_LTS_LOCAL=false
 
+# If kettle-dev does not have an open source collective set these to false.
+export OPENCOLLECTIVE_HANDLE=kettle-rb
+export FUNDING_ORG=kettle-rb
+
 # .env would override anything in this file, if `dotenv` is uncommented below.
 # .env is a DOCKER standard, and if we use it, it would be in deployed, or DOCKER, environments,
 #   and that is why we generally want to leave it commented out.

.git-hooks/commit-msg

@@ -1,6 +1,12 @@
 #!/usr/bin/env ruby
 # vim: set syntax=ruby
 
+# kettle-dev:freeze
+# To retain chunks of comments & code during kettle-dev templating:
+# Wrap custom sections with freeze markers (e.g., as above and below this comment chunk).
+# kettle-dev will then preserve content between those markers across template runs.
+# kettle-dev:unfreeze
+
 # Do not rely on Bundler; allow running outside a Bundler context
 begin
   require "rubygems"

.git-hooks/prepare-commit-msg

@@ -5,4 +5,4 @@ set -eu
 
 # We are not using direnv exec here because mise and direnv can result in conflicting PATH settings:
 # See: https://mise.jdx.dev/direnv.html
-exec "kettle-commit-msg" "$@"
+exec "bin/kettle-commit-msg" "$@"

.git-hooks/prepare-commit-msg.example

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Fail on error and unset variables
+set -eu
+
+# We are not using direnv exec here because mise and direnv can result in conflicting PATH settings:
+# See: https://mise.jdx.dev/direnv.html
+exec "kettle-commit-msg" "$@"

.github/workflows/jruby.yml

@@ -36,16 +36,6 @@ jobs:
     strategy:
       matrix:
         include:
-#          # NoMethodError: undefined method `resolve_feature_path' for #<Array:0x566f4659>
-#          #       <main> at /home/runner/.rubies/jruby-9.3.15.0/lib/ruby/gems/shared/gems/erb-4.0.4-java/lib/erb/util.rb:9
-#          # jruby-9.3 (targets Ruby 2.6 compatibility)
-#          - ruby: "jruby-9.3"
-#            appraisal: "ruby-2-6"
-#            exec_cmd: "rake test"
-#            gemfile: "Appraisal.root"
-#            rubygems: default
-#            bundler: default
-
           # jruby-9.4 (targets Ruby 3.1 compatibility)
           - ruby: "jruby-9.4"
             appraisal: "ruby-3-1"

.gitlab-ci.yml

@@ -22,7 +22,9 @@ variables:
   K_SOUP_COV_DEBUG: true
   K_SOUP_COV_DO: true
   K_SOUP_COV_HARD: true
+  # kettle-dev:freeze
   # Lower than local, which is at 100/100, because rubocop-lts isn't installed in the coverage workflow
+  # kettle-dev:unfreeze
   K_SOUP_COV_MIN_BRANCH: 74
   K_SOUP_COV_MIN_LINE: 90
   K_SOUP_COV_VERBOSE: true

.junie/guidelines.md

@@ -12,8 +12,8 @@ This document captures project-specific knowledge to streamline setup, testing,
     - See .env.local.example for an example of what to put in .env.local.
     - See CONTRIBUTING.md for details on how to set up your local environment.
 - Ruby and Bundler
-  - Runtime supports Ruby >= 1.9.2.
-  - Development tooling targets Ruby >= 2.3 (minimum supported by setup-ruby GHA).
+  - Runtime supports Ruby >= 2.3.0
+  - Development tooling targets Ruby >= 2.3.0 (minimum supported by setup-ruby GHA).
   - Use a recent Ruby (>= 3.4 recommended) for fastest setup and to exercise modern coverage behavior.
   - Install dependencies via Bundler in project root:
     - bundle install
@@ -48,12 +48,11 @@ This document captures project-specific knowledge to streamline setup, testing,
     - silent_stream: STDOUT is silenced by default for examples to keep logs clean.
       - To explicitly test console output, tag the example or group with :check_output.
     - DEBUG toggle: Set DEBUG=true to require 'debug' and avoid silencing output during your run.
-    - ENV seeding: The suite sets ENV["FLOSS_FUNDING_FLOSS_FUNDING"] = "Free-as-in-beer" so that the library’s own namespace is considered activated (avoids noisy warnings).
     - Coverage: kettle-soup-cover integrates SimpleCov; .simplecov is invoked from spec_helper when enabled by Kettle::Soup::Cover::DO_COV, which is controlled by K_SOUP_COV_DO being set to true / false.
     - RSpec.describe usage:
       - Use `describe "#<method_name>"` to contain a block of specs that test instance method behavior.
       - Use `describe "::<method_name>"` to contain a block of specs that test class method behavior.
-      - Do not use `describe ".<method_name>"` because the dot is ambiguous w.r.t instance vs. class methods. 
+      - Do not use `describe ".<method_name>"` because the dot is ambiguous w.r.t instance vs. class methods.
     - When adding new code or modifying existing code always add tests to cover the updated behavior, including branches, and different types of expected and unexpected inputs.
   - Additional test utilities:
     - rspec-stubbed_env: Use stub_env to control ENV safely within examples.
@@ -94,7 +93,9 @@ This document captures project-specific knowledge to streamline setup, testing,
       include_context 'with stubbed env'
     - in a before hook, or in an example:
       stub_env("FLOSS_FUNDING_MY_NS" => "Free-as-in-beer")
+
       # example code continues
+
   - If your spec needs to assert on console output, tag it with :check_output. By default, STDOUT is silenced.
   - Use Timecop for deterministic time-sensitive behavior as needed (require config/timecop is already done by spec_helper).