kettle-family 0.1.13 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3c5233f8223ab84157bd218613782a68b6d86073276611f5f48efcf399b3f7d
-  data.tar.gz: f96d4584d39c94b5956722d776d27309cdaad86779ebf4a522e47c5c42fe395d
+  metadata.gz: f34f86e4bbc4ff6d79503e62d90a5f5942f2cf5ca71889d28e9580467e1cbf62
+  data.tar.gz: 5b930341c10d8dbd8f254cfdd1cd38ffd553ce42801e43bc7d53be1feb794127
 SHA512:
-  metadata.gz: c6c40b482098bf7af4668965740cb643b7a4256efefc5398ec8c85071d1eec03a779317aa9c8121f9fc517e0beea3ae090318027d1ed61e940870b00e8199461
-  data.tar.gz: 0661b72077e5f25d7c8b7029accc11d56e8e459e2e060b3a394514b70bacdc92d69b43b5ce51eec88665a1046662c4d1f0bede30ed076a7e9f54825d0d1ed676
+  metadata.gz: 4728fe4ae1ee4c04ab01034ccc2443b7d77379912ec38aa0838c63f1ee08c902ce0db06c4d4753521a5461a34bd62a97715b4f3594eac960f4b4e0d3c0ea32b8
+  data.tar.gz: e51a4793bb4b96ac610165217d143cba66976ef4e0ac2c106e87c9c7197ba5a238af032b3e9b5f360e67134668a11f9fce70e70ac9d6fa4cc545e2fd7b2689ac

data/CHANGELOG.md

@@ -20,6 +20,8 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Added
 
+- `kettle-family push`, `kettle-family pull`, and `kettle-family up` now plan
+  or execute family-wide git synchronization commands.
 - `kettle-family bump-version` now accepts the same relative bump targets as
   `kettle-bump` (`major`, `minor`, `patch`, and `pre`) and applies them per
   member from each member's current version.
@@ -32,9 +34,17 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Fixed
 
+- Branch-stack commands now allow `main` as a configured branch target for
+  workflows like templating while excluding it from install and release
+  traversals.
 - `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

@@ -6,8 +6,9 @@ require "optparse"
 module Kettle
   module Family
     class CLI
-      COMMANDS = %w[discover plan report metadata check test lint docs template install bump-version add-changelog release branch-lanes release-state].freeze
-      WORKFLOW_COMMANDS = %w[check test lint docs template release].freeze
+      COMMANDS = %w[discover plan report metadata check test lint docs template install bump-version add-changelog release push pull up branch-lanes release-state].freeze
+      WORKFLOW_COMMANDS = %w[check test lint docs template release push pull up].freeze
+      MAIN_BRANCH_SKIPPING_COMMANDS = %w[install release].freeze
 
       def self.call(argv, out: $stdout, err: $stderr)
         new(argv, out: out, err: err).call
@@ -64,6 +65,9 @@ module Kettle
               bump-version    Check, plan, or execute family version alignment
               add-changelog   Add an entry to an existing Unreleased changelog section
               release         Plan or execute release build/publish phases
+              push            Plan or execute git push per member
+              pull            Plan or execute git pull --rebase per member
+              up              Plan or execute git pull --rebase then git push per member
               branch-lanes    Audit configured branch lane release mappings
               release-state   Report changelog release state for family members
 
@@ -176,8 +180,8 @@ module Kettle
           selected_members: selected,
           config_path: config.path,
           branch_lanes: config.branch_lanes,
-          release_target_branches: config.release_target_branches,
-          member_release_target_branches: member_release_target_branches(members: selected, config: config),
+          release_target_branches: branch_targets_for(command, config.release_target_branches),
+          member_release_target_branches: member_release_target_branches(command: command, members: selected, config: config),
           release_mode: release_mode(command: command, options: options),
           command: command,
           results: results
@@ -186,6 +190,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,10 +229,17 @@ 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)
-        config.release_target_branches.each_with_object([]) do |branch, memo|
+        branch_targets_for(command, config.release_target_branches).each_with_object([]) do |branch, memo|
           memo << runner.call(
             member: family_member(config),
             phase: "release_checkout",
@@ -245,6 +257,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
+
+          branch_targets_for(command, 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 +310,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:)
@@ -340,13 +395,19 @@ module Kettle
         options[:publish] ? "publish" : "build-only"
       end
 
-      def member_release_target_branches(members:, config:)
+      def member_release_target_branches(command:, members:, config:)
         members.each_with_object({}) do |member, memo|
           member_config = member_local_release_config(member: member, config: config)
-          memo[member.name] = member_config.release_target_branches if member_config
+          memo[member.name] = branch_targets_for(command, member_config.release_target_branches) if member_config
         end
       end
 
+      def branch_targets_for(command, branches)
+        return branches unless MAIN_BRANCH_SKIPPING_COMMANDS.include?(command)
+
+        branches.reject { |branch| branch == "main" }
+      end
+
       def member_local_release_config(member:, config:)
         member_config = Config.load(root: member.root)
         return unless member_config.path

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.15"
     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

data/lib/kettle/family/workflow.rb

@@ -14,6 +14,12 @@ module Kettle
         "lint" => "bundle exec rake rubocop_gradual",
         "docs" => "bundle exec rake yard"
       }.freeze
+      GIT_SYNC_COMMANDS = {
+        "push" => [["push", %w[git push]]],
+        "pull" => [["pull", %w[git pull --rebase]]],
+        "up" => [["pull", %w[git pull --rebase]], ["push", %w[git push]]]
+      }.freeze
+      MAIN_BRANCH_SKIPPING_COMMANDS = %w[release].freeze
 
       def initialize(command:, config:, members:, execute: false, commit: true, allow_dirty: false, publish: false, push: false, tag: false, start_step: nil, local_ci: false, continue_ci_failures: false, env_overrides: {}, gem_signing_password: nil)
         @command = command
@@ -47,6 +53,7 @@ module Kettle
       def current_branch_results(workflow_members)
         return check_results(workflow_members) if command == "check"
         return release_member_results(workflow_members, include_family_changelog: true) if command == "release"
+        return git_sync_results(workflow_members) if GIT_SYNC_COMMANDS.key?(command)
 
         member_workflow_results(workflow_members)
       end
@@ -75,7 +82,7 @@ module Kettle
       def branch_target_results
         runner = command_runner
         selected_names = members.map(&:name)
-        config.release_target_branches.each_with_object([]) do |branch, memo|
+        branch_targets.each_with_object([]) do |branch, memo|
           memo << checkout_branch_result(branch: branch, runner: runner)
           break memo unless memo.last.ok?
 
@@ -176,6 +183,17 @@ module Kettle
         end
       end
 
+      def git_sync_results(sync_members)
+        runner = command_runner
+        sync_members.each_with_object([]) do |member, memo|
+          GIT_SYNC_COMMANDS.fetch(command).each do |phase, git_command|
+            memo << runner.call(member: member, phase: phase, command: git_command)
+            break unless memo.last.ok?
+          end
+          break memo unless memo.last.ok?
+        end
+      end
+
       def command_runner
         CommandRunner.new(execute: execute, gem_signing_password: @gem_signing_password)
       end
@@ -190,6 +208,12 @@ module Kettle
         members.any? { |member| member_local_release_config(member) }
       end
 
+      def branch_targets
+        return config.release_target_branches unless MAIN_BRANCH_SKIPPING_COMMANDS.include?(command)
+
+        config.release_target_branches.reject { |branch| branch == "main" }
+      end
+
       def member_local_release_config(member)
         member_config = Config.load(root: member.root)
         return unless member_config.path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.15
 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.15
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v0.1.15/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.15
   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