jenkins-bundle-update-pr 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8956bbcd46eadb1d4142c94f34ea735257a5fd85
-  data.tar.gz: e4bffbeaf9af811ea813c688b38dd350c9ad3fc5
+  metadata.gz: f2a9c8cd37cb4193ad18a5c7e57a3038fbae4d6b
+  data.tar.gz: f7f4452e51584f83f3364571430857c08ac2cfe8
 SHA512:
-  metadata.gz: 0f40f61d1d4be59cc114633502fb2c2d2be29ba9296db85b0de1d20abd996522a37ffea84fe50b46d1c242749d60c9d1503afe78b9a3be9b30968c71d1036cd8
-  data.tar.gz: 2f69bf35044d8ff9a9efde3657f376db5bd49fc0713c52895162c0cbc971407825e22117d6bfd83007841f44e2b3cbdc291072b61dffa612302eea371fbc6481
+  metadata.gz: a63dac7ea1356318f15b00fb5ba4a633e90f37ef5a0fa5b7b998018904cbd29dc4fef3c279c49aef61a022bf5fdeea8980fb6a7f246b6743761e5a053570fe92
+  data.tar.gz: 3b5542fa1bf94a63d72b0a936dec5db2c4d016ab55e9e996bcf610affe70a478afb31f2558e65a6a1d8ae0de88fb21ca6701336f84b914561847e4c4210f5205

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

@@ -8,7 +8,7 @@ require 'octokit'
 class CompareLinker
   def make_compare_links
     if octokit.pull_request_files(repo_full_name, pr_number).find do |resource|
-      resource.filename == 'Gemfile.lock' || resource.filename == 'config/Gemfile.lock'
+      resource.filename == 'config/Gemfile.lock' || resource.filename == 'Gemfile.lock'
     end
       pull_request = octokit.pull_request(repo_full_name, pr_number)
 
@@ -18,20 +18,20 @@ class CompareLinker
 
       comparator = LockfileComparator.new
       comparator.compare(old_lockfile, new_lockfile)
-      @compare_links = comparator.updated_gems.map do |gem_name, gem_info|
+      @compare_links = comparator.updated_gems.map { |gem_name, gem_info|
         if gem_info[:owner].nil?
-          finder = GithubLinkFinder.new(octokit)
+          finder = GithubLinkFinder.new(octokit, gem_dictionary)
           finder.find(gem_name)
+          gem_info[:homepage_uri] = finder.homepage_uri
           if finder.repo_owner.nil?
-            gem_info[:homepage_uri] = finder.homepage_uri
             formatter.format(gem_info)
           else
             gem_info[:repo_owner] = finder.repo_owner
             gem_info[:repo_name] = finder.repo_name
 
-            tag_finder = GithubTagFinder.new(octokit)
-            old_tag = tag_finder.find(finder.repo_full_name, gem_info[:old_ver])
-            new_tag = tag_finder.find(finder.repo_full_name, gem_info[:new_ver])
+            tag_finder = GithubTagFinder.new(octokit, gem_name, finder.repo_full_name)
+            old_tag = tag_finder.find(gem_info[:old_ver])
+            new_tag = tag_finder.find(gem_info[:new_ver])
 
             if old_tag && new_tag
               gem_info[:old_tag] = old_tag.name
@@ -44,18 +44,19 @@ class CompareLinker
         else
           formatter.format(gem_info)
         end
-      end
+      }
       @compare_links
     end
   end
 
   class LockfileFetcher
     def fetch(repo_full_name, ref)
-      lockfile_content = octokit.contents(
-        repo_full_name, ref: ref
-      ).find do |content|
-        content.name == 'Gemfile.lock' || content.name == 'config/Gemfile.lock'
-      end
+      lockfile_content =
+        begin
+          octokit.contents(repo_full_name, path: 'config/Gemfile.lock', ref: ref)
+        rescue Octokit::NotFound
+          octokit.contents(repo_full_name, path: 'Gemfile.lock', ref: ref)
+        end
       Bundler::LockfileParser.new(
         Base64.decode64(
           octokit.blob(repo_full_name, lockfile_content.sha).content

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

@@ -4,7 +4,7 @@ module Jenkins
   module Bundle
     module Update
       module Pr
-        VERSION = '0.1.4'
+        VERSION = '0.1.5'
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins-bundle-update-pr
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Hidekazu Tanaka