gem_updater 3.0.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 458c286b02adc73fdeac3eded5de4b65390c1bfa0374efc83651b773f96f2f7b
-  data.tar.gz: bf55e5150ee714581df3b41e4177878c2b432d44c369d8bdd1cf62ae8f435d21
+  metadata.gz: 10e740d324e4bd91b5e7b8d6c7d2c4272b84eedf0cabcab2e5244c55779a4a2c
+  data.tar.gz: d7050c27a7791a3b185c08e088e29c9cf645908106d352027d3ddb02f826bdae
 SHA512:
-  metadata.gz: be83c20442e904d34c99f3674532ac80ff891e7a088abfe7f9d7867bad4c2208066ac57fd6861c508d3d47624a0f7946f72e48cb8d99abe4272e6aa3e7554287
-  data.tar.gz: 769a8fcbbe5b19d9e9c334079e5c3a84c1fbf0d4688aace73ee33b808ee8d4fd3728247b617985694b80365715a3787768b3a24a5d9ba10c811e8bf1b0b4f692
+  metadata.gz: 26be9e96400f04d892de240c28af03f02d5e5d23ec33d51bdbce015883df6bc4de2a1631da3ab42b1bada40384868a095f1b1e2c1a82fe1f6ca7cbd231656864
+  data.tar.gz: 55a53a16a210ef6380ca2bc3febafaf01ecd42de0693fa88fcabfe7302e195d9fe0ba69989bcc37b9638f085cb06a42fe33a3c78e1e691bb4557f291b043e90a

data/bin/gem_update

@@ -1,10 +1,13 @@
 #!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
 require 'optparse'
 
 # Exit cleanly from an early interrupt
 Signal.trap('INT') { exit 1 }
 
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'gem_updater'
 
 Bundler.ui = Bundler::UI::Shell.new

data/lib/gem_updater.rb

@@ -1,12 +1,18 @@
+# frozen_string_literal: true
+
+require 'erb'
+require 'memoist'
 require 'gem_updater/gem_file'
 require 'gem_updater/ruby_gems_fetcher'
 require 'gem_updater/source_page_parser'
 
+# Base lib.
 module GemUpdater
-
   # Updater's main responsability is to fill changes
   # happened before and after update of `Gemfile`, and then format them.
   class Updater
+    extend Memoist
+
     attr_accessor :gemfile
 
     def initialize
@@ -43,23 +49,11 @@ module GemUpdater
 
     # For each gem, retrieve its changelog
     def fill_changelogs
-      threads = []
-
-      gemfile.changes.each do |gem_name, details|
-        threads << Thread.new do
-          if source_uri = find_source(gem_name, details[:source])
-            source_page = GemUpdater::SourcePageParser.new(
-              url: source_uri, version: details[:versions][:new]
-            )
-
-            if source_page.changelog
-              gemfile.changes[gem_name][:changelog] = source_page.changelog
-            end
-          end
+      [].tap do |threads|
+        gemfile.changes.each do |gem_name, details|
+          threads << Thread.new { retrieve_gem_changes(gem_name, details) }
         end
-      end
-
-      threads.each(&:join)
+      end.each(&:join)
     end
 
     # Find where is hosted the source of a gem
@@ -76,16 +70,26 @@ module GemUpdater
       end
     end
 
+    def retrieve_gem_changes(gem_name, details)
+      source_uri = find_source(gem_name, details[:source])
+      return unless source_uri
+
+      source_page = GemUpdater::SourcePageParser.new(
+        url: source_uri, version: details[:versions][:new]
+      )
+
+      gemfile.changes[gem_name][:changelog] = source_page.changelog if source_page.changelog
+    end
+
     # Get the template for gem's diff.
     # It can use a custom template.
     #
     # @return [ERB] the template
     def template
-      @template ||= begin
-        File.read("#{Dir.home}/.gem_updater_template.erb")
-      rescue Errno::ENOENT
-        File.read(File.expand_path('../../lib/gem_updater_template.erb', __FILE__))
-      end
+      File.read("#{Dir.home}/.gem_updater_template.erb")
+    rescue Errno::ENOENT
+      File.read(File.expand_path('../lib/gem_updater_template.erb', __dir__))
     end
+    memoize :template
   end
 end

data/lib/gem_updater/gem_file.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
+require 'bundler'
 require 'bundler/cli'
 
 module GemUpdater
-
   # GemFile is responsible for handling `Gemfile`
   class GemFile
     attr_accessor :changes
@@ -21,21 +23,20 @@ module GemUpdater
     #
     # @return [Hash] gems for which there are differences.
     def compute_changes
-      get_spec_sets
+      spec_sets_diff!
 
       old_spec_set.each do |old_gem|
         updated_gem = new_spec_set.find { |new_gem| new_gem.name == old_gem.name }
+        next unless updated_gem && old_gem.version != updated_gem.version
 
-        if updated_gem && old_gem.version != updated_gem.version
-          fill_changes(old_gem, updated_gem)
-        end
+        fill_changes(old_gem, updated_gem)
       end
     end
 
     private
 
     # Get the two spec sets (before and after `bundle update`)
-    def get_spec_sets
+    def spec_sets_diff!
       @old_spec_set = spec_set
       reinitialize_spec_set!
       @new_spec_set = spec_set

data/lib/gem_updater/ruby_gems_fetcher.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'nokogiri'
 require 'open-uri'
 
 module GemUpdater
-
   # RubyGemsFetcher is a wrapper around rubygems API.
   class RubyGemsFetcher
-    HTTP_TOO_MANY_REQUESTS = '429'.freeze
+    HTTP_TOO_MANY_REQUESTS = '429'
     GEM_HOMEPAGES = %w[source_code_uri homepage_uri].freeze
 
     attr_reader :gem_name, :source
@@ -28,6 +29,14 @@ module GemUpdater
 
     private
 
+    # Parse JSON from a remote url.
+    #
+    # @param url [String] remote url
+    # @return [Hash] parsed JSON
+    def parse_remote_json(url)
+      JSON.parse(URI.parse(url).open.read)
+    end
+
     # Ask rubygems.org for source uri of gem.
     # See API: http://guides.rubygems.org/rubygems-org-api/#gem-methods
     #
@@ -35,11 +44,10 @@ module GemUpdater
     def uri_from_rubygems
       return unless source.remotes.map(&:host).include?('rubygems.org')
 
-      if response = query_rubygems
-        response[
-          GEM_HOMEPAGES.find { |key| response[key] && !response[key].empty? }
-        ]
-      end
+      response = query_rubygems
+      return unless response
+
+      response[GEM_HOMEPAGES.find { |key| response[key] && !response[key].empty? }]
     end
 
     # Make the real query to rubygems
@@ -47,13 +55,12 @@ module GemUpdater
     #
     # @param tries [Integer|nil] (optional) how many times we tried
     def query_rubygems(tries = 0)
-      JSON.parse(open("https://rubygems.org/api/v1/gems/#{gem_name}.json").read)
+      parse_remote_json("https://rubygems.org/api/v1/gems/#{gem_name}.json")
     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 and retry
-        end
+        tries += 1
+        sleep 1 && retry if tries < 2
       end
     end
 
@@ -61,20 +68,16 @@ module GemUpdater
     #
     # @return [String|nil] uri of source code
     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
 
     # Ask rails-assets.org for source uri of gem.
@@ -82,22 +85,21 @@ module GemUpdater
     #
     # @return [String|nil] uri of source code
     def uri_from_railsassets
-      if response = query_railsassets
-        response['url'].gsub(/^git/, 'http')
-      end
+      response = query_railsassets
+      return unless response
+
+      response['url'].gsub(/^git/, 'http')
     end
 
     # Make the real query to railsassets
+    # rubocop:disable Lint/SuppressedException
     def query_railsassets
-      JSON.parse(
-        open(
-          "https://rails-assets.org/packages/#{gem_name.gsub(/rails-assets-/, '')}"
-        ).read
-      )
+      parse_remote_json("https://rails-assets.org/packages/#{gem_name.gsub(/rails-assets-/, '')}")
     rescue JSON::ParserError
       # if gem is not found, rails-assets returns a 200
       # with html (instead of json) containing a 500...
     rescue OpenURI::HTTPError
     end
+    # rubocop:enable Lint/SuppressedException
   end
 end

data/lib/gem_updater/source_page_parser.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
 require 'nokogiri'
 require 'open-uri'
 
 module GemUpdater
-
   # SourcePageParser is responsible for parsing a source page where
   # the gem code is hosted.
   class SourcePageParser
+    extend Memoist
+
     HOSTS = {
       github: /github.com/,
       bitbucket: /bitbucket.org/,
@@ -29,23 +32,16 @@ module GemUpdater
     def changelog
       return unless uri
 
-      @changelog ||= begin
-        Bundler.ui.warn "Looking for a changelog in #{uri}"
-        doc = Nokogiri::HTML(open(uri))
-
-        find_changelog(doc)
-
-      rescue OpenURI::HTTPError # Uri points to nothing
-        Bundler.ui.error "Cannot find #{uri}"
-        false
-      rescue Errno::ETIMEDOUT # timeout
-        Bundler.ui.error "#{uri} is down"
-        false
-      rescue ArgumentError => e # x-oauth-basic raises userinfo not supported. [RFC3986]
-        Bundler.ui.error e
-        false
-      end
+      Bundler.ui.warn "Looking for a changelog in #{uri}"
+      find_changelog(Nokogiri::HTML(uri.open))
+    rescue OpenURI::HTTPError # Uri points to nothing
+      log_error("Cannot find #{uri}")
+    rescue Errno::ETIMEDOUT # timeout
+      log_error("#{uri} is down")
+    rescue ArgumentError => e # x-oauth-basic raises userinfo not supported. [RFC3986]
+      log_error(e)
     end
+    memoize :changelog
 
     private
 
@@ -55,15 +51,10 @@ module GemUpdater
     # @param url [String] the url to parse
     # @return [URI] valid URI
     def correct_uri(url)
-      return unless String === url && !url.empty?
+      return unless url.is_a?(String) && !url.empty?
 
-      uri = URI(url)
-
-      if uri.scheme == 'http'
-        known_https(uri)
-      else
-        uri
-      end
+      uri = URI.parse(url)
+      uri.scheme == 'http' ? known_https(uri) : uri
     end
 
     # Some uris are not https, but we know they should be,
@@ -73,13 +64,11 @@ module GemUpdater
     # @param uri [URI::HTTP]
     # @return [URI::HTTPS|URI::HTTP]
     def known_https(uri)
-      case
-      when uri.host =~ HOSTS[:github]
+      case uri.host
+      when HOSTS[:github]
         # remove possible subdomain like 'wiki.github.com'
         URI "https://github.com#{uri.path}"
-      when uri.host =~ HOSTS[:bitbucket]
-        URI "https://#{uri.host}#{uri.path}"
-      when uri.host =~ HOSTS[:rubygems]
+      when HOSTS[:bitbucket], HOSTS[:rubygems]
         URI "https://#{uri.host}#{uri.path}"
       else
         uri
@@ -115,49 +104,55 @@ module GemUpdater
       MARKUP_FILES.include?(File.extname(file_name))
     end
 
+    def log_error(error_message)
+      Bundler.ui.error error_message
+      false
+    end
+
     # GitHubParser is responsible for parsing source code
     # hosted on github.com.
     class GitHubParser < SourcePageParser
-      BASE_URL = 'https://github.com'.freeze
+      BASE_URL = 'https://github.com'
 
       attr_reader :doc, :version
 
       # @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.
       #
       # @return [String] the URL of changelog
       def changelog
         url = find_changelog_link
+        return unless url
 
-        if url
-          full_url = BASE_URL + url
+        full_url = BASE_URL + url
 
-          if changelog_may_contain_anchor?(full_url)
-            anchor = find_anchor(full_url)
-            full_url += anchor if anchor
-          end
-
-          full_url
+        if changelog_may_contain_anchor?(full_url)
+          anchor = find_anchor(full_url)
+          full_url += anchor if anchor
         end
+
+        full_url
       end
 
       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.
@@ -165,12 +160,12 @@ module GemUpdater
       # @param url [String] url of changelog
       # @return [String, nil] anchor's href
       def find_anchor(url)
-        changelog_page = Nokogiri::HTML(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
 
-        anchor.attr('href') if anchor
+        anchor&.attr('href')
       end
     end
   end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: gem_updater
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Maxime Demolin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: memoist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -52,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
@@ -66,9 +94,65 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+- !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: '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: []
@@ -84,7 +168,7 @@ homepage: https://github.com/MaximeD/gem_updater
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -92,16 +176,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Update your gems and find their changelogs
 test_files: []