circleci-bundle-update-pr 1.11.3 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fed190b6e303e6e6a2a90f51c5bba9cc74650f878d9f4bd2277ce7fe70dfaa80
-  data.tar.gz: e5cc3a2204ff8d645cde47fd6390b32690ee9128cab319dd9c0b00ea4c245e0f
+  metadata.gz: 7e50dd78098b429691a6337242fdee4ab41974be18904d58b6f9a5eedbdf74e0
+  data.tar.gz: 36555ee2c44458ef2d456d2a5cf3c09b21e3b96908948aba0fa40819fb68f590
 SHA512:
-  metadata.gz: bf2bf93e2ecb5183939f1ec2a899dd8ce1c30739ae0365e7d1ff8561f42d53ad5c5a09f3f8941de35651e37e0761ab91b30f65285f964fb6ef83d31becb4173f
-  data.tar.gz: 5918f4fadb14c3b359a58006d05ac03631c4b191808288da7611806fc5d8060ef1f6eda0ff7e5593a6a8686ce48babfea1e0e68ac02903b60b39041fca60625d
+  metadata.gz: c01f59d3e28e132607892ca07d807478c01155032109a96689becdd18d17e758f09c884a0067fda08bc54a8a2cd8b3281cdbc30f84028dcd499f4139b762feba
+  data.tar.gz: d253a28b14648fc6d42165eb0c59bcea01d1370ee675efb36f1f225c1c5396340799abd89c83dcac3695d6fac057398aa31e7dec67e3aabc8b27e4c82cebc2ef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    circleci-bundle-update-pr (1.11.3)
+    circleci-bundle-update-pr (1.12.0)
       compare_linker (>= 1.4.0)
       octokit
 
@@ -14,7 +14,7 @@ GEM
       httpclient
       octokit
     diff-lcs (1.3)
-    faraday (0.15.2)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
     httpclient (2.8.3)
     multipart-post (2.0.0)
@@ -51,4 +51,4 @@ DEPENDENCIES
   rspec (~> 3.7)
 
 BUNDLED WITH
-   1.16.4
+   1.16.5

data/README.md

@@ -1,8 +1,8 @@
 # Circleci::Bundle::Update::Pr
 
