vanagon 0.39.1 → 0.39.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fe169a867215743c1234c1dc7611f6747040505867c94f05379e2e789e1ef22
-  data.tar.gz: d663402a3ff359291b83a970e59ea8e9ce3b3101ba1a5d443e38b2372018ffa4
+  metadata.gz: 1ed8da3751c29acb70fea9bff9eb49263409066fe80d8b2d44554988768f02d7
+  data.tar.gz: a5f496b8508eee638db7cb797ae824f1b4beb5b046c67bba9efbd8f30de5faf7
 SHA512:
-  metadata.gz: 1c58c68372fb374b8ea3d3d016473e32bc41d76632f42dd76bcdef99a375b8758198fd1b193231932746d8c219cce8131817a43bc4c2597f8be2477c52f02d3f
-  data.tar.gz: 18e74e97521b6db5596d746ff6628f932bdfd0b69670987588063a8f6b688a4ce3e0bfcd9d2f6159af68f5f9c3a47a2336267a928e10e0adf35d3e7b4cdd9f29
+  metadata.gz: f3ad3013534e4f40bcc5972efac9397477ab3e636e391e669215d44b06130a7d8a379b6cc67c95127081e1c3b58167744f4db6a943d35ea0160312a875dc43b5
+  data.tar.gz: faecaa5fe8ec3dc0e8174f766bb0849f94ca8b3b35f70cb19faea91985365bda45da16820b3aadb27dcf0a101bec39f8b46075e6b65547b18cb1c0ddd45224e8

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

data/lib/vanagon/platform/defaults/debian-11-aarch64.rb

@@ -0,0 +1,11 @@
+platform "debian-11-aarch64" do |plat|
+  plat.servicedir "/lib/systemd/system"
+  plat.defaultdir "/etc/default"
+  plat.servicetype "systemd"
+  plat.codename "bullseye"
+
+  packages = %w(build-essential devscripts make quilt pkg-config debhelper rsync fakeroot cmake)
+  plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends #{packages.join(' ')}"
+  plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends "
+  plat.vmpooler_template "debian-11-arm64"
+end

data/lib/vanagon/project.rb

@@ -850,7 +850,7 @@ class Vanagon
                       source.file
                     end
 
-        @settings.merge!(yaml_safe_load_shim(yaml_path))
+        @settings.merge!(YAML.safe_load(File.read(yaml_path), permitted_classes: [Symbol]))
       end
     end
 
@@ -876,19 +876,6 @@ class Vanagon
       source_type
     end
 
-    # YAML.safe_load introduced an incompatible change in Ruby 3.1.0
-    # Shim that until no longer relevant.
-    def yaml_safe_load_shim(yaml_path)
-      new_safe_load_version = Gem::Version.new('3.1.0')
-      this_version = Gem::Version.new(RUBY_VERSION)
-
-      if this_version >= new_safe_load_version
-        YAML.safe_load(File.read(yaml_path), permitted_classes: [Symbol])
-      else
-        YAML.safe_load(File.read(yaml_path), [Symbol])
-      end
-    end
-
     def load_upstream_metadata(metadata_uri)
       VanagonLogger.info "Loading metadata from #{metadata_uri}"
       case metadata_uri

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.39.1
+  version: 0.39.3
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-25 00:00:00.000000000 Z
+date: 2023-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: |2
       Vanagon takes a set of project, component, and platform configuration files, to perform
       multiplatform builds that are packaged into rpms, debs, dmgs, etc.
@@ -157,6 +171,7 @@ files:
 - lib/vanagon/platform.rb
 - lib/vanagon/platform/deb.rb
 - lib/vanagon/platform/defaults/debian-10-amd64.rb
+- lib/vanagon/platform/defaults/debian-11-aarch64.rb
 - lib/vanagon/platform/defaults/debian-11-amd64.rb
 - lib/vanagon/platform/defaults/debian-8-amd64.rb
 - lib/vanagon/platform/defaults/debian-8-i386.rb