lock_diff 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 32ea1d5332489c1a0c065898274bec884df86f0f
-  data.tar.gz: 20690289ef5f89c78b8718015a3150e87666e013
+SHA256:
+  metadata.gz: db407b53c51962d6fb103f3d42d714e91799273cb73512ad46bf11ded0432325
+  data.tar.gz: 8c70ba785dd083ed785e3b5c7da5d6b3fcdd135a1a0b2f2c58ca46319eddc88b
 SHA512:
-  metadata.gz: aab3e4cc4d530c6cccbc0e0decfb97419ad6fbdd1be5027b5ddfef442107c224b76c290776613bc6851a320d30a72d0517080ded83455fe8aa020b4b43a8a9a0
-  data.tar.gz: 1aec7ef811fceaf5ba63510c0713770e8020f42f4d19b70aae57d5632ff98a6438c2bd150c0d435b0009f01c2ca373f40b18dcb00e791cfc2a645441afdf1f8c
+  metadata.gz: 35a2eb2d40e3022fd1a2ad75ef5661f727ff0c5d9fea949b045350db605075532c8cc5d33bdac6afcc500f1737a7b48761afb5bdf87b84247cf4baed45f6ad6c
+  data.tar.gz: cf412bc9644cc4179b850199e5b10093e1e57770e8b207e17851de129a1b02d1cde6f96305ae8fb71a7b5a02d64c6c805e387589ee30b28dbb48994bcf65c0bb

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,19 @@ 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,
+        package_name: package.name
+      ).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.rb

@@ -2,6 +2,7 @@ require_relative "github/access_token"
 require_relative "github/changelog_url_finder"
 require_relative "github/client"
 require_relative "github/content"
+require_relative "github/directory"
 require_relative "github/url_detector"
 require_relative "github/pull_request"
 require_relative "github/repository_name_detector"

data/lib/lock_diff/github/changelog_url_finder.rb

@@ -1,34 +1,25 @@
 module LockDiff
   module Github
     class ChangelogUrlFinder
-      CHANGE_LOG_CANDIDATES = %w(
-        changelog
-        changes
-        history
-        releases
-        releasenote
-        news
-      )
-
-      def initialize(repository:, repository_url:, ref:)
+      def initialize(repository:, repository_url:, ref:, package_name:)
         @repository = repository
         @repository_url = repository_url
         @ref = ref
+        @package_name = package_name
       end
 
       def call
-        find_change_log_url || find_release_url
+        directories.flat_map(&:change_log_urls).push(find_release_url).compact
       end
 
       private
 
-      def find_change_log_url
-        Github.client.contents(@repository, ref: @ref).
-          select(&:file?).
-          find { |content|
-            name = content.name.downcase.delete('_')
-            CHANGE_LOG_CANDIDATES.any? { |candidate| name.start_with? candidate }
-          }&.html_url
+      def directories
+        [
+          Directory.new(@repository, @ref),
+          Directory.new(@repository, @ref, path: @package_name),
+          Directory.new(@repository, @ref, path: "gems/#{@package_name}")
+        ]
       end
 
       def find_release_url
@@ -37,7 +28,6 @@ module LockDiff
           @repository_url + "/releases"
         end
       end
-
     end
   end
 end

data/lib/lock_diff/github/content.rb

@@ -6,14 +6,34 @@ module LockDiff
 
       def_delegators :@content, :name, :html_url
 
+      CHANGE_LOG_CANDIDATES = %w[
+        changelog
+        changes
+        history
+        releases
+        releasenote
+        news
+      ].freeze
+
       def initialize(content)
         @content = content
       end
 
+      def change_log?
+        file? && CHANGE_LOG_CANDIDATES.any? do |candidate|
+          normalized_name.start_with?(candidate)
+        end
+      end
+
+      private
+
+      def normalized_name
+        @normalized_name ||= name.downcase.delete('_')
+      end
+
       def file?
         @content.type == 'file'
       end
-
     end
   end
 end

data/lib/lock_diff/github/directory.rb

@@ -0,0 +1,23 @@
+module LockDiff
+  module Github
+    class Directory
+      def initialize(repository, ref, path: nil)
+        @repository = repository
+        @ref = ref
+        @path = path
+      end
+
+      def change_log_urls
+        contents.select(&:change_log?).map(&:html_url)
+      rescue Octokit::NotFound
+        []
+      end
+
+      private
+
+      def contents
+        @contents ||= Github.client.contents(@repository, ref: @ref, path: @path)
+      end
+    end
+  end
+end

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/version.rb

@@ -1,3 +1,3 @@
 module LockDiff
-  VERSION = "0.4.0"
+  VERSION = "0.7.0"
 end

data/lock_diff.gemspec

@@ -26,10 +26,12 @@ 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"
   spec.add_development_dependency "codacy-coverage"
+  spec.add_development_dependency "vcr"
+  spec.add_development_dependency "webmock"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lock_diff
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - vividmuimui
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2021-05-22 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
@@ -122,6 +122,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem detects changes to your package manager (e.g. Gemfile) and generates
   a Markdown-formatted diff.
 email:
@@ -145,6 +173,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
@@ -158,6 +187,7 @@ files:
 - lib/lock_diff/github/changelog_url_finder.rb
 - lib/lock_diff/github/client.rb
 - lib/lock_diff/github/content.rb
+- lib/lock_diff/github/directory.rb
 - lib/lock_diff/github/pull_request.rb
 - lib/lock_diff/github/repository_name_detector.rb
 - lib/lock_diff/github/tag_finder.rb
@@ -170,7 +200,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,9 +215,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: This gem detects changes to your package manager (e.g. Gemfile) and generates
   a Markdown-formatted diff.