circleci-bundle-update-pr 1.8.4 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9170b237913a3deea01e25193c6664d3d0ddb1f4cf7b5c1e997d986ed2e539ee
-  data.tar.gz: 4d2e1ca7f7f74c1bbc2fd17e1a6379b0cb3a373e68add8f2b8f3529b45ec7688
+  metadata.gz: 5ebeadf045cb505aea503e22071ab8dde4df038c64e18d7c479194cc25e7a85b
+  data.tar.gz: 572f0fa572eb2f2424dec31b0098e5118181fa6048727a7980e647e587668efd
 SHA512:
-  metadata.gz: b75132668ee48e8b4706503917c6fcac15f1b61e7e13089f1e0e13efb13fceb884c8cf2a963fb45c9dcd09f77dc9b48c9ab83d9372ae8ad26533e1f92fa237a5
-  data.tar.gz: 18f821948de58deb560ce6cc23a065ba4431e303063ec96fb56097e24eb1b037b399ec93c71b223c7ec8844e7bb6400dd7eccbbc17c8f039c1e818f283989e13
+  metadata.gz: 6d738b9eb1c37c9cbfdb7a050befbce82c2537f0b0cdb7430d6ab4fe6a9791f482d20bf1e9777d57d49bc923d121b044e31c040001344a7b0b2a8444c80329eb
+  data.tar.gz: 9eef3680614f7a294c996202e64af2f1c99795c31ff300b0b2cb9cfc16913f606938b900771156883e016156f4412c8220972d7ea40296a5ccb91451e3631822

data/.gitignore

@@ -1,4 +1,3 @@
 /.bundle
-/.envrc
 /pkg
 /vendor/bundle

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    circleci-bundle-update-pr (1.8.4)
-      compare_linker
+    circleci-bundle-update-pr (1.9.0)
+      compare_linker (>= 1.4.0)
       octokit
 
 GEM
@@ -13,11 +13,11 @@ GEM
     compare_linker (1.4.0)
       httpclient
       octokit
-    faraday (0.14.0)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
     httpclient (2.8.3)
     multipart-post (2.0.0)
-    octokit (4.8.0)
+    octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     public_suffix (3.0.2)
     rake (12.3.1)
@@ -36,4 +36,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/README-for-CircleCI-1.0.md

@@ -31,6 +31,9 @@ GitHub personal access token is required for sending pull requests to your repos
 1. Go to [your account's settings page](https://github.com/settings/tokens) and generate a personal access token with "repo" scope
 2. On CircleCI dashboard, go to your application's "Project Settings" -> "Environment Variables"
 3. Add an environment variable `GITHUB_ACCESS_TOKEN` with your GitHub personal access token
+    * If use GitHub Enterprise
+        * `ENTERPRISE_OCTOKIT_ACCESS_TOKEN` with your GitHub Enterprise personal access token
+        * `ENTERPRISE_OCTOKIT_API_ENDPOINT` with your GitHub Enterprise api endpoint (e.g. https://www.example.com/api/v3)
 
 ### Getting CircleCI API token
 

data/README.md

@@ -33,6 +33,9 @@ GitHub personal access token is required for sending pull requests to your repos
 1. Go to [your account's settings page](https://github.com/settings/tokens) and generate a personal access token with "repo" scope
 2. On CircleCI dashboard, go to your application's "Project Settings" -> "Environment Variables"
 3. Add an environment variable `GITHUB_ACCESS_TOKEN` with your GitHub personal access token
+    * If use GitHub Enterprise
+        * `ENTERPRISE_OCTOKIT_ACCESS_TOKEN` with your GitHub Enterprise personal access token
+        * `ENTERPRISE_OCTOKIT_API_ENDPOINT` with your GitHub Enterprise api endpoint (e.g. https://www.example.com/api/v3)
 
 ### Configure circle.yml
 

data/circleci-bundle-update-pr.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'octokit'
-  spec.add_dependency 'compare_linker'
+  spec.add_dependency 'compare_linker', ">= 1.4.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

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

@@ -7,16 +7,14 @@ module Circleci
     module Update
       module Pr
         def self.create_if_needed(git_username: nil, git_email: nil, git_branches: ["master"])
-          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']
+          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')}"
 
           git_username ||= client.user.login
-          git_email ||= "#{git_username}@users.noreply.github.com"
+          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)
@@ -33,7 +31,7 @@ module Circleci
         private_class_method :need?
 
         def self.create_branch(git_username, git_email, branch, repo_full_name)
-          remote = "https://#{ENV["GITHUB_ACCESS_TOKEN"]}@github.com/#{repo_full_name}"
+          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}")
           system("git config user.email #{git_email}")
@@ -46,7 +44,8 @@ module Circleci
 
         def self.create_pull_request(repo_full_name, branch, now)
           title = "bundle update at #{now.strftime('%Y-%m-%d %H:%M:%S %Z')}"
-          body  = "auto generated by [CircleCI of #{ENV['CIRCLE_PROJECT_REPONAME']}](https://circleci.com/gh/#{repo_full_name})"
+          build_url = URI.parse ENV['CIRCLE_BUILD_URL']
+          body = "auto generated by [CircleCI of #{ENV['CIRCLE_PROJECT_REPONAME']}](https://#{build_url.host}/gh/#{repo_full_name})"
           client.create_pull_request(repo_full_name, ENV['CIRCLE_BRANCH'], branch, title, body)
         end
         private_class_method :create_pull_request
@@ -63,15 +62,51 @@ module Circleci
 
 Powered by [compare_linker](https://rubygems.org/gems/compare_linker)
           EOC
-
           compare_linker.add_comment(repo_full_name, pr_number, comment)
         end
         private_class_method :add_comment_of_compare_linker
 
         def self.client
-          Octokit::Client.new(access_token: ENV["GITHUB_ACCESS_TOKEN"])
+          if enterprise?
+            Octokit::Client.new(access_token: ENV['ENTERPRISE_OCTOKIT_ACCESS_TOKEN'],
+                                api_endpoint: ENV['ENTERPRISE_OCTOKIT_API_ENDPOINT'])
+          else
+            Octokit::Client.new(access_token: ENV["GITHUB_ACCESS_TOKEN"])
+          end
         end
         private_class_method :client
+
+        def self.enterprise?
+          !!ENV['ENTERPRISE_OCTOKIT_ACCESS_TOKEN']
+        end
+        private_class_method :enterprise?
+
+        def self.github_access_token
+          enterprise? ? ENV['ENTERPRISE_OCTOKIT_ACCESS_TOKEN'] : ENV['GITHUB_ACCESS_TOKEN']
+        end
+        private_class_method :github_access_token
+
+        def self.github_host
+          # A format like git@github.com:masutaka/compare_linker.git
+          return $1 if ENV['CIRCLE_REPOSITORY_URL'] =~ %r{([^@]+?):}
+          # A format like https://github.com/masutaka/circleci-bundle-update-pr.git
+          return $1 if ENV['CIRCLE_REPOSITORY_URL'] =~ %r{https://(.+?)/}
+          'github.com'
+        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
+        end
+        private_class_method :raise_if_env_unvalid!
       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.8.4"
+        VERSION = "1.9.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.8.4
+  version: 1.9.0
 platform: ruby
 authors:
 - Takashi Masuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2018-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement