gems_comparator 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8efacdcbe2ff9dca410cb592060fef4889ad8886f94d74601c57eb144ef807b5
-  data.tar.gz: da528c27afb29a7f6ae30fc8a6ce10ef3393e7b595e549c6fe3c11ffc60fcf48
+  metadata.gz: 73350d48051c6613ec8f8beacca8b57cd3aa7b13a67cf471c42d6c9da344b2ce
+  data.tar.gz: 056e9853d3f248f3ebe98801c379c97fcdd98a2f1646a20e0265f3298910f167
 SHA512:
-  metadata.gz: ebd3dc71d9979700c2482a83b34ea002e6e3ac61645ac1801092ac72c3d2fdf1ef8281768e96099fd747e214557586dd32bb05cc6925c65ea5a206fb814d2c4e
-  data.tar.gz: ab1ed0f251464dc24a6ddfa707ea2fa96da8ebba12fe37a0059a77a08716fc69090a590b73996ff9301931d5d49a027aa36c35462aa676862d279efffe4b30f7
+  metadata.gz: d4bd2d6562def761bb753b53e19cf4133ff3b91097840b18197c42d7ac4015ed10647a423720f8c6b01682c0c394ec3103bd78d95780843bd880ce9eeb38de71
+  data.tar.gz: 3798cf8bac2f9615e629601e7d7e15980ed8690411ddc7a1705e0312bbe7e35fb1ccbfdf35c257f3fa57b2f46caf9636385879ecefafadf10757bfa53dc45220

data/.rubocop.yml

@@ -4,6 +4,7 @@ AllCops:
   DisplayStyleGuide: true
   ExtraDetails: true
   Exclude:
+    - 'vendor/**/*'
     - 'spec/fixtures/*'
 
 Style/Documentation:

data/gems_comparator.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'parallel', '~> 1.10.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '0.56.0'
+  spec.add_development_dependency 'rubocop', '0.59.2'
   spec.add_development_dependency 'webmock', '~> 2.3.2'
 end

data/lib/gems_comparator/comparator.rb

@@ -16,7 +16,7 @@ module GemsComparator
     end
 
     def compare
-      gems = addition_gems + change_gems + deletion_gems
+      gems = addition_gems + change_gems
       Comparator.convert(gems.sort_by(&:name))
     end
 
@@ -47,11 +47,6 @@ module GemsComparator
       names.map { |name| new_geminfo(name) }
     end
 
-    def deletion_gems
-      names = before_gems.keys - after_gems.keys
-      names.map { |name| new_geminfo(name) }
-    end
-
     def new_geminfo(name)
       GemInfo.new(name, before_gems[name].to_s, after_gems[name].to_s)
     end

data/lib/gems_comparator/gem_info.rb

@@ -24,10 +24,9 @@ module GemsComparator
     end
 
     def github_url
-      if GithubRepository.repo?(homepage)
-        homepage
-      elsif github_urls.key?(name)
-        "https://github.com/#{github_urls[name]}"
+      [homepage, source_code_uri, github_url_from_yaml].each do |url|
+        normalized = normalized_github_url(url)
+        break normalized if normalized
       end
     end
 
@@ -42,8 +41,20 @@ module GemsComparator
 
     private
 
-    def github_urls
-      @github_urls ||= YAML.load_file(GITHUB_URLS_PATH)
+    def normalized_github_url(url)
+      return unless url.include?(Octokit.web_endpoint)
+
+      Octokit::Repository.from_url(url).url
+    rescue URI::InvalidURIError, Octokit::InvalidRepository, NoMethodError
+      nil
+    end
+
+    def github_slugs
+      @github_slugs ||= YAML.load_file(GITHUB_URLS_PATH)
+    end
+
+    def github_url_from_yaml
+      "https://github.com/#{github_slugs[name]}" if github_slugs.key?(name)
     end
 
     def spec
@@ -57,5 +68,9 @@ module GemsComparator
       ]
       spec_paths.find { |path| File.exist?(path) }
     end
+
+    def source_code_uri
+      spec&.metadata&.fetch('source_code_uri', nil)
+    end
   end
 end

data/lib/gems_comparator/github_repository.rb

@@ -3,6 +3,8 @@
 module GemsComparator
   class GithubRepository
     def self.repo?(url)
+      return false unless url.include?(Octokit.web_endpoint)
+
       Octokit::Repository.from_url(url)
       true
     rescue StandardError
@@ -18,20 +20,22 @@ module GemsComparator
       head_tag = find_tag(head)
 
       if base_tag && head_tag
-        "#{@repo.url}/compare/#{base_tag.name}...#{head_tag.name}"
+        "#{@repo.url}/compare/#{base_tag}...#{head_tag}"
       elsif base_tag
-        "#{@repo.url}/compare/#{base_tag.name}...master"
+        "#{@repo.url}/compare/#{base_tag}...master"
       end
     end
 
     private
 
-    def tags
-      @tags ||= client.tags(@repo)
+    def tag_names
+      @tag_names ||= client.tags(@repo).map(&:name)
     end
 
     def find_tag(name)
-      tags.find { |tag| ["v#{name}", name].include?(tag.name) }
+      return if name.empty?
+
+      tag_names.find { |tag_name| tag_name.include?(name) }
     end
 
     def client

data/lib/gems_comparator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GemsComparator
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gems_comparator
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - sinsoku
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-14 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.56.0
+        version: 0.59.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.56.0
+        version: 0.59.2
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A comparator for Gemfile.lock that generate the GitHub's compare view urls