libyear-bundler 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6605cda8b92cd002e2b1a536a716ba50d8c0df4b550db28f6b0be4760d7734f7
-  data.tar.gz: eec844bd3aaf31c95fc29827ca6a33166da392ab799a03b3b3b5269cc5507fe7
+  metadata.gz: e4f90004a4a8f93453f73361a0e3415344017e83f55d10d625b0a3b69f1db74b
+  data.tar.gz: 55d91c831ae79f5b44c6de0bcd2f68e550590d73d5004646c1da0163abbcebea
 SHA512:
-  metadata.gz: 555318739eb3506de90e6d21f103fbb8ce2c0bd4225595830465c0aae476a906d55ffcf534e375925146c695348bbca975fe75ef962752bb4d41f474b6308b2d
-  data.tar.gz: a1fe20a4d14b170ccc8b10949868cf859382135651ec799bd1c0bfff4c588a5b92e63d7bf347cc0987feb4aa8199966e986b56d797d30828e9b01b3fb64cde72
+  metadata.gz: e3b1346dbdc4986e539fba595f18e01a46fd03d647210b34a6810e2bd9ae61028ffa00eae7e4e2c4088f524368a2cc74950f5d79610ab6aa2bd93d5c4cdd9e6a
+  data.tar.gz: 2196cc0fe1a16f2fd9ea4646eb7d07a227d58f07dc5f2cca3724c8ae4b08d4386adbdbc51f3364f2891745e7202b106348dabefed1734a6eb3b11c38823e4f17

data/lib/libyear_bundler/cli.rb

@@ -26,7 +26,7 @@ module LibyearBundler
       if @options.grand_total?
         grand_total
       else
-        print report.to_s
+        report.write
       end
 
       # Update cache
@@ -73,7 +73,7 @@ module LibyearBundler
     end
 
     def report
-      @_report ||= Report.new(bundle_outdated, ruby, @options)
+      @_report ||= Report.new(bundle_outdated, ruby, @options, $stdout)
     end
 
     def ruby

data/lib/libyear_bundler/models/ruby.rb

@@ -7,6 +7,7 @@ require 'yaml'
 require 'libyear_bundler/calculators/libyear'
 require 'libyear_bundler/calculators/version_number_delta'
 require 'libyear_bundler/calculators/version_sequence_delta'
+require 'libyear_bundler/yaml_loader'
 
 module LibyearBundler
   module Models
@@ -78,13 +79,19 @@ module LibyearBundler
         def all_versions
           @_all_versions ||= begin
             uri = ::URI.parse(RUBY_VERSION_DATA_URL)
-            response = ::Net::HTTP.get_response(uri)
-            # The Date object is passed through here due to a bug in
-            # YAML#safe_load
-            # https://github.com/ruby/psych/issues/262
-            ::YAML
-              .safe_load(response.body, [Date])
-              .map { |release| release['version'] }
+            opt = { open_timeout: 3, read_timeout: 5, use_ssl: true }
+            response = ::Net::HTTP.start(uri.hostname, uri.port, opt) do |con|
+              con.request_get(uri.path)
+            end
+            if response.is_a?(::Net::HTTPSuccess)
+              YAMLLoader.safe_load(response.body).map { |release| release['version'] }
+            else
+              warn format('Unable to get Ruby version list: response code: %s', response.code)
+              []
+            end
+          rescue ::Timeout::Error
+            warn 'Unable to get Ruby version list: network timeout'
+            []
           end
         end
       end
@@ -169,18 +176,20 @@ module LibyearBundler
       def version_from_bundler
         return unless File.exist?(@lockfile)
         ruby_version_string = ::Bundler::LockfileParser
-          .new(@lockfile)
+          .new(::File.read(@lockfile))
           .ruby_version
         return if ruby_version_string.nil?
-
         ::Bundler::RubyVersion.from_string(ruby_version_string).gem_version
       end
 
-      # TODO: this path should probably be relative to `@lockfile` instead
-      # TODO: of being relative to the current working directory.
       def version_from_ruby_version_file
-        return unless ::File.exist?('.ruby-version')
-        ::Gem::Version.new(::File.read('.ruby-version').strip)
+        version_file = File.join(File.dirname(@lockfile), '.ruby-version')
+        return unless File.exist?(version_file)
+
+        version_string = File.read(version_file).strip
+        version = version_string.split('-', 2).last
+
+        ::Gem::Version.new(version) if version
       end
 
       def version_from_ruby

data/lib/libyear_bundler/release_date_cache.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'libyear_bundler/yaml_loader'
 
 module LibyearBundler
   # A cache of release dates by name and version, for both gems and rubies.
@@ -18,10 +19,18 @@ module LibyearBundler
       end
     end
 
+    def empty?
+      @data.empty?
+    end
+
+    def size
+      @data.size
+    end
+
     class << self
       def load(path)
         if File.exist?(path)
-          new(YAML.safe_load(File.read(path), [Date]))
+          new(YAMLLoader.safe_load(File.read(path)))
         else
           new({})
         end

data/lib/libyear_bundler/report.rb

@@ -9,13 +9,14 @@ module LibyearBundler
 
     # `gems` - Array of `::LibyearBundler::Models::Gem` instances
     # `options` - Instance of `::LibyearBundler::Options`
-    def initialize(gems, ruby, options)
+    def initialize(gems, ruby, options, io)
       @gems = gems
       @ruby = ruby
       @options = options
+      @io = io
     end
 
-    def to_s
+    def write
       to_h[:gems].each { |gem| put_line_summary(gem) }
 
       begin
@@ -72,7 +73,7 @@ module LibyearBundler
         meta << libyears
       end
 
-      puts meta
+      @io.puts meta
     end
 
     def meta_line_summary(gem_or_ruby)
@@ -87,11 +88,11 @@ module LibyearBundler
     end
 
     def put_libyear_summary(sum_libyears)
-      puts format("System is %.1f libyears behind", sum_libyears)
+      @io.puts format("System is %.1f libyears behind", sum_libyears)
     end
 
     def put_version_delta_summary(sum_major_version, sum_minor_version, sum_patch_version)
-      puts format(
+      @io.puts format(
         "Major, minor, patch versions behind: %<major>d, %<minor>d, %<patch>d",
         major: sum_major_version || 0,
         minor: sum_minor_version || 0,
@@ -100,7 +101,7 @@ module LibyearBundler
     end
 
     def put_sum_seq_delta_summary(sum_seq_delta)
-      puts format(
+      @io.puts format(
         "Total releases behind: %<seq_delta>d",
         seq_delta: sum_seq_delta || 0
       )
@@ -130,11 +131,15 @@ module LibyearBundler
 
     def increment_libyears(model, memo)
       memo[:sum_libyears] += model.libyears
+    rescue StandardError => e
+      warn "Unable to calculate libyears for #{model.name}: #{e}"
     end
 
     def increment_seq_deltas(model, memo)
       memo[:sum_seq_delta] ||= 0
       memo[:sum_seq_delta] += model.version_sequence_delta
+    rescue StandardError => e
+      warn "Unable to calculate seq deltas for #{model.name}: #{e}"
     end
 
     def increment_version_deltas(model, memo)
@@ -144,6 +149,8 @@ module LibyearBundler
       memo[:sum_minor_version] += model.version_number_delta[1]
       memo[:sum_patch_version] ||= 0
       memo[:sum_patch_version] += model.version_number_delta[2]
+    rescue StandardError => e
+      warn "Unable to calculate version deltas for #{model.name}: #{e}"
     end
   end
 end

data/lib/libyear_bundler/version.rb

@@ -1,3 +1,3 @@
 module LibyearBundler
-  VERSION = "0.6.0".freeze
+  VERSION = "0.7.0".freeze
 end

data/lib/libyear_bundler/yaml_loader.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'yaml'
+
+module LibyearBundler
+  # Supports different versions of the `YAML` constant. For example,
+  #
+  # > psych 3.0.3 YAML#safe_load expected the permitted/whitelisted classes in
+  # > the second parameter.
+  # >
+  # > psych 3.1.0 YAML#safe_load introduced keyword argument permitted_classes
+  # > in addition to permitted/whitelisted classes in the second parameter.
+  # >
+  # > psych 4.0.0 dropped the second positional parameter of YAML#safe_load, and
+  # > expects the permitted/whitelisted classes only in keyword parameter
+  # > permitted_classes.
+  # > https://github.com/jaredbeck/libyear-bundler/issues/22
+  #
+  # I expect this will only get more complicated over the years, as we try to
+  # support old rubies for as long as possible.
+  #
+  # Other known issues:
+  #
+  # - https://github.com/ruby/psych/issues/262
+  module YAMLLoader
+    class << self
+      def safe_load(yaml, permitted_classes: [::Date])
+        if YAML.method(:safe_load).parameters.include?([:key, :permitted_classes])
+          YAML.safe_load(yaml, permitted_classes: permitted_classes)
+        else
+          YAML.safe_load(yaml, permitted_classes)
+        end
+      end
+    end
+  end
+end

data/libyear-bundler.gemspec

@@ -33,9 +33,6 @@ Gem::Specification.new do |spec|
   # above.
   spec.add_dependency "bundler", ">= 1.14", "< 3"
 
-  spec.add_development_dependency "rspec", "~> 3.9"
-
-  # rubocop 0.57 drops support for ruby 2.1, so 0.56 is the highest we can
-  # use. We're going to support ruby 2.1 as long as possible. See above.
-  spec.add_development_dependency "rubocop", "~> 0.56.0"
+  # Development dependencies are specified in `/gemfiles`. See CONTRIBUTING.md
+  # for details.
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libyear-bundler
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jared Beck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-13 00:00:00.000000000 Z
+date: 2024-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,34 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.56.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.56.0
 description: 
 email:
 - jared@jaredbeck.com
@@ -80,6 +52,7 @@ files:
 - lib/libyear_bundler/release_date_cache.rb
 - lib/libyear_bundler/report.rb
 - lib/libyear_bundler/version.rb
+- lib/libyear_bundler/yaml_loader.rb
 - libyear-bundler.gemspec
 homepage: https://libyear.com
 licenses:
@@ -100,8 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.3
+rubygems_version: 3.2.20
 signing_key: 
 specification_version: 4
 summary: A simple measure of dependency freshness