git-pr-release 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcfff97226a267200239ba145f57f35a4a75b1729f830022b20bd6933ba11cd6
-  data.tar.gz: 7e30e4a4932b9275c4025bc07cb51a5a10f5c81aad8882076c7df477f54069ea
+  metadata.gz: ca8cbcbeabc642ad4c1531d0e06a30a321a1fcbbe726f02c796a8a770db03107
+  data.tar.gz: 7c394639183d32987a2676d7e78c8cc6d3426841d763e972058f7db765ca8218
 SHA512:
-  metadata.gz: 82a273849c7f74b9c1000062cba072e898089e54a07d35be0109a5e3e16afcb158c956454462816b98b4504bedb7675654025d44f54be95352940d25346c46ab
-  data.tar.gz: 56560282a6aab0db0595d165227974254eb6cf51e591cfcad016efe655ae7a3c3a70ace9e368640c760f6c007c22bfca5ad9e1a923bc5794422b1defc46dc22e
+  metadata.gz: 318a4eaaed83ad8ff9f918a799864d9c4cb40224b3b168d41c073103d09b74af7c73cbe117ff54e1533cc182e4acbfd087949f42275f068eb4393e228761e573
+  data.tar.gz: 16dd7fc6cfa7f377644a4a8a342fb4fc1097c02f5fbd17794cc9f9e715d7fc2140a56952018295cc88100aec546919d2ada674258d7ce76cc71464239ac87b0d

data/CHANGELOG.md

@@ -1,21 +1,31 @@
 # git-pr-release
 
+## 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/motemen/git-pr-release/compare/v1.3.0...v1.4.0)
+[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/motemen/git-pr-release/compare/v1.2.0...v1.3.0)
+[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/motemen/git-pr-release/compare/v1.1.0...v1.2.0)
+[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)
@@ -23,13 +33,13 @@
 
 ## 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.4.0'
+  spec.version       = '1.5.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"

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

@@ -17,6 +17,7 @@ module Git
           @dry_run  = false
           @json     = false
           @no_fetch = false
+          @squashed = false
         end
 
         def start
@@ -30,6 +31,9 @@ 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
@@ -81,14 +85,24 @@ module Git
         def fetch_merged_prs
           git :remote, 'update', 'origin' unless @no_fetch
 
-          merged_feature_head_sha1s = git(
-            :log, '--merges', '--pretty=format:%P', "origin/#{production_branch}..origin/#{staging_branch}"
-          ).map do |line|
+          merged_pull_request_numbers = @squashed ? fetch_merged_pr_numbers_from_github : fetch_merged_pr_numbers_from_git_remote
+
+          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
+
+          merged_prs
+        end
+
+        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
@@ -106,14 +120,13 @@ module Git
               end
             end
           end.compact
+        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
-
-          merged_prs
+        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
 
         def create_release_pr(merged_prs)

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

@@ -94,7 +94,11 @@ ERB
                        DEFAULT_PR_TEMPLATE
                      end
 
-          erb = ERB.new template, nil, '-'
+          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

data/spec/spec_helper.rb

@@ -19,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.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - motemen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-22 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -143,11 +143,11 @@ files:
 - 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
@@ -162,8 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Creates a release pull request
 test_files: