kettle-family 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3c5233f8223ab84157bd218613782a68b6d86073276611f5f48efcf399b3f7d
-  data.tar.gz: f96d4584d39c94b5956722d776d27309cdaad86779ebf4a522e47c5c42fe395d
+  metadata.gz: 3b6e08799214b00e8f52b6860bc7b08d60388cf9d432d25570af4cfc4366b54c
+  data.tar.gz: 241f806e20a77c405ceb783b9a9e3e957d85d37d7d670e9e9528e91df69f09af
 SHA512:
-  metadata.gz: c6c40b482098bf7af4668965740cb643b7a4256efefc5398ec8c85071d1eec03a779317aa9c8121f9fc517e0beea3ae090318027d1ed61e940870b00e8199461
-  data.tar.gz: 0661b72077e5f25d7c8b7029accc11d56e8e459e2e060b3a394514b70bacdc92d69b43b5ce51eec88665a1046662c4d1f0bede30ed076a7e9f54825d0d1ed676
+  metadata.gz: a6a8c0facd2448af40324cdf3f4ffe7c17dffb57187b8919dffdb3c078a1424d0d5cf36b3c34b2227af9ff24ca79a0941661ced826190fd6f1ba5340d9746973
+  data.tar.gz: 7b40ab91662c6f755e055ec54edc435a9617ed9569cb5de755300e77834e76c03e620aadf0dcfc7a4f6d59e83173e25847daaab650cc343082fdac2e4f826fcb

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
->�C�#,j�ɞ��V���hS�P����E?-ce���z�?�1���u�;��x��܆&O�Æ����f����B�z�����d��q��	�;�P��W�L�d[��H����$��B��,����'E
-(
j���2�Q��R�yq /�M�j�<���TN�>������B�Y�7z��Y����S^Ŷ��~���߈�/�Z�y&{&)B#��)v�hr��[�s�ƥY�1�_
+mwz�Fu,�j��b��hȓ�P��{�����=/�XDQ
+�ML��H�تg�

data/CHANGELOG.md

@@ -35,6 +35,11 @@ Please file a bug if you notice a violation of semantic versioning.
 - `kettle-family bump-version` now leaves non-exact family dependency
   requirements unchanged instead of rejecting them as ambiguous, allowing
   families with loose inter-gem constraints to use relative version bumps.
+- `kettle-family bump-version --execute` now reports actual writes as
+  `updated`, includes each member's `current -> target` version change, commits
+  version bump edits, and uses member-local branch target stacks so branch
+  traversal can continue safely.
+- Text reports now indent each line of multi-line command output consistently.
 
 ### Security
 

data/lib/kettle/family/cli.rb

@@ -186,6 +186,7 @@ module Kettle
 
       def command_results(command:, config:, members:, options:)
         return branch_target_command_results(command: command, config: config, members: members, options: options) if branch_target_command?(command, config)
+        return member_local_branch_target_command_results(command: command, config: config, members: members, options: options) if member_local_branch_target_command?(command, config, members)
 
         command_results_for_current_branch(command: command, config: config, members: members, options: options)
       end
@@ -224,6 +225,13 @@ module Kettle
         !WORKFLOW_COMMANDS.include?(command)
       end
 
+      def member_local_branch_target_command?(command, config, members)
+        return false if !config.release_target_branches.empty?
+        return false unless command == "bump-version"
+
+        members.any? { |member| member_local_release_config(member: member, config: config) }
+      end
+
       def branch_target_command_results(command:, config:, members:, options:)
         runner = CommandRunner.new(execute: options[:execute])
         selected_names = members.map(&:name)
@@ -245,6 +253,33 @@ module Kettle
         end
       end
 
+      def member_local_branch_target_command_results(command:, config:, members:, options:)
+        runner = CommandRunner.new(execute: options[:execute])
+        members.each_with_object([]) do |member, memo|
+          member_config = member_local_release_config(member: member, config: config)
+          unless member_config
+            memo.concat(command_results_for_current_branch(command: command, config: config, members: [member], options: options))
+            break memo unless memo.last&.ok?
+            next
+          end
+
+          member_config.release_target_branches.each do |branch|
+            memo << runner.call(
+              member: member,
+              phase: "release_checkout",
+              command: ["git", "checkout", branch]
+            )
+            break unless memo.last.ok?
+
+            branch_members = rediscovered_selected_members(config: member_config, selected_names: [member.name], command: command)
+            branch_members = [member] if branch_members.empty?
+            memo.concat(command_results_for_current_branch(command: command, config: member_config, members: branch_members, options: options))
+            break unless memo.last&.ok?
+          end
+          break memo unless memo.last&.ok?
+        end
+      end
+
       def rediscovered_selected_members(config:, selected_names:, command:)
         discovered = Discovery.new(config: config).members
         ordered = (command == "install") ? install_order(discovered, config) : Orderer.new(members: discovered, mode: config.order_mode, hints: config.order_hints).ordered
@@ -271,12 +306,28 @@ module Kettle
       end
 
       def bump_version_results(members:, options:)
-        VersionBump.new(
+        results = VersionBump.new(
           members: members,
           target_version: options[:target_version],
           from_version: options[:from_version],
           mode: bump_version_mode(options)
         ).results
+        return results if options[:check] || !options[:commit]
+        return results unless results.all?(&:ok?)
+
+        runner = CommandRunner.new(execute: options[:execute])
+        members.each_with_object(results) do |member, memo|
+          memo << runner.call(
+            member: member,
+            phase: "commit_version_bump",
+            command: [
+              "sh",
+              "-lc",
+              "if ! git diff --quiet -- '*.gemspec' 'lib/**/version.rb'; then git add -- '*.gemspec' 'lib/**/version.rb' && git commit -m '🔖 Bump gem version'; fi"
+            ]
+          )
+          break memo unless memo.last.ok?
+        end
       end
 
       def add_changelog_results(members:, options:)

data/lib/kettle/family/report.rb

@@ -77,12 +77,16 @@ module Kettle
         lines << "results:"
         results.each do |result|
           lines << "  #{result_state(result)} #{result.member_name} #{result.phase} #{result.reason || ""}".rstrip
-          lines << "    #{result.stdout}" unless result.stdout.to_s.empty?
-          lines << "    #{result.stderr}" if !result.ok? && !result.stderr.to_s.empty?
+          append_indented_output(lines, result.stdout) unless result.stdout.to_s.empty?
+          append_indented_output(lines, result.stderr) if !result.ok? && !result.stderr.to_s.empty?
           lines << "    resume: #{resume_hint_for(result)}" unless result.ok?
         end
       end
 
+      def append_indented_output(lines, output)
+        output.to_s.each_line(chomp: true) { |line| lines << "    #{line}" }
+      end
+
       def append_member_release_targets(lines)
         return if member_release_target_branches.empty?
 

data/lib/kettle/family/version.rb

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

data/lib/kettle/family/version_bump.rb

@@ -45,7 +45,7 @@ module Kettle
           workdir: member.root,
           status: check_failed?(edits) ? 1 : 0,
           success: !check_failed?(edits),
-          stdout: edit_summary(edits),
+          stdout: edit_summary(member: member, target_version: member_target_version, edits: edits),
           stderr: "",
           elapsed_seconds: 0.0,
           skipped: mode == :dry_run,
@@ -220,10 +220,13 @@ module Kettle
         end
       end
 
-      def edit_summary(edits)
-        return "no version changes needed" if edits.empty?
+      def edit_summary(member:, target_version:, edits:)
+        lines = ["#{member.version} -> #{target_version}"]
+        return [*lines, "no version changes needed"].join("\n") if edits.empty?
 
-        edits.map { |edit| "would update #{edit.fetch(:path)}" }.uniq.join("\n")
+        verb = (mode == :execute) ? "updated" : "would update"
+        lines.concat(edits.map { |edit| "#{verb} #{edit.fetch(:path)}" }.uniq)
+        lines.join("\n")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Peter H. Boling
@@ -309,10 +309,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.13
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v0.1.13/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v0.1.14
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v0.1.14/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/0.1.13
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/0.1.14
   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