kettle-drift 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23e879797f1c1d7c8a61135b2d845b9c6911fc1d6c5eec4a7baa7128f80d3ebc
-  data.tar.gz: ee0d94f285a7589c6dab6a7cebd9c27a3ad4b87f3374536ffc3562190c7c5801
+  metadata.gz: d70a155dafab4151668f8bd2d870e2aef516f7c0a10d2af6e689c2ba5ef9a405
+  data.tar.gz: 33510c05d08a7ebbdc11a18607914f3c8fe741cabfbf43bdd342f21b2aeb7a48
 SHA512:
-  metadata.gz: 2aad73a71625265d883885adf52d8b7bd74ec0c651ec6637edafe39d5a104a7e37700b5a68868da8d8323e643ba3afde8125b763bf75b14da10578dd2d0249e2
-  data.tar.gz: a6e0a676d4127de1cac748262ff3f02f4a69527190b5a323b0cf9ddbdab04ba7dc72566d0b4c576cd3c89e4df6b2441b24e347143adacdb315b78e30cc6f72ff
+  metadata.gz: e02f71937a093bf9dcdea7e36eee0dde61ceb7560296ba5c9519c8a7fb00d103b324908bf32aa10b623e2fd748d2982fd78445280a6607cfc616ad4d59552901
+  data.tar.gz: e6b223fdce7e0e8f32ca9fa2414aeeee0330d69f190f044200465b17ce43526602fcf1cd2ed2f3901a6358cae13b680f35f43f4bbe7c58f0fed749a5958cfdc9

data/CHANGELOG.md

@@ -30,6 +30,41 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.0.15] - 2026-09-28
+
+- TAG: [v1.0.15][1.0.15t]
+- COVERAGE: 81.69% -- 455/557 lines in 14 files
+- BRANCH COVERAGE: 67.42% -- 149/221 branches in 14 files
+- 36.79% documented
+
+### Added
+
+- kettle-jem-template-20260913-001 - Templating now also surfaces a review
+  entry in `dependency_conflicts.resolve` when a direct development
+  dependency doesn't support one or more of this project's declared
+  `engines:` and has no template-managed modular home (e.g. `sqlite3` on
+  `jruby`). Review each entry and pick a resolution per the project's own
+  engine support needs.
+
+### Changed
+
+- [kc] kettle-jem/prepare: updated 12 project files:
+  - dependencies (12)
+
+- [kc] kettle-jem/template: updated 22 project files:
+  - code and tests (2)
+  - dependencies (1)
+  - other (1)
+  - workflows (18)
+
+### Fixed
+
+- Handle Windows path spellings when identifying template-managed drift files.
+
+- Keep drift lockfile paths project-relative across filesystem path aliases.
+
+- Resolve existing ancestor aliases when serializing paths for files not yet created.
+
 ## [1.0.14] - 2026-09-14
 
 - TAG: [v1.0.14][1.0.14t]
@@ -307,7 +342,9 @@ Please file a bug if you notice a violation of semantic versioning.
 
 - Initial release
 
-[Unreleased]: https://github.com/kettle-dev/kettle-drift/compare/v1.0.14...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-drift/compare/v1.0.15...HEAD
+[1.0.15]: https://github.com/kettle-dev/kettle-drift/compare/v1.0.14...v1.0.15
+[1.0.15t]: https://github.com/kettle-dev/kettle-drift/releases/tag/v1.0.15
 [1.0.14]: https://github.com/kettle-dev/kettle-drift/compare/v1.0.13...v1.0.14
 [1.0.14t]: https://github.com/kettle-dev/kettle-drift/releases/tag/v1.0.14
 [1.0.13]: https://github.com/kettle-dev/kettle-drift/compare/v1.0.12...v1.0.13

data/README.md

@@ -445,7 +445,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-0.542-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.557-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/kettle-dev/kettle-drift/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/drift/duplicate_line_validator.rb

@@ -179,11 +179,11 @@ module Kettle
         return [] unless File.directory?(template_dir)
 
         managed = []
-        Dir.glob(File.join(template_dir, "**", "*"), File::FNM_DOTMATCH).each do |src|
+        Dir.glob("**/*", File::FNM_DOTMATCH, base: template_dir).each do |rel|
+          src = File.join(template_dir, rel)
           next unless File.file?(src)
 
-          rel = src.sub(%r{^#{Regexp.escape(template_dir)}/?}, "")
-          rel = rel.sub(/\.example\z/, "")
+          rel = rel.delete_suffix(".example")
           next if rel.include?(".no-osc")
 
           dest = File.join(project_root, rel)

data/lib/kettle/drift/serializer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "json"
+require "pathname"
 
 module Kettle
   module Drift
@@ -74,11 +75,31 @@ module Kettle
           file = path.to_s
           return file if project_root.to_s.strip.empty?
 
-          root = File.expand_path(project_root.to_s)
-          absolute_file = File.expand_path(file)
-          return file unless absolute_file == root || absolute_file.start_with?("#{root}/")
+          root = canonical_path(project_root)
+          absolute_file = canonical_path(file)
+          relative = Pathname(absolute_file).relative_path_from(Pathname(root))
+          return file if relative.each_filename.first == ".."
 
-          absolute_file.delete_prefix("#{root}/").delete_prefix(root)
+          relative.to_s.tr("\\", "/").delete_prefix("./")
+        rescue ArgumentError
+          file
+        end
+
+        def canonical_path(path)
+          expanded = File.expand_path(path.to_s)
+          existing = expanded
+          suffix = []
+          until File.exist?(existing) || File.symlink?(existing)
+            parent = File.dirname(existing)
+            return expanded if parent == existing
+
+            suffix.unshift(File.basename(existing))
+            existing = parent
+          end
+
+          suffix.reduce(File.realpath(existing)) { |resolved, component| File.join(resolved, component) }
+        rescue SystemCallError
+          expanded
         end
       end
     end

data/lib/kettle/drift/version.rb

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

data/lib/kettle/drift.rb

@@ -82,14 +82,16 @@ module Kettle
       def target_files(project_root:, template_dir: nil)
         return Kettle::Drift::DuplicateLineValidator.template_managed_files(project_root: project_root, template_dir: template_dir) if template_dir
 
-        Dir.glob(File.join(project_root, "**", "*"), File::FNM_DOTMATCH).select do |path|
-          next false unless File.file?(path)
-          next false if EXCLUDED_FILE_EXTENSIONS.include?(File.extname(path).downcase)
-          next false if dependency_lockfile?(path)
-
-          relative = path.delete_prefix("#{project_root}/")
-          segments = relative.split("/")
-          segments.none? { |segment| segment.start_with?(".") || EXCLUDED_PATH_SEGMENTS.include?(segment) }
+        Dir.glob("**/*", File::FNM_DOTMATCH, base: project_root).filter_map do |relative|
+          path = File.join(project_root, relative)
+          next unless File.file?(path)
+          next if EXCLUDED_FILE_EXTENSIONS.include?(File.extname(path).downcase)
+          next if dependency_lockfile?(path)
+
+          segments = relative.tr("\\", "/").split("/")
+          next unless segments.none? { |segment| segment.start_with?(".") || EXCLUDED_PATH_SEGMENTS.include?(segment) }
+
+          path
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-drift
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Peter H. Boling
@@ -66,7 +66,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.5
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -164,7 +164,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.4
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.22
+        version: 2.0.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -184,7 +184,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.22
+        version: 2.0.23
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.2.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -204,7 +204,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -228,7 +228,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -238,7 +238,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: gitmoji-regex
   requirement: !ruby/object:Gem::Requirement
@@ -248,7 +248,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 2.0.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -258,7 +258,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 2.0.13
 description: "\U0001F372 Kettle::Drift tracks repeated adjacent-line chunks that usually
   signal template drift or copy/paste corruption."
 email:
@@ -292,10 +292,10 @@ licenses:
 - AGPL-3.0-only
 metadata:
   homepage_uri: https://kettle-drift.galtzo.com
-  source_code_uri: https://github.com/kettle-dev/kettle-drift/tree/v1.0.14
-  changelog_uri: https://github.com/kettle-dev/kettle-drift/blob/v1.0.14/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-drift/tree/v1.0.15
+  changelog_uri: https://github.com/kettle-dev/kettle-drift/blob/v1.0.15/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-drift/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-drift/1.0.14
+  documentation_uri: https://www.rubydoc.info/gems/kettle-drift/1.0.15
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-dev/kettle-drift/wiki
   news_uri: https://www.railsbling.com/tags/kettle-drift
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 4.0.20
 specification_version: 4
 summary: "\U0001F372 Detect duplicated adjacent lines introduced by template drift."
 test_files: []