git-pr-release 1.1.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ff787e6c979a6958c8be9e429eb7c089095a55fd20ac3ac497592564c9a9355
-  data.tar.gz: 4db4523c50aa12ba8b7f51450197b6e00dc3560d40356cdfac035fa0a036d871
+  metadata.gz: 54aeb2f71e8311efc9d48ea98c695496ddf9a9755d23aa822078484384b83329
+  data.tar.gz: ee8358c06dc99f8d15983c81f9725c50111af8697253fcc39c66bf2eef3099d7
 SHA512:
-  metadata.gz: ac75e33bbf1c2c8808ee0f22ebf397678401f12e384eae7042a82a5ec350ab3039f55a72d5d093da5242a5ee4a7d8bd892b717feca97f9deb58cc818039e98da
-  data.tar.gz: f0e1566526389611d3e94da79fb74dd3df6495a2d5242866a69e796fe02ca3053cb1a70ffe226f34540d7b684c2f2d4ee25bd1b55cd10591e86d7315c68af16c
+  metadata.gz: 594733c2d859ec97b8573df6bfb805df8ad83ffde7e1f80afde7bdc889c1f73b1641f54d047657d58b9cea54c3a24375e56cac6088326fe24f28843be756bfda
+  data.tar.gz: '09f9266b8d49b75a8fc2981b524df7a8bfb3bffd100c258ac4d660a1fa6cf3906af51f4ad913ae7ba86a3c13f6b1ec27fb9ce7c59e4e7fde49e9f204544604c8'

data/CHANGELOG.md

@@ -1,14 +1,51 @@
 # git-pr-release
 
+## v1.6.0 (2021-05-15)
+
+[full changelog](https://github.com/x-motemen/git-pr-release/compare/v1.5.0...v1.6.0)
+
+* (#63) Sort merged_pull_request_numbers numerically by default (@yutailang0119)
+
+## v1.5.0 (2021-04-02)
+
+[full changelog](https://github.com/x-motemen/git-pr-release/compare/v1.4.0...v1.5.0)
+
+* (#60, #61) Get issue number from GitHub API for squashed PR (@yuuan)
+* (#58) Make stable test (@kachick)
+* (#55) Suppress warning for ERB (@ohbarye)
+* (#50) support `GIT_PR_RELEASE_MENTION` environment variable (@dabutvin)
+* (#49) Transfer repository to x-motemen organization (@onk)
+
+## v1.4.0 (2020-02-22)
+
+[full changelog](https://github.com/x-motemen/git-pr-release/compare/v1.3.0...v1.4.0)
+
+* (#48) List PR API needs head user or head organization and branch name (@sasasin)
+
+## v1.3.0 (2020-02-19)
+
+[full changelog](https://github.com/x-motemen/git-pr-release/compare/v1.2.0...v1.3.0)
+
+* (#47) Fix Errno::ENOENT when finding the specified template (@onk)
+* (#45) Fix "warning: instance variable @xxx not initialized" (@onk)
+
+## v1.2.0 (2020-02-07)
+
+[full changelog](https://github.com/x-motemen/git-pr-release/compare/v1.1.0...v1.2.0)
+
+* (#44) Use API option when detecting existing release PR (@onk)
+* (#41, #42) Refactor (@onk)
+  - Some local variables are removed. This will break if you have customized the template ERB.
+
 ## v1.1.0 (2020-01-02)
 
-[full changelog](https://github.com/motemen/git-pr-release/compare/v1.0.1...v1.1.0)
+[full changelog](https://github.com/x-motemen/git-pr-release/compare/v1.0.1...v1.1.0)
 
 * (#38) Fetch changed files as many as possible (@shibayu36)
 
 ## v1.0.1 (2019-12-17)
 
-[full changelog](https://github.com/motemen/git-pr-release/compare/v1.0.0...v1.0.1)
+[full changelog](https://github.com/x-motemen/git-pr-release/compare/v1.0.0...v1.0.1)
 
 * (#37) Fix NameError (@onk)
 

data/README.md

@@ -75,6 +75,15 @@ You can specify this value by `GIT_PR_RELEASE_LABELS` environment variable.
 
 If not specified, any labels will not be added for PRs.
 
+### `pr-release.mention`
+
+The name that is listed next to each PR title.
+Accepted values: `author`
+
+You can specify this value by `GIT_PR_RELEASE_MENTION` environment variable.
+
+If not specified, the mention will be the PR assignee
+
 
 Errors and exit statuses
 ------------------------

data/git-pr-release.gemspec

@@ -4,12 +4,12 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "git-pr-release"
-  spec.version       = '1.1.0'
+  spec.version       = '1.6.0'
   spec.authors       = ["motemen"]
   spec.email         = ["motemen@gmail.com"]
   spec.summary       = 'Creates a release pull request'
   spec.description   = 'git-pr-release creates a pull request which summarizes feature branches that are to be released into production'
-  spec.homepage      = 'https://github.com/motemen/git-pr-release'
+  spec.homepage      = 'https://github.com/x-motemen/git-pr-release'
 
   spec.files         = `git ls-files`.split($/)
   spec.bindir        = "exe"
@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'timecop'
+  spec.add_development_dependency 'webmock'
 
   spec.license = 'MIT'
 end

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

@@ -6,20 +6,21 @@ module Git
     module Release
       class CLI
         include Git::Pr::Release::Util
-        extend Git::Pr::Release::Util
-        def self.start
-          host, repository, scheme = host_and_repository_and_scheme
+        attr_reader :repository, :production_branch, :staging_branch, :template_path, :labels
 
-          if host
-            # GitHub:Enterprise
-            OpenSSL::SSL.const_set :VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE # XXX
+        def self.start
+          result = self.new.start
+          exit result
+        end
 
-            Octokit.configure do |c|
-              c.api_endpoint = "#{scheme}://#{host}/api/v3"
-              c.web_endpoint = "#{scheme}://#{host}/"
-            end
-          end
+        def initialize
+          @dry_run  = false
+          @json     = false
+          @no_fetch = false
+          @squashed = false
+        end
 
+        def start
           OptionParser.new do |opts|
             opts.on('-n', '--dry-run', 'Do not create/update a PR. Just prints out') do |v|
               @dry_run = v
@@ -30,31 +31,78 @@ module Git
             opts.on('--no-fetch', 'Do not fetch from remote repo before determining target PRs (CI friendly)') do |v|
               @no_fetch = v
             end
+            opts.on('--squashed', 'Handle squash merged PRs') do |v|
+              @squashed = v
+            end
           end.parse!
 
           ### Set up configuration
+          configure
+
+          ### Fetch merged PRs
+          merged_prs = fetch_merged_prs
+          if merged_prs.empty?
+            say 'No pull requests to be released', :error
+            return 1
+          end
+
+          ### Create a release PR
+          create_release_pr(merged_prs)
+          return 0
+        end
+
+        def client
+          @client ||= Octokit::Client.new :access_token => obtain_token!
+        end
 
-          production_branch = ENV.fetch('GIT_PR_RELEASE_BRANCH_PRODUCTION') { git_config('branch.production') } || 'master'
-          staging_branch    = ENV.fetch('GIT_PR_RELEASE_BRANCH_STAGING') { git_config('branch.staging') }       || 'staging'
+        def configure
+          host, @repository, scheme = host_and_repository_and_scheme
+
+          if host
+            # GitHub:Enterprise
+            OpenSSL::SSL.const_set :VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE # XXX
+
+            Octokit.configure do |c|
+              c.api_endpoint = "#{scheme}://#{host}/api/v3"
+              c.web_endpoint = "#{scheme}://#{host}/"
+            end
+          end
+
+          @production_branch = ENV.fetch('GIT_PR_RELEASE_BRANCH_PRODUCTION') { git_config('branch.production') } || 'master'
+          @staging_branch    = ENV.fetch('GIT_PR_RELEASE_BRANCH_STAGING') { git_config('branch.staging') }       || 'staging'
+          @template_path     = ENV.fetch('GIT_PR_RELEASE_TEMPLATE') { git_config('template') }
+
+          _labels = ENV.fetch('GIT_PR_RELEASE_LABELS') { git_config('labels') }
+          @labels = _labels && _labels.split(/\s*,\s*/) || []
 
           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
+        end
 
-          client = Octokit::Client.new :access_token => obtain_token!
-
+        def fetch_merged_prs
           git :remote, 'update', 'origin' unless @no_fetch
 
-          ### Fetch merged PRs
+          merged_pull_request_numbers = @squashed ? fetch_merged_pr_numbers_from_github : fetch_merged_pr_numbers_from_git_remote
+
+          merged_prs = merged_pull_request_numbers.sort.map do |nr|
+            pr = client.pull_request repository, nr
+            say "To be released: ##{pr.number} #{pr.title}", :notice
+            pr
+          end
+
+          merged_prs
+        end
 
-          merged_feature_head_sha1s = git(
-            :log, '--merges', '--pretty=format:%P', "origin/#{production_branch}..origin/#{staging_branch}"
-          ).map do |line|
+        def fetch_merged_pr_numbers_from_git_remote
+          merged_feature_head_sha1s = git(:log, '--merges', '--pretty=format:%P', "origin/#{production_branch}..origin/#{staging_branch}").map do |line|
             main_sha1, feature_sha1 = line.chomp.split /\s+/
             feature_sha1
           end
 
-          merged_pull_request_numbers = git('ls-remote', 'origin', 'refs/pull/*/head').map do |line|
+          git('ls-remote', 'origin', 'refs/pull/*/head').map do |line|
             sha1, ref = line.chomp.split /\s+/
 
             if merged_feature_head_sha1s.include? sha1
@@ -72,87 +120,92 @@ module Git
               end
             end
           end.compact
+        end
 
-          if merged_pull_request_numbers.empty?
-            say 'No pull requests to be released', :error
-            exit 1
-          end
-
-          merged_prs = merged_pull_request_numbers.map do |nr|
-            pr = client.pull_request repository, nr
-            say "To be released: ##{pr.number} #{pr.title}", :notice
-            pr
-          end
+        def fetch_merged_pr_numbers_from_github
+          git(:log, '--pretty=format:%H', "origin/#{production_branch}..origin/#{staging_branch}").map(&:chomp).map do |sha1|
+            client.search_issues("repo:#{repository} is:pr is:closed #{sha1}")[:items].map(&:number)
+            sleep 1
+          end.flatten
+        end
 
-          ### Create a release PR
+        def create_release_pr(merged_prs)
+          found_release_pr = detect_existing_release_pr
+          create_mode = found_release_pr.nil?
 
-          say 'Searching for existing release pull requests...', :info
-          found_release_pr = client.pull_requests(repository).find do |pr|
-            pr.head.ref == staging_branch && pr.base.ref == production_branch
+          if create_mode
+            if @dry_run
+              release_pr = nil
+              changed_files = []
+            else
+              release_pr = prepare_release_pr
+              changed_files = pull_request_files(release_pr)
+            end
+          else
+            release_pr = found_release_pr
+            changed_files = pull_request_files(release_pr)
           end
-          create_mode = found_release_pr.nil?
 
-          # Fetch changed files of a release PR
-          changed_files = pull_request_files(client, found_release_pr)
+          pr_title, pr_body = build_and_merge_pr_title_and_body(release_pr, merged_prs, changed_files)
 
           if @dry_run
-            pr_title, new_body = build_pr_title_and_body found_release_pr, merged_prs, changed_files
-            pr_body = create_mode ? new_body : merge_pr_body(found_release_pr.body, new_body)
-
             say 'Dry-run. Not updating PR', :info
             say pr_title, :notice
             say pr_body, :notice
-            dump_result_as_json( found_release_pr, merged_prs, changed_files ) if @json
-            exit 0
+            dump_result_as_json( release_pr, merged_prs, changed_files ) if @json
+            return
           end
 
-          pr_title, pr_body = nil, nil
-          release_pr = nil
+          update_release_pr(release_pr, pr_title, pr_body)
 
-          if create_mode
-            created_pr = client.create_pull_request(
-              repository, production_branch, staging_branch, 'Preparing release pull request...', ''
-            )
-            unless created_pr
-              say 'Failed to create a new pull request', :error
-              exit 2
-            end
-            changed_files = pull_request_files(client, created_pr) # Refetch changed files from created_pr
-            pr_title, pr_body = build_pr_title_and_body created_pr, merged_prs, changed_files
-            release_pr = created_pr
-          else
-            pr_title, new_body = build_pr_title_and_body found_release_pr, merged_prs, changed_files
-            pr_body = merge_pr_body(found_release_pr.body, new_body)
-            release_pr = found_release_pr
-          end
+          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
+        end
+
+        def detect_existing_release_pr
+          say 'Searching for existing release pull requests...', :info
+          user=repository.split("/")[0]
+          client.pull_requests(repository, head: "#{user}:#{staging_branch}", base: production_branch).first
+        end
+
+        def prepare_release_pr
+          client.create_pull_request(
+            repository, production_branch, staging_branch, 'Preparing release pull request...', ''
+          )
+        end
 
+        def build_and_merge_pr_title_and_body(release_pr, merged_prs, changed_files)
+          # release_pr is nil when dry_run && create_mode
+          old_body = release_pr ? release_pr.body : ""
+          pr_title, new_body = build_pr_title_and_body(release_pr, merged_prs, changed_files, template_path)
+
+          [pr_title, merge_pr_body(old_body, new_body)]
+        end
+
+        def update_release_pr(release_pr, pr_title, pr_body)
           say 'Pull request body:', :debug
           say pr_body, :debug
 
-          updated_pull_request = client.update_pull_request(
+          client.update_pull_request(
             repository, release_pr.number, :title => pr_title, :body => pr_body
           )
 
-          unless updated_pull_request
-            say 'Failed to update a pull request', :error
-            exit 3
-          end
-
-          labels = ENV.fetch('GIT_PR_RELEASE_LABELS') { git_config('labels') }
-          if not labels.nil? and not labels.empty?
-            labels = labels.split(/\s*,\s*/)
-            labeled_pull_request = client.add_labels_to_an_issue(
+          unless labels.empty?
+            client.add_labels_to_an_issue(
               repository, release_pr.number, labels
             )
-
-            unless labeled_pull_request
-              say 'Failed to add labels to a pull request', :error
-              exit 4
-            end
           end
+        end
 
-          say "#{create_mode ? 'Created' : 'Updated'} pull request: #{updated_pull_request.rels[:html].href}", :notice
-          dump_result_as_json( release_pr, merged_prs, changed_files ) if @json
+        # Fetch PR files of specified pull_request
+        def pull_request_files(pull_request)
+          return [] if pull_request.nil?
+
+          # Fetch files as many as possible
+          client.auto_paginate = true
+          files = client.pull_request_files repository, pull_request.number
+          client.auto_paginate = false
+          return files
         end
       end
     end

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

@@ -34,7 +34,7 @@ module Git
         end
 
         def self.mention_type
-          @mention_type ||= (git_config('mention') || 'default')
+          @mention_type ||= (ENV.fetch('GIT_PR_RELEASE_MENTION') { git_config('mention') } || 'default')
         end
       end
     end

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

@@ -83,18 +83,22 @@ Release <%= Time.now %>
 <% end -%>
 ERB
 
-        def build_pr_title_and_body(release_pr, merged_prs, changed_files)
+        def build_pr_title_and_body(release_pr, merged_prs, changed_files, template_path)
           release_pull_request = target_pull_request = release_pr ? PullRequest.new(release_pr) : DummyPullRequest.new
           merged_pull_requests = pull_requests = merged_prs.map { |pr| PullRequest.new(pr) }
 
-          template = DEFAULT_PR_TEMPLATE
-
-          if path = ENV.fetch('GIT_PR_RELEASE_TEMPLATE') { git_config('template') }
-            template_path = File.join(git('rev-parse', '--show-toplevel').first.chomp, path)
-            template = File.read(template_path)
-          end
-
-          erb = ERB.new template, nil, '-'
+          template = if template_path
+                       template_fullpath = File.join(git('rev-parse', '--show-toplevel').first.chomp, template_path)
+                       File.read(template_fullpath)
+                     else
+                       DEFAULT_PR_TEMPLATE
+                     end
+
+          erb = if RUBY_VERSION >= '2.6'
+                  ERB.new template, trim_mode: '-'
+                else
+                  ERB.new template, nil, '-'
+                end
           content = erb.result binding
           content.split(/\n/, 2)
         end
@@ -195,19 +199,6 @@ ERB
 
           auth
         end
-
-        # Fetch PR files of specified pull_request
-        def pull_request_files(client, pull_request)
-          return [] if pull_request.nil?
-
-          host, repository, scheme = host_and_repository_and_scheme
-
-          # Fetch files as many as possible
-          client.auto_paginate = true
-          files = client.pull_request_files repository, pull_request.number
-          client.auto_paginate = false
-          return files
-        end
       end
     end
   end

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

@@ -0,0 +1,487 @@
+RSpec.describe Git::Pr::Release::CLI do
+  let(:configured_cli) {
+    cli = Git::Pr::Release::CLI.new
+    allow(cli).to receive(:host_and_repository_and_scheme) {
+      [nil, "motemen/git-pr-release", "https"]
+    }
+    allow(cli).to receive(:git_config).with(anything) { nil }
+    cli.configure
+    cli
+  }
+
+  describe "#start" do
+    subject { @cli.start }
+
+    before {
+      @cli = Git::Pr::Release::CLI.new
+
+      allow(@cli).to receive(:configure)
+      allow(@cli).to receive(:fetch_merged_prs) { merged_prs }
+      allow(@cli).to receive(:create_release_pr)
+    }
+
+    context "When merged_prs is empty" do
+      let(:merged_prs) { [] }
+      it {
+        is_expected.to eq 1
+        expect(@cli).to have_received(:configure)
+        expect(@cli).to have_received(:fetch_merged_prs)
+        expect(@cli).not_to have_received(:create_release_pr)
+      }
+    end
+
+    context "When merged_prs exists" do
+      let(:merged_prs) {
+        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
+        pr_3 = Sawyer::Resource.new(agent, YAML.load_file(file_fixture("pr_3.yml")))
+        pr_4 = Sawyer::Resource.new(agent, YAML.load_file(file_fixture("pr_4.yml")))
+        [pr_3, pr_4]
+      }
+      it {
+        is_expected.to eq 0
+        expect(@cli).to have_received(:configure)
+        expect(@cli).to have_received(:fetch_merged_prs)
+        expect(@cli).to have_received(:create_release_pr).with(merged_prs)
+      }
+    end
+  end
+
+  describe "#configure" do
+    subject { @cli.configure }
+
+    before {
+      @cli = Git::Pr::Release::CLI.new
+
+      allow(@cli).to receive(:git_config).with(anything) { nil }
+    }
+
+    context "When default" do
+      before {
+        allow(@cli).to receive(:host_and_repository_and_scheme) {
+          [nil, "motemen/git-pr-release", "https"]
+        }
+      }
+
+      it "configured as default" do
+        subject
+
+        expect(Octokit.api_endpoint).to eq "https://api.github.com/"
+        expect(Octokit.web_endpoint).to eq "https://github.com/"
+
+        expect(@cli.repository).to eq "motemen/git-pr-release"
+        expect(@cli.production_branch).to eq "master"
+        expect(@cli.staging_branch).to eq "staging"
+        expect(@cli.template_path).to eq nil
+        expect(@cli.labels).to eq []
+      end
+    end
+
+    context "When GitHub Enterprise Server" do
+      before {
+        allow(@cli).to receive(:host_and_repository_and_scheme) {
+          ["example.com", "motemen/git-pr-release", "https"]
+        }
+      }
+      after {
+        Octokit.reset!
+      }
+
+      it "octokit is configured" do
+        subject
+
+        expect(Octokit.api_endpoint).to eq "https://example.com/api/v3/"
+        expect(Octokit.web_endpoint).to eq "https://example.com/"
+      end
+    end
+
+    describe "branches" do
+      context "When branches are set by ENV" do
+        around do |example|
+          original = ENV.to_hash
+          begin
+            ENV["GIT_PR_RELEASE_BRANCH_PRODUCTION"] = "prod"
+            ENV["GIT_PR_RELEASE_BRANCH_STAGING"]    = "dev"
+            example.run
+          ensure
+            ENV.replace(original)
+          end
+        end
+
+        it "branches are configured" do
+          subject
+
+          expect(@cli.production_branch).to eq "prod"
+          expect(@cli.staging_branch).to eq "dev"
+        end
+      end
+
+      context "When branches are set by git_config" do
+        before {
+          allow(@cli).to receive(:git_config).with("branch.production") { "production" }
+          allow(@cli).to receive(:git_config).with("branch.staging") { "develop" }
+        }
+
+        it "branches are configured" do
+          subject
+
+          expect(@cli.production_branch).to eq "production"
+          expect(@cli.staging_branch).to eq "develop"
+        end
+      end
+    end
+
+    describe "labels" do
+      context "With ENV" do
+        around do |example|
+          original = ENV.to_hash
+          begin
+            ENV["GIT_PR_RELEASE_LABELS"] = env_labels
+            example.run
+          ensure
+            ENV.replace(original)
+          end
+        end
+
+        context "string" do
+          let(:env_labels) { "release" }
+          it "set labels" do
+            subject
+            expect(@cli.labels).to eq ["release"]
+          end
+        end
+
+        context "comma separated string" do
+          let(:env_labels) { "release,release2" }
+          it "set labels" do
+            subject
+            expect(@cli.labels).to eq ["release", "release2"]
+          end
+        end
+
+        context "empty string" do
+          let(:env_labels) { "" }
+          it "set labels as default" do
+            subject
+            expect(@cli.labels).to eq []
+          end
+        end
+      end
+
+      context "With git_config" do
+        before {
+          allow(@cli).to receive(:git_config).with("labels") { "release" }
+        }
+
+        it "set labels" do
+          subject
+          expect(@cli.labels).to eq ["release"]
+        end
+      end
+    end
+  end
+
+  describe "#fetch_merged_prs" do
+    subject { @cli.fetch_merged_prs }
+
+    before {
+      @cli = configured_cli
+
+      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
+
+      expect(@cli).to receive(:git).with(:remote, "update", "origin") {
+        []
+      }
+
+      expect(@cli).to receive(:git).with(:log, "--merges", "--pretty=format:%P", "origin/master..origin/staging") {
+        <<~GIT_LOG.each_line
+          ad694b9c2b868e8801f9209f0ad5dd5458c49854 42bd43b80c973c8f348df3521745201be05bf194
+          b620bead10831d2e4e15be392e0a435d3470a0ad 5c977a1827387ac7b7a85c7b827ee119165f1823
+        GIT_LOG
+      }
+      expect(@cli).to receive(:git).with("ls-remote", "origin", "refs/pull/*/head") {
+        <<~GIT_LS_REMOTE.each_line
+          bbcd2a04ef394e91be44c24e93e52fdbca944060        refs/pull/1/head
+          5c977a1827387ac7b7a85c7b827ee119165f1823        refs/pull/3/head
+          42bd43b80c973c8f348df3521745201be05bf194        refs/pull/4/head
+        GIT_LS_REMOTE
+      }
+      expect(@cli).to receive(:git).with("merge-base", "5c977a1827387ac7b7a85c7b827ee119165f1823", "origin/master") {
+        "b620bead10831d2e4e15be392e0a435d3470a0ad".each_line
+      }
+      expect(@cli).to receive(:git).with("merge-base", "42bd43b80c973c8f348df3521745201be05bf194", "origin/master") {
+        "b620bead10831d2e4e15be392e0a435d3470a0ad".each_line
+      }
+
+      client = double(Octokit::Client)
+      @pr_3 = Sawyer::Resource.new(agent, YAML.load_file(file_fixture("pr_3.yml")))
+      @pr_4 = Sawyer::Resource.new(agent, YAML.load_file(file_fixture("pr_4.yml")))
+      expect(client).to receive(:pull_request).with("motemen/git-pr-release", 3) { @pr_3 }
+      expect(client).to receive(:pull_request).with("motemen/git-pr-release", 4) { @pr_4 }
+      allow(@cli).to receive(:client).with(no_args) { client }
+    }
+
+    it { is_expected.to eq [@pr_3, @pr_4] }
+  end
+
+  describe "#create_release_pr" do
+    subject { @cli.create_release_pr(@merged_prs) }
+
+    before {
+      @cli = configured_cli
+
+      @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, YAML.load_file(file_fixture("pr_3.yml"))),
+        Sawyer::Resource.new(@agent, YAML.load_file(file_fixture("pr_4.yml"))),
+      ]
+
+      allow(@cli).to receive(:detect_existing_release_pr) { existing_release_pr }
+      @pr_title = "Release 2020-01-04 16:51:09 +0900"
+      @pr_body = <<~BODY.chomp
+        - [ ] #3 Provides a creating release pull-request object for template @hakobe
+        - [ ] #4 use user who create PR if there is no assignee @motemen
+      BODY
+      allow(@cli).to receive(:build_and_merge_pr_title_and_body) {
+        [@pr_title, @pr_body]
+      }
+      allow(@cli).to receive(:update_release_pr)
+      @changed_files = [double(Sawyer::Resource)]
+      allow(@cli).to receive(:pull_request_files) { @changed_files }
+    }
+
+    context "When create_mode" do
+      before {
+        @created_pr = Sawyer::Resource.new(@agent, YAML.load_file(file_fixture("pr_1.yml")))
+        allow(@cli).to receive(:prepare_release_pr) { @created_pr }
+      }
+
+      let(:existing_release_pr) { nil }
+
+      it {
+        subject
+
+        expect(@cli).to have_received(:detect_existing_release_pr)
+        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)
+      }
+    end
+
+    context "When not create_mode" do
+      before {
+        allow(@cli).to receive(:prepare_release_pr)
+      }
+
+      let(:existing_release_pr) { double(
+        number: 1023,
+        rels: { html: double(href: "https://github.com/motemen/git-pr-release/pull/1023") },
+      )}
+
+      it {
+        subject
+
+        expect(@cli).to have_received(:detect_existing_release_pr)
+        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)
+      }
+    end
+
+    context "When dry_run with create_mode" do
+      before {
+        @created_pr = Sawyer::Resource.new(@agent, YAML.load_file(file_fixture("pr_1.yml")))
+        allow(@cli).to receive(:prepare_release_pr) { @created_pr }
+
+        @cli.instance_variable_set(:@dry_run, true)
+      }
+
+      let(:existing_release_pr) { nil }
+
+      it {
+        subject
+
+        expect(@cli).to have_received(:detect_existing_release_pr)
+        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)
+      }
+    end
+  end
+
+  describe "#prepare_release_pr" do
+    subject { @cli.prepare_release_pr }
+
+    before {
+      @cli = configured_cli
+
+      @client = double(Octokit::Client)
+      allow(@client).to receive(:create_pull_request)
+      allow(@cli).to receive(:client) { @client }
+    }
+
+    it {
+      subject
+
+      expect(@client).to have_received(:create_pull_request).with(
+        "motemen/git-pr-release",
+        "master",
+        "staging",
+        "Preparing release pull request...",
+        "", # empby body
+      )
+    }
+  end
+
+  describe "#build_and_merge_pr_title_and_body" do
+    subject { @cli.build_and_merge_pr_title_and_body(release_pr, @merged_prs, changed_files) }
+
+    before {
+      @cli = configured_cli
+
+      @merged_prs = [double(Sawyer::Resource)]
+      allow(@cli).to receive(:build_pr_title_and_body) { ["PR Title", "PR Body"] }
+      allow(@cli).to receive(:merge_pr_body) { "Merged Body" }
+    }
+
+    context "When release_pr exists" do
+      let(:release_pr) { double(body: "Old Body") }
+      let(:changed_files) { [double(Sawyer::Resource)] }
+
+      it {
+        is_expected.to eq ["PR Title", "Merged Body"]
+
+        expect(@cli).to have_received(:build_pr_title_and_body).with(release_pr, @merged_prs, changed_files, nil)
+        expect(@cli).to have_received(:merge_pr_body).with("Old Body", "PR Body")
+      }
+    end
+
+    context "When release_pr is nil" do
+      # = When dry_run with create_mode
+      let(:release_pr) { nil }
+      let(:changed_files) { [] }
+
+      it {
+        is_expected.to eq ["PR Title", "Merged Body"]
+
+        expect(@cli).to have_received(:build_pr_title_and_body).with(release_pr, @merged_prs, changed_files, nil)
+        expect(@cli).to have_received(:merge_pr_body).with("", "PR Body")
+      }
+    end
+  end
+
+  describe "#update_release_pr" do
+    subject { @cli.update_release_pr(@release_pr, "PR Title", "PR Body") }
+
+    before {
+      @cli = configured_cli
+
+      @release_pr = double(number: 1023)
+
+      @client = double(Octokit::Client)
+      allow(@client).to receive(:update_pull_request) { @release_pr }
+      allow(@client).to receive(:add_labels_to_an_issue)
+      allow(@cli).to receive(:client) { @client }
+    }
+
+    context "Without labels" do
+      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_labels_to_an_issue)
+      }
+    end
+
+    context "With labels" do
+      before {
+        allow(@cli).to receive(:labels) { ["release"] }
+      }
+      it {
+        subject
+
+        expect(@client).to have_received(:update_pull_request).with(
+          "motemen/git-pr-release",
+          1023,
+          {
+            title: "PR Title",
+            body: "PR Body",
+          }
+        )
+        expect(@client).to have_received(:add_labels_to_an_issue).with(
+          "motemen/git-pr-release", 1023, ["release"]
+        )
+      }
+    end
+  end
+
+  describe "#detect_existing_release_pr" do
+    subject { @cli.detect_existing_release_pr }
+
+    before {
+      @cli = configured_cli
+
+      @client = double(Octokit::Client)
+      allow(@cli).to receive(:client).with(no_args) { @client }
+    }
+
+    context "When exists" do
+      before {
+        @release_pr = double(head: double(ref: "staging"), base: double(ref: "master"))
+        allow(@client).to receive(:pull_requests) { [@release_pr] }
+      }
+
+      it { is_expected.to eq @release_pr }
+    end
+
+    context "When not exists" do
+      before {
+        allow(@client).to receive(:pull_requests) { [] }
+      }
+
+      it { is_expected.to be_nil }
+    end
+  end
+
+  describe "#pull_request_files" do
+    subject { @cli.pull_request_files(@release_pr) }
+
+    before {
+      @cli = configured_cli
+
+      @release_pr = double(number: 1023)
+      @client = double(Octokit::Client)
+      @changed_files = [double(Sawyer::Resource)]
+      allow(@client).to receive(:pull_request_files) { @changed_files }
+      allow(@client).to receive(:auto_paginate=)
+      allow(@cli).to receive(:client) { @client }
+    }
+
+    it {
+      is_expected.to eq @changed_files
+
+      expect(@client).to have_received(:auto_paginate=).with(true)
+      expect(@client).to have_received(:pull_request_files).with("motemen/git-pr-release", 1023)
+      expect(@client).to have_received(:auto_paginate=).with(false)
+    }
+  end
+end

data/spec/git/pr/release_spec.rb

@@ -19,9 +19,9 @@ RSpec.describe Git::Pr::Release do
   end
 
   describe "#build_pr_title_and_body" do
-    context "without any options" do
+    context "without template_path" do
       it {
-        pr_title, new_body = build_pr_title_and_body(@release_pr, @merged_prs, @changed_files)
+        pr_title, new_body = build_pr_title_and_body(@release_pr, @merged_prs, @changed_files, nil)
         expect(pr_title).to eq "Release 2019-02-20 22:58:35 +0900"
         expect(new_body).to eq <<~MARKDOWN
           - [ ] #3 Provides a creating release pull-request object for template @hakobe
@@ -30,37 +30,15 @@ RSpec.describe Git::Pr::Release do
       }
     end
 
-    context "with ENV" do
-      before {
-        ENV["GIT_PR_RELEASE_TEMPLATE"] = "spec/fixtures/file/template_1.erb"
-      }
-
-      after {
-        ENV["GIT_PR_RELEASE_TEMPLATE"] = nil
-      }
-
+    context "with template_path" do
       it {
-        pr_title, new_body = build_pr_title_and_body(@release_pr, @merged_prs, @changed_files)
+        pr_title, new_body = build_pr_title_and_body(@release_pr, @merged_prs, @changed_files, "spec/fixtures/file/template_1.erb")
         expect(pr_title).to eq "a"
         expect(new_body).to eq <<~MARKDOWN
           b
         MARKDOWN
       }
     end
-
-    context "with git_config template" do
-      before {
-        expect(self).to receive(:git_config).with("template") { "spec/fixtures/file/template_2.erb" }
-      }
-
-      it {
-        pr_title, new_body = build_pr_title_and_body(@release_pr, @merged_prs, @changed_files)
-        expect(pr_title).to eq "c"
-        expect(new_body).to eq <<~MARKDOWN
-          d
-        MARKDOWN
-      }
-    end
   end
 
   describe "#dump_result_as_json" do

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require "timecop"
 require "yaml"
 require "git/pr/release"
+require "webmock/rspec"
 
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
@@ -18,6 +19,15 @@ RSpec.configure do |config|
   config.order = :random
   Kernel.srand config.seed
 
+  config.around(:each) do |example|
+    begin
+      ENV['TZ'], old = 'Asia/Tokyo', ENV['TZ']
+      example.run
+    ensure
+      ENV['TZ'] = old
+    end
+  end
+
   config.after do
     Timecop.return
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-pr-release
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.6.0
 platform: ruby
 authors:
 - motemen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2021-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: git-pr-release creates a pull request which summarizes feature branches
   that are to be released into production
 email:
@@ -124,15 +138,16 @@ files:
 - spec/fixtures/file/pr_6.yml
 - spec/fixtures/file/template_1.erb
 - spec/fixtures/file/template_2.erb
+- spec/git/pr/release/cli_spec.rb
 - spec/git/pr/release_spec.rb
 - spec/spec_helper.rb
 - spec/support/capture_support.rb
 - spec/support/file_fixture_support.rb
-homepage: https://github.com/motemen/git-pr-release
+homepage: https://github.com/x-motemen/git-pr-release
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,8 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.0.dev
+signing_key:
 specification_version: 4
 summary: Creates a release pull request
 test_files:
@@ -159,6 +174,7 @@ test_files:
 - spec/fixtures/file/pr_6.yml
 - spec/fixtures/file/template_1.erb
 - spec/fixtures/file/template_2.erb
+- spec/git/pr/release/cli_spec.rb
 - spec/git/pr/release_spec.rb
 - spec/spec_helper.rb
 - spec/support/capture_support.rb