git-pr-release 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1a94b83554ecc020acc0a736dcec3d764e416cd0a99ea2b3a1948b9b2a85fb6
-  data.tar.gz: 2d41363fc87ca3d42e21b8bf18348f2ff9ef6f2e4a53237c4292338e62a9e257
+  metadata.gz: 8a0c2d1ded6d8e250d8cafcce83e7148ebaf274a1afb92ce5b4b5469a29e3cec
+  data.tar.gz: 26eb1888e585695c2f2cdd0154b59d61ff80c2781c423b175227e7156aadd9d8
 SHA512:
-  metadata.gz: fbb6731c6b4805a9bf512d727641a8e73bc4bf50261c2e821d1a17beeba359a1c2c2ed234269c7b4e05d3d08378ad225ad84955008c055ad6c7bbbe0993db43f
-  data.tar.gz: ac651dbda5be13ed6fd43db65baee451e5dba97723c79c7eaa7ca44c1214500651a10a93f8e8c911062d772c8ead1726edcb5c06a1bf2c9214ff1380406b827d
+  metadata.gz: e25446387c28b266051d6e1d40b6dd8b553ba5d84f174bf32804c70f96e9591e3fdbb9b00a74ccb45364de68a7d33fed0a65d00ab68ec696528320b0321a1fac
+  data.tar.gz: 9d5cf6118e614100257bc7959357da6206e9f40f6bb07c7cc010e66be5c7d30f32e7629aee92b3cbac5e85780e0add3da4334e9267c5a0b42ed761b9c87ab476

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # git-pr-release
 
+## v2.2.0 (2022-08-17)
+
+[full changelog](https://github.com/x-motemen/git-pr-release/compare/v2.1.2...v2.2.0)
+
+* (#88) unshallow if a shallow repository (@Songmu)
+* (#89) Add overwrite-description option (@onk)
+
+## v2.1.2 (2022-07-29)
+
+[full changelog](https://github.com/x-motemen/git-pr-release/compare/v2.1.1...v2.1.2)
+
+* (#87) delegate to `@pr` when `method_missing` in PullRequest (@Songmu)
+
+## v2.1.1 (2022-03-09)
+
+[full changelog](https://github.com/x-motemen/git-pr-release/compare/v2.1.0...v2.1.1)
+
+* (#81) fix forbidden git config name (#80) (@mtgto)
+
 ## v2.1.0 (2022-03-03)
 
 [full changelog](https://github.com/x-motemen/git-pr-release/compare/v2.0.0...v2.1.0)

data/README.md

@@ -84,7 +84,7 @@ You can specify this value by `GIT_PR_RELEASE_MENTION` environment variable.
 
 If not specified, the mention will be the PR assignee
 
-## `pr-release.ssl_no_verify`
+### `pr-release.ssl-no-verify`
 
 Whether to verify SSL certificate or not.
 Accepted values: `true` | `false`
@@ -102,18 +102,6 @@ Errors and exit statuses
 
 exit status is 1.
 
-### Failed to create a new pull request
-
-exit status is 2.
-
-### Failed to update a pull request
-
-exit status is 3.
-
-### Failed to add labels
-
-exit status is 4.
-
 Author
 ------
 

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.1.0'
+  spec.version       = '2.2.0'
   spec.authors       = ["motemen"]
   spec.email         = ["motemen@gmail.com"]
   spec.summary       = 'Creates a release pull request'

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

@@ -34,6 +34,9 @@ module Git
             opts.on('--squashed', 'Handle squash merged PRs') do |v|
               @squashed = v
             end
+            opts.on('--overwrite-description', 'Force overwrite PR description') do |v|
+              @overwrite_description = v
+            end
           end.parse!
 
           ### Set up configuration
@@ -59,8 +62,8 @@ module Git
           host, @repository, scheme = host_and_repository_and_scheme
 
           if host
-            if host != 'github.com' && scheme == 'https' # GitHub Enterprise
-              ssl_no_verify = %w[true 1].include? ENV.fetch('GIT_PR_RELEASE_SSL_NO_VERIFY') { git_config('ssl_no_verify') }
+            if scheme == 'https' # GitHub Enterprise
+              ssl_no_verify = %w[true 1].include? ENV.fetch('GIT_PR_RELEASE_SSL_NO_VERIFY') { git_config('ssl-no-verify') }
               if ssl_no_verify
                 OpenSSL::SSL.const_set :VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE
               end
@@ -87,6 +90,10 @@ module Git
         end
 
         def fetch_merged_prs
+          bool = git(:'rev-parse', '--is-shallow-repository').first.chomp
+          if bool == 'true'
+            git(:fetch, '--unshallow')
+          end
           git :remote, 'update', 'origin' unless @no_fetch
 
           merged_pull_request_numbers = fetch_merged_pr_numbers_from_git_remote
@@ -191,7 +198,11 @@ module Git
             changed_files = pull_request_files(release_pr)
           end
 
-          pr_title, pr_body = build_and_merge_pr_title_and_body(release_pr, merged_prs, changed_files)
+          pr_title, pr_body = if @overwrite_description
+                                build_pr_title_and_body(release_pr, merged_prs, changed_files, template_path)
+                              else
+                                build_and_merge_pr_title_and_body(release_pr, merged_prs, changed_files)
+                              end
 
           if @dry_run
             say 'Dry-run. Not updating PR', :info

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

@@ -40,6 +40,14 @@ module Git
         def self.mention_type
           @mention_type ||= (ENV.fetch('GIT_PR_RELEASE_MENTION') { git_config('mention') } || 'default')
         end
+
+        def method_missing(name, *args, &block)
+          @pr.public_send name, *args, &block
+        end
+
+        def respond_to_missing?(name, include_private = false)
+          @pr.respond_to?(name, include_private)
+        end
       end
     end
   end

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

@@ -194,6 +194,7 @@ RSpec.describe Git::Pr::Release::CLI do
         conn.adapter(:test, Faraday::Adapter::Test::Stubs.new)
       end
 
+      expect(@cli).to receive(:git).with(:'rev-parse', "--is-shallow-repository") { ["false\n"] }
       expect(@cli).to receive(:git).with(:remote, "update", "origin") {
         []
       }
@@ -319,6 +320,32 @@ RSpec.describe Git::Pr::Release::CLI do
         expect(@cli).not_to have_received(:update_release_pr).with(@created_pr, @pr_title, @pr_body)
       }
     end
+
+    context "When overwrite_description" do
+      before {
+        @cli.instance_variable_set(:@overwrite_description, true)
+        @new_pr_title = "2022-08-17 12:34:58 +0900"
+        @new_pr_body = <<~BODY.chomp
+          - [ ] #3 @hakobe
+          - [ ] #4 @hakobe
+        BODY
+        allow(@cli).to receive(:build_pr_title_and_body) {
+          [@new_pr_title, @new_pr_body]
+        }
+      }
+
+      let(:existing_release_pr) { double(
+        number: 1023,
+        rels: { html: double(href: "https://github.com/motemen/git-pr-release/pull/1023") },
+      )}
+
+      it {
+        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)
+      }
+    end
   end
 
   describe "#prepare_release_pr" do

data/spec/spec_helper.rb

@@ -31,6 +31,9 @@ RSpec.configure do |config|
   config.after do
     Timecop.return
   end
+
+  # Trigger Autoload
+  Octokit::Client
 end
 
 Dir[File.expand_path("support/**/*.rb", __dir__)].each {|f| require f }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-pr-release
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - motemen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-05 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit