kettle-family 1.2.26 → 1.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adb17c73e9c486d45768f2d1c7fc6a5b3fa1c6ec6e7c55051a0f8eddce3c22a3
-  data.tar.gz: 61bfbb1584ae7b9bccd62879ce4f931c79790dfa3268e4295869d8b76894fa7d
+  metadata.gz: 7eb22e412099103ce6ac398ea2fc72f6a0ff8a9bf73834207deb5bcf3b66ba15
+  data.tar.gz: '09f4b61f9a2cae67da04bbd532d7955c57bdcf33699f68d497d044e87c4964d4'
 SHA512:
-  metadata.gz: 68bf18901ceaae72877b79b1453b1d4295fc96ac13ef973f53510b4a0fb9d5a27f8ba726952c06f45f5a867ba3641fb636a6ccd19b5c557838d1b1f0e1b42db8
-  data.tar.gz: 828a8d9d910fb9eab4b1fbdd4cfe162c2d49a5dc0fbf2246fd0536b35cbf70ee24f9cc77b6a6fefe30476c0c7b92a655542c731d62e40ea2a5319089288dd763
+  metadata.gz: 4db2cc116774e175b9ac032f2f786dc787d9c42b3a141a4669f9a55ec5eae582525fc3974f3f15d36936c6513f5b2278af0ecf1ac1b1520708dd07cfe7f07beb
+  data.tar.gz: 6091f9b45eaa9d9d32480a0c92e22b51238992e920fade590cedf1c5e3ce6ca44a773c540a1f419dbdecc3c65dca96f9c3eab80ddb48993adf4b328a7033414d

checksums.yaml.gz.sig

@@ -1,4 +1,2 @@
-X�q��#����?
-���"��
�<��>)߶���5q
-���L
-����/뱊�U�?��'K?��v� d�����@�2�v�,��'��ـŲ@�	���L�i���B�឵�j�@��t�����a�
+)�Ky�I�qȘׂ�a�|9�X�z�x��&�\�������c�ݔ���,�5٢/���x�F�`�K��"�
+�ƚ��ۡg�C��_�y�仁E����p�"x	�V�R�T�ͧ��%���c8�T3(xݺU�a�'DT�<]-��.����+i��z�'��yQ~���3{��:r�9�f݂��:K5�u@hV�zVP��5��I���7d`q�Y�

data/CHANGELOG.md

@@ -30,6 +30,21 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.27] - 2026-08-03
+
+- TAG: [v1.2.27][1.2.27t]
+- COVERAGE: 93.95% -- 4720/5024 lines in 31 files
+- BRANCH COVERAGE: 76.57% -- 1853/2420 branches in 31 files
+- 29.31% documented
+
+### Fixed
+
+- Clear shortened release progress statuses on TTY redraws
+
+- Redraw concurrent TTY progress rows from a stable block anchor.
+
+- List release members in deterministic release-wave order.
+
 ## [1.2.26] - 2026-08-03
 
 - TAG: [v1.2.26][1.2.26t]
