kettle-dev 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5ef625cbc6016859cd2c88105ce957e3719465cee97356df1fc77a30c8504c1
-  data.tar.gz: e18d15a0d1da90c31991b4b6601b698633dad3e377145724f8fb277ec7b2a75a
+  metadata.gz: cc18821059e69cb633ba8dbde14b8edf85b999738d86044c5df905f82a203bab
+  data.tar.gz: b534a2bf911e1a6ff8618209caebb93fbad634e647a454344ccc4221a5a58b1f
 SHA512:
-  metadata.gz: 227cb01388512c937d73fddf46deac2edf2b062f93a97b8e788ac0af4e21f8bd1b3a941dc4bf8eabfd5b494401e935e08a8d28d10fc1954b728e7148953e531b
-  data.tar.gz: 336fe91aab36fd2ca958967fbc3cfaaa2d6cea7dbb5b1e4d63882526b1271561920d41c016f301b93eb533cb636d252e923882859c9be58fbe4bd586b29d870d
+  metadata.gz: 3978928d9ef6fda478251deda2c79818bc645bff3b6150e44e4b2a8ebbf13c49de8a676d76eb8ff0795d3c93c7a326c5fa153562f8ac9a93f95e083e2d077723
+  data.tar.gz: 3686018133d386691fefdab49fa10e7dea1c4a4ae65e2486cd161091a0d98e7e2b76721b9f45edc536763dfa8d2f1dbc97bcc83f90a39d1149f8c414873ed02a

checksums.yaml.gz.sig

