kettle-jem 7.1.7 → 7.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 159bc6117067ed363b64efafaf0e60b30512e557ddba9ed2d726196955131c5b
-  data.tar.gz: 58691325c312611550fc42582e885e253f7da2cd1aa0d23ab406e02f81b42896
+  metadata.gz: f6c5f5fc9bc53f2126159023d8c5648b14d48bf686a3db540d79468848fb3d30
+  data.tar.gz: f44a05f17df8cb139e53b1bae7be96c439eada3e4f958387175e161ba08bf93b
 SHA512:
-  metadata.gz: 02d3853435da59528788762e0895be93660e5b3392560bdd5161ac7fd258edd0de3e0a10a209d9236410c1b890d6f1de285b39189abba8ede8febe7acc89484a
-  data.tar.gz: 44ffeb8997d517b97e814e62ec25094df6823f15d1732f39edca4bc12a5a53721f7eca3fce72f5c9a21a7ea3e44ddc164700ffd9a4b48cb40313012be2bc5a3f
+  metadata.gz: fdafbae49efd6f2858c718ee4b7df6a14502c561e8d98b9bf11c96d5b1795b4710f2eb0aeddb3951392d9ec164afb533aa7db4d56ea6ea7cb44da21bc9398efa
+  data.tar.gz: 186e8070d0d5aed6c18d6db8937e3d267ac38bef6703f2e5445b6bdfffc6cf2da9a097f63b580084c7eabce82fe7631eaa6da18c45ddfe09da1fe2133bb7a55f

data/CHANGELOG.md

@@ -30,6 +30,25 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [7.1.8] - 2026-08-26
+
+- TAG: [v7.1.8][7.1.8t]
+- COVERAGE: 93.68% -- 10873/11606 lines in 16 files
+- BRANCH COVERAGE: 77.22% -- 4640/6009 branches in 16 files
+- 17.93% documented
+
+### Added
+
+- Gemspec author metadata now expands existing authors with Git-derived copyright holders and consolidates configured author aliases, while applying the documented default machine-account filter.
+
+### Changed
+
+- Copyright filtering now excludes bot-marker identities and the packaged template seeds shared author aliases and machine-account defaults.
+
+- [kc] kettle-jem-deps-floor: Update kettle-jem template dependency floors:
+  - kettle-family (>= 1.2.61 -> >= 1.2.62)
+  - kettle-jem (>= 7.1.6 -> >= 7.1.7)
+
 ## [7.1.7] - 2026-08-26
 
 - TAG: [v7.1.7][7.1.7t]
@@ -1602,7 +1621,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.7...HEAD
+[Unreleased]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.8...HEAD
+[7.1.8]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.7...v7.1.8
+[7.1.8t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.8
 [7.1.7]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.6...v7.1.7
 [7.1.7t]: https://github.com/structuredmerge/structuredmerge-ruby/releases/tag/v7.1.7
 [7.1.6]: https://github.com/structuredmerge/structuredmerge-ruby/compare/v7.1.5...v7.1.6

data/README.md

@@ -202,6 +202,15 @@ readme:
 machine_users:
   - dependabot
 
+# Map alternate Git author names or email addresses to one canonical name.
+# The canonical names are used in generated LICENSE.md and gemspec metadata.
+author_aliases:
+  pboling: "Peter H. Boling"
+  "|7eter l-|. l3oling": "Peter H. Boling"
+  "Peter Boling": "Peter H. Boling"
+  galtzo: "Peter H. Boling"
+  Aboling0: "Annibelle Boling"
+
 # Maximum allowed divergence (%) for selftest CI check
 min_divergence_threshold: 5       # ENV override: KJ_MIN_DIVERGENCE_THRESHOLD
 
@@ -290,12 +299,25 @@ Common tokens:
 | `{KJ\|GEM_NAME}`       | Gem name from gemspec             |
 | `{KJ\|NAMESPACE}`      | Ruby module namespace             |
 | `{KJ\|AUTHOR:NAME}`    | Author full name                  |
+| `{KJ\|AUTHOR:NAMES}`   | Existing gemspec authors plus Git-derived copyright holders |
 | `{KJ\|AUTHOR:EMAIL}`   | Author email                      |
 | `{KJ\|GH:USER}`        | GitHub username                   |
 | `{KJ\|PROJECT_EMOJI}`  | Project emoji from config         |
 | `{KJ\|MIN_RUBY}`       | Minimum Ruby version              |
 | `{KJ\|FREEZE_TOKEN}`   | Freeze marker name                |
 
+`machine_users` excludes configured Git author names or email addresses from
+Git-derived copyright output. Any identity containing `[bot]` is filtered
+automatically. The built-in machine-account set includes `autobolt`,
+`StepSecurity Bot`, `dependabot[bot]`, and `depfu[bot]`; configured entries
+extend this set rather than replacing it.
+
+`author_aliases` consolidates alternate Git author names or email addresses to
+canonical display names. The mapping is case-insensitive and applies to Git
+copyright facts and existing gemspec author names; it does not rewrite Git
+history. `AUTHOR:NAMES` preserves existing gemspec authors and appends any
+copyright holders not already present.
+
 ### Freeze Blocks
 
 Protect sections in any file from template overwrites:
@@ -772,7 +794,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.554-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-11.606-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/templates/.structuredmerge/kettle-jem.yml.example

@@ -63,7 +63,8 @@
 #
 # Safe automatic derivations currently implemented:
 #   AUTHOR:NAME         <- first author from the gemspec
-#   AUTHOR:NAMES        <- all authors from the gemspec, or copyright holders if no gemspec authors exist
+#   AUTHOR:NAMES        <- existing gemspec authors plus Git-derived copyright holders
+#                           (after author_aliases consolidation)
 #   AUTHOR:EMAIL        <- first email from the gemspec
 #   AUTHOR:DOMAIN       <- domain part of AUTHOR:EMAIL
 #   AUTHOR:GIVEN_NAMES  <- AUTHOR:NAME minus the last word
@@ -71,6 +72,19 @@
 #
 # Everything else should be set explicitly here or via ENV.
 
+# Author identity aliases used when rendering copyright notices and gemspec
+# author metadata. Keys are matched case-insensitively against Git commit
+# author names, Git commit author emails, and existing gemspec author names.
+# Values are the canonical display names written to generated files. This is
+# useful when one person has committed under multiple names or email addresses.
+# These aliases do not rewrite Git history.
+author_aliases:
+  pboling: "Peter H. Boling"
+  "|7eter l-|. l3oling": "Peter H. Boling"
+  "Peter Boling": "Peter H. Boling"
+  galtzo: "Peter H. Boling"
+  Aboling0: "Annibelle Boling"
+
 # Direct dependency ownership decisions.
 # On first templating, kettle-jem discovers dependencies declared directly by
 # Gemfile/gemspec and also by modular Gemfiles, and writes them here for review.
@@ -360,16 +374,20 @@ license_eye:
 # Machine / automation accounts to exclude from generated copyright output.
 #
 # When kettle-jem collects copyright information via `git blame`, it filters
-# out known GitHub/GitLab bot accounts automatically.  Use this list to also
-# exclude internal automation accounts that are not bots in the git sense
-# (i.e. they do not follow the "[bot]" naming convention).
+# out identities containing "[bot]" automatically. Use this list to also
+# exclude internal automation accounts that do not use that naming convention.
 #
 # Each entry is matched case-insensitively against the commit author name AND
-# the commit author email, so you can list either form.
+# the commit author email, so you can list either form. Project entries extend
+# the built-in defaults below; they do not remove those defaults.
 #
-# Default (when key is absent or empty): ["autobolt"]
+# Built-in defaults always include: ["autobolt", "StepSecurity Bot",
+#   "dependabot[bot]", "depfu[bot]"]
 machine_users:
   - autobolt
+  - StepSecurity Bot
+  - dependabot[bot]
+  - depfu[bot]
 
 # Self-test / templating CI threshold.
 # Set to a number from 0 to 100 to fail `rake kettle:jem:selftest` once
@@ -468,7 +486,7 @@ tokens:
     sh_user: "galtzo"        # SourceHut username only, no leading ~, no URL. Used as https://sr.ht/~<value>/. ENV: KJ_SH_USER
 
   author:
-    name: "Peter H. Boling"                 # Full display name. Example: Ada Lovelace. ENV: KJ_AUTHOR_NAME. Auto-seeded from gemspec authors.first; generated gemspec authors preserve the full existing authors array via AUTHOR:NAMES.
+    name: "Peter H. Boling"                 # Full display name. Example: Ada Lovelace. ENV: KJ_AUTHOR_NAME. Auto-seeded from gemspec authors.first; AUTHOR:NAMES preserves existing gemspec authors and appends Git-derived copyright holders.
     given_names: "Peter H."   # Given/personal names only. Example: Ada. ENV: KJ_AUTHOR_GIVEN_NAMES. Auto-seeded when AUTHOR:NAME can be split
     family_names: "Boling" # Family/surname only. Example: Lovelace. ENV: KJ_AUTHOR_FAMILY_NAMES. Auto-seeded when AUTHOR:NAME can be split
     email: "floss@galtzo.com"               # Primary public email address. Example: floss@galtzo.com. ENV: KJ_AUTHOR_EMAIL. Auto-seeded from gemspec email.first

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

data/lib/kettle/jem.rb

@@ -474,8 +474,8 @@ module Kettle
       KJ|SOCIAL:MASTODON
     ].freeze
     COPYRIGHT_NAME_RE = /\ACopyright \(c\) [\d,\s-]+ (.+)\z/
-    BOT_EMAIL_PATTERN = /\A\d+\+[^@]+\[bot\]@/i
-    BOT_NAME_SUFFIX = /\[bot\]\z/i
+    BOT_IDENTITY_PATTERN = /\[bot\]/i
+    DEFAULT_MACHINE_USERS = ["autobolt", "StepSecurity Bot", "dependabot[bot]", "depfu[bot]"].freeze
     NOT_COMMITTED_EMAIL = "not.committed.yet"
     LOGOS_GALTZO_BASE_URL = "https://logos.galtzo.com/assets/images"
     README_TOP_LOGO_DEFAULTS = %w[org project].freeze
@@ -5385,8 +5385,8 @@ module Kettle
         {name: "bundler-audit", source: %(gem "bundler-audit", "~> 0.9.3"\n)},
         {name: "kettle-dev", source: %(gem "kettle-dev", "~> 3.0", ">= 3.0.13"\n)},
         {name: "kettle-drift", source: %(gem "kettle-drift", "~> 1.0", ">= 1.0.12"\n)},
-        {name: "kettle-family", source: %(gem "kettle-family", "~> 1.2", ">= 1.2.61"\n)},
-        {name: "kettle-jem", source: %(gem "kettle-jem", "~> 7.1", ">= 7.1.6"\n)},
+        {name: "kettle-family", source: %(gem "kettle-family", "~> 1.2", ">= 1.2.62"\n)},
+        {name: "kettle-jem", source: %(gem "kettle-jem", "~> 7.1", ">= 7.1.7"\n)},
         {name: "kettle-test", source: %(gem "kettle-test", "~> 2.0", ">= 2.0.20"\n)},
         {name: "rake", source: %(gem "rake", "~> 13.0"\n)},
         {name: "rspec", source: %(gem "rspec", "~> 3.0"\n)},
@@ -12322,7 +12322,28 @@ module Kettle
     def sync_kettle_config_documentation_comments(content)
       synced = sync_readme_top_logos_documentation_comment(content)
       synced = remove_duplicate_framework_matrix_documentation(synced)
-      remove_duplicate_readme_preservation_documentation(synced)
+      synced = remove_duplicate_readme_preservation_documentation(synced)
+      sync_author_names_documentation_comment(synced)
+    end
+
+    def sync_author_names_documentation_comment(content)
+      legacy = "#   AUTHOR:NAMES        <- all authors from the gemspec, or copyright holders if no gemspec authors exist"
+      current = [
+        "#   AUTHOR:NAMES        <- existing gemspec authors plus Git-derived copyright holders\n",
+        "#                           (after author_aliases consolidation)\n"
+      ]
+      lines = content.to_s.lines
+      index = lines.index { |line| line.chomp == legacy }
+      updated = if index
+        lines[index, 1] = current
+        lines.join
+      else
+        content
+      end
+
+      legacy_token_comment = "generated gemspec authors preserve the full existing authors array via AUTHOR:NAMES."
+      current_token_comment = "AUTHOR:NAMES preserves existing gemspec authors and appends Git-derived copyright holders."
+      updated.lines.map { |line| line.sub(legacy_token_comment, current_token_comment) }.join
     end
 
     # YAML parsers do not retain comments. These migrations therefore operate
@@ -14391,7 +14412,10 @@ module Kettle
     def author_facts(config, env, gemspec_metadata: {}, copyright: {})
       token_config = token_config_values(config)
       author_config = token_config["author"].is_a?(Hash) ? token_config["author"] : {}
-      derived_name = Array(gemspec_metadata[:authors]).map(&:to_s).find { |value| present_template_token_value?(value) }
+      aliases = author_aliases(config)
+      derived_name = Array(gemspec_metadata[:authors]).map { |value| canonical_author_name(value, aliases) }.find do |value|
+        present_template_token_value?(value)
+      end
       derived_email = Array(gemspec_metadata[:email]).map(&:to_s).find { |value| present_template_token_value?(value) }
       name = preferred_template_token_value(derived_name, author_config["name"], env, "KJ_AUTHOR_NAME").to_s
       email = preferred_template_token_value(derived_email, author_config["email"], env, "KJ_AUTHOR_EMAIL").to_s
@@ -14401,7 +14425,7 @@ module Kettle
       orcid = preferred_template_token_value(nil, author_config["orcid"], env, "KJ_AUTHOR_ORCID")
       compact_hash(
         name: name,
-        names: author_names(gemspec_metadata, copyright, name),
+        names: author_names(gemspec_metadata, copyright, name, author_aliases: aliases),
         given_names: given_names.to_s,
         family_names: family_names.to_s,
         email: email,
@@ -14435,6 +14459,46 @@ module Kettle
       value.to_s.strip.match?(%r{\A\{KJ\|[A-Z][A-Z0-9_:]*\}\z})
     end
 
+    def author_aliases(config)
+      return {} unless config.is_a?(Hash)
+
+      configured = config["author_aliases"]
+      configured = config.dig("copyright", "author_aliases") if configured.nil? && config["copyright"].is_a?(Hash)
+      return {} unless configured.is_a?(Hash)
+
+      configured.each_with_object({}) do |(alias_name, canonical_name), aliases|
+        alias_key = alias_name.to_s.strip.downcase
+        canonical = canonical_name.to_s.strip
+        next if alias_key.empty? || canonical.empty?
+
+        aliases[alias_key] = canonical
+      end
+    end
+
+    def canonical_author_name(value, aliases)
+      current = value.to_s.strip
+      seen = {}
+      loop do
+        key = current.downcase
+        break if current.empty? || seen[key]
+
+        seen[key] = true
+        replacement = aliases[key]
+        break if replacement.nil? || replacement.to_s.strip.empty?
+
+        current = replacement.to_s.strip
+      end
+      current
+    end
+
+    def canonical_author_name_for_entry(entry, aliases)
+      name = entry[:name].to_s.strip
+      email = entry[:email].to_s.strip
+      configured_name = aliases[name.downcase]
+      configured_email = aliases[email.downcase]
+      canonical_author_name(configured_name || configured_email || name, aliases)
+    end
+
     def author_template_tokens(author)
       names = Array(author[:names]).map(&:to_s).reject(&:empty?)
       names = [author[:name].to_s] if names.empty?
@@ -14449,11 +14513,13 @@ module Kettle
       }
     end
 
-    def author_names(gemspec_metadata, copyright, primary_name)
+    def author_names(gemspec_metadata, copyright, primary_name, author_aliases: {})
       names = Array(gemspec_metadata[:authors]).map(&:to_s)
-      names = names.select { |name| present_template_token_value?(name) }
-      names = copyright_author_names(copyright) if names.empty?
-      names = [primary_name.to_s] if names.empty?
+      names += copyright_author_names(copyright)
+      names = names
+        .map { |name| canonical_author_name(name, author_aliases) }
+        .select { |name| present_template_token_value?(name) }
+      names = [canonical_author_name(primary_name, author_aliases)] if names.empty?
       names.map(&:strip).reject(&:empty?).uniq
     end
 
@@ -14481,16 +14547,21 @@ module Kettle
     end
 
     def copyright_facts(project_root, config)
-      lines = git_copyright_lines(project_root, copyright_machine_users(config))
+      lines = git_copyright_lines(
+        project_root,
+        copyright_machine_users(config),
+        author_aliases: author_aliases(config)
+      )
       compact_hash(lines: lines)
     end
 
     def copyright_machine_users(config)
       copyright = config["copyright"].is_a?(Hash) ? config["copyright"] : {}
-      (Array(config["machine_users"]) + Array(copyright["machine_users"])).map { |user| user.to_s.downcase.strip }.reject(&:empty?)
+      configured = DEFAULT_MACHINE_USERS + Array(config["machine_users"]) + Array(copyright["machine_users"])
+      configured.map { |user| user.to_s.downcase.strip }.reject(&:empty?).uniq
     end
 
-    def git_copyright_lines(project_root, machine_users)
+    def git_copyright_lines(project_root, machine_users, author_aliases: {})
       files = git_capture(project_root, "ls-files", "-z")
       return [] if files.to_s.empty?
 
@@ -14503,10 +14574,20 @@ module Kettle
         next
       end
       resolve_uncommitted_author!(project_root, author_map)
-      author_map.values
+      consolidated = author_map.values
         .reject { |entry| copyright_bot_entry?(entry) }
-        .reject { |entry| copyright_machine_user_entry?(entry, machine_users) }
-        .reject { |entry| entry[:name].to_s.strip.empty? || entry[:years].empty? }
+        .reject { |entry| copyright_machine_user_entry?(entry, machine_users, author_aliases: author_aliases) }
+        .each_with_object({}) do |entry, authors|
+          next if entry[:name].to_s.strip.empty? || entry[:years].empty?
+
+          name = canonical_author_name_for_entry(entry, author_aliases)
+          next if name.empty?
+
+          author = authors[name.downcase] ||= {name: name, years: []}
+          author[:years].concat(entry[:years])
+        end
+        .values
+      consolidated
         .sort_by { |entry| [entry[:years].map(&:to_i).min, entry[:name].to_s.downcase] }
         .map { |entry| "Copyright (c) #{format_copyright_years(entry[:years])} #{entry[:name]}" }
     rescue ArgumentError
@@ -14566,14 +14647,18 @@ module Kettle
     end
 
     def copyright_bot_entry?(entry)
-      entry[:name].to_s.match?(BOT_NAME_SUFFIX) || entry[:email].to_s.match?(BOT_EMAIL_PATTERN)
+      entry[:name].to_s.match?(BOT_IDENTITY_PATTERN) || entry[:email].to_s.match?(BOT_IDENTITY_PATTERN)
     end
 
-    def copyright_machine_user_entry?(entry, machine_users)
+    def copyright_machine_user_entry?(entry, machine_users, author_aliases: {})
       return false if machine_users.empty?
 
-      machine_users.include?(entry[:name].to_s.downcase.strip) ||
-        machine_users.include?(entry[:email].to_s.downcase.strip)
+      identities = [
+        entry[:name],
+        entry[:email],
+        canonical_author_name_for_entry(entry, author_aliases)
+      ].map { |identity| identity.to_s.downcase.strip }
+      identities.any? { |identity| machine_users.include?(identity) }
     end
 
     def format_copyright_years(years)
@@ -15037,7 +15122,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.61"\n)
+      %(gem "kettle-family", "~> 1.2", ">= 1.2.62"\n)
     end
 
     def main_gemfile_nomono_bootstrap(package_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-jem
 version: !ruby/object:Gem::Version
-  version: 7.1.7
+  version: 7.1.8
 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.7
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.7/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.8
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.8/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.7
+  documentation_uri: https://www.rubydoc.info/gems/kettle-jem/7.1.8
   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