rubygems-await 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f040bdde5711373824dfc778356f15195f961c3e8927e6aeec2b4e30ac25798e
-  data.tar.gz: f63d4321dfb30d38ef3bf3eea88b883ad5b4cb6214ba32174f36d98d8554fd4c
+  metadata.gz: a7aa95f9ae9cf362a45db3e468784c20a34a3d4eb4f4c6defad953d42783ed53
+  data.tar.gz: 56bd242a22cd3a473cd62493605891d0ca978fe740c6f68c41eb8ae6836f07ba
 SHA512:
-  metadata.gz: 835768f38eaa5ca44fa3b74ccd07ee6b2ef31419ebabd1b6c729ff90d93070bc74defda1d86845468e4e4fdbff3d2f2aead814cb86008344b49e42cdcbca9bc5
-  data.tar.gz: 1f0a4d3c71f50adc95abec57d4cb410bef2d73c9833d76432cd37b2e9a38f178d6659ab1f2f8d8d76f1bdce5424b50933c053aa5b7ecb61d389961879325cc47
+  metadata.gz: 4cbe9b0affd9a4b6bb0e7469616ebf04dd43505c606ae92c2f24ffca74cdb42f9c4d65f5ddeac85d80247e3a20e96228141f294ba5fafc45d1a64f45f56cd7ee
+  data.tar.gz: 792367dc130c7b88f4b038418149d70ff85f6c6f7c26548a8b09a3f2749b44b5b41cbcdf90580f7e5bd9c0db87b7a2821ac7cfb7c5c1a7f16a5a47adb94933ac

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.1"
+    VERSION = "0.5.1"
   end
 end

data/lib/rubygems/await.rb

@@ -1,9 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "await/version"
+require "bundler/vendored_uri"
+require "rubygems/remote_fetcher"
+require "set"
 
 module Rubygems
   module Await
+    URI = defined?(Gem::URI) ? Gem::URI : Bundler::URI
+
     class Error < StandardError; end
 
     class Awaiter
@@ -23,7 +28,7 @@ module Rubygems
       def initialize(gems, source, deadline, name_indent = 10)
         @gems = gems
         @source = source
-        @source_uri = Bundler::URI.parse(source)
+        @source_uri = URI.parse(source)
         @deadline = deadline
         @name_indent = name_indent
       end
@@ -54,7 +59,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
@@ -111,25 +116,46 @@ module Rubygems
       end
 
       def downloader
-        remote = Bundler::Source::Rubygems::Remote.new URI(source)
+        remote = Bundler::Source::Rubygems::Remote.new URI.parse(source)
         fetcher = Bundler::Fetcher.new(remote)
         fetcher.send(:downloader)
       end
 
       def compact_index_client
-        remote = Bundler::Source::Rubygems::Remote.new URI(source)
+        remote = Bundler::Source::Rubygems::Remote.new URI.parse(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.parse(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)
+        remote = Bundler::Source::Rubygems::Remote.new URI.parse(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 +301,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 +321,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 +342,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|

data/lib/rubygems/commands/await_command.rb

@@ -66,6 +66,7 @@ module Gem
           Bundler::Thor::Shell::Color.const_set(:UNDERLINE,
                                                 "\e[4m")
         end
+        Bundler.ui.level = "silent" if options[:silent]
 
         gems = options[:args].map do |s|
           if s.end_with?(".gem")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-await
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2024-04-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.