ruby-maat 1.2.0 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6015693182fa71b7676389768560ffe75b15b8cc789878a8de2897a4c1e35535
-  data.tar.gz: 7074ca652d6e29ef33502c92769c2ed55f74453c4478a40a401ddd36c3718492
+  metadata.gz: d51369f42199d48e3ad5afb4d19737b75cccb62eb8dca64a54a0ac025a05f37c
+  data.tar.gz: 54ed689f672b96a2825961a9d5d22772d0a5d67b7ae2ea827377b001bbe09605
 SHA512:
-  metadata.gz: e398056d4b83287eb1e926603986243a33005856fb1755d22fadbd1ac14cbb41b9ed1238edbf47033c2164f9a526a74f47b313587abd634063dded3639918330
-  data.tar.gz: fcc96417f9165035d40b7f584a3a9da06234b6e579a505b82678f7da0ce50cb8b74c99da151fdd52d43257f1a82395b109e9ff99fae3f937f8a91f553a313e17
+  metadata.gz: 8cd8d93ee615d5f9917733ef693a07cbbb9a5122944fd12210d19904aa00302d57d5d997c39eb05d112cee1a4cc2d5fc26497626d7a9257df44ef724051c6df2
+  data.tar.gz: 635137995c30cd76f544bde641cc969fee86b229ca2d7fa667b00b23b4f22b8b96e30066424c8f584766bfa70408c04d8d43e3c539687a452bc48884ef8c5516

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.2.0"
+  ".": "1.4.1"
 }

data/CHANGELOG.md

