git-pr-release 1.6.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54aeb2f71e8311efc9d48ea98c695496ddf9a9755d23aa822078484384b83329
-  data.tar.gz: ee8358c06dc99f8d15983c81f9725c50111af8697253fcc39c66bf2eef3099d7
+  metadata.gz: b8bcbbdbe3dfb5b6783306e29dad9c919d86264ea185742aeb07b91d141ac247
+  data.tar.gz: 1d67e25f3acde325baf9a1103ecc619011486847def7e561aa620f9b0f538c9f
 SHA512:
-  metadata.gz: 594733c2d859ec97b8573df6bfb805df8ad83ffde7e1f80afde7bdc889c1f73b1641f54d047657d58b9cea54c3a24375e56cac6088326fe24f28843be756bfda
-  data.tar.gz: '09f9266b8d49b75a8fc2981b524df7a8bfb3bffd100c258ac4d660a1fa6cf3906af51f4ad913ae7ba86a3c13f6b1ec27fb9ce7c59e4e7fde49e9f204544604c8'
+  metadata.gz: 602b5171e7b0a0160555632b19ff35af9ca7bf9c6d560d4364d8251b661cc205b51f645c15d33db701c623817f5ad31c6e307781178a6103582f35f001b06fb1
+  data.tar.gz: 1fad3d9128cc3d982ceb426045013566967d53df7c25364d8b256562863286384b297bbcf14aa0df4acaa81b945e3c570ddef7559c30dbff2a5fe77a41231141

data/.github/workflows/test.yml

