token-resolver 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2614ef5d4abd4335b18fcfb4a75a7f5fff7e9285ad7690659e3028997b69e765
-  data.tar.gz: 477a74ae8456d26cd15648bb1e521786e047f906875050960f8b1376a99d2c12
+  metadata.gz: 2d0b29a16291b6af534e6da9b907ab056533cab2bd44504f3da0b9498f306b63
+  data.tar.gz: a8a2f4b21db6c3549f15a5cb451e956bf3340b21137832edd18b92d9b6755784
 SHA512:
-  metadata.gz: d7322c8f2d6ca25f538bc54f9450daf3edae06a07aee627909d1a01b431ba0d6a39f76234d1a9737807adf0c822055ce67ef36ff7166b615791b88b0a0fad7db
-  data.tar.gz: 393e05d3ab64f07d559bb0e2d4bbdfcd2bac219e05b04d7bdfc96d3cf72dd79403008cc062e69c68a6ccf6e5c5b8e2a053b7d9cc991d4bc2531a658848e2d487
+  metadata.gz: cc016ee7c380eefc3bb573eb8c83519e1ffe354f736e092f54dcd7b8e22caf9a4418137b5358700548658020a1142360c72dc4ba56ba2e7d41b0c0609993a9e4
+  data.tar.gz: 8726023b36d797327b5fd8a4c04ab75e4212625e915e545da2c66dd88442e3858f9542880f524c01937e95d8af22cc1ce9619e793b1e0ba4b8eadc30804ea048

data/CHANGELOG.md

@@ -30,6 +30,29 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [2.0.1] - 2026-05-31
+
+- TAG: [v2.0.1][2.0.1t]
+- COVERAGE: 100.00% -- 265/265 lines in 10 files
+- BRANCH COVERAGE: 100.00% -- 64/64 branches in 10 files
+- 93.55% documented
+
+### Added
+
+- Added StructuredMerge git diff driver config and local `.gitattributes`
+  entries generated by the current kettle-jem template.
+
+### Changed
+
+- Refreshed kettle-jem-managed project files, migrated template config to
+  `.structuredmerge/kettle-jem.yml`, and updated local development tooling
+  dependencies including `kettle-dev` 2.0.6 and `nomono` 1.0.2.
+
+### Fixed
+
+- Fixed generated documentation URLs that incorrectly pointed at a monorepo
+  `gems/token-resolver` path.
+
 ## [2.0.0] - 2026-05-27
 
 - TAG: [v2.0.0][2.0.0t]
@@ -145,7 +168,9 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
-[Unreleased]: https://github.com/kettle-rb/token-resolver/compare/v2.0.0...HEAD
+[Unreleased]: https://github.com/kettle-rb/token-resolver/compare/v2.0.1...HEAD
+[2.0.1]: https://github.com/kettle-rb/token-resolver/compare/v2.0.0...v2.0.1
+[2.0.1t]: https://github.com/kettle-rb/token-resolver/releases/tag/v2.0.1
 [2.0.0]: https://github.com/kettle-rb/token-resolver/compare/v1.0.2...v2.0.0
 [2.0.0t]: https://github.com/kettle-rb/token-resolver/releases/tag/v2.0.0
 [1.0.2]: https://github.com/kettle-rb/token-resolver/compare/v1.0.1...v1.0.2

data/CONTRIBUTING.md

@@ -102,13 +102,29 @@ Git hooks and commit message helpers (exe/kettle-commit-msg)
 - GIT_HOOK_FOOTER_SENTINEL: Required when footer append is enabled — a unique first-line sentinel to prevent duplicates
 - GIT_HOOK_FOOTER_APPEND_DEBUG: Extra debug output in the footer template (true/false)
 
+Git diff driver setup
+- Local setup writes repository `.gitattributes` entries so this checkout uses StructuredMerge semantic diffs.
+- Global setup registers `diff.smorg-*` commands once in the user Git config; use it when you work across several StructuredMerge-enabled repositories.
+- Include-file setup writes `.git/smorg/config` and includes it from local Git config, keeping command registrations out of the repository files.
+- Git hosting forges generally ignore external diff drivers, so pull request views may still show raw textual diffs even when local `git diff` uses semantic drivers.
+
+```console
+K_JEM_TEMPLATING=true bundle exec kettle-jem install
+```
+
+Troubleshooting Git diffs
+- Use `git diff --no-ext-diff` to compare against Git's built-in diff output.
+- Use `git diff --no-textconv` when a textconv projection obscures the raw file bytes you need to inspect.
+- If Git reports a missing `smorg-*` executable, rerun `bundle install` and the setup command above, then check `git config --get-regexp '^diff\.smorg-'`.
+- To remove managed local entries, run `K_JEM_TEMPLATING=true bundle exec kettle-jem install --undo`; remove global command registrations with `git config --global --unset-all diff.smorg-ruby.command`.
+
 For a quick starting point, this repository’s `mise.toml` defines the shared defaults, and `.env.local` can override them locally. Copy `.env.local.example` to `.env.local`, use `KEY=value` lines, and either activate `mise` in your shell or run commands through `mise exec -C /path/to/project -- ...`.
 
 ## Appraisals
 
 From time to time the [appraisal2][🚎appraisal2] gemfiles in `gemfiles/` will need to be updated.
 Generated appraisal and CI workflow floors are controlled by `ruby.test_minimum`
-in `.kettle-jem.yml`; this project was templated with `ruby.test_minimum: 3.2.0`.
+in `.structuredmerge/kettle-jem.yml`; this project was templated with `ruby.test_minimum: 3.2.0`.
 That value describes the lowest Ruby version expected to run the test/development
 toolchain, and it may be higher than the gemspec runtime floor.
 
@@ -233,9 +249,9 @@ NOTE: To build without signing the gem set `SKIP_GEM_SIGNING` to any value in th
 14. Run `bundle exec rake release` which will create a git tag for the version,
     push git commits and tags, and push the `.gem` file to the gem host configured in the gemspec.
 
-[📜src-gl]: https://gitlab.com/kettle-rb/token-resolver/-/tree/main/gems/token-resolver
-[📜src-cb]: https://codeberg.org/kettle-rb/token-resolver/src/branch/main/gems/token-resolver
-[📜src-gh]: https://github.com/kettle-rb/token-resolver/tree/main/gems/token-resolver
+[📜src-gl]: https://gitlab.com/kettle-rb/token-resolver
+[📜src-cb]: https://codeberg.org/kettle-rb/token-resolver
+[📜src-gh]: https://github.com/kettle-rb/token-resolver
 [🧪build]: https://github.com/kettle-rb/token-resolver/actions
 [🤝conduct]: https://github.com/kettle-rb/token-resolver/blob/main/CODE_OF_CONDUCT.md
 [🖐contrib-rocks]: https://contrib.rocks

data/README.md

@@ -1,17 +1,10 @@
-[![Galtzo FLOSS Logo by Aboling0, CC BY-SA 4.0][🖼️galtzo-floss-i]][🖼️galtzo-floss] [![ruby-lang Logo, Yukihiro Matsumoto, Ruby Visual Identity Team, CC BY-SA 2.5][🖼️ruby-lang-i]][🖼️ruby-lang] [![kettle-rb Logo by Aboling0, CC BY-SA 4.0][🖼️kettle-rb-i]][🖼️kettle-rb]
-
-[🖼️galtzo-floss-i]: https://logos.galtzo.com/assets/images/galtzo-floss/avatar-192px.svg
-[🖼️galtzo-floss]: https://discord.gg/3qme4XHNKN
-[🖼️ruby-lang-i]: https://logos.galtzo.com/assets/images/ruby-lang/avatar-192px.svg
-[🖼️ruby-lang]: https://www.ruby-lang.org/
-[🖼️kettle-rb-i]: https://logos.galtzo.com/assets/images/kettle-rb/avatar-192px.svg
-[🖼️kettle-rb]: https://github.com/kettle-rb
+<a href="https://github.com/kettle-rb"><img alt="kettle-rb Logo by Aboling0, CC BY-SA 4.0" src="https://logos.galtzo.com/assets/images/kettle-rb/avatar-128px.svg" width="14%" align="right"/></a>
 
 # 🪙 Token::Resolver
 
-[![Version][👽versioni]][👽version] [![GitHub tag (latest SemVer)][⛳️tag-img]][⛳️tag] [![License: AGPL-3.0-only OR PolyForm-Small-Business-1.0.0][📄license-img]][📄license] [![Downloads Rank][👽dl-ranki]][👽dl-rank] [![CodeCov Test Coverage][🏀codecovi]][🏀codecov] [![Coveralls Test Coverage][🏀coveralls-img]][🏀coveralls] [![QLTY Test Coverage][🏀qlty-covi]][🏀qlty-cov] [![QLTY Maintainability][🏀qlty-mnti]][🏀qlty-mnt] [![CI Heads][🚎3-hd-wfi]][🚎3-hd-wf] [![CI Runtime Dependencies @ HEAD][🚎12-crh-wfi]][🚎12-crh-wf] [![CI Current][🚎11-c-wfi]][🚎11-c-wf] [![CI Truffle Ruby][🚎9-t-wfi]][🚎9-t-wf] [![CI JRuby][🚎10-j-wfi]][🚎10-j-wf] [![Deps Locked][🚎13-🔒️-wfi]][🚎13-🔒️-wf] [![Deps Unlocked][🚎14-🔓️-wfi]][🚎14-🔓️-wf] [![CI Test Coverage][🚎2-cov-wfi]][🚎2-cov-wf] [![CI Style][🚎5-st-wfi]][🚎5-st-wf] [![CodeQL][🖐codeQL-img]][🖐codeQL]
+[![Version][👽versioni]][👽version] [![GitHub tag (latest SemVer)][⛳️tag-img]][⛳️tag] [![License: AGPL-3.0-only OR PolyForm-Small-Business-1.0.0][📄license-img]][📄license] [![Downloads Rank][👽dl-ranki]][👽dl-rank] [![CodeCov Test Coverage][🏀codecovi]][🏀codecov] [![Coveralls Test Coverage][🏀coveralls-img]][🏀coveralls] [![QLTY Test Coverage][🏀qlty-covi]][🏀qlty-cov] [![QLTY Maintainability][🏀qlty-mnti]][🏀qlty-mnt] [![CI Heads][🚎3-hd-wfi]][🚎3-hd-wf] [![CI Runtime Dependencies @ HEAD][🚎12-crh-wfi]][🚎12-crh-wf] [![CI Current][🚎11-c-wfi]][🚎11-c-wf] [![CI Truffle Ruby][🚎9-t-wfi]][🚎9-t-wf] [![CI JRuby][🚎10-j-wfi]][🚎10-j-wf] [![Deps Locked][🚎13-🔒️-wfi]][🚎13-🔒️-wf] [![Deps Unlocked][🚎14-🔓️-wfi]][🚎14-🔓️-wf] [![CI Test Coverage][🚎2-cov-wfi]][🚎2-cov-wf] [![CI Style][🚎5-st-wfi]][🚎5-st-wf]
 
-`if ci_badges.map(&:color).detect { it != "green"}` ☝️ [let me know][🖼️galtzo-floss], as I may have missed the [discord notification][🖼️galtzo-floss].
+`if ci_badges.map(&:color).detect { it != "green"}` ☝️ [let me know][✉️discord-invite], as I may have missed the [discord notification][✉️discord-invite].
 
 ---
 
@@ -26,7 +19,7 @@ I've summarized my thoughts in [this blog post](https://dev.to/galtzo/hostile-ta
 
 </details>
 
-## 🌻 Synopsis
+## 🌻 Synopsis <a href="https://discord.gg/3qme4XHNKN"><img alt="Galtzo FLOSS Logo by Aboling0, CC BY-SA 4.0" src="https://logos.galtzo.com/assets/images/galtzo-floss/avatar-128px.svg" width="8%" align="right"/></a> <a href="https://ruby-toolbox.com"><img alt="ruby-lang Logo, Yukihiro Matsumoto, Ruby Visual Identity Team, CC BY-SA 2.5" src="https://logos.galtzo.com/assets/images/ruby-lang/avatar-128px.svg" width="8%" align="right"/></a>
 
 Token::Resolver is a configurable PEG-based token parser and resolver for structured token detection and replacement in arbitrary text.
 
@@ -36,7 +29,7 @@ Detects structured tokens like `{KJ|GEM_NAME}` in any file format and resolves t
 # One-liner: parse and resolve
 result = Token::Resolver.resolve(
   "Hello {KJ|NAME}, welcome to {KJ|PROJECT}!",
-  {"KJ|NAME" => "World", "KJ|PROJECT" => "my-app"},
+  {"KJ|NAME" => "World", "KJ|PROJECT" => "my-app"}
 )
 # => "Hello World, welcome to my-app!"
 ```
@@ -172,7 +165,7 @@ doc.text_only?  # => false
 # Resolve tokens
 result = Token::Resolver.resolve(
   "Deploy {KJ|GEM_NAME} to {KJ|GH_ORG}",
-  {"KJ|GEM_NAME" => "my-gem", "KJ|GH_ORG" => "my-org"},
+  {"KJ|GEM_NAME" => "my-gem", "KJ|GH_ORG" => "my-org"}
 )
 # => "Deploy my-gem to my-org"
 ```
@@ -200,7 +193,7 @@ Token::Resolver.resolve("{KJ|MISSING}", {}, on_missing: :remove)
 config = Token::Resolver::Config.new(
   pre: "<<",
   post: ">>",
-  separators: [":"],
+  separators: [":"]
 )
 Token::Resolver.resolve("Hello <<NS:NAME>>!", {"NS:NAME" => "World"}, config: config)
 # => "Hello World!"
@@ -211,7 +204,7 @@ Token::Resolver.resolve("Hello <<NS:NAME>>!", {"NS:NAME" => "World"}, config: co
 ```ruby
 # Tokens like {KJ|SECTION:SUBSECTION}
 config = Token::Resolver::Config.new(
-  separators: ["|", ":"],  # First boundary uses |, second uses :, rest repeat :
+  separators: ["|", ":"]  # First boundary uses |, second uses :, rest repeat :
 )
 doc = Token::Resolver.parse("{KJ|META:AUTHOR}", config: config)
 doc.tokens.first.key       # => "KJ|META:AUTHOR"
@@ -357,6 +350,8 @@ To say "thanks!" ☝️ Join the Discord or 👇️ send money.
 
 ### Please give the project a star ⭐ ♥.
 
+Many parts of this project are actively managed by a [kettle-jem](https://github.com/structuredmerge/structuredmerge-ruby/tree/main/gems/kettle-jem) smart template utilizing [StructuredMerge.org](https://structuredmerge.org) merge contracts.
+
 Thanks for RTFM. ☺️
 
 [⛳liberapay-img]: https://img.shields.io/liberapay/goal/pboling.svg?logo=liberapay&color=a51611&style=flat
@@ -396,7 +391,7 @@ Thanks for RTFM. ☺️
 [✉️ruby-friends]: https://app.daily.dev/squads/rubyfriends
 
 [✇bundle-group-pattern]: https://gist.github.com/pboling/4564780
-[⛳️gem-namespace]: https://github.com/kettle-rb/token-resolver/tree/main/gems/token-resolver
+[⛳️gem-namespace]: https://github.com/kettle-rb/token-resolver
 [⛳️namespace-img]: https://img.shields.io/badge/namespace-Token::Resolver-3C2D2D.svg?style=square&logo=ruby&logoColor=white
 [⛳️gem-name]: https://bestgems.org/gems/token-resolver
 [⛳️name-img]: https://img.shields.io/badge/name-token--resolver-3C2D2D.svg?style=square&logo=rubygems&logoColor=red
@@ -436,11 +431,11 @@ Thanks for RTFM. ☺️
 [💁🏼‍♂️peterboling]: http://www.peterboling.com
 [🚂railsbling]: http://www.railsbling.com
 [📜src-gl-img]: https://img.shields.io/badge/GitLab-FBA326?style=for-the-badge&logo=Gitlab&logoColor=orange
-[📜src-gl]: https://gitlab.com/kettle-rb/token-resolver/-/tree/main/gems/token-resolver
+[📜src-gl]: https://gitlab.com/kettle-rb/token-resolver
 [📜src-cb-img]: https://img.shields.io/badge/CodeBerg-4893CC?style=for-the-badge&logo=CodeBerg&logoColor=blue
-[📜src-cb]: https://codeberg.org/kettle-rb/token-resolver/src/branch/main/gems/token-resolver
+[📜src-cb]: https://codeberg.org/kettle-rb/token-resolver
 [📜src-gh-img]: https://img.shields.io/badge/GitHub-238636?style=for-the-badge&logo=Github&logoColor=green
-[📜src-gh]: https://github.com/kettle-rb/token-resolver/tree/main/gems/token-resolver
+[📜src-gh]: https://github.com/kettle-rb/token-resolver
 [📜docs-cr-rd-img]: https://img.shields.io/badge/RubyDoc-Current_Release-943CD2?style=for-the-badge&logo=readthedocs&logoColor=white
 [📜docs-head-rd-img]: https://img.shields.io/badge/YARD_on_Galtzo.com-HEAD-943CD2?style=for-the-badge&logo=readthedocs&logoColor=white
 [📜gl-wiki]: https://gitlab.com/kettle-rb/token-resolver/-/wikis/home
@@ -459,8 +454,6 @@ Thanks for RTFM. ☺️
 [🏀codecovi]: https://codecov.io/gh/kettle-rb/token-resolver/graph/badge.svg
 [🏀coveralls]: https://coveralls.io/github/kettle-rb/token-resolver?branch=main
 [🏀coveralls-img]: https://coveralls.io/repos/github/kettle-rb/token-resolver/badge.svg?branch=main
-[🖐codeQL]: https://github.com/kettle-rb/token-resolver/security/code-scanning
-[🖐codeQL-img]: https://github.com/kettle-rb/token-resolver/actions/workflows/codeql-analysis.yml/badge.svg
 [🚎ruby-3.2-wf]: https://github.com/kettle-rb/token-resolver/actions/workflows/ruby-3.2.yml
 [🚎ruby-3.3-wf]: https://github.com/kettle-rb/token-resolver/actions/workflows/ruby-3.3.yml
 [🚎ruby-3.4-wf]: https://github.com/kettle-rb/token-resolver/actions/workflows/ruby-3.4.yml

data/lib/token/resolver/version.rb

@@ -3,7 +3,7 @@
 module Token
   module Resolver
     module Version
-      VERSION = "2.0.0"
+      VERSION = "2.0.1"
     end
     VERSION = Version::VERSION # Traditional Constant Location
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: token-resolver
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Peter H. Boling
@@ -80,7 +80,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -281,10 +281,10 @@ licenses:
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://token-resolver.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/token-resolver/tree/v2.0.0
-  changelog_uri: https://github.com/kettle-rb/token-resolver/blob/v2.0.0/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/token-resolver/tree/v2.0.1
+  changelog_uri: https://github.com/kettle-rb/token-resolver/blob/v2.0.1/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/token-resolver/issues
-  documentation_uri: https://www.rubydoc.info/gems/token-resolver/2.0.0
+  documentation_uri: https://www.rubydoc.info/gems/token-resolver/2.0.1
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-rb/token-resolver/wiki
   news_uri: https://www.railsbling.com/tags/token-resolver