@@ -5,6 +5,84 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.1](https://github.com/viamin/ruby-maat/compare/v1.4.0...v1.4.1) (2026-09-21)
+
+
+### Bug Fixes
+
+* 37: Can we identify merge commits to link commits to PRs? ([#44](https://github.com/viamin/ruby-maat/issues/44)) ([52ebb51](https://github.com/viamin/ruby-maat/commit/52ebb51b9f169ed1b0f28e880bbc4f876eb3cd61))
+
+## [1.4.0](https://github.com/viamin/ruby-maat/compare/v1.3.4...v1.4.0) (2026-09-19)
+
+
+### Features
+
+* identify merge commits to link commits to PRs for coupling analysis ([#37](https://github.com/viamin/ruby-maat/issues/37)) ([ee16386](https://github.com/viamin/ruby-maat/commit/ee16386459d589886525d5d3b4ee7da2bef144cc))
+
+
+### Bug Fixes
+
+* 37: Can we identify merge commits to link commits to PRs? ([#45](https://github.com/viamin/ruby-maat/issues/45)) ([6d57c5d](https://github.com/viamin/ruby-maat/commit/6d57c5d91bcc4f5dc6b4bb539021db327af1712d))
+* address remaining review comments on merge commit grouper ([69d62a4](https://github.com/viamin/ruby-maat/commit/69d62a47205d5426d5a948ad25ac8c79fa2e9554))
+* address remaining review comments on PR [#45](https://github.com/viamin/ruby-maat/issues/45) ([09f4279](https://github.com/viamin/ruby-maat/commit/09f4279bbd486ff470af3842cd2b7a0f422e1947))
+* address review comments on MergeCommitGrouper ([15be4b5](https://github.com/viamin/ruby-maat/commit/15be4b54a728c4d06ff08fffedf92d0f4d257e2c))
+* allow hyphens in author names in Git2Parser regexes ([dac123f](https://github.com/viamin/ruby-maat/commit/dac123f124cb5f82d3891427377d090f67fa668a))
+* check for nil instead of empty parent_revisions in --group-by-merge validation ([a2c1b98](https://github.com/viamin/ruby-maat/commit/a2c1b9808d54132e5abe58ac854b3ef03879590c))
+* clarify Set require comment to address review feedback ([4996924](https://github.com/viamin/ruby-maat/commit/4996924c3877ae698a3920253a39d1262402fbcb))
+* improve MergeCommitGrouper correctness and performance ([cd6b500](https://github.com/viamin/ruby-maat/commit/cd6b500c413e32ee7b870be1a98faa08d0742a28))
+* reject mixed-format logs in --group-by-merge validation ([21004c3](https://github.com/viamin/ruby-maat/commit/21004c31e8daa69d0876648bf3a2409f12a8248f))
+* rewrite feature-branch dates to merge commit date for consistency ([a6a4cfc](https://github.com/viamin/ruby-maat/commit/a6a4cfcd417e99a58caf96376b9b6ab81a3ce9df))
+* validate parent metadata for --group-by-merge and optimize octopus merge graph walks ([28742c0](https://github.com/viamin/ruby-maat/commit/28742c00443cb78cdbd02e9127d8db3d0089f0c4))
+
+## [1.3.4](https://github.com/viamin/ruby-maat/compare/v1.3.3...v1.3.4) (2025-09-08)
+
+
+### Improvements
+
+* simplify CI workflow and remove redundant release task ([b37fcd1](https://github.com/viamin/ruby-maat/commit/b37fcd11a885a9a45103b74c22894aa21c5ab824))
+
+## [1.3.3](https://github.com/viamin/ruby-maat/compare/v1.3.2...v1.3.3) (2025-09-08)
+
+
+### Bug Fixes
+
+* use correct task name rubygems:push instead of rubygem:push ([10d4795](https://github.com/viamin/ruby-maat/commit/10d4795b56346189cfd140dc1fa7c0aa7458b64d))
+
+## [1.3.2](https://github.com/viamin/ruby-maat/compare/v1.3.1...v1.3.2) (2025-09-08)
+
+
+### Bug Fixes
+
+* add description to release task to satisfy RuboCop ([51c8bb4](https://github.com/viamin/ruby-maat/commit/51c8bb40d3057de0a71f33db2ae6bc5eac423ee0))
+* override release task to skip tag creation ([7f22222](https://github.com/viamin/ruby-maat/commit/7f22222df12e90d8507be5baa584a6cce34470fa))
+
+## [1.3.1](https://github.com/viamin/ruby-maat/compare/v1.3.0...v1.3.1) (2025-09-08)
+
+
+### Bug Fixes
+
+* **Gemfile.lock:** update ruby-maat version to 1.3.0 ([c5f8f1d](https://github.com/viamin/ruby-maat/commit/c5f8f1d659220d0db4015ac21fbb285d454a8a53))
+* **release:** update version to 1.3.0 and enhance release-please configuration ([76c5222](https://github.com/viamin/ruby-maat/commit/76c5222720ee66c5e4238720c07f9e33edf1587e))
+* **release:** update version to 1.3.0 and enhance release-please configuration ([6e96292](https://github.com/viamin/ruby-maat/commit/6e962922db3179f5b3d51c13db513ec89ea23fcb))
+
+
+### Dependencies
+
+* **deps:** bump rexml from 3.4.2 to 3.4.3 ([10300aa](https://github.com/viamin/ruby-maat/commit/10300aa75eca1441fa7a9d80b285f0195ca5c078))
+
+## [1.3.0](https://github.com/viamin/ruby-maat/compare/v1.2.0...v1.3.0) (2025-09-03)
+
+
+### Features
+
+* add command preview functionality before execution ([3801f15](https://github.com/viamin/ruby-maat/commit/3801f15cf31cca8d519082ce78890efa4b5b9c65))
+* add command preview functionality before execution ([499b3d5](https://github.com/viamin/ruby-maat/commit/499b3d5c929175d2e394d2877ff0ab30e973739e))
+
+
+### Bug Fixes
+
+* move release-type out of packages section of release-please-config ([ee87f5b](https://github.com/viamin/ruby-maat/commit/ee87f5b1a2e4d48ddc36ea516a9a968b23e75f39))
+
 ## [1.2.0](https://github.com/viamin/ruby-maat/compare/ruby-maat-v1.1.3...ruby-maat/v1.2.0) (2025-08-17)
 
 

data/lib/ruby_maat/app.rb

@@ -44,6 +44,7 @@ module RubyMaat
       change_records = parser.parse
 
       # Apply data transformations
+      change_records = apply_merge_grouping(change_records)
       change_records = apply_grouping(change_records)
       change_records = apply_temporal_grouping(change_records)
       change_records = apply_team_mapping(change_records)
@@ -94,6 +95,30 @@ module RubyMaat
       end
     end
 
+    def apply_merge_grouping(change_records)
+      return change_records unless @options[:group_by_merge]
+      return change_records if change_records.nil? || change_records.empty?
+
+      # Check for non-nil parent_revisions (not non-empty) because root commits
+      # legitimately have parent_revisions == [] when parsed with the parents format.
+      records_with_parents = change_records.count { |record| !record.parent_revisions.nil? }
+      records_without_parents = change_records.count { |record| record.parent_revisions.nil? }
+
+      if records_with_parents.zero?
+        raise ArgumentError,
+          "--group-by-merge requires parent revision metadata in the log. " \
+          "Please regenerate the log using the 'pr-coupling' preset or another format that includes parent hashes."
+      elsif records_without_parents.positive?
+        raise ArgumentError,
+          "--group-by-merge requires parent revision metadata for all commits, " \
+          "but the provided log mixes records with and without parent hashes. " \
+          "Please regenerate the log using the 'pr-coupling' preset or another format that includes parent hashes."
+      end
+
+      grouper = RubyMaat::Groupers::MergeCommitGrouper.new
+      grouper.group(change_records)
+    end
+
     def apply_grouping(change_records)
       return change_records unless @options[:group]
 

data/lib/ruby_maat/change_record.rb

@@ -4,9 +4,10 @@ module RubyMaat
   # Represents a single change/modification record from VCS
   # This is the fundamental data structure that flows through the entire pipeline
   class ChangeRecord
-    attr_reader :entity, :author, :date, :revision, :message, :loc_added, :loc_deleted
+    attr_reader :entity, :author, :date, :revision, :message, :loc_added, :loc_deleted, :parent_revisions
 
-    def initialize(entity:, author:, date:, revision:, message: nil, loc_added: nil, loc_deleted: nil)
+    def initialize(entity:, author:, date:, revision:, message: nil, loc_added: nil, loc_deleted: nil,
+      parent_revisions: nil)
       @entity = entity
       @author = author
       @date = date.is_a?(Date) ? date : Date.parse(date)
@@ -14,6 +15,14 @@ module RubyMaat
       @message = message
       @loc_added = loc_added.to_i if loc_added && (!loc_added.is_a?(Float) || !loc_added.nan?)
       @loc_deleted = loc_deleted.to_i if loc_deleted && (!loc_deleted.is_a?(Float) || !loc_deleted.nan?)
+      @parent_revisions = parent_revisions
+    end
+
+    # True when the commit has multiple parents (i.e., a merge commit).
+    # Returns false when parent metadata is unavailable (nil), since the parser
+    # could not determine the parent count.
+    def merge_commit?
+      parent_revisions.is_a?(Array) && parent_revisions.size >= 2
     end
 
     def to_h
@@ -24,7 +33,8 @@ module RubyMaat
         revision: revision,
         message: message,
         loc_added: loc_added,
-        loc_deleted: loc_deleted
+        loc_deleted: loc_deleted,
+        parent_revisions: parent_revisions
       }
     end
 

data/lib/ruby_maat/cli.rb

@@ -362,6 +362,12 @@ module RubyMaat
           raise ArgumentError, "Invalid date format for --age-time-now: #{date_str}. Use YYYY-MM-dd format."
         end
 
+        opts.on("--group-by-merge",
+          "Group commits by merge commit for PR-level coupling analysis. " \
+          "Requires log generated with parent hashes (use --preset pr-coupling).") do
+          @options[:group_by_merge] = true
+        end
+
         opts.on("--verbose-results",
           "Includes additional analysis details together with the results. Only implemented for change coupling.") do
           @options[:verbose_results] = true

data/lib/ruby_maat/generators/base_generator.rb

@@ -101,6 +101,9 @@ module RubyMaat
       end
 
       def execute_command(command)
+        # Show command preview and ask for confirmation
+        show_command_preview(command)
+
         puts "Executing: #{command}" if @options[:verbose]
 
         # Use proper subprocess execution to prevent command injection
@@ -262,6 +265,25 @@ module RubyMaat
           puts "Please enter 'y' or 'n'"
         end
       end
+
+      def show_command_preview(command)
+        # Skip preview in non-interactive modes, when quiet is set, or during tests
+        return if @options[:quiet] || !$stdin.tty? || test_environment?
+
+        puts "\n" + "=" * 60
+        puts "COMMAND PREVIEW"
+        puts "=" * 60
+        puts "Repository: #{@repository_path}"
+        puts "Command:    #{command}"
+        puts "=" * 60
+        puts "\nPress Enter to execute this command..."
+        $stdin.gets
+      end
+
+      def test_environment?
+        # Check if we're in a test environment
+        !!(defined?(RSpec) || ENV["RUBY_MAAT_TEST"] == "true" || ENV["RSPEC_CORE_PID"])
+      end
     end
   end
 end

data/lib/ruby_maat/generators/git_generator.rb

@@ -48,6 +48,14 @@ module RubyMaat
             no_renames: true,
             all_branches: true
           }
+        },
+        "pr-coupling" => {
+          description: "Format with parent hashes for PR-level coupling analysis (use with --group-by-merge)",
+          options: {
+            format: "git2-parents",
+            no_renames: true,
+            all_branches: true
+          }
         }
       }.freeze
 
@@ -72,6 +80,8 @@ module RubyMaat
         case format
         when "git2"
           build_git2_command(options)
+        when "git2-parents"
+          build_git2_parents_command(options)
         when "legacy"
           build_legacy_command(options)
         else
@@ -87,10 +97,12 @@ module RubyMaat
         # Format selection
         puts "Output formats:"
         puts "  1. git2 (recommended, faster parsing)"
-        puts "  2. legacy (backward compatibility)"
+        puts "  2. git2-parents (git2 with parent hashes, for --group-by-merge)"
+        puts "  3. legacy (backward compatibility)"
 
-        format_choice = ask_integer("Choose format", 1, 2)
-        options[:format] = (format_choice == 1) ? "git2" : "legacy"
+        format_choice = ask_integer("Choose format", 1, 3)
+        formats = {1 => "git2", 2 => "git2-parents", 3 => "legacy"}
+        options[:format] = formats[format_choice]
 
         # Branch selection
         options[:all_branches] = ask_yes_no("Include all branches?", options[:all_branches])
@@ -119,7 +131,7 @@ module RubyMaat
         parts << "--all" if options[:all_branches]
         parts << "--numstat"
         parts << "--date=short"
-        parts << "--pretty=format:'--%h--%ad--%aN'"
+        parts << "--pretty=format:'--%h--%ad--%aN--%s'"
         parts << "--no-renames" if options[:no_renames]
 
         # Date filtering (with validation and shell escaping)
@@ -135,6 +147,25 @@ module RubyMaat
         parts.join(" ")
       end
 
+      def build_git2_parents_command(options)
+        parts = ["git", "log"]
+
+        parts << "--all" if options[:all_branches]
+        parts << "--numstat"
+        parts << "--date=short"
+        parts << "--pretty=format:'--%h--%p--%ad--%aN--%s'"
+        parts << "--no-renames" if options[:no_renames]
+
+        parts << "--after=#{shell_escape(validate_date(options[:since]))}" if options[:since]
+        parts << "--before=#{shell_escape(validate_date(options[:until]))}" if options[:until]
+
+        parts << "--author=#{shell_escape(options[:author])}" if options[:author]
+
+        parts << "--" << shell_escape(options[:path]) if options[:path]
+
+        parts.join(" ")
+      end
+
       def build_legacy_command(options)
         parts = ["git", "log"]
 

data/lib/ruby_maat/groupers/merge_commit_grouper.rb

@@ -0,0 +1,152 @@
+# frozen_string_literal: true
+
+# NOTE: Set has been a built-in class (autoloaded without require) since
+# Ruby 3.2, which is this project's minimum version (see gemspec:
+# required_ruby_version >= "3.2.0").  An explicit `require "set"` is
+# unnecessary and triggers RuboCop's Lint/RedundantRequireStatement cop.
+
+module RubyMaat
+  module Groupers
+    # Groups commits by their merge commit to enable PR-level coupling analysis.
+    #
+    # When Git uses a merge-based workflow (e.g., GitHub PRs), individual commits
+    # on feature branches are combined into merge commits on the main branch.
+    # This grouper identifies merge commits and rewrites the revision of child
+    # commits so that all commits belonging to a merge share the same revision.
+    #
+    # This allows the coupling analysis to treat all files changed in a PR as
+    # co-changing, giving more meaningful coupling results.
+    #
+    # Requires log data generated with parent hashes:
+    #   git log --all --numstat --date=short --pretty=format:'--%h--%p--%ad--%aN--%s' --no-renames
+    class MergeCommitGrouper
+      def group(change_records)
+        commit_info = build_commit_info(change_records)
+        merge_map = build_merge_map(commit_info)
+
+        return change_records if merge_map.empty?
+
+        merge_dates = build_merge_dates(commit_info)
+        rewrite_records(change_records, merge_map, merge_dates)
+      end
+
+      private
+
+      def build_commit_info(records)
+        commits = {}
+        records.each do |record|
+          rev = record.revision
+          commits[rev] ||= {parents: record.parent_revisions || [], merge: false, date: record.date}
+          commits[rev][:merge] = true if record.merge_commit?
+        end
+        commits
+      end
+
+      def build_merge_map(commits)
+        merge_map = {}
+        merges = commits.select { |_, info| info[:merge] }
+
+        merges.each do |merge_rev, info|
+          parents = info[:parents] || []
+          mainline_parent = parents[0]
+          # Skip this merge if it does not have a valid mainline parent present
+          # in the commit set, or if it is not a true merge (single parent).
+          next unless mainline_parent && parents.length > 1 && commits.key?(mainline_parent)
+
+          # Compute mainline ancestors once per merge commit and reuse across
+          # all feature parents, avoiding repeated graph walks for octopus merges.
+          mainline_ancestors = collect_ancestors(mainline_parent, commits)
+          # If we cannot determine any ancestors for the mainline parent (for
+          # example due to a filtered log), skip grouping for this merge to
+          # avoid incorrect rewrites with an incomplete graph.
+          next if mainline_ancestors.empty?
+
+          feature_parents = parents[1..].compact
+          feature_parents.each do |feature_parent|
+            feature_commits = find_feature_commits(feature_parent, mainline_ancestors, commits)
+            feature_commits.each { |rev| merge_map[rev] = merge_rev }
+          end
+        end
+
+        merge_map
+      end
+
+      # Walk backward from the feature branch tip, collecting commits that belong
+      # to this merge. Excludes any commits reachable from the mainline parent so
+      # that intermediate merges from main into the feature branch don't pull in
+      # unrelated mainline history.
+      #
+      # +mainline_ancestors+ is a pre-computed Set of commits reachable from the
+      # mainline parent, passed in to avoid redundant graph walks when a merge
+      # has multiple feature parents (octopus merges).
+      def find_feature_commits(start, mainline_ancestors, commits)
+        visited = Set.new
+        queue = [start]
+        head = 0
+
+        while head < queue.length
+          current = queue[head]
+          head += 1
+          next if mainline_ancestors.include?(current) || visited.include?(current) || !commits.key?(current)
+
+          visited << current
+
+          parents = commits[current][:parents]
+          parents&.each { |p| queue << p }
+        end
+
+        visited
+      end
+
+      # Collect all ancestors reachable from a given commit (inclusive).
+      def collect_ancestors(start, commits)
+        ancestors = Set.new
+        queue = [start]
+        head = 0
+
+        while head < queue.length
+          current = queue[head]
+          head += 1
+          next if ancestors.include?(current) || !commits.key?(current)
+
+          ancestors << current
+
+          parents = commits[current][:parents]
+          parents&.each { |p| queue << p }
+        end
+
+        ancestors
+      end
+
+      # Build a lookup from merge revision to its date, used to align
+      # rewritten feature-branch records with the merge commit's date.
+      def build_merge_dates(commits)
+        dates = {}
+        commits.each do |rev, info|
+          dates[rev] = info[:date] if info[:merge]
+        end
+        dates
+      end
+
+      def rewrite_records(records, merge_map, merge_dates)
+        records.map do |record|
+          merge_rev = merge_map[record.revision]
+          if merge_rev
+            ChangeRecord.new(
+              entity: record.entity,
+              author: record.author,
+              date: merge_dates[merge_rev] || record.date,
+              revision: merge_rev,
+              message: record.message,
+              loc_added: record.loc_added,
+              loc_deleted: record.loc_deleted,
+              parent_revisions: record.parent_revisions
+            )
+          else
+            record
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ruby_maat/parsers/git2_parser.rb

@@ -5,17 +5,27 @@ module RubyMaat
   module Parsers
     # Git2 parser - preferred Git parser (more tolerant and faster)
     #
-    # Input: git log --all --numstat --date=short --pretty=format:'--%h--%ad--%aN' --no-renames --after=YYYY-MM-DD
+    # Supports two formats:
     #
-    # Sample format:
-    # --586b4eb--2015-06-15--Adam Tornhill
+    # Standard format (without parent info):
+    #   git log --all --numstat --date=short --pretty=format:'--%h--%ad--%aN--%s' --no-renames
+    #
+    # Format with parent hashes (for --group-by-merge / PR-level coupling):
+    #   git log --all --numstat --date=short --pretty=format:'--%h--%p--%ad--%aN--%s' --no-renames
+    #   This format is generated by the "pr-coupling" preset.
+    #
+    # Sample standard format:
+    # --586b4eb--2015-06-15--Adam Tornhill--Add new feature
     # 35      0       src/code_maat/mining/vcs.clj
-    # 2       1       test/file.rb
     #
-    # --abc123--2015-06-16--Jane Doe
+    # Sample parent-hash format (merge commit has multiple parent hashes):
+    # --abc123--def456 ghi789--2015-06-16--Jane Doe--Merge pull request #42
     # 10      5       lib/example.rb
     class Git2Parser < BaseParser
-      COMMIT_SEPARATOR = /^--([a-z0-9]+)--(\d{4}-\d{2}-\d{2})--([^\r\n]+)$/
+      # Format with parent hashes: --hash--parent1 parent2--date--author--message
+      COMMIT_WITH_PARENTS = /^--([a-z0-9]+)--([a-z0-9 ]*)--(\d{4}-\d{2}-\d{2})--([^\r\n]+?)--([^\r\n]*)$/
+      # Standard format: --hash--date--author--message
+      COMMIT_SEPARATOR = /^--([a-z0-9]+)--(\d{4}-\d{2}-\d{2})--([^\r\n]+?)--([^\r\n]*)$/
       CHANGE_PATTERN = /^(-|\d+)[\t ]{1,10}(-|\d+)[\t ]{1,10}([^\r\n]*)$/
 
       protected
@@ -28,11 +38,22 @@ module RubyMaat
           line.strip!
           next if line.empty?
 
-          if (commit_match = line.match(COMMIT_SEPARATOR))
+          if (commit_match = line.match(COMMIT_WITH_PARENTS))
+            parents_str = commit_match[2].strip
+            current_commit = {
+              revision: commit_match[1],
+              parent_revisions: parents_str.empty? ? [] : parents_str.split,
+              date: parse_date(commit_match[3]),
+              author: commit_match[4].strip,
+              message: commit_match[5].strip
+            }
+          elsif (commit_match = line.match(COMMIT_SEPARATOR))
             current_commit = {
               revision: commit_match[1],
+              parent_revisions: nil,
               date: parse_date(commit_match[2]),
-              author: commit_match[3].strip
+              author: commit_match[3].strip,
+              message: commit_match[4].strip
             }
           elsif current_commit && (change_match = line.match(CHANGE_PATTERN))
             added = clean_numstat(change_match[1])
@@ -47,8 +68,10 @@ module RubyMaat
               author: current_commit[:author],
               date: current_commit[:date],
               revision: current_commit[:revision],
+              message: current_commit[:message],
               loc_added: added,
-              loc_deleted: deleted
+              loc_deleted: deleted,
+              parent_revisions: current_commit[:parent_revisions]
             )
           end
         end

data/lib/ruby_maat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyMaat
-  VERSION = "1.2.0"
+  VERSION = "1.3.4"
 end

data/lib/ruby_maat.rb

@@ -17,6 +17,7 @@ require_relative "ruby_maat/parsers/tfs_parser"
 require_relative "ruby_maat/groupers/layer_grouper"
 require_relative "ruby_maat/groupers/time_grouper"
 require_relative "ruby_maat/groupers/team_mapper"
+require_relative "ruby_maat/groupers/merge_commit_grouper"
 
 # Analysis modules (load before app.rb since app references them)
 require_relative "ruby_maat/analysis/base_analysis"

data/release-please-config.json

@@ -1,8 +1,57 @@
 {
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
   "packages": {
     ".": {
       "release-type": "ruby",
-      "version-file": "lib/ruby_maat/version.rb"
+      "package-name": "ruby-maat",
+      "version-file": "lib/ruby_maat/version.rb",
+      "changelog-sections": [
+        {
+          "type": "feat",
+          "section": "Features",
+          "hidden": false
+        },
+        {
+          "type": "fix",
+          "section": "Bug Fixes",
+          "hidden": false
+        },
+        {
+          "type": "refactor",
+          "section": "Improvements",
+          "hidden": false
+        },
+        {
+          "type": "chore",
+          "section": "Maintenance",
+          "hidden": true
+        },
+        {
+          "type": "docs",
+          "section": "Documentation",
+          "hidden": false
+        },
+        {
+          "type": "test",
+          "section": "Testing",
+          "hidden": true
+        },
+        {
+          "type": "ci",
+          "section": "CI/CD",
+          "hidden": true
+        },
+        {
+          "type": "deps",
+          "section": "Dependencies",
+          "hidden": false
+        },
+        {
+          "type": "BREAKING CHANGE",
+          "section": "Breaking Changes",
+          "hidden": false
+        }
+      ]
     }
   }
 }