vanagon 0.39.1 → 0.39.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fe169a867215743c1234c1dc7611f6747040505867c94f05379e2e789e1ef22
-  data.tar.gz: d663402a3ff359291b83a970e59ea8e9ce3b3101ba1a5d443e38b2372018ffa4
+  metadata.gz: 0bbab09cfcd3f8a91841bb070ac6fbdd57b37ba5833e4992f3c2251df12c825a
+  data.tar.gz: 1a14dea7853f5e623ae1d8fbccf35f63d5fb63c2ab6b9c013ce50bc37a2ba791
 SHA512:
-  metadata.gz: 1c58c68372fb374b8ea3d3d016473e32bc41d76632f42dd76bcdef99a375b8758198fd1b193231932746d8c219cce8131817a43bc4c2597f8be2477c52f02d3f
-  data.tar.gz: 18e74e97521b6db5596d746ff6628f932bdfd0b69670987588063a8f6b688a4ce3e0bfcd9d2f6159af68f5f9c3a47a2336267a928e10e0adf35d3e7b4cdd9f29
+  metadata.gz: f167828ef7a0012965b349b670fa4c3b3712bdb6065ae0ced63acca1ec8b909b850ada729cf4151271c62781f4576e088b8f5289de12e94f3748c64f311fdb4a
+  data.tar.gz: 4ab66f44f2b4fabd72ab2fa42c00bd4f3756b4dc9681c1ba05d2715fdacf82092327f297986f3fe872cdf3e306195d1fa3ee66b1ba9e2c8cf575e61b8b5386ae

data/lib/vanagon/component/source.rb

@@ -3,8 +3,11 @@ require 'vanagon/logger'
 require 'vanagon/component/source/http'
 require 'vanagon/component/source/git'
 require 'vanagon/component/source/local'
+require 'vanagon/errors'
 
 class Vanagon
+  class InvalidSource < Vanagon::Error
+  end
   class Component
     class Source
       SUPPORTED_PROTOCOLS = %w[file http https git].freeze
@@ -55,8 +58,8 @@ class Vanagon
           end
 
           # Unknown source type!
-          raise Vanagon::Error,
-            "Unknown file type: '#{uri}'; cannot continue"
+          raise Vanagon::InvalidSource,
+            "Source is invalid or of an unknown type: '#{uri}'; cannot continue"
         end
 
         def determine_source_type(uri)

data/lib/vanagon/component.rb

@@ -260,14 +260,21 @@ class Vanagon
           VanagonLogger.info %(Attempting to fetch from mirror URL "#{mirror}")
           @source = Vanagon::Component::Source.source(mirror, **options)
           return true if source.fetch
+        rescue Vanagon::InvalidSource
+          # This means that the URL was not a git repo or a valid downloadable file,
+          # which means either the URL is incorrect, or we don't have access to that
+          # resource. Return false, so that the pkg.url value can be used instead.
+          VanagonLogger.error %(Invalid source "#{mirror}")
         rescue SocketError
           # SocketError means that there was no DNS/name resolution
           # for whatever remote protocol the mirror tried to use.
           VanagonLogger.error %(Unable to resolve mirror URL "#{mirror}")
-        rescue RuntimeError
+        rescue StandardError
           # Source retrieval does not consistently return a meaningful
           # namespaced error message, which means we're brute-force rescuing
-          # RuntimeError. Not a good look, and we should fix this.
+          # StandardError. Also, we want to handle other unexpected things when
+          # we try reaching out to the URL, so that we can gracefully return
+          # false and fall back to fetching the pkg.url value instead.
           VanagonLogger.error %(Unable to retrieve mirror URL "#{mirror}")
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.39.1
+  version: 0.39.2
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-25 00:00:00.000000000 Z
+date: 2023-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt