compare_linker 1.3.8 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dbd7868325c3a0d45c8a416a8f5dabede70417f9
-  data.tar.gz: '0836ec5880102b346009b988f567bfd7004b14d0'
+SHA256:
+  metadata.gz: 50d73ff348de6f8b4260b5467c4c6a2b74f558def5f8abca4a763f2c47dd5607
+  data.tar.gz: 92a7a6877f185302aa084422dd2e24f83e0cd77945884c43e2d355080e9c66fc
 SHA512:
-  metadata.gz: 23a5f9d6e75304f79a51795ca043fbfc84d2529b37ce65a27af447c2974510fbedeed9a01ae8cdfc52ada577369932e773a0f3d9ad0fb56b03635db733e9e385
-  data.tar.gz: 16256943f523e668735ff45746aa1d40b1f0fc442435b0f546b86fc72d49c553a5a4403365d7d6e89ecf8e54d10999b902ebdaaf2a8b0b3c82005fae68ce6b4c
+  metadata.gz: 203911ffe47740f23723ba60860779e5ed3e4a5d8df78f697ce12fe0aace28d6b18e4c6ad025f9518dfccb109014800fd38107fd2f9c718e7ecaa67c64b806f7
+  data.tar.gz: 456b807be6b9b5773589b01cc4cd90013e34165f9a81a6750e31cedf487b815a42a81b7f4c722655bbcc88beda5691fa2f5522ba907ffaed336210d8af6ee54c

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 2.4.1
-  - 2.3.4
-  - 2.2.7
+  - 2.5.1
+  - 2.4.4
+  - 2.3.7

data/README.md

@@ -45,6 +45,14 @@ comment = compare_linker.make_compare_links.to_a.join("\n")
 compare_linker.add_comment('masutaka/compare_linker', '17', comment)
 ```
 
+### GitHub Enterprise
+In addition to OCTOKIT_ACCESS_TOKEN, set the following environment variables.
+
+```ruby
+ENV['ENTERPRISE_OCTOKIT_ACCESS_TOKEN'] = 'xxx'
+ENV['ENTERPRISE_OCTOKIT_API_ENDPOINT'] = 'https://www.example.com/api/v3'
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/compare_linker.rb

@@ -9,22 +9,20 @@ require_relative "compare_linker/lockfile_comparator"
 require_relative "compare_linker/lockfile_fetcher"
 
 class CompareLinker
-  attr_reader :repo_full_name, :pr_number, :compare_links, :gem_dictionary
-  attr_accessor :formatter, :octokit
+  attr_reader :repo_full_name, :pr_number, :compare_links
+  attr_accessor :formatter
 
   def initialize(repo_full_name, pr_number)
     @repo_full_name = repo_full_name
     @pr_number = pr_number
-    @octokit ||= Octokit::Client.new(access_token: ENV["OCTOKIT_ACCESS_TOKEN"])
-    @gem_dictionary = GemDictionary.new
     @formatter = Formatter::Text.new
   end
 
   def make_compare_links
-    if octokit.pull_request_files(repo_full_name, pr_number).find { |resource| resource.filename == "Gemfile.lock" }
-      pull_request = octokit.pull_request(repo_full_name, pr_number)
+    if requested_repository_octokit.pull_request_files(repo_full_name, pr_number).find { |resource| resource.filename == "Gemfile.lock" }
+      pull_request = requested_repository_octokit.pull_request(repo_full_name, pr_number)
 
-      fetcher = LockfileFetcher.new(octokit)
+      fetcher = LockfileFetcher.new(requested_repository_octokit)
       old_lockfile = fetcher.fetch(repo_full_name, pull_request.base.sha)
       new_lockfile = fetcher.fetch(repo_full_name, pull_request.head.sha)
 
@@ -62,11 +60,33 @@ class CompareLinker
   end
 
   def add_comment(repo_full_name, pr_number, compare_links)
-    res = octokit.add_comment(
+    res = requested_repository_octokit.add_comment(
       repo_full_name,
       pr_number,
       compare_links
     )
-    "https://github.com/#{repo_full_name}/pull/#{pr_number}#issuecomment-#{res.id}"
+    res[:html_url]
+  end
+
+  private
+
+  def requested_repository_octokit
+    enterprise_octokit || octokit
+  end
+
+  def enterprise_octokit
+    @enterprise_octokit ||=
+      if ENV["ENTERPRISE_OCTOKIT_ACCESS_TOKEN"] && ENV['ENTERPRISE_OCTOKIT_API_ENDPOINT']
+        Octokit::Client.new(access_token: ENV["ENTERPRISE_OCTOKIT_ACCESS_TOKEN"],
+                            api_endpoint: ENV["ENTERPRISE_OCTOKIT_API_ENDPOINT"])
+      end
+  end
+
+  def octokit
+    @octokit ||= Octokit::Client.new(access_token: ENV["OCTOKIT_ACCESS_TOKEN"])
+  end
+
+  def gem_dictionary
+    @gem_dictionary ||= GemDictionary.new
   end
 end

data/lib/compare_linker/version.rb

@@ -1,3 +1,3 @@
 class CompareLinker
-  VERSION = "1.3.8"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compare_linker
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.4.0
 platform: ruby
 authors:
 - Kensuke Nagae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Create GitHub's compare view URLs for pull request