@@ -0,0 +1,47 @@
+name: test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+  schedule:
+    - cron: "0 0 * * *" # JST 09:00
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    container: ${{ matrix.ruby }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - ruby:2.6
+          - ruby:2.7
+          - ruby:3.0
+          - rubylang/ruby:master-nightly-bionic
+        include:
+          - ruby: rubylang/ruby:master-nightly-bionic
+            allow_failures: "true"
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Cache vendor/bundle
+        uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: v1-gem-${{ runner.os }}-${{ matrix.ruby }}-${{ github.sha }}
+          restore-keys: |
+            v1-gem-${{ runner.os }}-${{ matrix.ruby }}-
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+      - name: bundle update
+        run: |
+          set -xe
+          bundle config path vendor/bundle
+          bundle update --jobs $(nproc) --retry 3
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+      - name: Run ${{ matrix.test_framework }}
+        run: |
+          set -xe
+          bundle exec rspec
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # git-pr-release
 
+## v2.0.0 (2022-02-17)
+
+[full changelog](https://github.com/x-motemen/git-pr-release/compare/v1.9.0...v2.0.0)
+
+* (#69) remove duplicated PR entries at squash (@Yuki-Inoue)
+* (#70) [Spec] Fix spec for build_pr_title_and_body (@yutailang0119)
+* (#71) Introduce CI (@ohbarye)
+* (#73) (#74) Use `YAML.unsafe_load_file` instead of `YAML.load_file` (@ohbarye)
+
+## v1.9.0 (2021-08-04)
+
+[full changelog](https://github.com/x-motemen/git-pr-release/compare/v1.8.0...v1.9.0)
+
+* (#68) Add nil check for release\_pr.body (@w1mvy)
+
+## v1.8.0 (2021-06-24)
+
+[full changelog](https://github.com/x-motemen/git-pr-release/compare/v1.7.0...v1.8.0)
+
+* (#66) Exclude titles from checklist items (@nhosoya)
+
+## 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)

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

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

@@ -87,7 +87,7 @@ module Git
 
           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|
+          merged_prs = merged_pull_request_numbers.uniq.sort.map do |nr|
             pr = client.pull_request repository, nr
             say "To be released: ##{pr.number} #{pr.title}", :notice
             pr
@@ -124,8 +124,8 @@ module Git
 
         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
+            client.search_issues("repo:#{repository} is:pr is:closed #{sha1}")[:items].map(&:number)
           end.flatten
         end
 
@@ -176,7 +176,7 @@ module Git
 
         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 : ""
+          old_body = (release_pr && release_pr.body != nil) ? 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)]

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

@@ -11,7 +11,7 @@ module Git
         end
 
         def to_checklist_item
-          "- [ ] ##{pr.number} #{pr.title}" + mention
+          "- [ ] ##{pr.number}" + mention
         end
 
         def html_link

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

@@ -36,8 +36,8 @@ RSpec.describe Git::Pr::Release::CLI do
           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 = Sawyer::Resource.new(agent, load_yaml("pr_3.yml"))
+        pr_4 = Sawyer::Resource.new(agent, load_yaml("pr_4.yml"))
         [pr_3, pr_4]
       }
       it {
@@ -219,8 +219,8 @@ RSpec.describe Git::Pr::Release::CLI do
       }
 
       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")))
+      @pr_3 = Sawyer::Resource.new(agent, load_yaml("pr_3.yml"))
+      @pr_4 = Sawyer::Resource.new(agent, load_yaml("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 }
@@ -241,8 +241,8 @@ RSpec.describe Git::Pr::Release::CLI do
       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"))),
+        Sawyer::Resource.new(@agent, load_yaml("pr_3.yml")),
+        Sawyer::Resource.new(@agent, load_yaml("pr_4.yml")),
       ]
 
       allow(@cli).to receive(:detect_existing_release_pr) { existing_release_pr }
@@ -261,7 +261,7 @@ RSpec.describe Git::Pr::Release::CLI do
 
     context "When create_mode" do
       before {
-        @created_pr = Sawyer::Resource.new(@agent, YAML.load_file(file_fixture("pr_1.yml")))
+        @created_pr = Sawyer::Resource.new(@agent, load_yaml("pr_1.yml"))
         allow(@cli).to receive(:prepare_release_pr) { @created_pr }
       }
 
@@ -301,7 +301,7 @@ RSpec.describe Git::Pr::Release::CLI do
 
     context "When dry_run with create_mode" do
       before {
-        @created_pr = Sawyer::Resource.new(@agent, YAML.load_file(file_fixture("pr_1.yml")))
+        @created_pr = Sawyer::Resource.new(@agent, load_yaml("pr_1.yml"))
         allow(@cli).to receive(:prepare_release_pr) { @created_pr }
 
         @cli.instance_variable_set(:@dry_run, true)

data/spec/git/pr/release_spec.rb

@@ -8,13 +8,13 @@ RSpec.describe Git::Pr::Release do
       conn.builder.handlers.delete(Faraday::Adapter::NetHttp)
       conn.adapter :test, @stubs
     end
-    @release_pr = Sawyer::Resource.new(@agent, YAML.load_file(file_fixture("pr_1.yml")))
+    @release_pr = Sawyer::Resource.new(@agent, load_yaml("pr_1.yml"))
     @merged_prs = [
-      Sawyer::Resource.new(@agent, YAML.load_file(file_fixture("pr_3.yml"))),
-      Sawyer::Resource.new(@agent, YAML.load_file(file_fixture("pr_6.yml"))),
+      Sawyer::Resource.new(@agent, load_yaml("pr_3.yml")),
+      Sawyer::Resource.new(@agent, load_yaml("pr_6.yml")),
     ]
     @changed_files = [
-      Sawyer::Resource.new(@agent, YAML.load_file(file_fixture("pr_1_files.yml"))),
+      Sawyer::Resource.new(@agent, load_yaml("pr_1_files.yml")),
     ]
   end
 
@@ -24,8 +24,8 @@ RSpec.describe Git::Pr::Release do
         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
-          - [ ] #6 Support two factor auth @ninjinkun
+          - [ ] #3 @hakobe
+          - [ ] #6 @ninjinkun
         MARKDOWN
       }
     end

data/spec/support/file_fixture_support.rb

@@ -1,4 +1,12 @@
 module FileFixtureSupport
+  def load_yaml(fixture_name)
+    if YAML.respond_to?(:unsafe_load_file)
+      YAML.unsafe_load_file(file_fixture(fixture_name))
+    else
+      YAML.load_file(file_fixture(fixture_name))
+    end
+  end
+
   def file_fixture(fixture_name)
     file_fixture_path = RSpec.configuration.file_fixture_path
     path = Pathname.new(File.join(file_fixture_path, fixture_name))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-pr-release
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0
 platform: ruby
 authors:
 - motemen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -117,6 +117,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
@@ -162,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: Creates a release pull request