kettle-family 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b6e08799214b00e8f52b6860bc7b08d60388cf9d432d25570af4cfc4366b54c
-  data.tar.gz: 241f806e20a77c405ceb783b9a9e3e957d85d37d7d670e9e9528e91df69f09af
+  metadata.gz: f34f86e4bbc4ff6d79503e62d90a5f5942f2cf5ca71889d28e9580467e1cbf62
+  data.tar.gz: 5b930341c10d8dbd8f254cfdd1cd38ffd553ce42801e43bc7d53be1feb794127
 SHA512:
-  metadata.gz: a6a8c0facd2448af40324cdf3f4ffe7c17dffb57187b8919dffdb3c078a1424d0d5cf36b3c34b2227af9ff24ca79a0941661ced826190fd6f1ba5340d9746973
-  data.tar.gz: 7b40ab91662c6f755e055ec54edc435a9617ed9569cb5de755300e77834e76c03e620aadf0dcfc7a4f6d59e83173e25847daaab650cc343082fdac2e4f826fcb
+  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,6 +34,9 @@ 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.

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
@@ -235,7 +239,7 @@ module Kettle
       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",
@@ -263,7 +267,7 @@ module Kettle
             next
           end
 
-          member_config.release_target_branches.each do |branch|
+          branch_targets_for(command, member_config.release_target_branches).each do |branch|
             memo << runner.call(
               member: member,
               phase: "release_checkout",
@@ -391,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/version.rb

@@ -3,7 +3,7 @@
 module Kettle
   module Family
     module Version
-      VERSION = "0.1.14"
+      VERSION = "0.1.15"
     end
     VERSION = Version::VERSION # Traditional Constant Location
   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.14
+  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.14
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v0.1.14/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.14
+  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