rubygems-await 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f750b3a0f3a14aaed6ffb33af552df814602bbd42c22d4ab80f0e23f8ed9580
-  data.tar.gz: a5606734d1b81a4e8fa4849a92ebb9a68a71988d8a98fcd65a29b32ab3848fce
+  metadata.gz: 10e1a7c6f2fd38db7465b38a3c588f9220d074bcef67c3891612d0e79673fc9a
+  data.tar.gz: 1a19045734c1a922f4f4b93f051ade46155a45d501bd0e6509ae1eb695f35beb
 SHA512:
-  metadata.gz: 494196ddf8202f39a310a0743908f144353325c3e72b8a137a607f115be77250a6605501f0a7c8957fcb468583d66e61606f66499fa6f529d81acdee98578946
-  data.tar.gz: 10eeecf617a1affb77708d761cd376aeb5e88168d386cb33f2dd743d1607e6bb872f9ee6eb0be3ed0f0c18d469527e996efb776db9b82d8955da85bf45c507aa
+  metadata.gz: df5ae29e5019fc2ed1941199f3cab44e8c60bb71a07bac9553c5949bdf0b7efc8048d5e05dfb2bac4ea799837b5cddf39317c0e877f13d37e514b7f7df623eb6
+  data.tar.gz: 62be45546fd49b042ec3e1aa5655c4a68039aa664e5816246c5a8c9d1d8792cb2bb33dacb8eabf94b534a4d21a02e30592f381bb9ed5c102633997dccd33bdba

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-## [Unreleased]
+## [0.5.0] - 2024-01-05
+
+- Add support for Ruby 3.3 / Bundler 2.5 / RubyGems 3.5
 
 ## [0.1.0] - 2023-10-02
 

data/lib/rubygems/await/version.rb

@@ -2,6 +2,6 @@
 
 module Rubygems
   module Await
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/lib/rubygems/await.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "await/version"
+require "rubygems/remote_fetcher"
 
 module Rubygems
   module Await
@@ -54,7 +55,7 @@ module Rubygems
           log { "#{Bundler.ui.add_color("missing", :yellow)}: #{format_element(missing)}" }
           process_collection(missing)
         rescue StandardError => e
-          log_error(e)
+          log_error(e) { e.full_message(highlight: false) }
         ensure
           iteration += 1
           log(level: "debug") { "##{iteration} #{Time.now.-(start).round(2)}s" } if start
@@ -119,17 +120,38 @@ module Rubygems
       def compact_index_client
         remote = Bundler::Source::Rubygems::Remote.new URI(source)
         fetcher = Bundler::Fetcher.new(remote)
-        client = Bundler::Fetcher::CompactIndex.new(fetcher.send(:downloader), remote,
-                                                    fetcher.uri).send(:compact_index_client)
+        client =
+          if Bundler::VERSION < "2.5.0"
+            Bundler::Fetcher::CompactIndex.new(fetcher.send(:downloader), remote, fetcher.uri)
+          else
+            Bundler::Fetcher::CompactIndex.new(fetcher.send(:downloader), remote, fetcher.uri,
+                                               fetcher.gem_remote_fetcher)
+          end.send(:compact_index_client)
         # ensure that updating info always hits the network
         client.instance_variable_set(:@info_checksums_by_name, Hash.new { "" })
         client
       end
 
+      def gem_remote_fetcher
+        if Bundler.rubygems.respond_to?(:gem_remote_fetcher)
+          Bundler.rubygems.gem_remote_fetcher
+        else
+          remote = Bundler::Source::Rubygems::Remote.new URI(source)
+          fetcher = Bundler::Fetcher.new(remote)
+          raise "unsupported bundler version" unless fetcher.respond_to?(:gem_remote_fetcher)
+
+          fetcher.gem_remote_fetcher
+        end
+      end
+
       def index_fetcher
         remote = Bundler::Source::Rubygems::Remote.new URI(source)
         fetcher = Bundler::Fetcher.new(remote)
-        Bundler::Fetcher::Index.new(fetcher.send(:downloader), remote, fetcher.uri)
+        if Bundler::VERSION < "2.5.0"
+          Bundler::Fetcher::Index.new(fetcher.send(:downloader), remote, fetcher.uri)
+        else
+          Bundler::Fetcher::Index.new(fetcher.send(:downloader), remote, fetcher.uri, fetcher.gem_remote_fetcher)
+        end
       end
 
       def self.awaiter_name
@@ -275,9 +297,8 @@ module Rubygems
 
         remote_gem_path = source_uri + "gems/#{gem_file_name}"
 
-        fetcher = Bundler.rubygems.gem_remote_fetcher
         Bundler::SharedHelpers.filesystem_access(local_gem_path) do
-          fetcher.cache_update_path remote_gem_path, local_gem_path
+          gem_remote_fetcher.cache_update_path remote_gem_path, local_gem_path
         end
         true
       rescue Gem::RemoteFetcher::FetchError => e
@@ -296,9 +317,8 @@ module Rubygems
       end
 
       def process_collection(missing)
-        fetcher = Bundler.rubygems.gem_remote_fetcher
         path = source_uri + "specs.#{Gem.marshal_version}.gz"
-        contents = fetcher.fetch_path(path)
+        contents = gem_remote_fetcher.fetch_path(path)
         idx = safe_load_marshal(contents)
 
         idx.each do |found|
@@ -318,9 +338,8 @@ module Rubygems
       end
 
       def process_collection(missing)
-        fetcher = Bundler.rubygems.gem_remote_fetcher
         path = source_uri + "prerelease_specs.#{Gem.marshal_version}.gz"
-        contents = fetcher.fetch_path(path)
+        contents = gem_remote_fetcher.fetch_path(path)
         idx = safe_load_marshal(contents)
 
         idx.each do |found|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-await
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2024-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '3.2'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: A RubyGems plugin with a command to wait until gems are available.