-[![Build Status](https://img.shields.io/circleci/project/masutaka/circleci-bundle-update-pr/master.svg?style=flat-square)][circleci]
+[![Build Status](https://img.shields.io/circleci/project/github/masutaka/circleci-bundle-update-pr/master.svg?logo=circieci&style=flat-square)][circleci]
 [![License](https://img.shields.io/github/license/masutaka/circleci-bundle-update-pr.svg?style=flat-square)][license]
-[![Gem](https://img.shields.io/gem/v/circleci-bundle-update-pr.svg?style=flat-square)][gem-link]
+[![Gem](https://img.shields.io/gem/v/circleci-bundle-update-pr.svg?logo=ruby&style=flat-square)][gem-link]
 
 [circleci]: https://circleci.com/gh/masutaka/circleci-bundle-update-pr
 [license]: https://github.com/masutaka/circleci-bundle-update-pr/blob/master/LICENSE.txt

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

@@ -9,32 +9,72 @@ module Circleci
         def self.create_if_needed(git_username: nil, git_email: nil, git_branches: ["master"],
                                   assignees: nil, reviewers: nil, labels: nil)
           raise_if_env_unvalid!
-          return unless need?(git_branches)
-          repo_full_name = "#{ENV['CIRCLE_PROJECT_USERNAME']}/#{ENV['CIRCLE_PROJECT_REPONAME']}"
-          now = Time.now
-          branch = "bundle-update-#{now.strftime('%Y%m%d%H%M%S')}"
+
+          if skip?
+            puts 'Skip because it has already existed.'
+            return
+          end
+
+          unless need_to_commit?(git_branches)
+            puts 'No changes due to bundle update'
+            return
+          end
 
           git_username ||= client.user.login
           git_email ||= "#{git_username}@users.noreply.#{github_host}"
 
-          create_branch(git_username, git_email, branch, repo_full_name)
-          pull_request = create_pull_request(repo_full_name, branch, now)
-          add_labels(repo_full_name, pull_request[:number], labels) if labels
-          update_pull_request_body(repo_full_name, pull_request[:number])
-          add_assignees(repo_full_name, pull_request[:number], assignees) if assignees
-          request_review(repo_full_name, pull_request[:number], reviewers) if reviewers
+          branch = create_branch(git_username, git_email)
+          pull_request = create_pull_request(branch)
+          add_labels(pull_request[:number], labels) if labels
+          update_pull_request_body(pull_request[:number])
+          add_assignees(pull_request[:number], assignees) if assignees
+          request_review(pull_request[:number], reviewers) if reviewers
         end
 
-        def self.need?(git_branches)
+        BRANCH_PREFIX = 'bundle-update-'.freeze
+        TITLE_PREFIX = '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']
+            raise "$ENTERPRISE_OCTOKIT_API_ENDPOINT isn't set"
+          end
+          if !ENV['ENTERPRISE_OCTOKIT_ACCESS_TOKEN'] && ENV['ENTERPRISE_OCTOKIT_API_ENDPOINT']
+            raise "$ENTERPRISE_OCTOKIT_ACCESS_TOKEN isn't set"
+          end
+        end
+        private_class_method :raise_if_env_unvalid!
+
+        # Has 'bundle update PR' already existed?
+        #
+        # @return [Boolean]
+        def self.skip?
+          client.pull_requests(repo_full_name).find do |pr|
+            pr.title =~ /\A#{TITLE_PREFIX}/ && pr.head.ref =~ /\A#{BRANCH_PREFIX}\d+/
+          end != nil
+        end
+        private_class_method :skip?
+
+        # Does it need to commit due to bundle update?
+        #
+        # @param git_branches [Array<String>]
+        # @return [Boolean]
+        def self.need_to_commit?(git_branches)
           return false unless git_branches.include?(ENV['CIRCLE_BRANCH'])
           unless system("bundle update && bundle update --ruby")
             raise "Unable to execute `bundle update && bundle update --ruby`"
           end
           `git status -sb 2> /dev/null`.include?("Gemfile.lock")
         end
-        private_class_method :need?
+        private_class_method :need_to_commit?
 
-        def self.create_branch(git_username, git_email, branch, repo_full_name)
+        # Create remote branch for bundle update PR
+        #
+        # @return [String] remote branch name. e.g. bundle-update-20180929154455
+        def self.create_branch(git_username, git_email)
+          branch = "#{BRANCH_PREFIX}#{now.strftime('%Y%m%d%H%M%S')}"
           remote = "https://#{github_access_token}@#{github_host}/#{repo_full_name}"
           system("git remote add github-url-with-token #{remote}")
           system("git config user.name #{git_username}")
@@ -43,16 +83,26 @@ module Circleci
           system("git commit -m '$ bundle update && bundle update --ruby'")
           system("git branch -M #{branch}")
           system("git push -q github-url-with-token #{branch}")
+          branch
         end
         private_class_method :create_branch
 
-        def self.create_pull_request(repo_full_name, branch, now)
-          title = "bundle update at #{now.strftime('%Y-%m-%d %H:%M:%S %Z')}"
+        # Create bundle update PR
+        #
+        # @param branch [String] branch name
+        # @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)
         end
         private_class_method :create_pull_request
 
-        def self.update_pull_request_body(repo_full_name, pr_number)
+        def self.add_labels(pr_number, labels)
+          client.add_labels_to_an_issue(repo_full_name, pr_number, labels)
+        end
+        private_class_method :add_labels
+
+        def self.update_pull_request_body(pr_number)
           ENV["OCTOKIT_ACCESS_TOKEN"] = ENV["GITHUB_ACCESS_TOKEN"]
           compare_linker = CompareLinker.new(repo_full_name, pr_number)
           compare_linker.formatter = CompareLinker::Formatter::Markdown.new
@@ -69,21 +119,16 @@ Powered by [circleci-bundle-update-pr](https://rubygems.org/gems/circleci-bundle
         end
         private_class_method :update_pull_request_body
 
-        def self.add_assignees(repo_full_name, pr_number, assignees)
+        def self.add_assignees(pr_number, assignees)
           client.add_assignees(repo_full_name, pr_number, assignees)
         end
         private_class_method :add_assignees
 
-        def self.request_review(repo_full_name, pr_number, reviewers)
+        def self.request_review(pr_number, reviewers)
           client.request_pull_request_review(repo_full_name, pr_number, reviewers)
         end
         private_class_method :request_review
 
-        def self.add_labels(repo_full_name, pr_number, labels)
-          client.add_labels_to_an_issue(repo_full_name, pr_number, labels)
-        end
-        private_class_method :add_labels
-
         def self.client
           if enterprise?
             Octokit::Client.new(access_token: ENV['ENTERPRISE_OCTOKIT_ACCESS_TOKEN'],
@@ -104,6 +149,14 @@ Powered by [circleci-bundle-update-pr](https://rubygems.org/gems/circleci-bundle
         end
         private_class_method :github_access_token
 
+        # Get repository full name
+        #
+        # @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']}"
+        end
+        private_class_method :repo_full_name
+
         def self.github_host
           # A format like https://github.com/masutaka/circleci-bundle-update-pr.git
           return $1 if ENV['CIRCLE_REPOSITORY_URL'] =~ %r{https://(.+?)/}
@@ -113,18 +166,13 @@ Powered by [circleci-bundle-update-pr](https://rubygems.org/gems/circleci-bundle
         end
         private_class_method :github_host
 
-        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']
-            raise "$ENTERPRISE_OCTOKIT_API_ENDPOINT isn't set"
-          end
-          if !ENV['ENTERPRISE_OCTOKIT_ACCESS_TOKEN'] && ENV['ENTERPRISE_OCTOKIT_API_ENDPOINT']
-            raise "$ENTERPRISE_OCTOKIT_ACCESS_TOKEN isn't set"
-          end
+        # Get unified current time
+        #
+        # @return [Time]
+        def self.now
+          @now ||= Time.now
         end
-        private_class_method :raise_if_env_unvalid!
+        private_class_method :now
       end
     end
   end

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

@@ -2,7 +2,7 @@ module Circleci
   module Bundle
     module Update
       module Pr
-        VERSION = "1.11.3"
+        VERSION = "1.12.0"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: circleci-bundle-update-pr
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.12.0
 platform: ruby
 authors:
 - Takashi Masuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2018-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit