kettle-dev 2.2.25 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e5b1b17ea5254ca2a656ec1a10a984b5f8170359507c9a7c56c46b42ab3ca0b
-  data.tar.gz: cc447fb1871394c8473e2464fe8dd56d8b554274b1e08bdb2ae5461b92030b77
+  metadata.gz: 12ded2228617ffab7dbd8c9d6712dbae7ce229cb86e243c49a357f49e2777702
+  data.tar.gz: b2db64901a1d1e8bbaebfcfdc2b12c6c5bb2d67ee970a5216a7e5f2279b3b352
 SHA512:
-  metadata.gz: 0a0ae789338feaaae14007e02ebdb520da4d819d14783f82cf27b2d3e400f6818eefb4be5d5d485fee5cea9cd086b7387b50c0fb8d7f63e64a37214b238f6437
-  data.tar.gz: 7a6dc01a712098bcc218652f83c219bc9e0551be7d492bec5bcd1fc0f82dbcf7b196f0fafa324a7c934c410136df41108ce22ecf449fa1d475299e3bd9a866ed
+  metadata.gz: 28a7ecbc70b68c1f4b430234b006c11643f280b0474c2f4f9627d1896f7cbe8d46e702587528ce4fdec63b730aef6dce72c6ed62dec7cee916ffb5a6b9737084
+  data.tar.gz: 53305c2ed6b3cbf3c66c20f453a90524b28a0af396acc285a905fe6336fdfbd35d98ec21ed503fa4b856ce1324098efe228751b4422c9a01eb49103333cb0d01

data/CHANGELOG.md

@@ -30,6 +30,19 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [2.3.0] - 2026-07-02
+
+- TAG: [v2.3.0][2.3.0t]
+- COVERAGE: 91.95% -- 4216/4585 lines in 35 files
+- BRANCH COVERAGE: 73.19% -- 1660/2268 branches in 35 files
+- 58.02% documented
+
+### Added
+
+- `Kettle::Dev::VersionBump` now exposes the reusable engine behind
+  `kettle-bump`, so other tools can share version detection, target resolution,
+  Prism edits, and write behavior without shelling out or duplicating logic.
+
 ## [2.2.25] - 2026-07-01
 
 - TAG: [v2.2.25][2.2.25t]
@@ -2396,7 +2409,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-dev/kettle-dev/compare/v2.2.25...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v2.3.0...HEAD
+[2.3.0]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.25...v2.3.0
+[2.3.0t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.3.0
 [2.2.25]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.24...v2.2.25
 [2.2.25t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.2.25
 [2.2.24]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.23...v2.2.24

data/README.md

@@ -874,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.567-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-4.585-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/lib/kettle/dev/bump_cli.rb

@@ -6,8 +6,6 @@ module Kettle
   module Dev
     # CLI for bumping the current project's gem version before changelog prep.
     class BumpCLI
-      BUMP_TYPES = %w[major minor patch pre].freeze
-
       def initialize(argv = [], out: $stdout, err: $stderr, root: Kettle::Dev::CIHelpers.project_root)
         @argv = argv.dup
         @out = out
@@ -19,16 +17,15 @@ module Kettle
         options = parse_options
         return 0 if options.fetch(:help)
 
-        current_version = Kettle::Dev::Versioning.detect_version(root)
-        target_version = resolve_target_version(options.fetch(:target), current_version)
-        edits = collect_edits(
-          current_version: current_version,
-          target_version: target_version,
+        bump = Kettle::Dev::VersionBump.new(
+          root: root,
+          target_version: options.fetch(:target),
           from_version: options[:from]
         )
-        write_edits(edits) if options.fetch(:mode) == :execute
+        edits = bump.edits
+        Kettle::Dev::VersionBump.write_edits(edits) if options.fetch(:mode) == :execute
 
-        out.puts(summary(edits: edits, current_version: current_version, target_version: target_version, mode: options.fetch(:mode)))
+        out.puts(summary(edits: edits, current_version: bump.current_version, target_version: bump.target_version, mode: options.fetch(:mode)))
         (options.fetch(:mode) == :check && edits.any?) ? 1 : 0
       end
 
@@ -59,168 +56,8 @@ module Kettle
         raise Kettle::Dev::Error, error.message
       end
 
-      def resolve_target_version(target, current_version)
-        if BUMP_TYPES.include?(target)
-          bumped_version(target, current_version)
-        else
-          validate_version(target)
-        end
-      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) }
-          raise Kettle::Dev::Error, "cannot #{type}-bump non-numeric version #{current_version.inspect}"
-        end
-
-        major, minor, patch = (segments + [0, 0, 0])[0, 3]
-        case type
-        when "major"
-          "#{major + 1}.0.0"
-        when "minor"
-          "#{major}.#{minor + 1}.0"
-        when "patch"
-          "#{major}.#{minor}.#{patch + 1}"
-        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
-        raise Kettle::Dev::Error, "invalid version #{version.inspect}: #{error.message}"
-      end
-
-      def collect_edits(current_version:, target_version:, from_version:)
-        if from_version && current_version != from_version
-          raise Kettle::Dev::Error, "current version is #{current_version}, not --from #{from_version}"
-        end
-
-        version_file_edits(target_version) + gemspec_version_edits(current_version, target_version)
-      end
-
-      def version_file_edits(target_version)
-        Kettle::Dev::Versioning.version_file_candidates(root).filter_map do |path|
-          source = File.read(path)
-          node = version_string_node(source, path)
-          current = node.unescaped
-          next if current == target_version
-
-          replacement = quote_like(node.location.slice, target_version)
-          file_edit(path, source, node.location.start_offset, node.location.end_offset, replacement)
-        end
-      end
-
-      def gemspec_version_edits(current_version, target_version)
-        gemspec_path = gemspec_path_for_bump
-        return [] unless gemspec_path
-
-        source = File.read(gemspec_path)
-        parse_result = parse_source(source, gemspec_path)
-        each_node(parse_result.value).filter_map do |node|
-          next unless node.is_a?(Prism::CallNode) && node.name == :version=
-
-          version_node = node.arguments&.arguments&.first
-          next unless version_node.is_a?(Prism::StringNode)
-          next unless version_node.unescaped == current_version
-          next if version_node.unescaped == target_version
-
-          replacement = quote_like(version_node.location.slice, target_version)
-          file_edit(gemspec_path, source, version_node.location.start_offset, version_node.location.end_offset, replacement)
-        end
-      end
-
-      def gemspec_path_for_bump
-        paths = Dir.glob(File.join(root, "*.gemspec")).sort
-        return nil if paths.empty?
-        raise Kettle::Dev::Error, "multiple gemspecs found; kettle-bump supports single gems only" if paths.length > 1
-
-        paths.first
-      end
-
-      def version_string_node(source, path)
-        parse_result = parse_source(source, path)
-        constant = each_node(parse_result.value).find do |node|
-          node.is_a?(Prism::ConstantWriteNode) && node.name == :VERSION && node.value.is_a?(Prism::StringNode)
-        end
-        raise Kettle::Dev::Error, "could not find string VERSION constant in #{path}" unless constant
-
-        constant.value
-      end
-
-      def parse_source(source, path)
-        require_prism
-        parse_result = Prism.parse(source)
-        raise Kettle::Dev::Error, "could not parse #{path}" unless parse_result.success?
-
-        parse_result
-      end
-
-      def require_prism
-        return if defined?(Prism)
-
-        require "prism"
-      rescue LoadError => error
-        raise Kettle::Dev::Error, "kettle-bump requires Prism; install the prism gem or run on Ruby 3.3+ (#{error.message})"
-      end
-
-      def each_node(root)
-        return enum_for(__method__, root) unless block_given?
-
-        queue = [root]
-        until queue.empty?
-          node = queue.shift
-          yield node
-          queue.concat(node.child_nodes.compact) if node.respond_to?(:child_nodes)
-        end
-      end
-
-      def file_edit(path, source, start_offset, end_offset, replacement)
-        {path: path, source: source, start_offset: start_offset, end_offset: end_offset, replacement: replacement}
-      end
-
-      def quote_like(original, value)
-        quote = original.start_with?("'") ? "'" : '"'
-        "#{quote}#{value}#{quote}"
-      end
-
-      def write_edits(edits)
-        edits.group_by { |edit| edit.fetch(:path) }.each_value do |file_edits|
-          source = file_edits.first.fetch(:source)
-          file_edits.sort_by { |edit| -edit.fetch(:start_offset) }.each do |edit|
-            source[edit.fetch(:start_offset)...edit.fetch(:end_offset)] = edit.fetch(:replacement)
-          end
-          File.write(file_edits.first.fetch(:path), source)
-        end
+        Kettle::Dev::VersionBump.validate_version(version)
       end
 
       def summary(edits:, current_version:, target_version:, mode:)

data/lib/kettle/dev/version.rb

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

data/lib/kettle/dev/version_bump.rb

@@ -0,0 +1,195 @@
+# frozen_string_literal: true
+
+module Kettle
+  module Dev
+    # Reusable engine behind kettle-bump.
+    class VersionBump
+      BUMP_TYPES = %w[major minor patch pre].freeze
+
+      class << self
+        def resolve_target_version(target, current_version)
+          target = target.to_s
+          if BUMP_TYPES.include?(target)
+            bumped_version(target, current_version)
+          else
+            validate_version(target)
+          end
+        end
+
+        def validate_version(version)
+          Gem::Version.new(version).to_s
+        rescue ArgumentError => error
+          raise Kettle::Dev::Error, "invalid version #{version.inspect}: #{error.message}"
+        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) }
+            raise Kettle::Dev::Error, "cannot #{type}-bump non-numeric version #{current_version.inspect}"
+          end
+
+          major, minor, patch = (segments + [0, 0, 0])[0, 3]
+          case type
+          when "major"
+            "#{major + 1}.0.0"
+          when "minor"
+            "#{major}.#{minor + 1}.0"
+          when "patch"
+            "#{major}.#{minor}.#{patch + 1}"
+          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 version_string_node(source, path)
+          parse_result = parse_source(source, path)
+          constant = each_node(parse_result.value).find do |node|
+            node.is_a?(Prism::ConstantWriteNode) && node.name == :VERSION && node.value.is_a?(Prism::StringNode)
+          end
+          raise Kettle::Dev::Error, "could not find string VERSION constant in #{path}" unless constant
+
+          constant.value
+        end
+
+        def parse_source(source, path)
+          require_prism
+          parse_result = Prism.parse(source)
+          raise Kettle::Dev::Error, "could not parse #{path}" unless parse_result.success?
+
+          parse_result
+        end
+
+        def require_prism
+          return if defined?(Prism)
+
+          require "prism"
+        rescue LoadError => error
+          raise Kettle::Dev::Error, "kettle-bump requires Prism; install the prism gem or run on Ruby 3.3+ (#{error.message})"
+        end
+
+        def each_node(root)
+          return enum_for(__method__, root) unless block_given?
+
+          queue = [root]
+          until queue.empty?
+            node = queue.shift
+            yield node
+            queue.concat(node.child_nodes.compact) if node.respond_to?(:child_nodes)
+          end
+        end
+
+        def file_edit(path, source, start_offset, end_offset, replacement)
+          {path: path, source: source, start_offset: start_offset, end_offset: end_offset, replacement: replacement}
+        end
+
+        def quote_like(original, value)
+          quote = original.start_with?("'") ? "'" : '"'
+          "#{quote}#{value}#{quote}"
+        end
+
+        def write_edits(edits)
+          edits.group_by { |edit| edit.fetch(:path) }.each_value do |file_edits|
+            source = file_edits.first.fetch(:source)
+            file_edits.sort_by { |edit| -edit.fetch(:start_offset) }.each do |edit|
+              source[edit.fetch(:start_offset)...edit.fetch(:end_offset)] = edit.fetch(:replacement)
+            end
+            File.write(file_edits.first.fetch(:path), source)
+          end
+        end
+      end
+
+      def initialize(root:, target_version:, current_version: nil, from_version: nil)
+        @root = root
+        @current_version = current_version || Kettle::Dev::Versioning.detect_version(root)
+        @target_version = self.class.resolve_target_version(target_version, @current_version)
+        @from_version = self.class.validate_version(from_version) if from_version
+      end
+
+      attr_reader :root, :current_version, :target_version, :from_version
+
+      def edits
+        validate_from_version
+        version_file_edits + gemspec_version_edits
+      end
+
+      def write!
+        self.class.write_edits(edits)
+      end
+
+      private
+
+      def validate_from_version
+        return unless from_version && current_version != from_version
+
+        raise Kettle::Dev::Error, "current version is #{current_version}, not --from #{from_version}"
+      end
+
+      def version_file_edits
+        Kettle::Dev::Versioning.version_file_candidates(root).filter_map do |path|
+          source = File.read(path)
+          node = self.class.version_string_node(source, path)
+          current = node.unescaped
+          next if current == target_version
+
+          replacement = self.class.quote_like(node.location.slice, target_version)
+          self.class.file_edit(path, source, node.location.start_offset, node.location.end_offset, replacement)
+        end
+      end
+
+      def gemspec_version_edits
+        gemspec_path = gemspec_path_for_bump
+        return [] unless gemspec_path
+
+        source = File.read(gemspec_path)
+        parse_result = self.class.parse_source(source, gemspec_path)
+        self.class.each_node(parse_result.value).filter_map do |node|
+          next unless node.is_a?(Prism::CallNode) && node.name == :version=
+
+          version_node = node.arguments&.arguments&.first
+          next unless version_node.is_a?(Prism::StringNode)
+          next unless version_node.unescaped == current_version
+          next if version_node.unescaped == target_version
+
+          replacement = self.class.quote_like(version_node.location.slice, target_version)
+          self.class.file_edit(gemspec_path, source, version_node.location.start_offset, version_node.location.end_offset, replacement)
+        end
+      end
+
+      def gemspec_path_for_bump
+        paths = Dir.glob(File.join(root, "*.gemspec")).sort
+        return nil if paths.empty?
+        raise Kettle::Dev::Error, "multiple gemspecs found; kettle-bump supports single gems only" if paths.length > 1
+
+        paths.first
+      end
+    end
+  end
+end

data/lib/kettle/dev.rb

@@ -47,6 +47,7 @@ module Kettle
     autoload :ReleaseCLI, "kettle/dev/release_cli"
     autoload :PreReleaseCLI, "kettle/dev/pre_release_cli"
     autoload :Version, "kettle/dev/version"
+    autoload :VersionBump, "kettle/dev/version_bump"
     autoload :Versioning, "kettle/dev/versioning"
 
     # Nested tasks namespace with autoloaded task modules

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 2.2.25
+  version: 2.3.0
 platform: ruby
 authors:
 - Peter H. Boling
@@ -339,6 +339,7 @@ files:
 - lib/kettle/dev/tasks.rb
 - lib/kettle/dev/tasks/ci_task.rb
 - lib/kettle/dev/version.rb
+- lib/kettle/dev/version_bump.rb
 - lib/kettle/dev/versioning.rb
 - lib/kettle/emoji_regex.rb
 - sig/kettle-dev.rbs
@@ -375,10 +376,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.25
-  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v2.2.25/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-dev/tree/v2.3.0
+  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v2.3.0/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.2.25
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.3.0
   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