kettle-family 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19486d91816150dae28ac5f1e8b31ef3f43b0f4f7004337681f08819fb41b27d
-  data.tar.gz: e2bf61a97f739f211accb4fc5cbfe91acc4121077c5f620786d30d217b4cc803
+  metadata.gz: f81e03e49736eb1884f0272f7af5ee78b14239ace620cf5427da26cfbaf2df5c
+  data.tar.gz: cc974713f574848b1740c413c1db51913bd99f8fc91fa2683b312f7cdbcfcf91
 SHA512:
-  metadata.gz: e8826e083336b3de83e313fc3207c60461e494fc8c1c4ad22b8148b861024ca78adcefa1b5c357d7ed90af79dddb3cda59dc4900434e862739d8d2f930e8e0c3
-  data.tar.gz: 1d735e6c84877eab971381d22226c96871e2fa0198bab1d9895bf771abdbbe2d5bf2c69a0d16bd04c0a3cdfdc830c7e7354f526313a5f0b8dbeec2a96df7d908
+  metadata.gz: 7fb8fa2d38f8a84c537558ab48d90fd17f9933cd27e8017b60a9f6ecf89f54a928d0c21b058dcc0e41766d47372dffb4a2a125c18c0e7049d11ce31ddaac24cd
+  data.tar.gz: 2e546a76ba606eb8078a477b696109a30a0acdfe23bda7267905fc926cb65dec5237f938f5d42ab8e8e75fb131a316d0303a3ec637284c7c41331e98a02bcdd2

data/CHANGELOG.md

@@ -30,6 +30,42 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.0.4] - 2026-07-21
+
+- TAG: [v1.0.4][1.0.4t]
+- COVERAGE: 95.68% -- 2726/2849 lines in 24 files
+- BRANCH COVERAGE: 77.97% -- 952/1221 branches in 24 files
+- 28.68% documented
+
+### Fixed
+
+- `kettle-family release --publish` now skips already-published members with no
+  unreleased changes even when post-release commits leave HEAD ahead of the
+  release tag, allowing later pending members to continue.
+
+## [1.0.3] - 2026-07-21
+
+- TAG: [v1.0.3][1.0.3t]
+- COVERAGE: 95.61% -- 2724/2849 lines in 24 files
+- BRANCH COVERAGE: 77.97% -- 952/1221 branches in 24 files
+- 28.68% documented
+
+### Changed
+
+- `kettle-family release-state` text tables now use compact column headings and
+  truncate checkout branch names to 10 characters.
+
+### Fixed
+
+- `kettle-family release` now builds release waves from gemspec development
+  dependencies and literal Gemfile dependencies, including dependencies in
+  modular Gemfiles loaded with `eval_gemfile`, so development-tooling releases
+  unblock dependent member releases before the next wave starts.
+
+- `kettle-family bump` now rewrites exact family dependency pins according to
+  release-wave order, so earlier members are not changed to require unreleased
+  later member versions.
+
 ## [1.0.2] - 2026-07-21
 
 - TAG: [v1.0.2][1.0.2t]
@@ -823,7 +859,11 @@ 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/v1.0.2...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.0.4...HEAD
+[1.0.4]: https://github.com/kettle-dev/kettle-family/compare/v1.0.3...v1.0.4
+[1.0.4t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.0.4
+[1.0.3]: https://github.com/kettle-dev/kettle-family/compare/v1.0.2...v1.0.3
+[1.0.3t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.0.3
 [1.0.2]: https://github.com/kettle-dev/kettle-family/compare/v1.0.1...v1.0.2
 [1.0.2t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.0.2
 [1.0.1]: https://github.com/kettle-dev/kettle-family/compare/v1.0.0...v1.0.1

data/README.md

@@ -669,7 +669,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.761-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-2.849-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/cli.rb

@@ -743,14 +743,25 @@ module Kettle
 
       def bump_version_results(members:, options:, phase:)
         require_relative "version_bump"
+        require_relative "release_waves"
+
+        results = []
+        completed_target_versions = {}
+        ReleaseWaves.new(members: members).waves.each do |wave|
+          bump = VersionBump.new(
+            members: wave,
+            target_version: options[:target_version],
+            from_version: options[:from_version],
+            mode: bump_version_mode(options),
+            phase: phase,
+            dependency_target_versions: completed_target_versions
+          )
+          wave_results = bump.results
+          results.concat(wave_results)
+          break unless wave_results.all?(&:ok?)
 
-        results = VersionBump.new(
-          members: members,
-          target_version: options[:target_version],
-          from_version: options[:from_version],
-          mode: bump_version_mode(options),
-          phase: phase
-        ).results
+          completed_target_versions.merge!(bump.target_versions)
+        end
         return results if options[:check] || !options[:commit]
         return results unless results.all?(&:ok?)
 

data/lib/kettle/family/dependency_floor.rb

@@ -5,7 +5,7 @@ require "kettle/dev"
 module Kettle
   module Family
     class DependencyFloor
-      DEPENDENCY_METHODS = %i[add_dependency add_runtime_dependency].freeze
+      DEPENDENCY_METHODS = %i[add_dependency add_runtime_dependency add_development_dependency].freeze
 
       def initialize(released_members:, dependent_members:, mode: :dry_run)
         @released_members = released_members

data/lib/kettle/family/discovery.rb

@@ -57,19 +57,41 @@ module Kettle
 
       def member_from_gemspec(path)
         spec = load_gemspec(path)
+        root = File.dirname(path)
+        dependencies = spec.runtime_dependencies.map(&:name).sort
         Member.new(
           name: spec.name,
-          root: File.dirname(path),
+          root: root,
           gemspec_path: path,
-          version_file: version_file(File.dirname(path), spec.name),
+          version_file: version_file(root, spec.name),
           version: spec.version.to_s,
-          dependencies: spec.runtime_dependencies.map(&:name).sort,
+          dependencies: dependencies,
+          release_dependencies: release_dependencies(root: root, spec: spec, dependencies: dependencies),
           required_ruby_version: required_ruby_version(spec),
           licenses: licenses(spec),
           authors: authors(spec)
         )
       end
 
+      def release_dependencies(root:, spec:, dependencies:)
+        (
+          dependencies +
+          spec.development_dependencies.map(&:name) +
+          gemfile_dependencies(root)
+        ).uniq.sort
+      end
+
+      def gemfile_dependencies(root)
+        gemfile = File.join(root, "Gemfile")
+        return [] unless File.file?(gemfile)
+
+        gemfile_dependency_collector(root: root).dependencies_for(gemfile).sort
+      end
+
+      def gemfile_dependency_collector(root:)
+        GemfileDependencyCollector.new(root: root)
+      end
+
       def required_ruby_version(spec)
         value = spec.required_ruby_version&.to_s&.strip
         value.empty? ? nil : value
@@ -153,6 +175,79 @@ module Kettle
 
         expanded_path.delete_prefix(prefix)
       end
+
+      class GemfileDependencyCollector
+        GEM_METHODS = %i[gem].freeze
+        EVAL_GEMFILE_METHODS = %i[eval_gemfile].freeze
+
+        def initialize(root:)
+          @root = root
+          @dependencies = Set.new
+          @visited = Set.new
+        end
+
+        def dependencies_for(path)
+          collect(File.expand_path(path))
+          dependencies.to_a
+        end
+
+        private
+
+        attr_reader :root, :dependencies, :visited
+
+        def collect(path)
+          return unless File.file?(path)
+          return if visited.include?(path)
+
+          visited << path
+          source = File.read(path)
+          parse_result = parse_source(source, path)
+          each_node(parse_result.value) do |node|
+            collect_call(path, node) if node.is_a?(Prism::CallNode)
+          end
+        end
+
+        def collect_call(path, node)
+          args = node.arguments&.arguments || []
+          first_arg = args.first
+          dependencies << first_arg.unescaped if GEM_METHODS.include?(node.name) && first_arg.is_a?(Prism::StringNode)
+          collect(eval_gemfile_path(path, first_arg)) if EVAL_GEMFILE_METHODS.include?(node.name) && first_arg.is_a?(Prism::StringNode)
+        end
+
+        def eval_gemfile_path(path, node)
+          gemfile_path = node.unescaped
+          return File.expand_path(gemfile_path, root) if gemfile_path.start_with?("/")
+
+          File.expand_path(gemfile_path, File.dirname(path))
+        end
+
+        def parse_source(source, path)
+          require_prism
+          parse_result = Prism.parse(source)
+          raise Error, "could not parse Gemfile dependency file #{path}" unless parse_result.success?
+
+          parse_result
+        end
+
+        def require_prism
+          return if defined?(Prism)
+
+          require "prism"
+        rescue LoadError => error
+          raise Error, "Gemfile dependency discovery 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
+      end
     end
   end
 end

data/lib/kettle/family/member.rb

@@ -9,6 +9,7 @@ module Kettle
       :version_file,
       :version,
       :dependencies,
+      :release_dependencies,
       :required_ruby_version,
       :licenses,
       :authors
@@ -21,6 +22,7 @@ module Kettle
           "version_file" => version_file,
           "version" => version,
           "dependencies" => dependencies,
+          "release_dependencies" => release_dependencies || dependencies,
           "required_ruby_version" => required_ruby_version,
           "licenses" => Array(licenses),
           "authors" => Array(authors)

data/lib/kettle/family/release_waves.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Kettle
+  module Family
+    class ReleaseWaves
+      def initialize(members:)
+        @members = members
+      end
+
+      def waves
+        by_name = members.to_h { |member| [member.name, member] }
+        pending = by_name.keys
+        completed = []
+        [].tap do |planned_waves|
+          until pending.empty?
+            hard_ready = pending.select do |name|
+              selected_hard_dependencies_for(by_name.fetch(name), by_name).all? { |dependency| completed.include?(dependency) }
+            end
+            raise Error, "cyclic release dependency order: #{pending.join(", ")}" if hard_ready.empty?
+
+            wave_names = hard_ready.select do |name|
+              selected_dependencies_for(by_name.fetch(name), by_name).all? { |dependency| completed.include?(dependency) }
+            end
+            wave_names = [hard_ready.first] if wave_names.empty?
+
+            planned_waves << wave_names.map { |name| by_name.fetch(name) }
+            completed.concat(wave_names)
+            pending -= wave_names
+          end
+        end
+      end
+
+      private
+
+      attr_reader :members
+
+      def selected_hard_dependencies_for(member, by_name)
+        Array(member.dependencies).map(&:to_s).select { |dependency| by_name.key?(dependency) }
+      end
+
+      def selected_dependencies_for(member, by_name)
+        release_dependency_names(member).select { |dependency| by_name.key?(dependency) }
+      end
+
+      def release_dependency_names(member)
+        Array(member.release_dependencies || member.dependencies).map(&:to_s)
+      end
+    end
+  end
+end

data/lib/kettle/family/report.rb

@@ -357,7 +357,7 @@ module Kettle
         state = result.state || {}
         row = [
           state.fetch("gem_name", result.member_name).to_s,
-          state.fetch("current_branch", nil).to_s.empty? ? "unknown" : state.fetch("current_branch").to_s,
+          release_state_checkout(state),
           state.fetch("version", "unknown").to_s,
           state.fetch("latest_released", nil).to_s.empty? ? "unknown" : state.fetch("latest_released").to_s,
           state.fetch("latest_changelog_version", nil).to_s.empty? ? "none" : state.fetch("latest_changelog_version").to_s,
@@ -372,12 +372,17 @@ module Kettle
       end
 
       def release_state_header
-        header = [["gem", "checkout", "version.rb", "latest released", "latest changelog", "ahead / behind", "unreleased", "prepared", "pending"]]
+        header = [["gem", "checkout", "V.rb", "V.rel", "V.ch.md", "🔼 / 🔽", "unrel", "prep", "pend"]]
         return header unless release_state_has_branches?
 
         [["branch", *header.first]]
       end
 
+      def release_state_checkout(state)
+        branch = state.fetch("current_branch", nil).to_s
+        branch.empty? ? "unknown" : branch[0, 10]
+      end
+
       def release_state_ahead_behind(state)
         local_ahead = state.fetch("ahead", nil)
         local_behind = state.fetch("behind", nil)

data/lib/kettle/family/version.rb

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

data/lib/kettle/family/version_bump.rb

@@ -5,9 +5,9 @@ require "kettle/dev"
 module Kettle
   module Family
     class VersionBump
-      DEPENDENCY_METHODS = %i[add_dependency add_runtime_dependency].freeze
+      DEPENDENCY_METHODS = %i[add_dependency add_runtime_dependency add_development_dependency].freeze
 
-      def initialize(members:, target_version:, from_version: nil, mode: :dry_run, phase: "bump-version")
+      def initialize(members:, target_version:, from_version: nil, mode: :dry_run, phase: "bump-version", dependency_target_versions: nil)
         @members = members
         @target_version = target_version.to_s
         @explicit_target_version = validate_version(target_version) unless Kettle::Dev::VersionBump::BUMP_TYPES.include?(@target_version)
@@ -18,15 +18,21 @@ module Kettle
         @member_target_versions = members.each_with_object({}) do |member, memo|
           memo[member.name] = resolve_target_version(member)
         end
+        @dependency_target_versions = dependency_target_versions || member_target_versions
+        @dependency_member_names = @dependency_target_versions.keys
       end
 
       def results
         members.map { |member| result_for(member) }
       end
 
+      def target_versions
+        member_target_versions.dup
+      end
+
       private
 
-      attr_reader :members, :target_version, :explicit_target_version, :from_version, :mode, :phase, :member_names, :member_target_versions
+      attr_reader :members, :target_version, :explicit_target_version, :from_version, :mode, :phase, :member_target_versions, :dependency_target_versions, :dependency_member_names
 
       def validate_version(version)
         with_dev_errors { Kettle::Dev::VersionBump.validate_version(version) }
@@ -90,9 +96,11 @@ module Kettle
 
         args = node.arguments&.arguments || []
         name_node, requirement_node = args
-        return unless name_node.is_a?(Prism::StringNode) && member_names.include?(name_node.unescaped)
+        return unless name_node.is_a?(Prism::StringNode) && dependency_member_names.include?(name_node.unescaped)
         return unless requirement_node
-        dependency_target_version = member_target_versions.fetch(name_node.unescaped)
+        dependency_target_version = dependency_target_versions[name_node.unescaped]
+        return unless dependency_target_version
+
         if same_version_dependency_requirement?(node, requirement_node)
           return if dependency_target_version == target_version_for(member)
 

data/lib/kettle/family/workflow.rb

@@ -520,25 +520,7 @@ module Kettle
       end
 
       def release_waves(release_members)
-        by_name = release_members.to_h { |member| [member.name, member] }
-        pending = by_name.keys
-        completed = []
-        waves = []
-        until pending.empty?
-          wave_names = pending.select do |name|
-            selected_dependencies_for(by_name.fetch(name), by_name).all? { |dependency| completed.include?(dependency) }
-          end
-          raise Error, "cyclic release dependency order: #{pending.join(", ")}" if wave_names.empty?
-
-          waves << wave_names.map { |name| by_name.fetch(name) }
-          completed.concat(wave_names)
-          pending -= wave_names
-        end
-        waves
-      end
-
-      def selected_dependencies_for(member, by_name)
-        Array(member.dependencies).map(&:to_s).select { |dependency| by_name.key?(dependency) }
+        ReleaseWaves.new(members: release_members).waves
       end
 
       def append_dependency_floor_results(released_members:, dependent_members:, runner:, memo:)
@@ -565,10 +547,14 @@ module Kettle
       def dependent_members_depending_on(released_members:, dependent_members:)
         released_names = released_members.map(&:name)
         dependent_members.select do |member|
-          Array(member.dependencies).map(&:to_s).any? { |dependency| released_names.include?(dependency) }
+          release_dependency_names(member).any? { |dependency| released_names.include?(dependency) }
         end
       end
 
+      def release_dependency_names(member)
+        Array(member.release_dependencies || member.dependencies).map(&:to_s)
+      end
+
       def append_registry_wait_result(released_members:, dependent_members:, memo:)
         return unless execute && publish
         return if dependent_members.empty?
@@ -807,14 +793,15 @@ module Kettle
           stdout = "#{member.name} #{member.version} is already published and current HEAD matches #{tag}; skipping release"
           reason = "already released"
           skipped = true
-        elsif release_pending?(member)
-          stdout = "#{member.name} #{member.version} is already published, but current HEAD is not #{tag}. " \
-            "Bump the version with `kettle-family bump-version patch --execute --only #{member.name}` before releasing."
-          reason = "published version does not match current HEAD"
+        elsif unreleased_changes_pending?(member)
+          stdout = "#{member.name} #{member.version} is already published, but release-state reports unreleased changes. " \
+            "Bump the version with `kettle-family bump patch --execute --only #{member.name}` before releasing."
+          reason = "published version has unreleased changes"
           skipped = false
         else
-          stdout = "#{member.name} #{member.version} is already published and release-state reports no pending release; skipping release"
-          reason = "already released; no pending release"
+          stdout = "#{member.name} #{member.version} is already published, current HEAD is newer than #{tag}, " \
+            "and release-state reports no unreleased changes; skipping release"
+          reason = "already released; no unreleased changes"
           skipped = true
         end
 
@@ -833,11 +820,11 @@ module Kettle
         )
       end
 
-      def release_pending?(member)
+      def unreleased_changes_pending?(member)
         results = ReleaseStateCheck.new(members: [member], config: config).results
         return true unless results.all?(&:ok?)
 
-        results.any? { |result| result.state.fetch("pending_release", true) }
+        results.any? { |result| result.state.fetch("unreleased_entries", true) }
       end
 
       def release_tag_name(version)

data/lib/kettle/family.rb

@@ -15,6 +15,7 @@ require_relative "family/config"
 require_relative "family/branch_target_config"
 require_relative "family/release_state_check"
 require_relative "family/local_install"
+require_relative "family/release_waves"
 require_relative "family/workflow"
 require_relative "family/discovery"
 require_relative "family/orderer"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Peter H. Boling
@@ -291,6 +291,7 @@ files:
 - lib/kettle/family/readiness_check.rb
 - lib/kettle/family/release_state_check.rb
 - lib/kettle/family/release_state_result.rb
+- lib/kettle/family/release_waves.rb
 - lib/kettle/family/report.rb
 - lib/kettle/family/selection.rb
 - lib/kettle/family/version.rb
@@ -303,10 +304,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/v1.0.2
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.0.2/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.0.4
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.0.4/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.0.2
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.0.4
   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