kettle-dev 2.2.14 → 2.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec2b6c362bca706e061a15f28afde989862a24497273074e8b82a4c845c6b006
-  data.tar.gz: 6750c11df44f32f1b92b93b77743e2e44d7173082279f6433fd37f3eccd1c0fb
+  metadata.gz: 543c0feea2569c36fc0f92795c6da98708938c8a262eadde59b93cfcbf3cd2a2
+  data.tar.gz: '08e6fe52f9d7b7fcee3f834938b5cb1267baa6f1b64c2fec51ffe2bc26ac3228'
 SHA512:
-  metadata.gz: e23ea3391f369936bcec3d35e38428117b6d839f02df67f9fa4c275d034bd7bcb3caa94cd09d65348804434c710e35f52de96c5d306eecb92f8413a83c56e79d
-  data.tar.gz: 8a5ad8e56efd578960cb996a22b48cb862630df96907c3cffb70283f5189545e7eb1634a6a1a6c2d0d6de4ceb6be641d0c8336bc73d62afc44eeaab19f77d170
+  metadata.gz: efe57e55df3cbd6cf7b01b01d6ef28f6e96149a41957e0dc1157be27c6e53d036ecde76d6aba89d7e3eb6016c37b8f95c9973f8924e9f22539322e5a722c06e4
+  data.tar.gz: 4ca4f8be55e9cc0cd0262e5ec88d309cd0ca6feee559a244474688db9da047f359bac9c736facaf8b19c25fedf11f7778639188ac382c31125e4fd3791bb2cee

data/CHANGELOG.md

@@ -30,6 +30,37 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [2.2.16] - 2026-06-24
+
+- TAG: [v2.2.16][2.2.16t]
+- COVERAGE: 92.23% -- 4093/4438 lines in 33 files
+- BRANCH COVERAGE: 73.14% -- 1609/2200 branches in 33 files
+- 62.11% documented
+
+### Changed
+
+- `kettle-release` start step 0 now runs `kettle-changelog` after the
+  `kettle-pre-release` gates so release prep generates the versioned changelog
+  section before the numbered release steps.
+
+### Fixed
+
+- `kettle-release` now invokes `bundle exec kettle-changelog` as an interactive
+  command, making the changelog plan banner and confirmation prompt visible
+  during release prep.
+
+## [2.2.15] - 2026-06-21
+
+- TAG: [v2.2.15][2.2.15t]
+- COVERAGE: 91.83% -- 4067/4429 lines in 33 files
+- BRANCH COVERAGE: 72.57% -- 1595/2198 branches in 33 files
+- 62.11% documented
+
+### Added
+
+- `kettle-bump pre` now bumps prerelease versions by applying `String#next` to
+  the prerelease suffix.
+
 ## [2.2.14] - 2026-06-21
 
 - TAG: [v2.2.14][2.2.14t]
