kettle-family 0.1.32 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab7db3c6a2cfe0e5c9456e14e0d7b643ee341da154f591c5de6b81d09a423a65
-  data.tar.gz: 9b1b9ecbc828efccfc1d51327a9a4efe7b69b2726500cabdca5943c6ca742f4e
+  metadata.gz: 1f37904c4583ed3dbc1ef2c372c5d4aa7e3ecec95d8aba520e0979065106087f
+  data.tar.gz: ce0b99d87d7a815467428209c2f504ddafc0800890dabf9af5b534e4f8073fc0
 SHA512:
-  metadata.gz: 4e95a38962f4f0f4dada8de8adf59e9c2910ef9c7984df519f474fda1167e86523a6bb54d87382da9dd7e231bbd44df08955fed36e916aeb28acf078354cfc28
-  data.tar.gz: 28c0f4e0592ef36165f5a4bfe62a82fb8c13c8ee2ff5a22ad28dddad84a4b5003a84d5272f84eeb936d920f2fc2a135d426e54ca8d0b48a84203b6e2cefc33d9
+  metadata.gz: b98994c1f6daa8fd29ec064de3b23a241c3e25c3786b67e67bc765dea795e92dfa6cf3ba510a4782f9a9b5a954ef0f748bb82c0d6f94a5f2a5b1f95da9ac0be9
+  data.tar.gz: '0189a3faba9e70ec5e333eaee9eaf956d4c7151ded78916f63faaf8d1bce1c2a14d10c636fcec54bb7555dff7332cb0ae8adc9f763231d75b94eac0ec0caaf12'

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-�-`
-�d�$�'��Uz�D��ᢉ�TT^�ت���]K	��G@�
"LM�?�N7;
��������<UX�s���ҮS��c���,�"m�a�zT�����ݡ%&��3P�n)�MoTB�<��D&A������ɒݯ���5D�9eQ��Q����Y�;
+[���4w���Z�
+���
+^���Q�뢦C)m��"]���0NN�������f�g��Rf��qe	�`ie�qE�zSʄj�zW	�l?��{��tw'�Ph<��^��]���-D���Ӊ�k�+

data/CHANGELOG.md

@@ -30,6 +30,29 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [0.2.0] - 2026-07-02
+
+- TAG: [v0.2.0][0.2.0t]
+- COVERAGE: 95.56% -- 2173/2274 lines in 21 files
+- BRANCH COVERAGE: 76.50% -- 700/915 branches in 21 files
+- 29.96% documented
+
+### Changed
+
+- `kettle-family bump-version` now delegates per-member version file,
+  gemspec-version, and relative bump target handling to `kettle-dev`'s shared
+  `kettle-bump` engine, leaving `kettle-family` responsible only for
+  family-specific dependency pin updates and reporting.
+- `kettle-dev` is now a runtime dependency because `kettle-family` reuses its
+  version bump engine directly.
+- Runtime dependency `kettle-dev` now requires 2.3.0 or newer.
+
+### Fixed
+
+- `kettle-family bump-version` now prefers `lib/<gem_name>/version.rb` over
+  alphabetically earlier compatibility namespace version files when discovering
+  each member's editable version file.
+
 ## [0.1.32] - 2026-07-01
 
 - TAG: [v0.1.32][0.1.32t]
@@ -572,7 +595,9 @@ Please file a bug if you notice a violation of semantic versioning.
 - Fixed CI load failures on engines without compatible `pty` support by falling back to Open3 for interactive release commands.
 - Fixed Ruby 3.2 version-bump support by loading Prism lazily and wiring the Prism gem only for MRI versions that need it.
 
-[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v0.1.32...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v0.2.0...HEAD
+[0.2.0]: https://github.com/kettle-dev/kettle-family/compare/v0.1.32...v0.2.0
+[0.2.0t]: https://github.com/kettle-dev/kettle-family/releases/tag/v0.2.0
 [0.1.32]: https://github.com/kettle-dev/kettle-family/compare/v0.1.31...v0.1.32
 [0.1.32t]: https://github.com/kettle-dev/kettle-family/releases/tag/v0.1.32
 [0.1.31]: https://github.com/kettle-dev/kettle-family/compare/v0.1.30...v0.1.31

data/README.md

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

@@ -61,7 +61,7 @@ module Kettle
           name: spec.name,
           root: File.dirname(path),
           gemspec_path: path,
-          version_file: version_file(File.dirname(path)),
+          version_file: version_file(File.dirname(path), spec.name),
           version: spec.version.to_s,
           dependencies: spec.runtime_dependencies.map(&:name).sort,
           required_ruby_version: required_ruby_version(spec),
@@ -85,7 +85,10 @@ module Kettle
         Array(spec.authors).compact.map(&:to_s).map(&:strip).reject(&:empty?)
       end
 
-      def version_file(root)
+      def version_file(root, gem_name)
+        canonical = File.join(root, "lib", gem_name.tr("-", "_"), "version.rb")
+        return canonical if File.file?(canonical)
+
         candidates = Dir.glob(File.join(root, "lib", "**", "version.rb"))
         candidates.min
       end

data/lib/kettle/family/local_install.rb

@@ -124,7 +124,7 @@ module Kettle
           name: spec.name,
           root: File.dirname(gemspec),
           gemspec_path: gemspec,
-          version_file: version_file(File.dirname(gemspec)),
+          version_file: version_file(File.dirname(gemspec), spec.name),
           version: spec.version.to_s,
           dependencies: spec.runtime_dependencies.map(&:name).sort,
           required_ruby_version: required_ruby_version(spec),
@@ -158,7 +158,10 @@ module Kettle
         raise Error, "could not load gemspec #{path}: #{error.message}"
       end
 
-      def version_file(root)
+      def version_file(root, gem_name)
+        canonical = File.join(root, "lib", gem_name.tr("-", "_"), "version.rb")
+        return canonical if File.file?(canonical)
+
         Dir.glob(File.join(root, "lib", "**", "version.rb")).min
       end
 

data/lib/kettle/family/version.rb

@@ -3,7 +3,7 @@
 module Kettle
   module Family
     module Version
-      VERSION = "0.1.32"
+      VERSION = "0.2.0"
     end
     VERSION = Version::VERSION # Traditional Constant Location
   end

data/lib/kettle/family/version_bump.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
 
+require "kettle/dev"
+
 module Kettle
   module Family
     class VersionBump
-      BUMP_TYPES = %w[major minor patch pre].freeze
       DEPENDENCY_METHODS = %i[add_dependency add_runtime_dependency].freeze
 
       def initialize(members:, target_version:, from_version: nil, mode: :dry_run)
         @members = members
         @target_version = target_version.to_s
-        @explicit_target_version = validate_version(target_version) unless BUMP_TYPES.include?(@target_version)
+        @explicit_target_version = validate_version(target_version) unless Kettle::Dev::VersionBump::BUMP_TYPES.include?(@target_version)
         @from_version = validate_version(from_version) if from_version
         @mode = mode
         @member_names = members.map(&:name)
@@ -27,9 +28,7 @@ module Kettle
       attr_reader :members, :target_version, :explicit_target_version, :from_version, :mode, :member_names, :member_target_versions
 
       def validate_version(version)
-        Gem::Version.new(version).to_s
-      rescue ArgumentError => error
-        raise Error, "invalid version #{version.inspect}: #{error.message}"
+        with_dev_errors { Kettle::Dev::VersionBump.validate_version(version) }
       end
 
       def result_for(member)
@@ -66,67 +65,25 @@ module Kettle
       end
 
       def collect_edits(member, member_target_version)
-        edits = []
-        edits << version_file_edit(member, member_target_version) if member.version_file
-        edits.concat(gemspec_dependency_edits(member))
-        edits.compact
-      end
-
-      def version_file_edit(member, member_target_version)
-        source = File.read(member.version_file)
-        node = version_string_node(source, member.version_file)
-        current = node.unescaped
-        return nil if current == member_target_version
-
-        replacement = quote_like(node.location.slice, member_target_version)
-        file_edit(member.version_file, source, node.location.start_offset, node.location.end_offset, replacement)
-      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(Error, "could not find string VERSION constant in #{path}")
-        constant.value
+        version_edits = with_dev_errors do
+          Kettle::Dev::VersionBump.new(
+            root: member.root,
+            current_version: member.version,
+            target_version: member_target_version
+          ).edits
+        end
+        version_edits + gemspec_dependency_edits(member)
       end
 
       def gemspec_dependency_edits(member)
         source = File.read(member.gemspec_path)
-        parse_result = parse_source(source, member.gemspec_path)
+        parse_result = with_dev_errors { Kettle::Dev::VersionBump.parse_source(source, member.gemspec_path) }
 
-        each_node(parse_result.value).filter_map do |node|
+        Kettle::Dev::VersionBump.each_node(parse_result.value).filter_map do |node|
           dependency_edit_for(member.gemspec_path, source, node)
         end
       end
 
-      def parse_source(source, path)
-        require_prism
-        parse_result = Prism.parse(source)
-        raise 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 Error, "bump-version requires Prism; install the prism gem or run on a Ruby engine that provides it (#{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 dependency_edit_for(path, source, node)
         return unless node.is_a?(Prism::CallNode) && DEPENDENCY_METHODS.include?(node.name)
 
@@ -142,8 +99,8 @@ module Kettle
         return unless current.start_with?(exact_prefix)
         return if current == "#{exact_prefix}#{dependency_target_version}"
 
-        replacement = quote_like(requirement_node.location.slice, "#{exact_prefix}#{dependency_target_version}")
-        file_edit(path, source, requirement_node.location.start_offset, requirement_node.location.end_offset, replacement)
+        replacement = Kettle::Dev::VersionBump.quote_like(requirement_node.location.slice, "#{exact_prefix}#{dependency_target_version}")
+        Kettle::Dev::VersionBump.file_edit(path, source, requirement_node.location.start_offset, requirement_node.location.end_offset, replacement)
       end
 
       def target_version_for(member)
@@ -151,73 +108,13 @@ module Kettle
       end
 
       def resolve_target_version(member)
-        return explicit_target_version unless BUMP_TYPES.include?(target_version)
-
-        bumped_version(target_version, member.version)
-      end
+        return explicit_target_version unless Kettle::Dev::VersionBump::BUMP_TYPES.include?(target_version)
 
-      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 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) }
-        raise Error, "cannot pre-bump version without prerelease segment #{current_version.inspect}" unless prerelease_index
-
-        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 Error, "cannot find prerelease segment in version #{current_version.inspect}"
-      end
-
-      def string_tail(value, offset)
-        value[offset, value.length - offset]
-      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}"
+        with_dev_errors { Kettle::Dev::VersionBump.resolve_target_version(target_version, member.version) }
       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.write_edits(edits)
       end
 
       def edit_summary(member:, target_version:, edits:)
@@ -228,6 +125,12 @@ module Kettle
         lines.concat(edits.map { |edit| "#{verb} #{edit.fetch(:path)}" }.uniq)
         lines.join("\n")
       end
+
+      def with_dev_errors
+        yield
+      rescue Kettle::Dev::Error => error
+        raise Error, error.message
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.2.0
 platform: ruby
 authors:
 - Peter H. Boling
@@ -105,20 +105,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.24
-  type: :development
+        version: 2.3.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.24
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +196,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -206,7 +206,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.9
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -339,10 +339,10 @@ licenses:
 - AGPL-3.0-only
 metadata:
   homepage_uri: https://kettle-family.galtzo.com
-  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v0.1.32
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v0.1.32/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v0.2.0
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v0.2.0/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/0.1.32
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/0.2.0
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-dev/kettle-family/wiki
   news_uri: https://www.railsbling.com/tags/kettle-family