@@ -1705,7 +1720,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/v1.2.26...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.27...HEAD
+[1.2.27]: https://github.com/kettle-dev/kettle-family/compare/v1.2.26...v1.2.27
+[1.2.27t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.27
 [1.2.26]: https://github.com/kettle-dev/kettle-family/compare/v1.2.25...v1.2.26
 [1.2.26t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.26
 [1.2.25]: https://github.com/kettle-dev/kettle-family/compare/v1.2.24...v1.2.25

data/README.md

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

@@ -641,7 +641,9 @@ module Kettle
         release_state_results = release_state_results_for_selection(config: config, members: ordered, only: effective_only)
         selected = Selection.new(members: ordered, release_state_results: release_state_results).apply(only: effective_only, exclude: options[:exclude], start_at: start_at.member)
         result_members = selected
-        print_execution_intent(command: command, config: config, members: result_members, options: options, start_at: start_at)
+        display_members = display_members_for(command: command, config: config, members: ordered, selected_members: selected)
+        display_selected_members = display_members_for(command: command, config: config, members: selected, selected_members: selected)
+        print_execution_intent(command: command, config: config, members: display_selected_members, options: options, start_at: start_at)
         started_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         results = command_results(command: command, config: config, members: result_members, options: options, start_at: start_at)
         elapsed_seconds = Process.clock_gettime(Process::CLOCK_MONOTONIC) - started_at
@@ -649,7 +651,7 @@ module Kettle
           family_name: config.family_name,
           family_mode: config.family_mode,
           order_mode: config.order_mode,
-          members: ordered,
+          members: display_members,
           selected_members: selected,
           config_path: config.path,
           branch_lanes: config.branch_lanes,
@@ -693,6 +695,23 @@ module Kettle
         names
       end
 
+      def display_members_for(command:, config:, members:, selected_members:)
+        return members unless command == "release"
+
+        require_relative "release_waves"
+        planned = ReleaseWaves.new(
+          members: selected_members,
+          configured_waves: config.release_waves,
+          strict_cycles: true
+        ).waves.flatten
+        planned_names = planned.map(&:name)
+        planned + members.reject { |member| planned_names.include?(member.name) }
+      rescue Error
+        # Let the workflow report invalid cycles or wave configuration. The
+        # display should not prevent that diagnostic from being produced.
+        members
+      end
+
       def command_results_for_current_branch(command:, config:, members:, options:, start_at: StartAt.new(nil, nil))
         return mise_trust_results(config: config, members: members) if command == "mise-trust"
         return bump_version_results(members: members, options: options, phase: command) if %w[bump bump-version].include?(command)

data/lib/kettle/family/version.rb

@@ -5,7 +5,7 @@ module Kettle
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = "1.2.26"
+      VERSION = "1.2.27"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/family/workflow_progress.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "tty-progressbar"
 require "tty-screen"
 
 module Kettle
@@ -9,7 +8,7 @@ module Kettle
       MEMBER_WIDTH = 24
       PROGRESS_WIDTH = 7
       ELAPSED_WIDTH = 7
-      FORMAT = "%<member>-#{MEMBER_WIDTH}.#{MEMBER_WIDTH}s :progress :duration :events :status"
+      FORMAT = "%<member>-#{MEMBER_WIDTH}.#{MEMBER_WIDTH}s %<progress>s %<duration>s %<events>s %<status>s"
       EVENT_WIDTH = 20
       MIN_STATUS_WIDTH = 12
       DEFAULT_TERMINAL_WIDTH = 80
@@ -23,7 +22,6 @@ module Kettle
         @heading = heading
         @clock = clock || lambda { Process.clock_gettime(Process::CLOCK_MONOTONIC) }
         @enabled = enabled && !!io
-        @bars = {}
         @line_order = members.map(&:name)
         @started = false
         @stopped = false
@@ -35,7 +33,8 @@ module Kettle
         @member_statuses = Hash.new("")
         @mutex = Mutex.new
         @tty = @enabled && io.respond_to?(:tty?) && io.tty?
-        @multibar = @tty ? TTY::ProgressBar::Multi.new(output: io, frequency: 0) : nil
+        @tty_rendered = false
+        @tty_rows = 0
       end
 
       def start
@@ -46,7 +45,10 @@ module Kettle
 
           write_line(@heading || "#{@label} #{@total} member#{plural(@total)} with #{@jobs} job#{plural(@jobs)}:")
           @started = true
-          @line_order.each { |member_name| render_name(member_name, status: "") } if @tty
+          if @tty
+            @line_order.each { |member_name| render_name(member_name, status: "") }
+            render_tty_block unless @line_order.empty?
+          end
         end
       end
 
@@ -114,7 +116,6 @@ module Kettle
         synchronize do
           next if @stopped
 
-          @multibar&.stop
           @stopped = true
         end
       end
@@ -136,6 +137,7 @@ module Kettle
 
       def render(member, status:)
         render_name(member.name, status: status)
+        render_tty_block if @tty
       end
 
       def append_event(member, mark)
@@ -147,8 +149,30 @@ module Kettle
       def render_name(member_name, status:)
         @member_statuses[member_name] = truncate_status(status)
         @line_order << member_name unless @line_order.include?(member_name)
-        bar_for(member_name).advance(
-          0,
+      end
+
+      # Redraw the complete block from a stable cursor position. TTY::ProgressBar::Multi
+      # saves and restores the cursor independently for each bar, which is unreliable
+      # across terminals that do not implement its legacy ESC 7/ESC 8 sequences.
+      def render_tty_block
+        rows = @line_order.map { |member_name| tty_line(member_name) }
+        return if rows.empty?
+
+        output = +""
+        output << "\e[#{@tty_rows}A" if @tty_rendered && @tty_rows.positive?
+        rows.each do |line|
+          output << "\e[1G\e[2K#{line}\n"
+        end
+        @io.write(output)
+        @io.flush if @io.respond_to?(:flush)
+        @tty_rendered = true
+        @tty_rows = rows.length
+      end
+
+      def tty_line(member_name)
+        Kernel.format(
+          FORMAT,
+          member: member_name,
           progress: progress_text(member_name),
           duration: elapsed_text(member_name),
           events: @member_events[member_name].rjust(EVENT_WIDTH),
@@ -156,10 +180,6 @@ module Kettle
         )
       end
 
-      def bar_for(member_name)
-        @bars[member_name] ||= @multibar.register(Kernel.format(FORMAT, member: member_name), total: nil)
-      end
-
       def plural(count)
         "s" unless count == 1
       end
@@ -214,7 +234,7 @@ module Kettle
       def truncate_status(status)
         normalized = status.to_s.gsub(/\s+/, " ").strip
         width = status_width
-        return normalized if normalized.length <= width
+        return normalized.ljust(width) if normalized.length <= width
         return normalized[0, width] if width <= ELLIPSIS.length
 
         "#{normalized[0, width - ELLIPSIS.length]}#{ELLIPSIS}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.26
+  version: 1.2.27
 platform: ruby
 authors:
 - Peter H. Boling
@@ -120,19 +120,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: tty-progressbar
+  name: tty-screen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -345,10 +345,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.2.26
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.26/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.27
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.27/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.26
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.27
   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