lock_diff 0.3.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4bd53748cc250bef15eff5a49da0a505faa84d24
-  data.tar.gz: 528f3e74318971a0d942539964ab4b8c90796e1a
+SHA256:
+  metadata.gz: b72b0103bb0456640f9f87ce36c6aab414b9448d7f362e931a43b32968975fe7
+  data.tar.gz: bc757035ce6f1abb73351ffe667903f6d07c7cd61197e307db410412060f8b23
 SHA512:
-  metadata.gz: 4d91859144482b359679a161f24d1f98b3ee83c259a7344d73df64175b12023104dff90257bac38f4c88a31a1e222ae403e87eed70b74a12bd5ac82f9f29c119
-  data.tar.gz: 0c0b50ccd947fca8f228f0e67da4896dbc5c0c73a1062edc7775805e46e261a67b6c2f44ec1dc3e49268450db6d3222907cbb6a15a93c682ae00002c31b43901
+  metadata.gz: 03d27cc09817e1695418a4acb7efab5cddd6208a7a73362237292dd827b2507397251ef2d78331bd40db6bbf16a052549476eb2577a7ba12c9ab1351941bbe10
+  data.tar.gz: bce05c0eb4ce1df1595cd0e7c88111c9c25b0412a84ca769ac3f5997c451a6abbaa1a50ac29c25424f66c420249cbcb83fbea69adf06fed7c3c550d818067739

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
 rvm:
-- 2.3.4
-- 2.4.1
+- 2.4
+- 2.5
+- 2.6
+- 2.7
 script:
 - bundle exec rspec
 notifications:

data/README.md

@@ -1,13 +1,9 @@
 # LockDiff
 
 [![Gem Version](https://badge.fury.io/rb/lock_diff.svg)](https://badge.fury.io/rb/lock_diff)
-[![GitHub tag](https://img.shields.io/github/tag/vividmuimui/lock_diff.svg)](https://github.com/vividmuimui/lock_diff/tags)
 [![Build Status](https://travis-ci.org/vividmuimui/lock_diff.svg?branch=master)](https://travis-ci.org/vividmuimui/lock_diff)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d05b439bc5064e30ad84ecfa8e57b448)](https://www.codacy.com/app/vividmuimui/lock_diff?utm_source=github.com&utm_medium=referral&utm_content=vividmuimui/lock_diff&utm_campaign=badger)
-[![Dependency Status](https://gemnasium.com/badges/github.com/vividmuimui/lock_diff.svg)](https://gemnasium.com/github.com/vividmuimui/lock_diff)
 [![Code Climate](https://codeclimate.com/github/vividmuimui/lock_diff/badges/gpa.svg)](https://codeclimate.com/github/vividmuimui/lock_diff)
-[![Issue Count](https://codeclimate.com/github/vividmuimui/lock_diff/badges/issue_count.svg)](https://codeclimate.com/github/vividmuimui/lock_diff)
-[![ghit.me](https://ghit.me/badge.svg?repo=vividmuimui/lock_diff)](https://ghit.me/repo/vividmuimui/lock_diff)
 
 This gem detects changes to your package manager (e.g. Gemfile) and generates a Markdown-formatted diff including:
 
@@ -109,7 +105,7 @@ TODO:
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/lock_diff. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/vividmuimui/lock_diff. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -117,7 +113,7 @@ The gem is available as open source under the terms of the [MIT License](http://
 
 ### Original
 
-Most source code in this pepository is by https://github.com/kyanny/compare_linker .
+Most of the source code in this repository is by https://github.com/kyanny/compare_linker.
 
 ```
 Copyright (c) 2014 Kensuke Nagae
@@ -147,4 +143,4 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ## Code of Conduct
 
-Everyone interacting in the LockDiff project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/lock_diff/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the LockDiff project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/vividmuimui/lock_diff/blob/master/CODE_OF_CONDUCT.md).

data/lib/lock_diff.rb

@@ -1,6 +1,7 @@
 require "logger"
 require "forwardable"
 
+require "lock_diff/changelog"
 require "lock_diff/diff_info"
 require "lock_diff/formatter/github_markdown"
 require "lock_diff/gem"

data/lib/lock_diff/changelog.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module LockDiff
+  class Changelog
+    attr_reader :url
+
+    def initialize(url)
+      @url = url
+    end
+
+    def name
+      File.basename(@url)
+    end
+  end
+end

data/lib/lock_diff/diff_info.rb

@@ -57,28 +57,18 @@ module LockDiff
       end
     end
 
-    def changelog_url
-      @changelog_url ||= begin
-        ref =
-          case status
-          when UPGRADE, NEW
-            @new_package.ref
-          when DOWNGRADE, DELETE
-            nil # default branch(master)
-          end
+    def changelogs
+      return nil if [DOWNGRADE, DELETE].include?(status)
 
-        Github::ChangelogUrlFinder.new(
-          repository: package.repository,
-          repository_url: package.repository_url,
-          ref: ref
-        ).call
+      Github::ChangelogUrlFinder.new(
+        repository: package.repository,
+        repository_url: package.repository_url,
+        ref: @new_package.ref
+      ).call.map do |url|
+        Changelog.new(url)
       end
     end
 
-    def changelog_name
-      File.basename(changelog_url)
-    end
-
     def commits_url
       return unless package.repository_url
       old_ref = @old_package.ref

data/lib/lock_diff/formatter/github_markdown.rb

@@ -41,7 +41,7 @@ module LockDiff
           text << repository
           text << status
           text << commits_text
-          text << changelog
+          text << changelogs
           "| #{text.join(' | ')} |"
         end
 
@@ -77,15 +77,16 @@ module LockDiff
           end
         end
 
-        def changelog
-          if diff_info.changelog_url
-            "[#{diff_info.changelog_name}](#{diff_info.changelog_url})"
+        def changelogs
+          if diff_info.changelogs
+            diff_info.changelogs.map do |changelog|
+              "[#{changelog.name}](#{changelog.url})"
+            end.join(" ")
           else
             ""
           end
         end
       end
-
     end
   end
 end

data/lib/lock_diff/github/changelog_url_finder.rb

@@ -17,18 +17,18 @@ module LockDiff
       end
 
       def call
-        find_change_log_url || find_release_url
+        change_log_urls.push(find_release_url).compact
       end
 
       private
 
-      def find_change_log_url
+      def change_log_urls
         Github.client.contents(@repository, ref: @ref).
           select(&:file?).
-          find { |content|
+          select do |content|
             name = content.name.downcase.delete('_')
             CHANGE_LOG_CANDIDATES.any? { |candidate| name.start_with? candidate }
-          }&.html_url
+          end&.map(&:html_url)
       end
 
       def find_release_url

data/lib/lock_diff/github/repository_name_detector.rb

@@ -1,7 +1,7 @@
 module LockDiff
   module Github
     class RepositoryNameDetector
-      REGEXP = %r!github\.com[/:](.*?)(?:.git)?\z!
+      REGEXP = %r!github\.com[/:](.*?)(?:\.git)?\z!
 
       def initialize(url)
         @url = url
@@ -9,7 +9,7 @@ module LockDiff
 
       def call
         return unless @url
-        path = @url.match(REGEXP).to_a.last
+        path = @url.match(REGEXP).to_a.last&.split('#')&.first
         return unless path
         repository_name = path.split("/").first(2).join("/")
         repository_name if repository_name.match?(/.+\/.+/)

data/lib/lock_diff/pull_request.rb

@@ -13,8 +13,10 @@ module LockDiff
       end
 
       def latest_by_tachikoma(repository)
-        client.newer_pull_requests(repository).
-          find { |pull_request| pull_request.head_ref.include?("tachikoma") }
+        client.newer_pull_requests(repository).find do |pull_request|
+          branch = pull_request.head_ref
+          branch.include?("tachikoma") || branch.include?("bundle-update")
+        end
       end
 
       private

data/lib/lock_diff/version.rb

@@ -1,3 +1,3 @@
 module LockDiff
-  VERSION = "0.3.7"
+  VERSION = "0.5.0"
 end

data/lock_diff.gemspec

@@ -21,13 +21,13 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.3.0"
+  spec.required_ruby_version = ">= 2.4.0"
 
   spec.add_dependency "octokit", "~> 4.0"
   spec.add_dependency "httpclient"
 
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "> 1.15"
+  spec.add_development_dependency "rake", ">= 13"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lock_diff
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.5.0
 platform: ruby
 authors:
 - vividmuimui
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-21 00:00:00.000000000 Z
+date: 2020-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -42,30 +42,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +145,7 @@ files:
 - exe/lock_diff
 - exe/lock_diff_for_tachikoma
 - lib/lock_diff.rb
+- lib/lock_diff/changelog.rb
 - lib/lock_diff/cli/option_parser.rb
 - lib/lock_diff/diff_info.rb
 - lib/lock_diff/formatter/github_markdown.rb
@@ -178,15 +179,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: This gem detects changes to your package manager (e.g. Gemfile) and generates