git-pr-release 1.2.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c62affe0022fbc68eb4fb5d6f3ac2ad27c6bb37779c2977619ac7636bfed8340
-  data.tar.gz: 66793e7118f37575b3121ca87c5575322a1b7ec406e94c929165bce4698fdc4c
+  metadata.gz: 50f0bc6156728f1409b494f7d58c93574f8d022c452e935e245c8c36fa083e02
+  data.tar.gz: bc9a65dc34ac07b069885daaea51e81082045da6a5d152d10bafaea3e4dc2ca4
 SHA512:
-  metadata.gz: 6b89116177f0b77ff0ac6aec85b123117cf1aedc84843581e88d84d54106a3cc2f5c400ad072976c4764691336947f6c036b8bc01454929f64dcb6bf0028a2b2
-  data.tar.gz: 3e31b988775f96af5f619f23cb28ce29a5096ad8a785b7e592f8241c40e0326c24abbd6ae50114934c53fda97fbc164477cdc52e97fb07cc690a633638895530
+  metadata.gz: 56c638066c3cca4b0732bb2ac8ec86139d18ba3ef5c9d1ee05f112b737e996395171f6c3998ffa82532fe7de457f7cad754f6efd6a023eb808d7c64aa9f54190
+  data.tar.gz: b80feeefd29cf5326b7cb83fcb7a2d6c52e0ec3a63aa7a068a1a335f21180c515d75f7f64000c63fb363b11dea21f6dacc60e2959a331ebf76b9cbb8410b0271

data/CHANGELOG.md

@@ -1,8 +1,43 @@
 # git-pr-release
 
+## v1.7.0 (2021-05-24)
+
+[full changelog](https://github.com/x-motemen/git-pr-release/compare/v1.6.0...v1.7.0)
+
+* (#64) fix wrong pr number due to sleep (@mpon)
+
+## 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/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)
@@ -10,13 +45,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.2.0'
+  spec.version       = '1.7.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

@@ -13,6 +13,13 @@ module Git
           exit result
         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|
@@ -24,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
@@ -75,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.sort.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
@@ -100,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|
+            sleep 1
+            client.search_issues("repo:#{repository} is:pr is:closed #{sha1}")[:items].map(&:number)
+          end.flatten
         end
 
         def create_release_pr(merged_prs)
@@ -145,7 +164,8 @@ module Git
 
         def detect_existing_release_pr
           say 'Searching for existing release pull requests...', :info
-          client.pull_requests(repository, head: staging_branch, base: production_branch).first
+          user=repository.split("/")[0]
+          client.pull_requests(repository, head: "#{user}:#{staging_branch}", base: production_branch).first
         end
 
         def prepare_release_pr

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

@@ -89,12 +89,16 @@ ERB
 
           template = if template_path
                        template_fullpath = File.join(git('rev-parse', '--show-toplevel').first.chomp, template_path)
-                       File.read(template_path)
+                       File.read(template_fullpath)
                      else
                        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.2.0
+  version: 1.7.0
 platform: ruby
 authors:
 - motemen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2021-05-24 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.3.0.dev
+signing_key:
 specification_version: 4
 summary: Creates a release pull request
 test_files: