vanagon 0.41.0 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbfdc34ac75b70c6f96c6f767426d61ed0140be4e7e0fbee6cf9cf255f6b1c4b
-  data.tar.gz: 51109a1e790290e27d1b03674601f3209fc17df1431f860768b15b88534bc5aa
+  metadata.gz: db6bbca78a910b41075dc50bccc92e3088ffc4a076b58543feff84ec809b59dc
+  data.tar.gz: ada82f3362eaab0c8ee9b5248c3f3e17d1660276ed9c6328a1a9d38a9575fe38
 SHA512:
-  metadata.gz: 9166d82bf7623a2423ac6bd10becdc2c0bd1dd98808abf098b91c2818f7742152d8109fc778155646c36cb4295cab960fa60ae74d1e53ca1748cf4e9b049fac1
-  data.tar.gz: 63175335e9f35857aebd80da28d7777d40b13050136b62290acc54217b71dfbf3deb03f03d6c6af2bf6eb8ebc15d22ae64bef89e3f94425506c0e64f485d6838
+  metadata.gz: 5271dfd756bf4ca321b56124402d81e0ab235aca51554b278b770a9942a0a251307141f58b6d0f7ea92fa969c72b4f21e67f5e353dcdfb2eab0fb22b5d9f50fd
+  data.tar.gz: 30ff287725847bb4949d3f782724163169e2f3e42eb3de04c6ff42ca1260c11f728b2073d7e1dda9b8c91109b8af1bb50a46b6c7ffd254e21f7557e4f805e02c

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/source/git.rb

@@ -106,7 +106,7 @@ class Vanagon
           @clone_options = opts[:clone_options] ||= {}
 
           # We can test for Repo existence without cloning
-          raise Vanagon::InvalidRepo, "url is not a valid Git repo" unless valid_remote?
+          raise Vanagon::InvalidRepo, "\"#{url}\" is not a valid Git repo" unless valid_remote?
         end
 
         # Fetch the source. In this case, clone the repository into the workdir

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.rb

@@ -380,6 +380,13 @@ class Vanagon
       return !!@name.match(/^fedora-.*$/)
     end
 
+    # Utility matcher to determine is the platform is a amazon linux variety
+    #
+    # @return [true, false] true if it is a amazon linux variety, false otherwise
+    def is_amazon?
+      return !!@name.match(/^amazon-.*$/)
+    end
+
     # Utility matcher to determine is the platform is a debian variety
     #
     # @return [true, false] true if it is a debian variety, false otherwise

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
     #

data/resources/rpm/project.spec.erb

@@ -81,7 +81,7 @@ Requires:  <%= requires.requirement %><%= requires.version ? " #{requires.versio
 # did not specify a dependency on these.
 # In the future, we will supress pre/post scripts completely if there's nothing
 # specified by the project or the components.
-<%- if @platform.is_fedora? || (@platform.is_el? && @platform.os_version.to_i >= 9) -%>
+<%- if @platform.is_fedora? || @platform.is_amazon? || (@platform.is_el? && @platform.os_version.to_i >= 9) -%>
 Requires(pre): /usr/bin/mkdir
 Requires(pre): /usr/bin/touch
 Requires(post): /usr/bin/mkdir
@@ -242,6 +242,15 @@ fi
 
 
 %post
+# Run required postinstall scripts on install if defined
+if [ -e %{_localstatedir}/lib/rpm-state/%{name}/install ] ; then
+  <%= get_postinstall_required_actions("install") %>
+fi
+
+# Run required postinstall scripts on upgrade if defined
+if [ -e %{_localstatedir}/lib/rpm-state/%{name}/upgrade ] ; then
+  <%= get_postinstall_required_actions("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.41.0
+  version: 0.43.0
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2023-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt