gem_updater 4.1.0 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee9e569b64eb9f67682569f6ba01702053b577e8131b92711e40e4da5e10ec86
-  data.tar.gz: 7d898ce89b934f4f2ea6f1fb500e86d800037317101890cff7edd5a2240c54ed
+  metadata.gz: a4dd7e8e62f51f8cba5198d1e3c7b051b029065992f3a13fe0c10c96d9430695
+  data.tar.gz: 71d68ec7467a7ecdc729820170e852f015e1e54fc2bd62d7464e498695c48e90
 SHA512:
-  metadata.gz: bbdd9008fc9f6160bbbb99e697ae59da92ec342f03ae05583fbab12e1f0a16a18e9837d4e6617dc8e5ba81970e2bfec5ebaeed0893ec58e2e98b9c042b7f4033
-  data.tar.gz: 2079a869717dfbd64aee1984c0a63646b1b4229db167cf3afbc8e06fd76b3d3128797b2ce38c08acc3ba32a2eda3d41353bee7b2b778dab466ebe6d508189821
+  metadata.gz: '09ca478d1d07e3f4e1b5f0646ecffd851e08ceff086dbdc4bc4a4e98efb418b0d9beffa8ba786adec27ed09e5830e9bc3dd37b231e524a41919f1d77af8624cf'
+  data.tar.gz: e23082bb66792d4cacdb8c3f9f4863a75a51954272a400878932ec4b26d095eb581f4c3977d4edf948e468b29fe1d02ae53f72bc075b83bfdfc0d7b211caf17b

data/bin/gem_update

@@ -1,6 +1,7 @@
+#!/usr/bin/env ruby
+
 # frozen_string_literal: true
 
-#!/usr/bin/env ruby
 require 'optparse'
 
 # Exit cleanly from an early interrupt

data/lib/gem_updater/gem_file.rb

@@ -53,8 +53,8 @@ module GemUpdater
     # will return the same result.
     # Use a hacky way to tell bundle we want to parse the new `Gemfile.lock`
     def reinitialize_spec_set!
-      Bundler.remove_instance_variable('@locked_gems')
-      Bundler.remove_instance_variable('@definition')
+      Bundler.remove_instance_variable(:@locked_gems)
+      Bundler.remove_instance_variable(:@definition)
     end
 
     # Add changes to between two versions of a gem

data/lib/gem_updater/ruby_gems_fetcher.rb

@@ -34,7 +34,7 @@ module GemUpdater
     # @param url [String] remote url
     # @return [Hash] parsed JSON
     def parse_remote_json(url)
-      JSON.parse(URI.open(url).read)
+      JSON.parse(URI.parse(url).open.read)
     end
 
     # Ask rubygems.org for source uri of gem.
@@ -59,34 +59,26 @@ module GemUpdater
     rescue OpenURI::HTTPError => e
       # We may trigger too many requests, in which case give rubygems a break
       if e.io.status.include?(HTTP_TOO_MANY_REQUESTS)
-        if (tries += 1) < 2
-          sleep 1 && retry
-        end
+        tries += 1
+        sleep 1 && retry if tries < 2
       end
     end
 
     # Look if gem can be found in another remote
     #
     # @return [String|nil] uri of source code
-    # rubocop:disable Metrics/MethodLength
     def uri_from_other_sources
-      uri = nil
-      source.remotes.each do |remote|
-        break if uri
-
-        uri = case remote.host
-              when 'rubygems.org' then next # already checked
-              when 'rails-assets.org'
-                uri_from_railsassets
-              else
-                Bundler.ui.error "Source #{remote} is not supported, ' \
-                  'feel free to open a PR or an issue on https://github.com/MaximeD/gem_updater"
-              end
+      source.remotes.find do |remote|
+        case remote.host
+        when 'rubygems.org' then next # already checked
+        when 'rails-assets.org'
+          return uri_from_railsassets
+        else
+          Bundler.ui.error "Source #{remote} is not supported, ' \
+            'feel free to open a PR or an issue on https://github.com/MaximeD/gem_updater"
+        end
       end
-
-      uri
     end
-    # rubocop:enable Metrics/MethodLength
 
     # Ask rails-assets.org for source uri of gem.
     # API is at : https://rails-assets.org/packages/package_name

data/lib/gem_updater/source_page_parser.rb

@@ -33,7 +33,7 @@ module GemUpdater
       return unless uri
 
       Bundler.ui.warn "Looking for a changelog in #{uri}"
-      find_changelog(Nokogiri::HTML(URI.open(uri)))
+      find_changelog(Nokogiri::HTML(uri.open))
     rescue OpenURI::HTTPError # Uri points to nothing
       log_error("Cannot find #{uri}")
     rescue Errno::ETIMEDOUT # timeout
@@ -53,7 +53,7 @@ module GemUpdater
     def correct_uri(url)
       return unless url.is_a?(String) && !url.empty?
 
-      uri = URI(url)
+      uri = URI.parse(url)
       uri.scheme == 'http' ? known_https(uri) : uri
     end
 
@@ -68,9 +68,7 @@ module GemUpdater
       when HOSTS[:github]
         # remove possible subdomain like 'wiki.github.com'
         URI "https://github.com#{uri.path}"
-      when HOSTS[:bitbucket]
-        URI "https://#{uri.host}#{uri.path}"
-      when HOSTS[:rubygems]
+      when HOSTS[:bitbucket], HOSTS[:rubygems]
         URI "https://#{uri.host}#{uri.path}"
       else
         uri
@@ -120,10 +118,12 @@ module GemUpdater
 
       # @param doc [Nokogiri::XML::Element] document of source page
       # @param version [String] version of gem
+      # rubocop:disable Lint/MissingSuper
       def initialize(doc, version)
         @doc     = doc
         @version = version
       end
+      # rubocop:enable Lint/MissingSuper
 
       # Finds url of changelog.
       #
@@ -145,14 +145,14 @@ module GemUpdater
       private
 
       # Find which link corresponds to changelog.
+      # Last one is taken as files come after directories. So if there is a directory plus a file
+      # matching a changelog name, we ensure file is preferred.
       #
       # @return [String, nil] url of changelog
       def find_changelog_link
-        changelog_names.find do |name|
-          node = doc.at_css(%(table.files .content a[title^="#{name}"]))
-
-          break node.attr('href') if node
-        end
+        changelog_names.map do |name|
+          doc.at_css(%([aria-labelledby="files"] a[title^="#{name}"]))
+        end.compact.last&.attr('href')
       end
 
       # Looks into document to find it there is an anchor to new gem version.
@@ -160,7 +160,7 @@ module GemUpdater
       # @param url [String] url of changelog
       # @return [String, nil] anchor's href
       def find_anchor(url)
-        changelog_page = Nokogiri::HTML(URI.open(url))
+        changelog_page = Nokogiri::HTML(URI.parse(url).open)
         anchor = changelog_page.css(%(a.anchor)).find do |element|
           element.attr('href').match(version.delete('.'))
         end

data/lib/gem_updater.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'erb'
 require 'memoist'
 require 'gem_updater/gem_file'
 require 'gem_updater/ruby_gems_fetcher'
@@ -39,8 +40,14 @@ module GemUpdater
     # Format the diff to get human readable information
     # on the gems that were updated.
     def format_diff
+      erb = if RUBY_VERSION.to_f < 3.0
+              ERB.new(template, nil, '<>')
+            else
+              ERB.new(template, trim_mode: '<>')
+            end
+
       gemfile.changes.map do |gem, details|
-        ERB.new(template, nil, '<>').result(binding)
+        erb.result(binding)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem_updater
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.5.0
 platform: ruby
 authors:
 - Maxime Demolin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-19 00:00:00.000000000 Z
+date: 2022-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,31 +100,59 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.78'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.78'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '3.8'
 description: Updates the gems of your Gemfile and fetches the links pointing to where
   their changelogs are
-email: akbarova.armia@gmail.com
+email: maxime_dev@demol.in
 executables:
 - gem_update
 extensions: []
@@ -125,8 +167,9 @@ files:
 homepage: https://github.com/MaximeD/gem_updater
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,8 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Update your gems and find their changelogs
 test_files: []