vanagon 0.39.2 → 0.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bbab09cfcd3f8a91841bb070ac6fbdd57b37ba5833e4992f3c2251df12c825a
-  data.tar.gz: 1a14dea7853f5e623ae1d8fbccf35f63d5fb63c2ab6b9c013ce50bc37a2ba791
+  metadata.gz: 49e90bdaa700172f444cb3849dfbaa7d422c4912f081eb45a3466a45857b23d6
+  data.tar.gz: b88bbbadd07826f06f05d0ae766048af7e3bba74a859bc029c35bedcda6d710e
 SHA512:
-  metadata.gz: f167828ef7a0012965b349b670fa4c3b3712bdb6065ae0ced63acca1ec8b909b850ada729cf4151271c62781f4576e088b8f5289de12e94f3748c64f311fdb4a
-  data.tar.gz: 4ab66f44f2b4fabd72ab2fa42c00bd4f3756b4dc9681c1ba05d2715fdacf82092327f297986f3fe872cdf3e306195d1fa3ee66b1ba9e2c8cf575e61b8b5386ae
+  metadata.gz: 188b11f3ca921713dba0f9c790b5bec8039dd3d2fe79488a76f4cb065ac616cc98ea3af03a5d7c78d29070d5bea547d8dc977beeaddfccf988f3dc738cbd18a2
+  data.tar.gz: e7d53de5ec39fbc9975e610f987511dbcf652ece373d7d2ed72c6965f5c358c734410f2992de2918bd38d5402fccdb9a753ada37a05c205fb0eee1143d340664

data/lib/vanagon/component/dsl.rb

@@ -503,6 +503,16 @@ class Vanagon
         @component.activate_triggers << OpenStruct.new(:activate_name => activate_name)
       end
 
+      # Add post installation action that must exit successfully before restarting the service
+      #
+      # @param pkg_state [Array] the state in which the scripts should execute. Can be
+      #   one or multiple of 'install' and 'upgrade'.
+      # @param scripts [Array] the Bourne shell compatible scriptlet(s) to execute
+      def add_postinstall_required_action(pkg_state, scripts)
+        check_pkg_state_array(pkg_state)
+        @component.postinstall_required_actions << OpenStruct.new(:pkg_state => Array(pkg_state), :scripts => Array(scripts))
+      end
+
       # Adds action to run during the postinstall phase of packaging
       #
       # @param pkg_state [Array] the state in which the scripts should execute. Can be

data/lib/vanagon/component.rb

@@ -106,6 +106,9 @@ class Vanagon
     # activate_triggers is a one-dimentional Array of Strings, describing scripts that
     # should be executed when a package identifies an activate trigger
     attr_accessor :activate_triggers
+    # postinstall_required_actions is a two-dimensional Array, describing scripts that
+    # must be executed successfully after a given component is installed.
+    attr_accessor :postinstall_required_actions
     # postinstall_actions is a two-dimensional Array, describing scripts that
     # should be executed after a given component is installed.
     attr_accessor :postinstall_actions
@@ -176,6 +179,7 @@ class Vanagon
       @install_triggers = []
       @interest_triggers = []
       @activate_triggers = []
+      @postinstall_required_actions = []
       @postinstall_actions = []
       @preremove_actions = []
       @postremove_actions = []

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

@@ -494,6 +494,18 @@ class Vanagon
       end
     end
 
+    # Collects the postinstall packaging actions that must exit successfully for the project and it's components
+    #  for the specified packaging state
+    #
+    # @param pkg_state [String] the package state we want to run the given scripts for.
+    #   Can be one of 'install' or 'upgrade'
+    # @return [String] string of Bourne shell compatible scriptlets to execute during the postinstall
+    #   phase of packaging during the state of the system defined by pkg_state (either install or upgrade)
+    def get_postinstall_required_actions(pkg_state)
+      scripts = components.flat_map(&:postinstall_required_actions).compact.select { |s| s.pkg_state.include? pkg_state }.map(&:scripts)
+      return ': no postinstall required scripts provided' if scripts.empty?
+      scripts.join("\n")
+    end
     # Collects the preremove packaging actions for the project and it's components
     # for the specified packaging state
     #
@@ -850,7 +862,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 +888,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

data/resources/rpm/project.spec.erb

@@ -242,6 +242,17 @@ fi
 
 
 %post
+# Run required postinstall scripts on install if defined
+if [ -e %{_localstatedir}/lib/rpm-state/%{name}/install ] ; then
+  <%= get_postinstall_required_actions("install") %>
+  rm %{_localstatedir}/lib/rpm-state/%{name}/install
+fi
+
+# Run required postinstall scripts on upgrade if defined
+if [ -e %{_localstatedir}/lib/rpm-state/%{name}/upgrade ] ; then
+  <%= get_postinstall_required_actions("upgrade") %>
+  rm %{_localstatedir}/lib/rpm-state/%{name}/upgrade
+fi
 <%- if @platform.is_aix? || (@platform.is_el? && @platform.os_version.to_i == 4) -%>
 ## EL-4 and AIX RPM don't have %posttrans, so we'll put them here
 # Run postinstall scripts on install if defined

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.39.2
+  version: 0.40.0
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2023-10-24 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