compare_linker 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65da887b73e5fabab1db09457461a5579fd2bb42471e5f6880d09641c68acb5c
-  data.tar.gz: 4b29c00670d32ee28010f07ad31d88590d128a61c48aa4ca814b95a5335ed2d6
+  metadata.gz: a66e1f77f2336333a3fec1904453bed0c8e006981bce6cb3c07261e32d8f264a
+  data.tar.gz: c840aa131e2ced1492a3c8ba2b3c468b19ed7914f1ba79de1ad71b338244f347
 SHA512:
-  metadata.gz: 01066c681a37b6b9368814a6653792ab7c77c2b917a12e20b83fb40b74ff2f5cc29f9c0f6b5fa96ead45737d8f176ef8df081486f87b9cb007539e4658a16e84
-  data.tar.gz: 7fcdf4d543eb414a30e2bcaeae80863917c282a28b55adcb6cf553d48f8c8b4588abc8727fa31eb9141b1613ff2cc8d9579867655eab462625bdf85bf5e9f7dd
+  metadata.gz: a5f77468a540e60074128207a50a4880fa763b2a4b870d91a07e207750585e9af92c82dba8242a412bb1f6ba1ca050ef2285ef05a45af547e80de9e7be4094fe
+  data.tar.gz: fd762ab40117f3c14411b43456b29eee15ee7dfa2effddb95a16bde412bf8f84f163baa3dc5a61580e8655944ca77ba94e0893fe7e6eb2486cc265732b469ea6

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
-  - 2.5.1
-  - 2.4.4
-  - 2.3.7
+  - 2.6.1
+  - 2.5.3
+  - 2.4.5
+  - 2.3.8

data/README.md

@@ -1,8 +1,8 @@
 # Compare Linker
 
-[![Travis Status](https://img.shields.io/travis/masutaka/compare_linker.svg?style=flat-square)][travisci]
+[![Travis Status](https://img.shields.io/travis/masutaka/compare_linker.svg?logo=travis&style=flat-square)][travisci]
 [![License](https://img.shields.io/github/license/masutaka/compare_linker.svg?style=flat-square)][license]
-[![Gem](https://img.shields.io/gem/v/compare_linker.svg?style=flat-square)][gem-link]
+[![Gem](https://img.shields.io/gem/v/compare_linker.svg?logo=ruby&style=flat-square)][gem-link]
 
 [travisci]: https://travis-ci.org/masutaka/compare_linker
 [license]: https://github.com/masutaka/compare_linker/blob/master/LICENSE.txt

data/compare_linker.gemspec

@@ -6,8 +6,8 @@ require 'compare_linker/version'
 Gem::Specification.new do |spec|
   spec.name          = "compare_linker"
   spec.version       = CompareLinker::VERSION
-  spec.authors       = ["Kensuke Nagae"]
-  spec.email         = ["kyanny@gmail.com"]
+  spec.authors       = ["Takashi Masuda", "Kensuke Nagae"]
+  spec.email         = ["masutaka.net@gmail.com", "kyanny@gmail.com"]
   spec.description   = %q{Create GitHub's compare view URLs for pull request from diff of Gemfile.lock}
   spec.summary       = %q{Create GitHub's compare view URLs for pull request}
   spec.homepage      = "https://github.com/masutaka/compare_linker"
@@ -21,9 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "octokit"
   spec.add_dependency "httpclient"
 
-  spec.add_development_dependency "activesupport", "~> 4" # for ruby-2.[0-2].0 tests, required by factory_girl
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "factory_girl"
+  spec.add_development_dependency "bundler", ">= 1.3"
+  spec.add_development_dependency "factory_bot"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

data/lib/compare_linker.rb

@@ -26,37 +26,41 @@ class CompareLinker
       old_lockfile = fetcher.fetch(repo_full_name, pull_request.base.sha)
       new_lockfile = fetcher.fetch(repo_full_name, pull_request.head.sha)
 
-      comparator = LockfileComparator.new
-      comparator.compare(old_lockfile, new_lockfile)
-      @compare_links = comparator.updated_gems.map { |gem_name, gem_info|
-        if gem_info[:owner].nil?
-          finder = GithubLinkFinder.new(octokit, gem_dictionary)
-          finder.find(gem_name)
-          gem_info[:homepage_uri] = finder.homepage_uri
-          if finder.repo_owner.nil?
-            formatter.format(gem_info)
-          else
-            gem_info[:repo_owner] = finder.repo_owner
-            gem_info[:repo_name] = finder.repo_name
+      make_compare_links_from_lockfiles(old_lockfile, new_lockfile)
+    end
+  end
+
+  def make_compare_links_from_lockfiles(old_lockfile, new_lockfile)
+    comparator = LockfileComparator.new
+    comparator.compare(old_lockfile, new_lockfile)
+    @compare_links = comparator.updated_gems.map { |gem_name, gem_info|
+      if gem_info[:owner].nil?
+        finder = GithubLinkFinder.new(octokit, gem_dictionary)
+        finder.find(gem_name)
+        gem_info[:homepage_uri] = finder.homepage_uri
+        if finder.repo_owner.nil?
+          formatter.format(gem_info)
+        else
+          gem_info[:repo_owner] = finder.repo_owner
+          gem_info[:repo_name] = finder.repo_name
 
-            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])
+          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
-              gem_info[:new_tag] = new_tag.name
-              formatter.format(gem_info)
-            else
-              formatter.format(gem_info)
-            end
+          if old_tag && new_tag
+            gem_info[:old_tag] = old_tag.name
+            gem_info[:new_tag] = new_tag.name
+            formatter.format(gem_info)
+          else
+            formatter.format(gem_info)
           end
-        else
-          formatter.format(gem_info)
         end
-      }
-      @compare_links
-    end
+      else
+        formatter.format(gem_info)
+      end
+    }
+    @compare_links
   end
 
   def add_comment(repo_full_name, pr_number, compare_links)

data/lib/compare_linker/version.rb

@@ -1,3 +1,3 @@
 class CompareLinker
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/spec/factories/gem_info.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :gem_info, class: Hash do
     factory :g_owner__old_rev__new_rev do
       defaults = {

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'compare_linker'
-require 'factory_girl'
+require 'factory_bot'
 require 'rspec'
 
 Dir["#{__dir__}/support/**/*.rb"].each do |f|
@@ -7,10 +7,10 @@ Dir["#{__dir__}/support/**/*.rb"].each do |f|
 end
 
 RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
   config.include LoadFixtureHelper
 
   config.before(:suite) do
-    FactoryGirl.find_definitions
+    FactoryBot.find_definitions
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: compare_linker
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
+- Takashi Masuda
 - Kensuke Nagae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2019-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -38,36 +39,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,6 +97,7 @@ dependencies:
         version: '0'
 description: Create GitHub's compare view URLs for pull request from diff of Gemfile.lock
 email:
+- masutaka.net@gmail.com
 - kyanny@gmail.com
 executables: []
 extensions: []
@@ -167,8 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Create GitHub's compare view URLs for pull request