kettle-dev 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cad2d78d297d0e69cd016624ff87dba0c5fa4bd3af5399d7c97c4e8fcc2af82a
-  data.tar.gz: '08f58025922178025f79d3ef3004b35f9207e23764c490587ec3ed5dfc240ca5'
+  metadata.gz: 73ca5267629934af0b0f044598295a93c287cbace6c0ac2f5e2d1a701a72ca89
+  data.tar.gz: 1743ac37975a516f979d135d52c62b8a9fa28171d6df1a82fb58cce4d1676ea1
 SHA512:
-  metadata.gz: 12563697c8b719fc13ded6b096fcd92266dbb98f9f8c87a21aad756bebbe2065f7dc17e2be982d1a3765a15c8c3b8cbd0eec88642fc7fb90600e1be88c4db149
-  data.tar.gz: e3ce95406792e64d08da4db003a5771c45c975155c417176e10972e13ad0e012ed006aa9193b81b1fbecc96d59edb752cba80a26a538c60f824c52228e6110e9
+  metadata.gz: afd0cdb05a6f08db4665b634cf38d4f959d08ea73ff526f1757d9168d3aab0a6a6d81ba90a5f20905f8888bd88bbbe55c1c53d15f0d1898202448dac0f204bd3
+  data.tar.gz: 92a005b6bb76771bffe3e0e3e3762bc6e11699286119dc009cb61e4c72278666552e07cf0a547c215c586caf7abeea7305767fce2d008342758b5d8fe80cc676

data/CHANGELOG.md

@@ -30,6 +30,21 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.4] - 2025-11-28
+
+- TAG: [v1.2.4][1.2.4t]
+- COVERAGE: 93.53% -- 4701/5026 lines in 31 files
+- BRANCH COVERAGE: 76.61% -- 1913/2497 branches in 31 files
+- 69.78% documented
+
+### Fixed
+
+- Fixed comment deduplication in `restore_custom_leading_comments` to prevent accumulation across multiple template runs
+  - Comments from destination are now deduplicated before being merged back into result
+  - Fixes issue where `:replace` strategy (used by `kettle-dev-setup --force`) would accumulate duplicate comments
+  - Ensures truly idempotent behavior when running templating multiple times on the same file
+  - Example: `frozen_string_literal` comments no longer multiply from 1→4→5→6 on repeated runs
+
 ## [1.2.3] - 2025-11-28
 
 - TAG: [v1.2.3][1.2.3t]
@@ -1507,7 +1522,9 @@ Please file a bug if you notice a violation of semantic versioning.
   - Selecting will run the selected workflow via `act`
   - This may move to its own gem in the future.
 
-[Unreleased]: https://github.com/kettle-rb/kettle-dev/compare/v1.2.3...HEAD
+[Unreleased]: https://github.com/kettle-rb/kettle-dev/compare/v1.2.4...HEAD
+[1.2.4]: https://github.com/kettle-rb/kettle-dev/compare/v1.2.3...v1.2.4
+[1.2.4t]: https://github.com/kettle-rb/kettle-dev/releases/tag/v1.2.4
 [1.2.3]: https://github.com/kettle-rb/kettle-dev/compare/v1.2.2...v1.2.3
 [1.2.3t]: https://github.com/kettle-rb/kettle-dev/releases/tag/v1.2.3
 [1.2.2]: https://github.com/kettle-rb/kettle-dev/compare/v1.2.1...v1.2.2

data/README.md

@@ -1026,7 +1026,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-5.010-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-5.026-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: 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/README.md.example

@@ -548,7 +548,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-5.010-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-5.026-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: 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/Rakefile.example

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# kettle-dev Rakefile v1.2.3 - 2025-11-28
+# kettle-dev Rakefile v1.2.4 - 2025-11-28
 # Ruby 2.3 (Safe Navigation) or higher required
 #
 # MIT License (see License.txt)

data/lib/kettle/dev/source_merger.rb

@@ -590,21 +590,54 @@ module Kettle
       end
 
       def restore_custom_leading_comments(dest_content, merged_content)
-        block = leading_comment_block(dest_content)
-        return merged_content if block.strip.empty?
+        # Extract and deduplicate leading comments from dest
+        dest_block = leading_comment_block(dest_content)
+        return merged_content if dest_block.strip.empty?
 
-        # Check if the merged content already starts with this block
-        # Use normalized comparison to handle whitespace differences
+        # Parse and deduplicate the dest leading comments
+        dest_deduplicated = deduplicate_leading_comment_block(dest_block)
+        return merged_content if dest_deduplicated.strip.empty?
+
+        # Get the merged content's leading comments
         merged_leading = leading_comment_block(merged_content)
 
-        # If merged already has the same or more comprehensive leading comments, don't add
-        return merged_content if merged_leading.strip == block.strip
-        return merged_content if merged_content.include?(block.strip)
+        # Parse both blocks to compare individual comments
+        dest_comments = extract_comment_lines(dest_deduplicated)
+        merged_comments = extract_comment_lines(merged_leading)
+
+        # Find comments in dest that aren't in merged (by normalized text)
+        merged_set = Set.new(merged_comments.map { |c| normalize_comment(c) })
+        unique_dest_comments = dest_comments.reject { |c| merged_set.include?(normalize_comment(c)) }
+
+        return merged_content if unique_dest_comments.empty?
 
-        # Insert after shebang / frozen string literal comments (same place reminder goes)
+        # Add unique dest comments after the insertion point
         insertion_index = reminder_insertion_index(merged_content)
-        block = ensure_trailing_newline(block)
-        merged_content.dup.insert(insertion_index, block)
+        new_comments = unique_dest_comments.join + "\n"
+        merged_content.dup.insert(insertion_index, new_comments)
+      end
+
+      def deduplicate_leading_comment_block(block)
+        # Parse the block as if it were a Ruby file with just comments
+        # This allows us to use the same deduplication logic
+        parse_result = PrismUtils.parse_with_comments(block)
+        return block unless parse_result.success?
+
+        tuples = create_comment_tuples(parse_result)
+        deduplicated_tuples = deduplicate_comment_sequences(tuples)
+
+        # Rebuild the comment block from deduplicated tuples
+        deduplicated_tuples.map { |tuple| tuple[2] + "\n" }.join
+      end
+
+      def extract_comment_lines(block)
+        lines = block.to_s.lines
+        lines.select { |line| line.strip.start_with?("#") }
+      end
+
+      def normalize_comment(comment)
+        # Normalize by removing trailing whitespace and standardizing spacing
+        comment.strip
       end
 
       def leading_comment_block(content)

data/lib/kettle/dev/version.rb

@@ -6,7 +6,7 @@ module Kettle
     module Version
       # The gem version.
       # @return [String]
-      VERSION = "1.2.3"
+      VERSION = "1.2.4"
 
       module_function
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Peter H. Boling
@@ -414,10 +414,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://kettle-dev.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/kettle-dev/tree/v1.2.3
-  changelog_uri: https://github.com/kettle-rb/kettle-dev/blob/v1.2.3/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/kettle-dev/tree/v1.2.4
+  changelog_uri: https://github.com/kettle-rb/kettle-dev/blob/v1.2.4/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/1.2.3
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/1.2.4
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-rb/kettle-dev/wiki
   news_uri: https://www.railsbling.com/tags/kettle-dev