kettle-jem 7.1.28 → 7.1.30

data/lib/kettle/jem/templates/gemfiles/modular/templating_local.gemfile.example

@@ -13,14 +13,12 @@ structuredmerge_local_gems = %w[
   ast-template
   bash-merge
   binary-merge
-  commonmarker-merge
   citrus-toml-merge
   dotenv-merge
   go-merge
   html-merge
   json-merge
   kettle-jem
-  kramdown-merge
   markdown-merge
   markly-merge
   parslet-toml-merge
@@ -43,16 +41,27 @@ structuredmerge_local_gems = %w[
 kettle_dev_local_gems = %w[
   {KJ|KETTLE_DEV_LOCAL_GEMS}
 ]
+shared_nomono_options = {
+  vendored_gems_env: "VENDORED_GEMS",
+  vendor_gem_dir_env: "VENDOR_GEM_DIR"
+}
+kettle_dev_nomono_options = shared_nomono_options.merge(
+  prefix: "KETTLE_DEV",
+  path_env: "KETTLE_DEV_DEV",
+  debug_env: "KETTLE_DEV_DEBUG",
+  root: ["src", "my", "kettle-dev"]
+)
+structuredmerge_nomono_options = shared_nomono_options.merge(
+  prefix: "STRUCTUREDMERGE",
+  path_env: "STRUCTUREDMERGE_DEV",
+  debug_env: "STRUCTUREDMERGE_DEBUG"
+)
 structuredmerge_local_gems_to_eval = structuredmerge_local_gems - %w[{KJ|PACKAGE_NAME}]
 
 if ENV.fetch("STRUCTUREDMERGE_DEV", "false").casecmp("false") != 0
   eval_nomono_gems(
     gems: structuredmerge_local_gems_to_eval,
-    prefix: "STRUCTUREDMERGE",
-    path_env: "STRUCTUREDMERGE_DEV",
-    vendored_gems_env: "VENDORED_GEMS",
-    vendor_gem_dir_env: "VENDOR_GEM_DIR",
-    debug_env: "STRUCTUREDMERGE_DEBUG"
+    **structuredmerge_nomono_options
   )
 end
 
@@ -62,12 +71,7 @@ if ENV.fetch("KETTLE_DEV_DEV", "false").casecmp("false") != 0
   kettle_dev_dependency = instance_variable_get(:@dependencies).to_a.find { |dependency| dependency.name == "kettle-dev" }
   kettle_dev_local_path = nomono_gems(
     gems: %w[kettle-dev],
-    prefix: "KETTLE_DEV",
-    path_env: "KETTLE_DEV_DEV",
-    vendored_gems_env: "VENDORED_GEMS",
-    vendor_gem_dir_env: "VENDOR_GEM_DIR",
-    debug_env: "KETTLE_DEV_DEBUG",
-    root: ["src", "my", "kettle-dev"]
+    **kettle_dev_nomono_options
   ).fetch("kettle-dev", nil)
   if kettle_dev_dependency && kettle_dev_local_path
     instance_variable_get(:@dependencies).delete(kettle_dev_dependency)
@@ -79,11 +83,6 @@ if ENV.fetch("KETTLE_DEV_DEV", "false").casecmp("false") != 0
 
   eval_nomono_gems(
     gems: kettle_dev_local_gems_to_eval,
-    prefix: "KETTLE_DEV",
-    path_env: "KETTLE_DEV_DEV",
-    vendored_gems_env: "VENDORED_GEMS",
-    vendor_gem_dir_env: "VENDOR_GEM_DIR",
-    debug_env: "KETTLE_DEV_DEBUG",
-    root: ["src", "my", "kettle-dev"]
+    **kettle_dev_nomono_options
   )
 end

data/lib/kettle/jem/templates/gemfiles/modular/x_std_libs/r4/libs.gemfile.example

@@ -1,5 +1,6 @@
 eval_gemfile "../../erb/r4/v5.0.gemfile"
 eval_gemfile "../../mutex_m/r4/v0.3.gemfile"
+eval_gemfile "../../ostruct/r4/v0.6.gemfile"
 eval_gemfile "../../stringio/r4/v3.0.gemfile"
 eval_gemfile "../../benchmark/r4/v0.5.gemfile"
 eval_gemfile "../../cgi/r4/v0.5.gemfile"

data/lib/kettle/jem/templates/mise.toml.example

@@ -22,4 +22,4 @@ _.path = ["exe", "bin"]
 _.source = ".config/mise/env.sh"
 
 [tools]
-ruby = "4.0.6"
+ruby = "4.0.7"

data/lib/kettle/jem/templates/mise.toml.no-osc.example

@@ -22,4 +22,4 @@ _.path = ["exe", "bin"]
 _.source = ".config/mise/env.sh"
 
 [tools]
-ruby = "4.0.6"
+ruby = "4.0.7"

data/lib/kettle/jem/templates/readme/partials/configuration.md.example

@@ -12,7 +12,7 @@ project_emoji: "💎"
 engines:
   - ruby
 ruby:
-  test_minimum: "2.4"
+  test_minimum: "{KJ|DEFAULT_TEST_MINIMUM_RUBY}"
 licenses:
   - MIT
 templates:
@@ -106,8 +106,9 @@ application, and Rakefile scaffold cleanup.
 `workflows.exec_cmd` sets the default command for generated test workflows
 (default: `kettle-test`; ENV override: `KJ_EXEC_CMD`).
 `ruby.test_minimum` sets the lowest MRI Ruby version used for generated CI
-workflows and Appraisals. It defaults to `2.4`, and the effective generated
-floor is never lower than the gemspec `required_ruby_version`.
+workflows and Appraisals. It defaults to `{KJ|DEFAULT_TEST_MINIMUM_RUBY}`, and
+the effective generated floor is never lower than the gemspec
+`required_ruby_version`.
 `workflows.coverage` enables coverage workflow generation. Existing custom
 workflows can receive pinned-action snippets without replacing the whole file.
 

data/lib/kettle/jem/templates/shim/Gemfile.example

@@ -6,9 +6,15 @@ shimmed_gem_path = ENV["KETTLE_JEM_SHIMMED_GEM_PATH"].to_s
 gem "{KJ|SHIMMED_GEM_NAME}", path: shimmed_gem_path unless shimmed_gem_path.empty?
 
 # Local workspace dependency wiring for templating_local.gemfile overrides.
-gem "nomono", "~> 1.1", ">= 1.1.5", require: false # ruby >= 3.2.0
+gem "nomono", "~> 1.1", ">= 1.1.7", require: false # ruby >= 3.2.0
 
-# Templating (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths)
-eval_gemfile "gemfiles/modular/templating.gemfile" if ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero?
+# Templating and the StructuredMerge family share this modular Gemfile.
+# kettle-jem needs StructuredMerge to template, and kettle-changelog needs it at
+# runtime, so the test, lint, and release bundles resolve the family too.
+#
+# (env-switched: STRUCTUREDMERGE_DEV=/path/to/structuredmerge/ruby/gems for local paths)
+eval_gemfile "gemfiles/modular/templating.gemfile" if
+  ENV.fetch("K_JEM_TEMPLATING", "false").casecmp("true").zero? ||
+  ENV.fetch("STRUCTUREDMERGE_DEV", "false").casecmp("false") != 0
 
 gemspec

data/lib/kettle/jem/templates/shim/gem.gemspec.example

@@ -30,16 +30,16 @@ Gem::Specification.new do |spec|
   spec.add_dependency "{KJ|SHIMMED_GEM_NAME}"
 
   # Dev, Test, & Release Tasks
-  spec.add_development_dependency("kettle-dev", "~> 3.1", ">= 3.1.0")             # ruby >= {KJ|MIN_TEST_RUBY}
+  spec.add_development_dependency("kettle-dev", "~> 3.1", ">= 3.1.13")             # ruby >= {KJ|MIN_TEST_RUBY}
 
   # Tasks
   spec.add_development_dependency "rake", "~> 13.0"
 
   # Testing
-  spec.add_development_dependency("kettle-test", "~> 2.0", ">= 2.0.21")            # ruby >= {KJ|MIN_TEST_RUBY}
+  spec.add_development_dependency("kettle-test", "~> 2.0", ">= 2.0.25")            # ruby >= {KJ|MIN_TEST_RUBY}
   spec.add_development_dependency "rspec", "~> 3.12"
 
   # Releasing
   spec.add_development_dependency("ruby-progressbar", "~> 1.13")                    # ruby >= 0
-  spec.add_development_dependency("stone_checksums", "~> 1.0", ">= 1.0.8")          # ruby >= 2.2.0
+  spec.add_development_dependency("stone_checksums", "~> 1.0", ">= 1.0.9")          # ruby >= 2.2.0
 end

data/lib/kettle/jem/version.rb

@@ -5,7 +5,7 @@ module Kettle
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = "7.1.28"
+      VERSION = "7.1.30"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location