git-pr-release 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17e56434b26daa007a68481f6c125c523c3c2287ce04a3884aa1fd92b3e0f6a2
-  data.tar.gz: 345da41250aa2f0d723c9cf4f7ee21ad275a41fb45ee217c5e69e4c365e62056
+  metadata.gz: 9e376b7fffae49f44aebc877ed835158b11fdcc74cb6ef59f9226b638c9e4d31
+  data.tar.gz: cb97fbbffc5be83f438384a02902ba05c6c12327d787d9df93d93f6b5c11c61c
 SHA512:
-  metadata.gz: 62394388288ad25af3050f77b036e1c043865c618354f29e7ae00ddad95baf902cbf49b512c581fba3ea122694209de444689baaecf54b11e29bd3f5027dd07c
-  data.tar.gz: d9aad0d322c38cd485d9f31366076789861d7b79980c68832318a209baa2ac068dbdd2d5f185a90682afcb3a644b8b8af09add2c114d41a0f38952c30181860e
+  metadata.gz: bd00f29dcbb0690b1a607ab34a110d51e8b44f25c0f51e834a99a8034062147277fe07d50ee12248494a37e10c1eb2196c3960a3bf7253072be988f3f9cce49b
+  data.tar.gz: b18a60610527e86b6ef83bb744d197460bd5e90f2ddc7e35ad8d6502ae633834b2f21a66b41f2f5f174d1ff27401c70743500bcfca715d3024631a8affe69637

data/.github/workflows/release.yml

@@ -0,0 +1,24 @@
+name: Release new version to RubyGems.org
+
+on:
+  workflow_dispatch:
+
+jobs:
+  release:
+    runs-on: ubuntu-slim
+
+    permissions:
+      contents: write
+      id-token: write
+
+    steps:
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        with:
+          persist-credentials: false
+
+      - uses: ruby/setup-ruby@ac793fdd38cc468a4dd57246fa9d0e868aba9085 # v1.270.0
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      - uses: rubygems/release-gem@1c162a739e8b4cb21a676e97b087e8268d8fc40b # v1.1.2

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # git-pr-release
 
+## v2.4.0 (2025-12-16)
+
+[full changelog](https://github.com/x-motemen/git-pr-release/compare/v2.3.0...v2.4.0)
+
+* (#112) Add release workflow using trusted publishing (@ohbarye)
+* (#110) Support `pr-release.assign-pr-author` and `pr-release.request-pr-author-review` options (@moznion)
+
 ## v2.3.0 (2025-12-15)
 
 [full changelog](https://github.com/x-motemen/git-pr-release/compare/v2.2.0...v2.3.0)

data/README.md

@@ -96,6 +96,28 @@ You can specify this value by `GIT_PR_RELEASE_MENTION` environment variable.
 
 If not specified, the mention will be the PR assignee
 
+### `pr-release.assign-pr-author`
+
+Whether to assign the related users of the merged pull requests to the release pull request.
+Accepted values: `true` | `false`
+
+You can specify this value by `GIT_PR_RELEASE_ASSIGN_PR_AUTHOR` environment variable.
+
+If not specified, no assignees will be added.
+
+Note: The user selection follows the same logic as `pr-release.mention`. If `mention` is set to `author`, the PR author will be assigned. Otherwise, the PR assignee will be used (falling back to the author if no assignee exists).
+
+### `pr-release.request-pr-author-review`
+
+Whether to request review from the related users of the merged pull requests on the release pull request.
+Accepted values: `true` | `false`
+
+You can specify this value by `GIT_PR_RELEASE_REQUEST_PR_AUTHOR_REVIEW` environment variable.
+
+If not specified, no review requests will be made.
+
+Note: The user selection follows the same logic as `pr-release.mention`. If `mention` is set to `author`, the PR author will be requested for review. Otherwise, the PR assignee will be used (falling back to the author if no assignee exists).
+
 ### `pr-release.ssl-no-verify`
 
 Whether to verify SSL certificate or not.

data/git-pr-release.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "git-pr-release"
-  spec.version       = '2.3.0'
+  spec.version       = '2.4.0'
   spec.authors       = ["motemen"]
   spec.email         = ["motemen@gmail.com"]
   spec.summary       = 'Creates a release pull request'

data/lib/git/pr/release/cli.rb

@@ -6,7 +6,7 @@ module Git
     module Release
       class CLI
         include Git::Pr::Release::Util
-        attr_reader :repository, :production_branch, :staging_branch, :template_path, :labels
+        attr_reader :repository, :production_branch, :staging_branch, :template_path, :labels, :assign_pr_author, :request_pr_author_review
 
         def self.start
           result = self.new.start
@@ -82,11 +82,19 @@ module Git
           _labels = ENV.fetch('GIT_PR_RELEASE_LABELS') { git_config('labels') }
           @labels = _labels && _labels.split(/\s*,\s*/) || []
 
+          _assign_pr_author = ENV.fetch('GIT_PR_RELEASE_ASSIGN_PR_AUTHOR') { git_config('assign-pr-author') }
+          @assign_pr_author = %w[true 1].include?(_assign_pr_author)
+
+          _request_pr_author_review = ENV.fetch('GIT_PR_RELEASE_REQUEST_PR_AUTHOR_REVIEW') { git_config('request-pr-author-review') }
+          @request_pr_author_review = %w[true 1].include?(_request_pr_author_review)
+
           say "Repository:        #{repository}", :debug
           say "Production branch: #{production_branch}", :debug
           say "Staging branch:    #{staging_branch}", :debug
           say "Template path:     #{template_path}", :debug
           say "Labels             #{labels}", :debug
+          say "Assign PR author:  #{assign_pr_author}", :debug
+          say "Request PR author review: #{request_pr_author_review}", :debug
         end
 
         def fetch_merged_prs
@@ -212,7 +220,7 @@ module Git
             return
           end
 
-          update_release_pr(release_pr, pr_title, pr_body)
+          update_release_pr(release_pr, pr_title, pr_body, merged_prs)
 
           say "#{create_mode ? 'Created' : 'Updated'} pull request: #{release_pr.rels[:html].href}", :notice
           dump_result_as_json( release_pr, merged_prs, changed_files ) if @json
@@ -238,7 +246,7 @@ module Git
           [pr_title, merge_pr_body(old_body, new_body)]
         end
 
-        def update_release_pr(release_pr, pr_title, pr_body)
+        def update_release_pr(release_pr, pr_title, pr_body, merged_prs)
           say 'Pull request body:', :debug
           say pr_body, :debug
 
@@ -251,6 +259,24 @@ module Git
               repository, release_pr.number, labels
             )
           end
+
+          if assign_pr_author
+            assignees = merged_prs.map { |pr| PullRequest.new(pr).target_user_login_names }.flatten.compact.uniq
+            unless assignees.empty?
+              client.add_assignees(
+                repository, release_pr.number, assignees
+              )
+            end
+          end
+
+          if request_pr_author_review
+            reviewers = merged_prs.map { |pr| PullRequest.new(pr).target_user_login_names }.flatten.compact.uniq
+            unless reviewers.empty?
+              client.request_pull_request_review(
+                repository, release_pr.number, reviewers:
+              )
+            end
+          end
         end
 
         # Fetch PR files of specified pull_request

data/lib/git/pr/release/pull_request.rb

@@ -27,22 +27,25 @@ module Git
         end
 
         def mention
-          mention = case PullRequest.mention_type
-                    when 'author'
-                      pr.user ? "@#{pr.user.login}" : nil
-                    else
-                      if pr.assignees&.any? && pr.assignees.length > 1
-                        pr.assignees.map { |assignee| "@#{assignee.login}" }.join(" ")
-                      elsif pr.assignee
-                        "@#{pr.assignee.login}"
-                      elsif pr.user
-                        "@#{pr.user.login}"
-                      else
-                        nil
-                      end
-                    end
-
-          mention ? " #{mention}" : ""
+          mention = target_user_login_names.map { |login_name| "@#{login_name}" }.join(" ")
+          mention.empty? ? "" : " #{mention}"
+        end
+
+        def target_user_login_names
+          case PullRequest.mention_type
+          when 'author'
+            pr.user ? [pr.user.login] : []
+          else
+            if pr.assignees&.any? && pr.assignees.length > 1
+              pr.assignees.map(&:login)
+            elsif pr.assignee
+              [pr.assignee.login]
+            elsif pr.user
+              [pr.user.login]
+            else
+              []
+            end
+          end
         end
 
         def self.mention_type

data/spec/git/pr/release/cli_spec.rb

@@ -76,6 +76,8 @@ RSpec.describe Git::Pr::Release::CLI do
         expect(@cli.staging_branch).to eq "staging"
         expect(@cli.template_path).to eq nil
         expect(@cli.labels).to eq []
+        expect(@cli.assign_pr_author).to eq false
+        expect(@cli.request_pr_author_review).to eq false
       end
     end
 
@@ -181,6 +183,134 @@ RSpec.describe Git::Pr::Release::CLI do
         end
       end
     end
+
+    describe "assign_pr_author" do
+      context "With ENV set to true" do
+        around do |example|
+          original = ENV.to_hash
+          begin
+            ENV["GIT_PR_RELEASE_ASSIGN_PR_AUTHOR"] = "true"
+            example.run
+          ensure
+            ENV.replace(original)
+          end
+        end
+
+        it "enables assign_pr_author" do
+          subject
+          expect(@cli.assign_pr_author).to eq true
+        end
+      end
+
+      context "With ENV set to 1" do
+        around do |example|
+          original = ENV.to_hash
+          begin
+            ENV["GIT_PR_RELEASE_ASSIGN_PR_AUTHOR"] = "1"
+            example.run
+          ensure
+            ENV.replace(original)
+          end
+        end
+
+        it "enables assign_pr_author" do
+          subject
+          expect(@cli.assign_pr_author).to eq true
+        end
+      end
+
+      context "With ENV set to false" do
+        around do |example|
+          original = ENV.to_hash
+          begin
+            ENV["GIT_PR_RELEASE_ASSIGN_PR_AUTHOR"] = "false"
+            example.run
+          ensure
+            ENV.replace(original)
+          end
+        end
+
+        it "disables assign_pr_author" do
+          subject
+          expect(@cli.assign_pr_author).to eq false
+        end
+      end
+
+      context "With git_config" do
+        before {
+          allow(@cli).to receive(:git_config).with("assign-pr-author") { "true" }
+        }
+
+        it "enables assign_pr_author" do
+          subject
+          expect(@cli.assign_pr_author).to eq true
+        end
+      end
+    end
+
+    describe "request_pr_author_review" do
+      context "With ENV set to true" do
+        around do |example|
+          original = ENV.to_hash
+          begin
+            ENV["GIT_PR_RELEASE_REQUEST_PR_AUTHOR_REVIEW"] = "true"
+            example.run
+          ensure
+            ENV.replace(original)
+          end
+        end
+
+        it "enables request_pr_author_review" do
+          subject
+          expect(@cli.request_pr_author_review).to eq true
+        end
+      end
+
+      context "With ENV set to 1" do
+        around do |example|
+          original = ENV.to_hash
+          begin
+            ENV["GIT_PR_RELEASE_REQUEST_PR_AUTHOR_REVIEW"] = "1"
+            example.run
+          ensure
+            ENV.replace(original)
+          end
+        end
+
+        it "enables request_pr_author_review" do
+          subject
+          expect(@cli.request_pr_author_review).to eq true
+        end
+      end
+
+      context "With ENV set to false" do
+        around do |example|
+          original = ENV.to_hash
+          begin
+            ENV["GIT_PR_RELEASE_REQUEST_PR_AUTHOR_REVIEW"] = "false"
+            example.run
+          ensure
+            ENV.replace(original)
+          end
+        end
+
+        it "disables request_pr_author_review" do
+          subject
+          expect(@cli.request_pr_author_review).to eq false
+        end
+      end
+
+      context "With git_config" do
+        before {
+          allow(@cli).to receive(:git_config).with("request-pr-author-review") { "true" }
+        }
+
+        it "enables request_pr_author_review" do
+          subject
+          expect(@cli.request_pr_author_review).to eq true
+        end
+      end
+    end
   end
 
   describe "#fetch_merged_prs" do
@@ -275,7 +405,7 @@ RSpec.describe Git::Pr::Release::CLI do
         expect(@cli).to have_received(:prepare_release_pr)
         expect(@cli).to have_received(:pull_request_files)
         expect(@cli).to have_received(:build_and_merge_pr_title_and_body).with(@created_pr, @merged_prs, @changed_files)
-        expect(@cli).to have_received(:update_release_pr).with(@created_pr, @pr_title, @pr_body)
+        expect(@cli).to have_received(:update_release_pr).with(@created_pr, @pr_title, @pr_body, @merged_prs)
       }
     end
 
@@ -296,7 +426,7 @@ RSpec.describe Git::Pr::Release::CLI do
         expect(@cli).to have_received(:pull_request_files).with(existing_release_pr)
         expect(@cli).not_to have_received(:prepare_release_pr)
         expect(@cli).to have_received(:build_and_merge_pr_title_and_body).with(existing_release_pr, @merged_prs, @changed_files)
-        expect(@cli).to have_received(:update_release_pr).with(existing_release_pr, @pr_title, @pr_body)
+        expect(@cli).to have_received(:update_release_pr).with(existing_release_pr, @pr_title, @pr_body, @merged_prs)
       }
     end
 
@@ -317,7 +447,7 @@ RSpec.describe Git::Pr::Release::CLI do
         expect(@cli).not_to have_received(:prepare_release_pr)
         expect(@cli).not_to have_received(:pull_request_files)
         expect(@cli).to have_received(:build_and_merge_pr_title_and_body).with(nil, @merged_prs, [])
-        expect(@cli).not_to have_received(:update_release_pr).with(@created_pr, @pr_title, @pr_body)
+        expect(@cli).not_to have_received(:update_release_pr).with(@created_pr, @pr_title, @pr_body, @merged_prs)
       }
     end
 
@@ -343,7 +473,7 @@ RSpec.describe Git::Pr::Release::CLI do
         subject
 
         expect(@cli).not_to have_received(:build_and_merge_pr_title_and_body)
-        expect(@cli).to have_received(:update_release_pr).with(existing_release_pr, @new_pr_title, @new_pr_body)
+        expect(@cli).to have_received(:update_release_pr).with(existing_release_pr, @new_pr_title, @new_pr_body, @merged_prs)
       }
     end
   end
@@ -410,20 +540,32 @@ RSpec.describe Git::Pr::Release::CLI do
   end
 
   describe "#update_release_pr" do
-    subject { @cli.update_release_pr(@release_pr, "PR Title", "PR Body") }
+    subject { @cli.update_release_pr(@release_pr, "PR Title", "PR Body", @merged_prs) }
 
     before {
       @cli = configured_cli
 
       @release_pr = double(number: 1023)
 
+      @agent = Sawyer::Agent.new("http://example.com/") do |conn|
+        conn.builder.handlers.delete(Faraday::Adapter::NetHttp)
+        conn.adapter(:test, Faraday::Adapter::Test::Stubs.new)
+      end
+      @merged_prs = [
+        Sawyer::Resource.new(@agent, load_yaml("pr_3.yml")),
+        Sawyer::Resource.new(@agent, load_yaml("pr_4.yml")),
+        Sawyer::Resource.new(@agent, load_yaml("pr_6.yml")),
+      ]
+
       @client = double(Octokit::Client)
       allow(@client).to receive(:update_pull_request) { @release_pr }
       allow(@client).to receive(:add_labels_to_an_issue)
+      allow(@client).to receive(:add_assignees)
+      allow(@client).to receive(:request_pull_request_review)
       allow(@cli).to receive(:client) { @client }
     }
 
-    context "Without labels" do
+    context "Without labels and without assign_pr_author" do
       it {
         subject
 
@@ -436,6 +578,8 @@ RSpec.describe Git::Pr::Release::CLI do
           }
         )
         expect(@client).not_to have_received(:add_labels_to_an_issue)
+        expect(@client).not_to have_received(:add_assignees)
+        expect(@client).not_to have_received(:request_pull_request_review)
       }
     end
 
@@ -457,6 +601,58 @@ RSpec.describe Git::Pr::Release::CLI do
         expect(@client).to have_received(:add_labels_to_an_issue).with(
           "motemen/git-pr-release", 1023, ["release"]
         )
+        expect(@client).not_to have_received(:add_assignees)
+        expect(@client).not_to have_received(:request_pull_request_review)
+      }
+    end
+
+    context "With assign_pr_author enabled" do
+      before {
+        allow(@cli).to receive(:assign_pr_author) { true }
+      }
+
+      it {
+        subject
+
+        expect(@client).to have_received(:update_pull_request).with(
+          "motemen/git-pr-release",
+          1023,
+          {
+            title: "PR Title",
+            body: "PR Body",
+          }
+        )
+        # Both pr_3.yml and pr_4.yml have hakobe as the author, so only one unique assignee
+        # And the author of pr_6.yml is ninjinkun.
+        expect(@client).to have_received(:add_assignees).with(
+          "motemen/git-pr-release", 1023, ["hakobe", "ninjinkun"]
+        )
+        expect(@client).not_to have_received(:request_pull_request_review)
+      }
+    end
+
+    context "With request_pr_author_review enabled" do
+      before {
+        allow(@cli).to receive(:request_pr_author_review) { true }
+      }
+
+      it {
+        subject
+
+        expect(@client).to have_received(:update_pull_request).with(
+          "motemen/git-pr-release",
+          1023,
+          {
+            title: "PR Title",
+            body: "PR Body",
+          }
+        )
+        expect(@client).not_to have_received(:add_assignees)
+        # Both pr_3.yml and pr_4.yml have hakobe as the author
+        # And the author of pr_6.yml is ninjinkun.
+        expect(@client).to have_received(:request_pull_request_review).with(
+          "motemen/git-pr-release", 1023, reviewers: ["hakobe", "ninjinkun"]
+        )
       }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-pr-release
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - motemen
@@ -130,6 +130,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"