circleci-bundle-update-pr 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10da4d9e8e3d7bcc1040720c63a9d62ea1689d0a1aba20af4afdacbc0aa259e7
-  data.tar.gz: 036edf4a72c54c7ac75cb1847cf2d18261018125ef213984ddb29af0b6ac7d04
+  metadata.gz: 9f9f0c4b26b2b4a94afa593263ba9a79b97b9aa53e726a2eebb58c0d2d700385
+  data.tar.gz: 5b5c133b453d52d259097d3f7fe84e99fd138dfd1f5ed559b19232c83e4b5e63
 SHA512:
-  metadata.gz: a8a3a0f6db5c3e59bed66ba14dfbb8a7bbcd5cf608eba9d0f3a84e6e4af17dd7124fb8bb37a9b770326db656d8bc9dd7062b28a57b75b4a5ffadc9af1d5b2fdf
-  data.tar.gz: 7dc7f107ba41295e5641759ffd70c045cdaa728ab91bc40ed4c227e254139a8bcd9534c9fbbc42dde877969950a84804bee2ce073cd59d04649609b098968a76
+  metadata.gz: a5253486a6aedf168f70ca1cf31bd91700ab02fd9a045ce3b4e1992a63407c4063da12de5952d75c8df744cc67c666ab698eafeb09bcc170b6aacabda60ccbbf
+  data.tar.gz: 2e3d2f9c61c0b0f75223d7cf9ca4d4b01d90693a856c7e75f9973be754082720b1bd84db9a9f81a41ffcceb7fc6656e66de68a9efc96c29e95efd89e414d7ec2

data/.circleci/config.yml

@@ -8,7 +8,7 @@ executors:
     parameters:
       ruby_version:
         type: enum
-        enum: ['2.5', '2.6', '2.7', '3.0']
+        enum: ['2.5', '2.6', '2.7', '3.0', '3.1']
     docker:
       - image: cimg/ruby:<< parameters.ruby_version >>
     working_directory: ~/repo
@@ -23,7 +23,7 @@ commands:
     parameters:
       ruby_version:
         type: enum
-        enum: ['2.5', '2.6', '2.7', '3.0']
+        enum: ['2.5', '2.6', '2.7', '3.0', '3.1']
     steps:
       - restore_cache:
           name: Restore bundle cache
@@ -34,25 +34,20 @@ commands:
     parameters:
       ruby_version:
         type: enum
-        enum: ['2.5', '2.6', '2.7', '3.0']
+        enum: ['2.5', '2.6', '2.7', '3.0', '3.1']
     steps:
       - save_cache:
           name: Save bundle cache
           key: gems-ruby<< parameters.ruby_version >>-{{ .Environment.COMMON_CACHE_KEY }}-{{ checksum "Gemfile.lock" }}
           paths:
             - ~/repo/vendor/bundle
-  install_bundler:
-    steps:
-      - run:
-          name: install bundler
-          command: gem install -N bundler:1.17.3 # same version as Gemfile.lock
 
 jobs:
   build:
     parameters:
       ruby_version:
         type: enum
-        enum: ['2.5', '2.6', '2.7', '3.0']
+        enum: ['2.5', '2.6', '2.7', '3.0', '3.1']
     executor:
       name: default
       ruby_version: << parameters.ruby_version >>
@@ -61,7 +56,6 @@ jobs:
       - checkout
       - restore_bundle_cache:
           ruby_version: << parameters.ruby_version >>
-      - install_bundler
       - run:
           name: bundle install
           command: |
@@ -75,13 +69,12 @@ jobs:
   continuous_bundle_update:
     executor:
       name: default
-      ruby_version: '3.0'
+      ruby_version: '3.1'
     steps:
       - setup_requirements
       - checkout
       - restore_bundle_cache:
-          ruby_version: '3.0'
-      - install_bundler
+          ruby_version: '3.1'
       - run:
           name: Install edge circleci-bundle-update-pr
           command: |
@@ -108,6 +101,9 @@ workflows:
       - build:
           name: ruby-3.0
           ruby_version: '3.0'
+      - build:
+          name: ruby-3.1
+          ruby_version: '3.1'
   nightly:
     triggers:
       - schedule:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    circleci-bundle-update-pr (3.0.0)
+    circleci-bundle-update-pr (3.1.0)
       compare_linker (>= 1.4.0)
       octokit
 
@@ -14,64 +14,70 @@ GEM
     compare_linker (1.4.4)
       httpclient
       octokit
-    diff-lcs (1.4.4)
-    faraday (1.8.0)
+    diff-lcs (1.5.0)
+    faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     httpclient (2.8.3)
     multipart-post (2.1.1)
-    octokit (4.21.0)
+    octokit (4.22.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.19.2)
-    parser (3.0.2.0)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    public_suffix (4.0.6)
-    rainbow (3.0.0)
+    public_suffix (4.0.7)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.3.1)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.22.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.28.2)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
-      parser (>= 3.0.1.1)
-    rubocop-rspec (2.5.0)
+    rubocop-ast (1.17.0)
+      parser (>= 3.1.1.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.10.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
@@ -95,7 +101,8 @@ DEPENDENCIES
   rake
   rspec
   rubocop
+  rubocop-rake
   rubocop-rspec
 
 BUNDLED WITH
-   1.17.3
+   2.3.11

data/README.md

@@ -101,7 +101,7 @@ General usage:
 $ circleci-bundle-update-pr <git username> <git email address>
 ```
 
-By default, it works only on master branch, but you can also explicitly specify any branches rather than only master branch by adding them to the arguments.
+By default, it works only on master or main branches, but you can also explicitly specify any branches rather than only these branches by adding them to the arguments.
 
 ```
 $ circleci-bundle-update-pr <git username> <git email address> master develop topic

data/bin/circleci-bundle-update-pr

@@ -15,7 +15,7 @@ opt.parse!(ARGV)
 Circleci::Bundle::Update::Pr.create_if_needed(
   git_username: ARGV.shift,
   git_email: ARGV.shift,
-  git_branches: ARGV.empty? ? ['master'] : ARGV,
+  git_branches: ARGV.empty? ? %w[master main] : ARGV,
   assignees: options[:assignees],
   reviewers: options[:reviewers],
   labels: options[:labels],

data/circleci-bundle-update-pr.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/masutaka/circleci-bundle-update-pr'
   spec.license       = 'MIT'
 
+  spec.metadata['rubygems_mfa_required'] = 'true'
+
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
@@ -29,5 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rake'
   spec.add_development_dependency 'rubocop-rspec'
 end

data/lib/circleci/bundle/update/pr/version.rb

@@ -4,7 +4,7 @@ module Circleci
   module Bundle
     module Update
       module Pr
-        VERSION = '3.0.0'
+        VERSION = '3.1.0'
       end
     end
   end

data/lib/circleci/bundle/update/pr.rb

@@ -7,7 +7,7 @@ module Circleci
   module Bundle
     module Update
       module Pr
-        def self.create_if_needed(git_username: nil, git_email: nil, git_branches: ['master'],
+        def self.create_if_needed(git_username: nil, git_email: nil, git_branches: %w[master main],
                                   assignees: nil, reviewers: nil, labels: nil, allow_dup_pr: false)
           raise_if_env_unvalid!
 
@@ -16,8 +16,8 @@ module Circleci
             return
           end
 
-          unless target_branch?(running_branch: ENV['CIRCLE_BRANCH'], target_branches: git_branches)
-            puts "Skip because CIRCLE_BRANCH[#{ENV['CIRCLE_BRANCH']}] is not included in target branches[#{git_branches.join(',')}]."
+          unless target_branch?(running_branch: ENV.fetch('CIRCLE_BRANCH', nil), target_branches: git_branches)
+            puts "Skip because CIRCLE_BRANCH[#{ENV.fetch('CIRCLE_BRANCH', nil)}] is not included in target branches[#{git_branches.join(',')}]."
             return
           end
 
@@ -37,17 +37,17 @@ module Circleci
           request_review(pull_request[:number], reviewers) if reviewers
         end
 
-        BRANCH_PREFIX = ENV['BRANCH_PREFIX'] || 'bundle-update-'.freeze
-        TITLE_PREFIX = ENV['TITLE_PREFIX'] || 'bundle update at '.freeze
+        BRANCH_PREFIX = ENV.fetch('BRANCH_PREFIX', nil) || 'bundle-update-'.freeze
+        TITLE_PREFIX = ENV.fetch('TITLE_PREFIX', nil) || 'bundle update at '.freeze
 
         def self.raise_if_env_unvalid!
           raise "$CIRCLE_PROJECT_USERNAME isn't set" unless ENV['CIRCLE_PROJECT_USERNAME']
           raise "$CIRCLE_PROJECT_REPONAME isn't set" unless ENV['CIRCLE_PROJECT_REPONAME']
           raise "$GITHUB_ACCESS_TOKEN isn't set" unless ENV['GITHUB_ACCESS_TOKEN']
-          if ENV['ENTERPRISE_OCTOKIT_ACCESS_TOKEN'] && !ENV['ENTERPRISE_OCTOKIT_API_ENDPOINT']
+          if ENV.fetch('ENTERPRISE_OCTOKIT_ACCESS_TOKEN', nil) && !ENV['ENTERPRISE_OCTOKIT_API_ENDPOINT']
             raise "$ENTERPRISE_OCTOKIT_API_ENDPOINT isn't set"
           end
-          if !ENV['ENTERPRISE_OCTOKIT_ACCESS_TOKEN'] && ENV['ENTERPRISE_OCTOKIT_API_ENDPOINT']
+          if !ENV['ENTERPRISE_OCTOKIT_ACCESS_TOKEN'] && ENV.fetch('ENTERPRISE_OCTOKIT_API_ENDPOINT', nil)
             raise "$ENTERPRISE_OCTOKIT_ACCESS_TOKEN isn't set"
           end
         end
@@ -106,7 +106,7 @@ module Circleci
         def self.create_branch(git_username, git_email)
           branch = "#{BRANCH_PREFIX}#{now.strftime('%Y%m%d%H%M%S')}"
 
-          current_ref = client.ref(repo_full_name, "heads/#{ENV['CIRCLE_BRANCH']}")
+          current_ref = client.ref(repo_full_name, "heads/#{ENV.fetch('CIRCLE_BRANCH', nil)}")
           branch_ref = client.create_ref(repo_full_name, "heads/#{branch}", current_ref.object.sha)
 
           branch_commit = client.commit(repo_full_name, branch_ref.object.sha)
@@ -151,7 +151,7 @@ module Circleci
         # @return [Sawyer::Resource] The newly created pull request
         def self.create_pull_request(branch)
           title = "#{TITLE_PREFIX}#{now.strftime('%Y-%m-%d %H:%M:%S %Z')}"
-          client.create_pull_request(repo_full_name, ENV['CIRCLE_BRANCH'], branch, title)
+          client.create_pull_request(repo_full_name, ENV.fetch('CIRCLE_BRANCH', nil), branch, title)
         end
         private_class_method :create_pull_request
 
@@ -161,7 +161,7 @@ module Circleci
         private_class_method :add_labels
 
         def self.update_pull_request_body(pr_number)
-          ENV['OCTOKIT_ACCESS_TOKEN'] = ENV['GITHUB_ACCESS_TOKEN']
+          ENV['OCTOKIT_ACCESS_TOKEN'] = ENV.fetch('GITHUB_ACCESS_TOKEN', nil)
           compare_linker = CompareLinker.new(repo_full_name, pr_number)
           compare_linker.formatter = CompareLinker::Formatter::Markdown.new
 
@@ -198,10 +198,10 @@ Powered by [circleci-bundle-update-pr](https://rubygems.org/gems/circleci-bundle
 
         def self.client
           if enterprise?
-            Octokit::Client.new(access_token: ENV['ENTERPRISE_OCTOKIT_ACCESS_TOKEN'],
-                                api_endpoint: ENV['ENTERPRISE_OCTOKIT_API_ENDPOINT'])
+            Octokit::Client.new(access_token: ENV.fetch('ENTERPRISE_OCTOKIT_ACCESS_TOKEN', nil),
+                                api_endpoint: ENV.fetch('ENTERPRISE_OCTOKIT_API_ENDPOINT', nil))
           else
-            Octokit::Client.new(access_token: ENV['GITHUB_ACCESS_TOKEN'])
+            Octokit::Client.new(access_token: ENV.fetch('GITHUB_ACCESS_TOKEN', nil))
           end
         end
         private_class_method :client
@@ -215,15 +215,15 @@ Powered by [circleci-bundle-update-pr](https://rubygems.org/gems/circleci-bundle
         #
         # @return [String] e.g. 'masutaka/circleci-bundle-update-pr'
         def self.repo_full_name
-          @repo_full_name ||= "#{ENV['CIRCLE_PROJECT_USERNAME']}/#{ENV['CIRCLE_PROJECT_REPONAME']}"
+          @repo_full_name ||= "#{ENV.fetch('CIRCLE_PROJECT_USERNAME', nil)}/#{ENV.fetch('CIRCLE_PROJECT_REPONAME', nil)}"
         end
         private_class_method :repo_full_name
 
         def self.github_host
           # A format like https://github.com/masutaka/circleci-bundle-update-pr.git
-          return Regexp.last_match(1) if ENV['CIRCLE_REPOSITORY_URL'] =~ %r{https://(.+?)/}
+          return Regexp.last_match(1) if ENV.fetch('CIRCLE_REPOSITORY_URL', nil) =~ %r{https://(.+?)/}
           # A format like git@github.com:masutaka/compare_linker.git
-          return Regexp.last_match(1) if ENV['CIRCLE_REPOSITORY_URL'] =~ /([^@]+?):/
+          return Regexp.last_match(1) if ENV.fetch('CIRCLE_REPOSITORY_URL', nil) =~ /([^@]+?):/
 
           'github.com'
         end
@@ -241,7 +241,7 @@ Powered by [circleci-bundle-update-pr](https://rubygems.org/gems/circleci-bundle
         #
         # @return [String]
         def self.lockfile_path
-          workdir_env = ENV['CIRCLE_WORKING_DIRECTORY']
+          workdir_env = ENV.fetch('CIRCLE_WORKING_DIRECTORY', nil)
           return 'Gemfile.lock' unless workdir_env
 
           workdir = Pathname.new(workdir_env).expand_path

data/spec/circleci/bundle/update/pr/note_spec.rb

@@ -54,7 +54,7 @@ describe Circleci::Bundle::Update::Pr::Note do
 
     context 'with .circleci/BUNDLE_UPDATE_NOTE.md' do
       before do
-        File.open('.circleci/BUNDLE_UPDATE_NOTE.md', 'w') { |f| f.write('I am .circleci/BUNDLE_UPDATE_NOTE.md') }
+        File.write('.circleci/BUNDLE_UPDATE_NOTE.md', 'I am .circleci/BUNDLE_UPDATE_NOTE.md')
       end
 
       it { is_expected.to eq 'I am .circleci/BUNDLE_UPDATE_NOTE.md' }
@@ -62,7 +62,7 @@ describe Circleci::Bundle::Update::Pr::Note do
 
     context 'with CIRCLECI_BUNDLE_UPDATE_NOTE.md' do
       before do
-        File.open('CIRCLECI_BUNDLE_UPDATE_NOTE.md', 'w') { |f| f.write('I am CIRCLECI_BUNDLE_UPDATE_NOTE.md') }
+        File.write('CIRCLECI_BUNDLE_UPDATE_NOTE.md', 'I am CIRCLECI_BUNDLE_UPDATE_NOTE.md')
       end
 
       it { is_expected.to eq 'I am CIRCLECI_BUNDLE_UPDATE_NOTE.md' }
@@ -70,8 +70,8 @@ describe Circleci::Bundle::Update::Pr::Note do
 
     context 'with .circleci/BUNDLE_UPDATE_NOTE.md and CIRCLECI_BUNDLE_UPDATE_NOTE.md' do
       before do
-        File.open('.circleci/BUNDLE_UPDATE_NOTE.md', 'w') { |f| f.write('I am .circleci/BUNDLE_UPDATE_NOTE.md') }
-        File.open('CIRCLECI_BUNDLE_UPDATE_NOTE.md', 'w') { |f| f.write('I am CIRCLECI_BUNDLE_UPDATE_NOTE.md') }
+        File.write('.circleci/BUNDLE_UPDATE_NOTE.md', 'I am .circleci/BUNDLE_UPDATE_NOTE.md')
+        File.write('CIRCLECI_BUNDLE_UPDATE_NOTE.md', 'I am CIRCLECI_BUNDLE_UPDATE_NOTE.md')
       end
 
       it { is_expected.to eq 'I am .circleci/BUNDLE_UPDATE_NOTE.md' }

data/spec/circleci/bundle/update/pr_spec.rb

@@ -77,7 +77,7 @@ describe Circleci::Bundle::Update::Pr do
     context "when ENV['CIRCLE_WORKING_DIRECTORY'] is relative path" do
       let(:workdir_env) do
         project_dir = Pathname.getwd.to_s
-        home_dir = Pathname.new(ENV['HOME']).to_s
+        home_dir = Pathname.new(ENV.fetch('HOME', nil)).to_s
         project_dir.sub(home_dir, '~')
       end
       let(:src_dir) { 'spec/tmp' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: circleci-bundle-update-pr
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Takashi Masuda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-03 00:00:00.000000000 Z
+date: 2022-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compare_linker
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  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'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +165,8 @@ files:
 homepage: https://github.com/masutaka/circleci-bundle-update-pr
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -167,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Provide continues bundle update using CircleCI