lock_diff 0.3.8 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2d656295586641a6b05f6f512164b0d38256d4b5
-  data.tar.gz: b449079a6ceef72575eda764005cb6c3e10febb9
+SHA256:
+  metadata.gz: c3d24a9de17d4e6d158bd759389b0dafa4c15cf58efc61452b4ce85c450644e2
+  data.tar.gz: ffae4dd28a5385834069b856fcc888b10b397416f8305c026b369d220c944443
 SHA512:
-  metadata.gz: '0930238ed955a2129682bdcab710b1508f4ce05ccaa935ac88e961ac15a3145c21860a5eabc7cbebc7ca831099a0ee5df5967c7e7d5ed70729dfedddefa6a7f5'
-  data.tar.gz: ecd64a6959bebc28c83ad7fcce84a8ed7997405243a34308c96edc5c0372ff6e5a526576076ac3e196eeb298298e4c73013cc50079de461fbb63c400b8e9401a
+  metadata.gz: 71b5432a0d3ff82cf24ae95c61de3a2c3cbd8e00db8c601be84838549432370dd91da0ee4e7da2055d73917b641360ceef5406b32f6de429ab04a9dbbc1ba787
+  data.tar.gz: 4952208e316746577f8bf051bc5d8f3967575e888c1d21296687ef18485d2e69b452521ff00980110e1ee2aa402169ca9e5d68f59dbdbfe9480b5225c5411e76

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
 rvm:
-- 2.4.0
-- 2.4.2
+  - 2.5
+  - 2.6
+  - 2.7
+  - 3.0
 script:
-- bundle exec rspec
+  - bundle exec rspec
 notifications:
   slack:
     secure: DKSdr5uEtNXGpAARGV+Q694eNv9IGi30RjSIjk8lRZrmLxE0WJbk/17FkmjgVF2w1onO/knFWgCiPBoIncihy4hh6nfAJZDaRI8AwXqYGGi10KeUBu4309r/7SL60KnFUFsQ9o47tar09TY6HS55IesNjN2/mKIEJlpw2c7McPz58rIzlFizTW5OPShsfWQnuLAz9iUYjknZfrntirav+mwkqVKqDZoMM7MRzedk1KjlkRbun/EVrgMEYPqsbpmhfYV0DZkcymorhH6d/FBsrWeqB7QMT6KwROMBHDZGeGzYgaN3KgjZV35gw6pK2VlsETm7E/Fk9Imrjalq87Q28aqX5nq/MR6Llo9yfE4J7PkGOTxcvZlXqp/W+2xT/8Ne6Dy29gb/7TeJY9K4nmkbkrmkanKBBmvIjbhwT46BOPjn1Sz4kbceoZNgihI2hMMPypH61+U6v0eUcGLuxRyDaUsyrgRnBEDHFZHMpfZ1eE7uXnCO9IvqGm5Tn4goP0s67H98CFhP+j3cIM2HKdns6ZyGsAHVakw7bnB90mKc9bIaaPSKEyZZD4MpkJxnMxR453OlSwJZIXesIkbBJMZA4wdOAsPQSBaSCY2w566LsUs4izRVLpdeILa/NOaxb+l1OvmejGyiihUjSUfH7fiIhoD5E0+SgOsDIdd0TV17rb4=

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/exe/lock_diff_for_tachikoma

@@ -4,4 +4,4 @@ require "lock_diff"
 require "lock_diff/cli/option_parser"
 
 options = LockDiff::Cli::OptionParser.parse(ARGV, require_flags: %i(repository))
-LockDiff.run_by_latest_tachikoma(options)
+LockDiff.run_by_latest_tachikoma(**options)

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.8"
+  VERSION = "0.6.0"
 end

data/lock_diff.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   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.8
+  version: 0.6.0
 platform: ruby
 authors:
 - vividmuimui
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-10-21 00:00:00.000000000 Z
+date: 2021-02-27 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
@@ -170,7 +171,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,9 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: This gem detects changes to your package manager (e.g. Gemfile) and generates
   a Markdown-formatted diff.