rubygems-await 0.1.5 → 0.3.0

data/lib/rubygems/await/version.rb

@@ -2,6 +2,6 @@
 
 module Rubygems
   module Await
-    VERSION = "0.1.5"
+    VERSION = "0.3.0"
   end
 end

data/lib/rubygems/await.rb

@@ -7,6 +7,17 @@ module Rubygems
     class Error < StandardError; end
 
     class Awaiter
+      unless respond_to?(:subclasses)
+        def self.subclasses
+          @subclasses ||= []
+        end
+
+        def inherited(klass)
+          super(klass)
+          subclasses << klass
+        end
+      end
+
       attr_reader :gems, :source, :deadline, :name_indent, :source_uri
 
       def initialize(gems, source, deadline, name_indent = 10)
@@ -125,7 +136,7 @@ module Rubygems
         raise NotImplementedError
       end
 
-      def log(level: "info", tags: nil, &)
+      def log(level: "info", tags: nil)
         return unless Bundler.ui.level(level)
 
         s = Time.now.to_s << " "
@@ -155,6 +166,14 @@ module Rubygems
       def expired?(padding = 0)
         Time.now + padding > deadline
       end
+
+      def safe_load_marshal(contents)
+        if Bundler.respond_to?(:safe_load_marshal)
+          Bundler.safe_load_marshal(contents)
+        else
+          Marshal.load(contents) # rubocop:disable Security/MarshalLoad
+        end
+      end
     end
 
     class VersionsAwaiter < Awaiter
@@ -231,7 +250,11 @@ module Rubygems
 
         downloader.fetch(uri)
         true
-      rescue Bundler::Fetcher::AuthenticationForbiddenError => e
+      rescue (if defined?(::Bundler::Fetcher::AuthenticationForbiddenError)
+                ::Bundler::Fetcher::AuthenticationForbiddenError
+              else
+                ::Bundler::Fetcher::AuthenticationRequiredError
+              end) => e
         log_error(e) { "#{Bundler::URICredentialsFilter.credential_filtered_uri(uri)} not found" }
         false
       end
@@ -276,7 +299,7 @@ module Rubygems
         fetcher = Bundler.rubygems.gem_remote_fetcher
         path = source_uri + "specs.#{Gem.marshal_version}.gz"
         contents = fetcher.fetch_path(path)
-        idx = Bundler.safe_load_marshal(contents)
+        idx = safe_load_marshal(contents)
 
         idx.each do |found|
           tuple = Gem::NameTuple.new(*found.map!(&:to_s))
@@ -298,7 +321,7 @@ module Rubygems
         fetcher = Bundler.rubygems.gem_remote_fetcher
         path = source_uri + "prerelease_specs.#{Gem.marshal_version}.gz"
         contents = fetcher.fetch_path(path)
-        idx = Bundler.safe_load_marshal(contents)
+        idx = safe_load_marshal(contents)
 
         idx.each do |found|
           tuple = Gem::NameTuple.new(*found.map!(&:to_s))
@@ -320,7 +343,7 @@ module Rubygems
         dependency_api_uri = "#{source_uri}api/v1/dependencies"
         dependency_api_uri.query = URI.encode_www_form(gems: missing.keys.sort)
         marshalled_deps = downloader.fetch(dependency_api_uri).body
-        deps = Bundler.safe_load_marshal(marshalled_deps)
+        deps = safe_load_marshal(marshalled_deps)
 
         deps.each do |s|
           name, number, platform = s.values_at(:name, :number, :platform)

data/lib/rubygems/commands/await_command.rb

@@ -18,7 +18,7 @@ module Gem
 
         defaults = {
           timeout: 5 * 60,
-          awaiters:,
+          awaiters: awaiters,
           skip: ["dependency api"],
           only: nil
         }
@@ -68,7 +68,12 @@ module Gem
         end
 
         gems = options[:args].map do |s|
-          parts = s.split(":", 3)
+          if s.end_with?(".gem")
+            require "rubygems/package"
+            parts = Gem::Package.new(s).spec.name_tuple.to_a.compact.map(&:to_s)
+          else
+            parts = s.split(":", 3)
+          end
           raise Gem::CommandLineError, "Please specify a name:version[:platform], given #{s.inspect}" if parts.size < 2
 
           unless Gem::Version.correct?(parts[1])
@@ -115,7 +120,7 @@ module Gem
           all_missing.uniq!
           all_missing.map! { Bundler.ui.add_color(_1.respond_to?(:full_name) ? _1.full_name : _1.to_s, :red, :bold) }
           log(level: "error") do
-            Bundler.ui.add_color("Timed out", :red) << " after " <<
+            Bundler.ui.add_color(+"Timed out", :red) << " after " <<
               Bundler.ui.add_color("#{Time.now.-(start).round(2)}s", :white, :bold) <<
               ". Check that #{all_missing.join(", ")} are published."
           end
@@ -148,7 +153,7 @@ module Gem
 
       private
 
-      def log(level: "info", tags: nil, &)
+      def log(level: "info", tags: nil)
         return unless Bundler.ui.level(level)
 
         s = Time.now.to_s << " "

data/lib/rubygems_plugin.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-require "rubygems/command"
+require "rubygems/command_manager"
 Gem::CommandManager.instance.register_command :await

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-await
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2023-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.2'
 description: 
 email:
 - segiddins@segiddins.me
@@ -37,6 +37,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- fixtures/vcr_cassettes/2023-12-01.yml
 - lib/rubygems/await.rb
 - lib/rubygems/await/version.rb
 - lib/rubygems/commands/await_command.rb
@@ -58,12 +59,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.4'
+      version: '3.2'
 requirements: []
 rubygems_version: 3.4.10
 signing_key: