kettle-jem 7.1.13 → 7.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5727e30e966bc0b35df82298bf1ed8c7b9724641604e814d0ca3d655a3cd119
-  data.tar.gz: a1bfadf03c584d245ad03f06466cc133a228f473092865593fe02d7bff5f5d9b
+  metadata.gz: e2de3a21e9a9d1fe0ca969b14a89f4345b7ed4fbc327e6f7564eec589876a627
+  data.tar.gz: 8347a7586bfe4c4639225f2d0a0e00b196248daa7a6545d9bb7121a5a59b8338
 SHA512:
-  metadata.gz: 1abd520d313d7888500f58aa5f6bbf494e56c3e7c10629ba4f5206927bb111ce0b03096b43651caef812006d01134f7e20c8ffe40bb97fc7da0064ee2c897e05
-  data.tar.gz: cdafb8779bc44d03077368e7db0554e0eb998d15d0960542cb77658c947abec959396f3a60ff16245bf2b6aeabb26b7fd448b1f53cf10616fa83afaddb87a03c
+  metadata.gz: dcb29f595007a3416794c42d1c446e5308178409c6ab44aada85c19b723df8aec0ffb9cb66d4836ebaad82f5af73715a525212aea853ffa01a23582da00e7a7d
+  data.tar.gz: 498ba447eec84b3a1138b7440ecfe9fa0c7c609553e86227ccd511a352d1d959fce678752cc1f8a4d196d4551065741537576775f72b9df75d53eba11dc5cfea

data/CHANGELOG.md

@@ -30,6 +30,36 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [7.1.14] - 2026-09-01
+
+- TAG: [v7.1.14][7.1.14t]
+- COVERAGE: 93.61% -- 11130/11890 lines in 16 files
+- BRANCH COVERAGE: 76.95% -- 4740/6160 branches in 16 files
+- 17.95% documented
+
+### Changed
+
+- [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
+  - kettle-dev (>= 3.0.24 -> >= 3.0.27)
+  - kettle-family (>= 1.2.74 -> >= 1.2.77)
+
+- [kc] kettle-jem/template: updated 398 project files:
+  - code and tests (20)
+  - configuration (12)
+  - dependencies (147)
+  - documentation (9)
+  - other (123)
+  - workflows (87)
+
+- [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
+  - kettle-family (>= 1.2.77 -> >= 1.2.79)
+
+### Fixed
+
+- Preserve destination .gitignore rules while adding template ignore rules, retain SSH GitHub sources, and keep Bundler lockfile checksums during template normalization.
+
+- Preserve class namespaces and matching RBS declarations when templating version_gem package wrappers.
+
 ## [7.1.13] - 2026-08-31
 
 - TAG: [v7.1.13][7.1.13t]
@@ -1746,7 +1776,9 @@ Please file a bug if you notice a violation of semantic versioning.
 - Released kettle-jem as part of the initial StructuredMerge Ruby 7.0.0 gem set.
 - Included packaged templates and parser-backed merge support for Ruby gem templating.
 
-[Unreleased]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.13...HEAD
+[Unreleased]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.14...HEAD
+[7.1.14]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.13...v7.1.14
+[7.1.14t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.14
 [7.1.13]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.12...v7.1.13
 [7.1.13t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.13
 [7.1.12]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.11...v7.1.12

data/README.md

@@ -879,7 +879,7 @@ Thanks for RTFM. ☺️
 [📌gitmoji]: https://gitmoji.dev
 [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-11.860-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-11.890-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/lib/kettle/jem/tasks/install_task.rb

@@ -788,7 +788,7 @@ module Kettle
 
         def lockfile_normalization_command(project_root)
           platforms = lockfile_normalization_platforms(project_root)
-          ["bundle", "lock", *platforms.map { |platform| "--add-platform=#{platform}" }, "--update"]
+          ["bundle", "lock", *platforms.map { |platform| "--add-platform=#{platform}" }, "--update", "--add-checksums"]
         end
 
         def lockfile_normalization_platforms(project_root)

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

@@ -8,6 +8,7 @@
 
 source "https://gem.coop"
 
+git_source(:github) { |repo_name| "git@github.com:#{repo_name}.git" }
 git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" }
 git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" }
 

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

@@ -118,7 +118,7 @@ Gem::Specification.new do |spec|
   #       and preferably a modular one (see gemfiles/modular/*.gemfile).
 
   # Dev, Test, & Release Tasks
-  spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.24")             # ruby >= {KJ|MIN_TEST_RUBY}
+  spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.27")             # ruby >= {KJ|MIN_TEST_RUBY}
 
   # Security
   spec.add_development_dependency("bundler-audit", "~> 0.9.3")                      # ruby >= 2.0.0

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

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "{KJ|SHIMMED_GEM_NAME}"
 
   # Dev, Test, & Release Tasks
-  spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.24")             # ruby >= {KJ|MIN_TEST_RUBY}
+  spec.add_development_dependency("kettle-dev", "~> 3.0", ">= 3.0.27")             # ruby >= {KJ|MIN_TEST_RUBY}
 
   # Tasks
   spec.add_development_dependency "rake", "~> 13.0"

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.13"
+      VERSION = "7.1.14"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/jem.rb

@@ -5442,10 +5442,10 @@ module Kettle
       [
         {name: "appraisal2", source: %(gem "appraisal2", "~> 3.2", ">= 3.2.3"\n)},
         {name: "bundler-audit", source: %(gem "bundler-audit", "~> 0.9.3"\n)},
-        {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.0", ">= 3.0.24"\n)},
+        {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.0", ">= 3.0.27"\n)},
         {name: "kettle-drift", source: %(gem "kettle-drift", "~> 1.0", ">= 1.0.13"\n)},
-        {name: "kettle-family", source: %(gem "kettle-family", "~> 1.2", ">= 1.2.74"\n)},
-        {name: "kettle-jem", source: %(gem "kettle-jem", "~> 7.1", ">= 7.1.12"\n)},
+        {name: "kettle-family", source: %(gem "kettle-family", "~> 1.2", ">= 1.2.79"\n)},
+        {name: "kettle-jem", source: %(gem "kettle-jem", "~> 7.1", ">= 7.1.13"\n)},
         {name: "kettle-test", source: %(gem "kettle-test", "~> 2.0", ">= 2.0.21"\n)},
         {name: "rake", source: %(gem "rake", "~> 13.0"\n)},
         {name: "rspec", source: %(gem "rspec", "~> 3.0"\n)},
@@ -5537,6 +5537,12 @@ module Kettle
         preferred_path: entrypoint_path
       )
       entrypoint_path = namespace_superclass_details[:path] if namespace_superclass_details[:path]
+      namespace_kinds_override = existing_version_namespace_kinds(
+        project_root,
+        version_path,
+        namespace,
+        entrypoint_path: entrypoint_path
+      )
       version_gem_bootstrap_step_for_paths(
         project_root,
         facts,
@@ -5547,7 +5553,8 @@ module Kettle
         # the generated version file must reopen as that same class.
         manage_version_file: !templated_paths.include?(version_path) ||
           version_namespace_outer_kind_for_template(project_root, facts, entrypoint_path, version_path, namespace) == :class,
-        manage_signature_file: !templated_paths.include?(signature_path)
+        manage_signature_file: !templated_paths.include?(signature_path),
+        namespace_kinds_override: namespace_kinds_override
       )
     end
 
@@ -7912,6 +7919,8 @@ module Kettle
       end
 
       case file_type
+      when :gitignore
+        return merge_gitignore_template_source(template_content, destination_content)
       when :gemspec
         return merge_gemspec_template_source(template_content, destination_content, facts: facts, env: env)
       when :ruby, :gemfile, :rakefile, :appraisals
@@ -12291,6 +12300,7 @@ module Kettle
       relative_path = recipe.fetch(:target_path).to_s
       basename = File.basename(relative_path)
       extension = File.extname(relative_path).downcase
+      return :gitignore if basename == ".gitignore"
       return :gemfile if basename == "Gemfile" || basename.end_with?(".gemfile")
       return :appraisals if basename.start_with?("Appraisals") || basename == "Appraisal.root.gemfile"
       return :gemspec if basename.end_with?(".gemspec")
@@ -12311,6 +12321,40 @@ module Kettle
       :text
     end
 
+    def merge_gitignore_template_source(template_content, destination_content)
+      # Git ignore files have no parser-backed AST. Treat each non-comment line
+      # as a rule node, retain destination order and comments, and append only
+      # template rules that the destination does not already declare.
+      destination_rules = destination_content.lines.map(&:strip).reject { |line| line.empty? || line.start_with?("#") }.to_set
+      additions = []
+      pending_comments = []
+
+      template_content.lines.each do |line|
+        stripped = line.strip
+        if stripped.empty?
+          pending_comments << line unless pending_comments.empty?
+          next
+        end
+        if stripped.start_with?("#")
+          pending_comments << line
+          next
+        end
+        next if destination_rules.include?(stripped)
+
+        additions.concat(pending_comments)
+        additions << line
+        destination_rules << stripped
+        pending_comments = []
+      end
+
+      return destination_content if additions.empty?
+
+      output = destination_content.dup
+      output << "\n" unless output.empty? || output.end_with?("\n\n")
+      output << additions.join
+      ensure_trailing_newline(output)
+    end
+
     def apply_kettle_config_bootstrap(project_root, recipe, env: ENV, template_contents: nil)
       content = recipe_template_content(project_root, recipe, template_contents: template_contents)
       tokens = stringify_template_tokens(recipe.fetch(:template_tokens, {}))
@@ -14497,6 +14541,9 @@ module Kettle
       version = "0.0.1.pre" if version.empty?
       return {} if namespace.empty?
 
+      namespace_kinds = version_namespace_kinds_from_facts(facts)
+      outer_namespace_kind = namespace_kinds.fetch(namespace.split("::").length - 1, :module)
+
       version_rb = if facts.dig(:shim, :version_strategy).to_s == "shim"
         shim_version_file_content(
           namespace: namespace,
@@ -14504,7 +14551,13 @@ module Kettle
           replacement_require: facts.dig(:shim, :replacement_require)
         )
       else
-        version_gem_version_file_content(existing_version: "", namespace: namespace, version: version)
+        version_gem_version_file_content(
+          existing_version: "",
+          namespace: namespace,
+          version: version,
+          outer_namespace_kind: outer_namespace_kind,
+          namespace_kinds: namespace_kinds
+        )
       end
 
       {
@@ -14515,7 +14568,11 @@ module Kettle
           entrypoint_require: facts.dig(:rubygems, :entrypoint_require).to_s,
           dedicated: true
         ).chomp,
-        "KJ|VERSION_GEM:VERSION_RBS" => version_gem_signature_file_content(namespace: namespace).chomp
+        "KJ|VERSION_GEM:VERSION_RBS" => version_gem_signature_file_content(
+          namespace: namespace,
+          outer_namespace_kind: outer_namespace_kind,
+          namespace_kinds: namespace_kinds
+        ).chomp
       }
     end
 
@@ -15333,7 +15390,7 @@ module Kettle
     def main_gemfile_kettle_family_gem(package_name)
       return "" if package_name.to_s == "kettle-family"
 
-      %(gem "kettle-family", "~> 1.2", ">= 1.2.74"\n)
+      %(gem "kettle-family", "~> 1.2", ">= 1.2.79"\n)
     end
 
     def main_gemfile_nomono_bootstrap(package_name)
@@ -15417,12 +15474,13 @@ module Kettle
     end
 
     def version_gem_bootstrap_step_for_paths(project_root, facts, manage_version_file: true, manage_signature_file: true,
-      package_entrypoint_preexisting: true, preserve_version_module_include: nil)
+      package_entrypoint_preexisting: true, preserve_version_module_include: nil, namespace_kinds_override: {})
       package_name = facts.dig(:package, :name).to_s
       return {name: "version_gem_bootstrap", status: "unavailable", reason: "missing_package_facts"} if package_name.empty?
 
       entrypoint_require = facts.dig(:rubygems, :entrypoint_require).to_s
       entrypoint_require = package_name.tr("-", "/") if entrypoint_require.empty?
+      namespace = facts.dig(:rubygems, :namespace).to_s
       version_path = File.join("lib", entrypoint_require, "version.rb")
       entrypoint_path = version_gem_bootstrap_entrypoint_path(
         project_root,
@@ -15435,7 +15493,6 @@ module Kettle
       version_spec_path = File.join("spec", entrypoint_require, "version_spec.rb")
       signature_path = File.join("sig", "#{entrypoint_require}.rbs")
       legacy_signature_paths = legacy_rbs_signature_paths(project_root, entrypoint_require)
-      namespace = facts.dig(:rubygems, :namespace).to_s
       if namespace.empty?
         namespace = existing_entrypoint_version_namespace(
           project_root,
@@ -15475,14 +15532,17 @@ module Kettle
       version = "0.0.1.pre" if version.empty?
       changes = []
       current_entrypoint = read_project_file(project_root, entrypoint_path)
-      outer_namespace_kind = ruby_entrypoint_outer_namespace_kind(current_entrypoint, namespace)
-      namespace_kinds = version_namespace_kinds_from_facts(facts).merge(
-        existing_version_namespace_kinds(
-          project_root,
-          version_path,
-          namespace,
-          entrypoint_path: entrypoint_path
-        )
+      discovered_namespace_kinds = existing_version_namespace_kinds(
+        project_root,
+        version_path,
+        namespace,
+        entrypoint_path: entrypoint_path
+      )
+      namespace_kinds = version_namespace_kinds_from_facts(facts).merge(discovered_namespace_kinds)
+      namespace_kinds = namespace_kinds.merge(namespace_kinds_override)
+      outer_namespace_kind = namespace_kinds.fetch(
+        namespace.split("::").length - 1,
+        ruby_entrypoint_outer_namespace_kind(current_entrypoint, namespace)
       )
       preserve_version_module_include = existing_version_file_includes_version_module?(project_root, version_path) if preserve_version_module_include.nil?
 
@@ -15550,7 +15610,9 @@ module Kettle
             project_root,
             signature_path,
             legacy_signature_paths,
-            namespace: namespace
+            namespace: namespace,
+            outer_namespace_kind: outer_namespace_kind,
+            namespace_kinds: namespace_kinds
           )
         )
       end
@@ -15841,8 +15903,13 @@ module Kettle
       end
     end
 
-    def write_consolidated_version_signature(project_root, signature_path, legacy_signature_paths, namespace:)
-      template = version_gem_signature_file_content(namespace: namespace)
+    def write_consolidated_version_signature(project_root, signature_path, legacy_signature_paths, namespace:,
+      outer_namespace_kind: :module, namespace_kinds: {})
+      template = version_gem_signature_file_content(
+        namespace: namespace,
+        outer_namespace_kind: outer_namespace_kind,
+        namespace_kinds: namespace_kinds
+      )
       current = read_project_file(project_root, signature_path)
       merged = current
       legacy_signature_paths.each do |legacy_signature_path|
@@ -15932,7 +15999,7 @@ module Kettle
       "#{sections.reject(&:empty?).join("\n\n")}\n"
     end
 
-    def version_gem_signature_file_content(namespace:)
+    def version_gem_signature_file_content(namespace:, outer_namespace_kind: :module, namespace_kinds: {})
       body = [
         "module Version",
         "  VERSION: String",
@@ -15940,7 +16007,7 @@ module Kettle
         "VERSION: String"
       ]
 
-      "#{wrap_ruby_namespace(namespace, body).join("\n")}\n"
+      "#{wrap_ruby_namespace(namespace, body, outer_namespace_kind: outer_namespace_kind, namespace_kinds: namespace_kinds).join("\n")}\n"
     end
 
     def version_gem_bootstrap_entrypoint_content(content, namespace:, entrypoint_require:, namespace_superclasses: {}, version_require_path: nil)
@@ -18346,6 +18413,7 @@ module Kettle
     def default_template_strategy_config(template_root, target_path)
       return unless template_root.fetch(:kind) == "packaged"
       return {strategy: :merge, preference: :destination, add_template_only_nodes: true} if target_path.to_s == KETTLE_CONFIG_PATH
+      return {strategy: :merge, preference: :destination, add_template_only_nodes: true} if target_path.to_s == ".gitignore"
       return {strategy: :accept_template} if target_path.to_s == "CITATION.cff"
       return {strategy: :merge, preference: :destination, add_template_only_nodes: true} if target_path.to_s == "Rakefile"
       return {strategy: :accept_template} if version_gem_template_target_path?(target_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-jem
 version: !ruby/object:Gem::Version
-  version: 7.1.13
+  version: 7.1.14
 platform: ruby
 authors:
 - Peter H. Boling
@@ -976,10 +976,10 @@ licenses:
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://structuredmerge.org
-  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.13
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.13/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.14
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.14/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.13
+  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.14
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/kettle-jem