@@ -1 +1,2 @@
-!�5å����Ԇ��,@K:�v���Fr���%�������&��lv��,j_��r��Wy��yU%GU����6�knu|�b������b�g/&��5"K������DF`t<|�q����sǩ�:5^��'B`1����*˲���hV�J�ҥ,��.��*(�y���+�im(�$-�T�W-�x>o%Psw���kt)� �~F�Ȕ�h�‡,�\	��	d̎�������A�EkH���>J�S���"9�,Y̛;�̄
C�����ZN��ƍ�$hLx`�=�U������1J�;l~
T��_��FiOm���6�dSс��o�aD^�1��/���Uw�����F|�3aX�31��A��T'$���b�N#�P{�Fz���v�
+-����g*�y��aʨ��n]}�
+���3�#���U4f�����ٖ�Q{�m߇��E�v����J�������9&4m��n��Q>t���ȋ�������5��G�����C��3��9�iS�ð��:;����!<�e)�H��۲=˄4q2�P��E���+���^��w�W�Z�ų�$m�I[��%��2�5lZL!�o߹�Z����v�{�T�]�K����Mw�Č�۠j�r�%�'����hr���8��p��;޴��VG{Se��6�,p޲gx���S�u݋�U�?�^�t3S��*PN[>��qb��y�<���$�����de�N�L
y��CQh_�������D�n2	!0�J����^�IL(Z

data/CHANGELOG.md

@@ -30,7 +30,28 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
-## [1.2.0] - 2025-11-25
+## [1.2.2] - 2025-11-27
+
+- TAG: [v1.2.2][1.2.2t]
+- COVERAGE: 93.28% -- 4596/4927 lines in 31 files
+- BRANCH COVERAGE: 76.45% -- 1883/2463 branches in 31 files
+- 70.00% documented
+
+### Added
+
+- Prism AST-based manipulation of ruby during templating
+  - Gemfiles
+  - gemspecs
+  - .simplecov
+- Stop rescuing Exception in certain scenarios (just StandardError)
+- Refactored logging logic and documentation
+- Prevent self-referential gemfile injection
+  - in Gemfiles, gemspecs, and Appraisals
+- Improve reliability of coverage and documentation stats
+  - in the changelog version heading
+  - fails hard when unable to generate stats, unless `--no-strict` provided
+
+## [1.2.1] - 2025-11-25
 
 - TAG: [v1.2.0][1.2.0t]
 - COVERAGE: 94.38% -- 4066/4308 lines in 26 files
@@ -1470,7 +1491,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.0...HEAD
+[Unreleased]: https://github.com/kettle-rb/kettle-dev/compare/v1.2.2...HEAD
+[1.2.2]: https://github.com/kettle-rb/kettle-dev/compare/v1.2.1...v1.2.2
+[1.2.2t]: https://github.com/kettle-rb/kettle-dev/releases/tag/v1.2.2
 [1.2.0]: https://github.com/kettle-rb/kettle-dev/compare/v1.1.60...v1.2.0
 [1.2.0t]: https://github.com/kettle-rb/kettle-dev/releases/tag/v1.2.0
 [1.1.60]: https://github.com/kettle-rb/kettle-dev/compare/v1.1.59...v1.1.60

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-4.308-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-4.927-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-4.308-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-4.927-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.0 - 2025-11-25
+# kettle-dev Rakefile v1.2.2 - 2025-11-27
 # Ruby 2.3 (Safe Navigation) or higher required
 #
 # MIT License (see License.txt)

data/exe/kettle-changelog

@@ -50,22 +50,37 @@ end
 begin
   if ARGV.include?("-h") || ARGV.include?("--help")
     puts <<~USAGE
-      Usage: kettle-changelog
+      Usage: kettle-changelog [--no-strict]
 
       Generates a new CHANGELOG.md entry for the current version detected from lib/**/version.rb.
       Moves entries from [Unreleased] into the new section, adds coverage and documentation stats,
       and updates bottom link references to GitHub style, adding new compare/tag links.
 
+      Options:
+        --no-strict               Allow missing coverage and yard data (warnings only, no errors)
+
+      Environment:
+        K_CHANGELOG_STRICT=false  Disable strict mode (equivalent to --no-strict flag)
+
       Prerequisites:
-        - coverage/coverage.json present (run: K_SOUP_COV_FORMATTERS="json" bin/rspec)
+        - coverage/coverage.json present (run: bin/rake coverage to generate)
         - yard installed and available via bin/yard
+
+      By default (strict mode), if coverage.json or yard stats are missing, the script will:
+        1. Attempt to generate them by running bin/rake coverage and bin/rake yard
+        2. Fail with an error if generation fails or data is still unavailable
+
+      Use --no-strict or K_CHANGELOG_STRICT=false to allow missing data (backward compatible behavior).
     USAGE
     exit(0)
   end
 end
 
 begin
-  Kettle::Dev::ChangelogCLI.new.run
+  # Determine if strict mode is enabled (default: true)
+  strict_mode = !ARGV.include?("--no-strict") && ENV.fetch("K_CHANGELOG_STRICT", "true").downcase != "false"
+
+  Kettle::Dev::ChangelogCLI.new(strict: strict_mode).run
 rescue LoadError => e
   warn("#{script_basename}: could not load dependency: #{e.class}: #{e.message}")
   warn(e.backtrace.join("\n")) if ENV["DEBUG"]

data/lib/kettle/dev/changelog_cli.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "open3"
+
 module Kettle
   module Dev
     # CLI for updating CHANGELOG.md with new version sections
@@ -11,10 +13,12 @@ module Kettle
 
       # Initialize the changelog CLI
       # Sets up paths for CHANGELOG.md and coverage.json
-      def initialize
+      # @param strict [Boolean] when true (default), require coverage and yard data; raise errors if unavailable
+      def initialize(strict: true)
         @root = Kettle::Dev::CIHelpers.project_root
         @changelog_path = File.join(@root, "CHANGELOG.md")
         @coverage_path = File.join(@root, "coverage", "coverage.json")
+        @strict = strict
       end
 
       # Main entry point to update CHANGELOG.md
@@ -215,11 +219,49 @@ module Kettle
       end
 
       def coverage_lines
-        unless File.file?(@coverage_path)
-          warn("Coverage JSON not found at #{@coverage_path}.")
-          warn("Run: K_SOUP_COV_FORMATTERS=\"json\" bin/rspec")
-          return [nil, nil]
+        if @strict
+          # Always generate fresh coverage data in strict mode
+          # Delete old coverage files to ensure we get current data
+          coverage_dir = File.dirname(@coverage_path)
+          if Dir.exist?(coverage_dir)
+            puts "Cleaning old coverage data from #{coverage_dir}..."
+            Dir.glob(File.join(coverage_dir, "*")).each do |file|
+              File.delete(file) if File.file?(file)
+            end
+          end
+
+          puts "Generating fresh coverage data by running: bin/rake coverage"
+
+          # Run bin/rake coverage to generate coverage.json
+          rake_cmd = File.join(@root, "bin", "rake")
+          unless File.executable?(rake_cmd)
+            raise "bin/rake not found or not executable; cannot generate coverage data"
+          end
+
+          # Run the command exactly as the user would run it manually
+          # The coverage task knows how to configure itself properly
+          success = system(rake_cmd, "coverage", chdir: @root)
+
+          unless success
+            raise "bin/rake coverage failed with exit status #{$?.exitstatus || "unknown"}"
+          end
+
+          puts "Coverage generation complete."
+
+          # Check if coverage.json was generated
+          unless File.file?(@coverage_path)
+            raise "Coverage JSON not found at #{@coverage_path} after running bin/rake coverage"
+          end
+        else
+          # Non-strict mode: check if coverage.json exists, warn if not
+          unless File.file?(@coverage_path)
+            warn("Coverage JSON not found at #{@coverage_path}.")
+            warn("Run: bin/rake coverage to generate it")
+            return [nil, nil]
+          end
         end
+
+        # Parse the coverage data
         data = JSON.parse(File.read(@coverage_path))
         files = data["coverage"] || {}
         file_count = 0
@@ -252,31 +294,55 @@ module Kettle
         line_str = format("COVERAGE: %.2f%% -- %d/%d lines in %d files", line_pct, covered_lines, total_lines, file_count)
         branch_str = format("BRANCH COVERAGE: %.2f%% -- %d/%d branches in %d files", branch_pct, covered_branches, total_branches, file_count)
         [line_str, branch_str]
+      rescue JSON::ParserError => e
+        if @strict
+          raise "Failed to parse coverage JSON at #{@coverage_path}: #{e.class}: #{e.message}"
+        else
+          warn("Failed to parse coverage: #{e.class}: #{e.message}")
+          [nil, nil]
+        end
       rescue StandardError => e
-        warn("Failed to parse coverage: #{e.class}: #{e.message}")
-        [nil, nil]
+        if @strict
+          raise "Failed to get coverage data: #{e.class}: #{e.message}"
+        else
+          warn("Failed to get coverage data: #{e.class}: #{e.message}")
+          [nil, nil]
+        end
       end
 
       def yard_percent_documented
         cmd = File.join(@root, "bin", "yard")
         unless File.executable?(cmd)
-          warn("bin/yard not found or not executable; ensure yard is installed via bundler")
-          return
+          if @strict
+            raise "bin/yard not found or not executable; ensure yard is installed via bundler"
+          else
+            warn("bin/yard not found or not executable; ensure yard is installed via bundler")
+            return
+          end
         end
-        out, _ = Open3.capture2(cmd)
-        # Look for a line containing e.g., "95.35% documented"
-        line = out.lines.find { |l| l =~ /\d+(?:\.\d+)?%\s+documented/ }
-        if line
-          line = line.strip
-          # Return exactly as requested: e.g. "95.35% documented"
-          line
-        else
-          warn("Could not find documented percentage in bin/yard output.")
-          nil
+
+        begin
+          # Run bin/yard to get documentation percentage
+          out, _ = Open3.capture2(cmd, {chdir: @root})
+          # Look for a line containing e.g., "95.35% documented"
+          line = out.lines.find { |l| l =~ /\d+(?:\.\d+)?%\s+documented/ }
+
+          if line
+            line.strip
+          elsif @strict
+            raise "Could not find documented percentage in bin/yard output"
+          else
+            warn("Could not find documented percentage in bin/yard output.")
+            nil
+          end
+        rescue StandardError => e
+          if @strict
+            raise "Failed to run bin/yard: #{e.class}: #{e.message}"
+          else
+            warn("Failed to run bin/yard: #{e.class}: #{e.message}")
+            nil
+          end
         end
-      rescue StandardError => e
-        warn("Failed to run bin/yard: #{e.class}: #{e.message}")
-        nil
       end
 
       # Transform legacy release headings that include a tag suffix, e.g.:

data/lib/kettle/dev/modular_gemfiles.rb

@@ -36,9 +36,9 @@ module Kettle
           modular_gemfile = "#{base}.gemfile"
           src = helpers.prefer_example(File.join(gem_checkout_root, MODULAR_GEMFILE_DIR, modular_gemfile))
           dest = File.join(project_root, MODULAR_GEMFILE_DIR, modular_gemfile)
-          existing = File.exist?(dest) ? File.read(dest) : nil
           helpers.copy_file_with_prompt(src, dest, allow_create: true, allow_replace: true) do |content|
-            existing ? helpers.merge_gemfile_dependencies(content, existing) : content
+            # Use apply_strategy for proper AST-based merging with Prism
+            helpers.apply_strategy(content, dest)
           end
         end
 
@@ -46,7 +46,6 @@ module Kettle
         modular_gemfile = "style.gemfile"
         src = helpers.prefer_example(File.join(gem_checkout_root, MODULAR_GEMFILE_DIR, modular_gemfile))
         dest = File.join(project_root, MODULAR_GEMFILE_DIR, modular_gemfile)
-        existing_style = File.exist?(dest) ? File.read(dest) : nil
         if File.basename(src).sub(/\.example\z/, "") == "style.gemfile"
           helpers.copy_file_with_prompt(src, dest, allow_create: true, allow_replace: true) do |content|
             # Adjust rubocop-lts constraint based on min_ruby
@@ -98,11 +97,13 @@ module Kettle
               token = "{RUBOCOP|RUBY|GEM}"
               content.gsub!(token, "rubocop-ruby#{rubocop_ruby_gem_version}") if content.include?(token)
             end
-            existing_style ? helpers.merge_gemfile_dependencies(content, existing_style) : content
+            # Use apply_strategy for proper AST-based merging with Prism
+            helpers.apply_strategy(content, dest)
           end
         else
           helpers.copy_file_with_prompt(src, dest, allow_create: true, allow_replace: true) do |content|
-            existing_style ? helpers.merge_gemfile_dependencies(content, existing_style) : content
+            # Use apply_strategy for proper AST-based merging with Prism
+            helpers.apply_strategy(content, dest)
           end
         end