@@ -2221,7 +2252,11 @@ 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-dev/kettle-dev/compare/v2.2.14...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.16...HEAD
+[2.2.16]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.15...v2.2.16
+[2.2.16t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.2.16
+[2.2.15]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.14...v2.2.15
+[2.2.15t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.2.15
 [2.2.14]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.13...v2.2.14
 [2.2.14t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.2.14
 [2.2.13]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.12...v2.2.13

data/README.md

@@ -433,9 +433,11 @@ What it does:
 
 - Script: `exe/kettle-bump` (run as `kettle-bump`)
 - Purpose: Bumps the current single gem's `lib/**/version.rb` before changelog
-  preparation. It accepts an exact version or `major`, `minor`, or `patch`.
+  preparation. It accepts an exact version or `major`, `minor`, `patch`, or
+  `pre`.
 - Usage:
     - `kettle-bump patch`
+    - `kettle-bump pre`
     - `kettle-bump 1.2.4 --from 1.2.3`
     - `kettle-bump minor --dry-run`
     - `kettle-bump patch --check`
@@ -872,7 +874,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.411-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-4.438-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/kettle-dev/kettle-dev/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/exe/kettle-release

@@ -47,12 +47,13 @@ if ARGV.include?("-h") || ARGV.include?("--help")
 
     Automates the release flow for a Ruby gem in the host project.
 
-    Full releases start at step 0 and run `kettle-pre-release` before the
-    numbered release steps. Any start_step greater than 0 skips pre-release
-    checks and resumes directly at the requested numbered step.
+    Full releases start at step 0 and run `kettle-pre-release` plus
+    `kettle-changelog` before the numbered release steps. Any start_step
+    greater than 0 skips pre-release prep and resumes directly at the
+    requested numbered step.
 
     Start steps (use start_step=<n> to begin at that step):
-      0. Run kettle-pre-release gates
+      0. Run kettle-pre-release gates and kettle-changelog
       1. Verify Bundler >= 2.7 (start at 1 to skip pre-release checks)
       2. Detect version; RubyGems sanity check; confirm CHANGELOG/version; sync copyright years; update badges/headers
       3. Run bin/setup

data/lib/kettle/dev/bump_cli.rb

@@ -6,7 +6,7 @@ module Kettle
   module Dev
     # CLI for bumping the current project's gem version before changelog prep.
     class BumpCLI
-      BUMP_TYPES = %w[major minor patch].freeze
+      BUMP_TYPES = %w[major minor patch pre].freeze
 
       def initialize(argv = [], out: $stdout, err: $stderr, root: Kettle::Dev::CIHelpers.project_root)
         @argv = argv.dup
@@ -39,7 +39,7 @@ module Kettle
       def parse_options
         options = {mode: :execute, help: false}
         parser = OptionParser.new do |opts|
-          opts.banner = "Usage: kettle-bump VERSION|major|minor|patch [options]"
+          opts.banner = "Usage: kettle-bump VERSION|major|minor|patch|pre [options]"
           opts.on("--from VERSION", "Require the current version before bumping") { |value| options[:from] = validate_version(value) }
           opts.on("--check", "Exit non-zero when the bump would change files") { options[:mode] = :check }
           opts.on("--dry-run", "Print planned changes without writing files") { options[:mode] = :dry_run }
@@ -51,7 +51,7 @@ module Kettle
         end
         parser.parse!(argv)
         options[:target] = argv.shift
-        raise Kettle::Dev::Error, "kettle-bump requires VERSION, major, minor, or patch" unless options[:target] || options[:help]
+        raise Kettle::Dev::Error, "kettle-bump requires VERSION, major, minor, patch, or pre" unless options[:target] || options[:help]
         raise Kettle::Dev::Error, "unexpected arguments: #{argv.join(" ")}" unless argv.empty?
 
         options
@@ -68,6 +68,8 @@ module Kettle
       end
 
       def bumped_version(type, current_version)
+        return bumped_prerelease_version(current_version) if type == "pre"
+
         version = Gem::Version.new(current_version)
         segments = version.segments
         unless segments.all? { |segment| segment.is_a?(Integer) }
@@ -85,6 +87,33 @@ module Kettle
         end
       end
 
+      def bumped_prerelease_version(current_version)
+        version = Gem::Version.new(current_version)
+        segments = version.segments
+        prerelease_index = segments.index { |segment| !segment.is_a?(Integer) }
+        unless prerelease_index
+          raise Kettle::Dev::Error, "cannot pre-bump version without prerelease segment #{current_version.inspect}"
+        end
+
+        release_core = segments[0...prerelease_index].join(".")
+        prerelease_suffix = prerelease_suffix_for(current_version, release_core)
+        "#{release_core}.#{prerelease_suffix.next}"
+      end
+
+      def prerelease_suffix_for(current_version, release_core)
+        prefix = "#{release_core}."
+        return string_tail(current_version, prefix.length) if current_version.start_with?(prefix)
+
+        canonical_version = Gem::Version.new(current_version).to_s
+        return string_tail(canonical_version, prefix.length) if canonical_version.start_with?(prefix)
+
+        raise Kettle::Dev::Error, "cannot find prerelease segment in version #{current_version.inspect}"
+      end
+
+      def string_tail(value, offset)
+        value[offset, value.length - offset]
+      end
+
       def validate_version(version)
         Gem::Version.new(version).to_s
       rescue ArgumentError => error

data/lib/kettle/dev/ci_helpers.rb

@@ -20,11 +20,11 @@ module Kettle
       # @return [String] absolute path to the project root
       def project_root
         # Too difficult to test every possible branch here, so ignoring
-        # :nocov:
+        # simplecov:disable
         dir = if defined?(Rake) && Rake&.application&.respond_to?(:original_dir)
           Rake.application.original_dir
         end
-        # :nocov:
+        # simplecov:enable
         dir || Dir.pwd
       end
 

data/lib/kettle/dev/release_cli.rb

@@ -31,7 +31,9 @@ module Kettle
           # Some commands are interactive (e.g., `bundle exec rake release` prompting for RubyGems MFA).
           # Using capture3 detaches STDIN, preventing prompts from working. For such commands, use system
           # so they inherit the current TTY and can read the user's input.
-          interactive = /\Abundle(\s+exec)?\s+rake\s+release\b/.match?(cmd) || /\Agem\s+push\b/.match?(cmd)
+          interactive = /\Abundle(\s+exec)?\s+rake\s+release\b/.match?(cmd) ||
+            /\Agem\s+push\b/.match?(cmd) ||
+            /\A(bundle\s+exec\s+)?kettle-changelog\b/.match?(cmd)
           if interactive
             ok = system(env_hash, cmd)
             unless ok
@@ -327,6 +329,21 @@ module Kettle
       def run_pre_release_checks!
         puts "Running pre-release checks via kettle-pre-release..."
         Kettle::Dev::PreReleaseCLI.new(check_num: 1).run
+        run_changelog!
+      end
+
+      def run_changelog!
+        cmd = "bundle exec kettle-changelog"
+        cmd = "#{cmd} --version #{Shellwords.escape(@version_override)}" if @version_override
+        run_cmd!(cmd)
+      end
+
+      def changelog_strict?
+        ENV.fetch("K_CHANGELOG_STRICT", "true").downcase != "false"
+      end
+
+      def changelog_coverage_hard?
+        ENV.fetch("K_CHANGELOG_COVERAGE_HARD", "true").downcase != "false"
       end
 
       # Update the README KLOC badge number based on the denominator in the current version's COVERAGE line in CHANGELOG.md.

data/lib/kettle/dev/tasks/ci_task.rb

@@ -326,10 +326,10 @@ module Kettle
                 end
               rescue Exception => e # rubocop:disable Lint/RescueException
                 Kettle::Dev.debug_error(e, __method__)
-                # :nocov:
+                # simplecov:disable
                 # Catch all exceptions in the worker thread boundary, including SystemExit
                 status_q << [c, f, "err"]
-                # :nocov:
+                # simplecov:enable
               end
             end
           end

data/lib/kettle/dev/version.rb

@@ -3,7 +3,7 @@
 module Kettle
   module Dev
     module Version
-      VERSION = "2.2.14"
+      VERSION = "2.2.16"
     end
     VERSION = Version::VERSION # Traditional Constant Location
   end

data/lib/kettle/dev.rb

@@ -19,9 +19,9 @@ end
 # External gems
 
 # It's not reasonable to test this ENV variable
-# :nocov:
+# simplecov:disable
 require "require_bench" if ENV.fetch("REQUIRE_BENCH", "false").casecmp("true").zero?
-# :nocov:
+# simplecov:enable
 
 # Autoload public CLI/APIs so requiring "kettle-dev" exposes them lazily
 # for tests and executables. Files will be loaded on first constant access.
@@ -203,9 +203,9 @@ module Kettle
           Kettle::Soup::Cover.install_tasks
           # NOTE: Coverage on CI is configured independent of this task.
           #       This task is for local development, as it opens results in browser
-          # :nocov:
+          # simplecov:disable
           Kettle::Dev.register_default("coverage") unless Kettle::Dev::IS_CI
-          # :nocov:
+          # simplecov:enable
         rescue LoadError
           # OK, no soup for you.
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 2.2.14
+  version: 2.2.16
 platform: ruby
 authors:
 - Peter H. Boling
@@ -339,10 +339,10 @@ licenses:
 - AGPL-3.0-only
 metadata:
   homepage_uri: https://kettle-dev.galtzo.com
-  source_code_uri: https://github.com/kettle-dev/kettle-dev/tree/v2.2.14
-  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v2.2.14/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-dev/tree/v2.2.16
+  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v2.2.16/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.2.14
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.2.16
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-dev/kettle-dev/wiki
   news_uri: https://www.railsbling.com/tags/kettle-dev