vanagon 0.26.2 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 710560a9b3a7ca3a3161c658eb4b6422870bb226bbff4396f9749546488bccb0
-  data.tar.gz: 5bcc31eccdad2d206662b7dc99624cb7b10ff79186730a947696deb3af2957ba
+  metadata.gz: 00034c4fe7b0e35639a03953d65d4ba132e471f2363d2f3e557a19f61c925054
+  data.tar.gz: 262931385449e18763989f2e39ebb91e6f1d718de3350273d64de0064755d7cf
 SHA512:
-  metadata.gz: 7015b26ff75b4589b79bdcb88401366e8e6e58f9e8dfc7cef50a519b6f8f5f2e855936874509785db1923d7b227531bd767f958ad229dcd07e209564ba59a122
-  data.tar.gz: 93bfbc527dc52f69f217902e53e71738928f196b08340ad422f5fc8d378be9965e61b7ee6b673d8ba1c66e54a0213f6572bff67003d56ab43405933b9b55a1aa
+  metadata.gz: 8a6d7230aff64e44af6d1bfdfe311494ae0fa5b346cbf38f537c62ce9472c0282ec78b19781eb40e441dc0e292eecf605d7c37bf3e64aaf45bae17aacfed7014
+  data.tar.gz: 80e72898b8fdc9d5fba797b22749f73ddf23346038615f82a82132503e8b24aabf0a58134a825fed0f9aa932710976b3d6c00b1b4bfa10116de84294bb18546e

data/lib/vanagon/component/source/local.rb

@@ -97,14 +97,12 @@ class Vanagon
             %(gunzip "#{file}")
           when "rar"
             %(unrar x "#{file}")
-          when "tar"
+          when "tar", "txz"
             %(#{tar} xf "#{file}")
           when "tbz2"
             %(bunzip2 -c "#{file}" | #{tar} xf -)
           when "tgz"
             %(gunzip -c "#{file}" | #{tar} xf -)
-          when "txz"
-            %(unxz -d "#{file}" | #{tar} xvf -)
           when "xz"
             %(unxz "#{file}")
           when "zip"

data/lib/vanagon/platform/deb.rb

@@ -46,7 +46,7 @@ class Vanagon
         end
 
         # These could be templates, but their content is static, so that seems weird.
-        File.open(File.join(deb_dir, "compat"), "w") { |f| f.puts("7") }
+        File.open(File.join(deb_dir, 'compat'), 'w') { |f| f.puts('10') }
         FileUtils.mkdir_p(File.join(deb_dir, "source"))
         File.open(File.join(deb_dir, "source", "format"), "w") { |f| f.puts("3.0 (quilt)") }
       end

data/lib/vanagon/platform/defaults/fedora-36-x86_64.rb

@@ -0,0 +1,17 @@
+platform 'fedora-36-x86_64' do |plat|
+  plat.servicedir '/usr/lib/systemd/system'
+  plat.defaultdir '/etc/sysconfig'
+  plat.servicetype 'systemd'
+  plat.dist 'fc36'
+
+  packages = %w[
+    autoconf automake bzip2-devel gcc gcc-c++ libselinux-devel
+    libsepol libsepol-devel make cmake pkgconfig readline-devel
+    rpmdevtools rsync swig zlib-devel systemtap-sdt-devel
+    perl-lib perl-FindBin
+  ]
+  plat.provision_with("/usr/bin/dnf install -y --best --allowerasing #{packages.join(' ')}")
+
+  plat.install_build_dependencies_with '/usr/bin/dnf install -y --best --allowerasing'
+  plat.vmpooler_template 'fedora-36-x86_64'
+end

data/lib/vanagon/platform/defaults/ubuntu-22.04-aarch64.rb

@@ -0,0 +1,11 @@
+platform "ubuntu-22.04-aarch64" do |plat|
+  plat.servicedir "/lib/systemd/system"
+  plat.defaultdir "/etc/default"
+  plat.servicetype "systemd"
+  plat.codename "jammy"
+
+  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 "ubuntu-2204-arm64"
+end

data/lib/vanagon/platform/defaults/ubuntu-22.04-amd64.rb

@@ -0,0 +1,11 @@
+platform "ubuntu-22.04-amd64" do |plat|
+  plat.servicedir "/lib/systemd/system"
+  plat.defaultdir "/etc/default"
+  plat.servicetype "systemd"
+  plat.codename "jammy"
+
+  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 "ubuntu-2204-x86_64"
+end

data/lib/vanagon/platform.rb

@@ -144,22 +144,34 @@ class Vanagon
 
     VERSION_REGEX = /^([=<>]+)\s*([^<>=]*)$/.freeze
 
-    # Loads a given platform from the configdir
+    # Loads a platform from the config/platforms directory
     #
-    # @param name [String] the name of the platform
-    # @param configdir [String] the path to the platform config file
+    # @param platform_name [String] the name of the platform
+    # @param config_directory [String] the path to the platform config file
     # @return [Vanagon::Platform] the platform as specified in the platform config
     # @raise if the instance_eval on Platform fails, the exception is reraised
-    def self.load_platform(name, configdir)
-      platfile = File.join(configdir, "#{name}.rb")
-      dsl = Vanagon::Platform::DSL.new(name)
-      dsl.instance_eval(File.read(platfile), platfile, 1)
-      dsl._platform
-    rescue StandardError => e
-      VanagonLogger.error "Error loading platform '#{name}' using '#{platfile}':"
-      VanagonLogger.error(e)
-      VanagonLogger.error e.backtrace.join("\n")
-      raise e
+    def self.load_platform(platform_name, config_directory) # rubocop:disable Metrics/AbcSize
+      platform_name = File.basename(platform_name, '.rb')
+      platform_file_name = "#{platform_name}.rb"
+      platform_path = File.join(config_directory, platform_file_name)
+
+      begin
+        platform_definition = File.read(platform_path)
+      rescue Errno::ENOENT, Errno::EACCES => e
+        VanagonLogger.error "Error loading '#{platform_name}': #{e}"
+        exit 1
+      end
+
+      dsl = Vanagon::Platform::DSL.new(platform_name)
+      begin
+        dsl.instance_eval(platform_definition, platform_path, 1)
+        dsl._platform
+      rescue StandardError => e
+        VanagonLogger.error "Error loading platform '#{platform_name}' using '#{platform_path}':"
+        VanagonLogger.error(e)
+        VanagonLogger.error e.backtrace.join("\n")
+        raise e
+      end
     end
 
     # Generate the scripts required to add a group to the package generated.

data/resources/deb/rules.erb

@@ -27,5 +27,10 @@ override_dh_shlibdeps:
 
 override_dh_usrlocal:
 
+override_dh_builddeb:
+	# Force builddeb to use gzip for its internal compression. reprepro can get
+	# confused if something newer is used.
+	dh_builddeb -- -Zgzip
+
 %:
 	dh $@

data/resources/osx/project-installer.xml.erb

@@ -5,7 +5,7 @@
     <license file="<%= @name -%>-License.rtf"/>
     <domains enable_anywhere="true" enable_currentUserHome="false" enable_localSystem="true" />
     <pkg-ref id="<%= @identifier-%>.<%= @name -%>"/>
-    <options customize="never" hostArchitectures="i386" require-scripts="false"/>
+    <options customize="never" hostArchitectures="x86_64,arm64" require-scripts="false"/>
     <choices-outline>
         <line choice="default">
             <line choice="<%= @identifier-%>.<%= @name -%>"/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.28.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: fustigit
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +169,7 @@ files:
 - lib/vanagon/platform/defaults/el-9-x86_64.rb
 - lib/vanagon/platform/defaults/fedora-32-x86_64.rb
 - lib/vanagon/platform/defaults/fedora-34-x86_64.rb
+- lib/vanagon/platform/defaults/fedora-36-x86_64.rb
 - lib/vanagon/platform/defaults/osx-10.15-x86_64.rb
 - lib/vanagon/platform/defaults/osx-11-x86_64.rb
 - lib/vanagon/platform/defaults/osx-12-x86_64.rb
@@ -184,6 +185,8 @@ files:
 - lib/vanagon/platform/defaults/ubuntu-18.04-amd64.rb
 - lib/vanagon/platform/defaults/ubuntu-20.04-aarch64.rb
 - lib/vanagon/platform/defaults/ubuntu-20.04-amd64.rb
+- lib/vanagon/platform/defaults/ubuntu-22.04-aarch64.rb
+- lib/vanagon/platform/defaults/ubuntu-22.04-amd64.rb
 - lib/vanagon/platform/dsl.rb
 - lib/vanagon/platform/osx.rb
 - lib/vanagon/platform/rpm.rb
@@ -330,42 +333,42 @@ signing_key:
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
-- spec/lib/makefile_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/common/pathname_spec.rb
+- spec/lib/git/rev_list_spec.rb
+- spec/lib/vanagon/environment_spec.rb
 - spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/vanagon/platform_spec.rb
-- spec/lib/vanagon/driver_spec.rb
-- spec/lib/vanagon/cli_spec.rb
-- spec/lib/vanagon/extensions/ostruct/json_spec.rb
 - spec/lib/vanagon/extensions/string_spec.rb
 - spec/lib/vanagon/extensions/set/json_spec.rb
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/project_spec.rb
-- spec/lib/vanagon/environment_spec.rb
+- spec/lib/vanagon/extensions/ostruct/json_spec.rb
 - spec/lib/vanagon/utilities/shell_utilities_spec.rb
 - spec/lib/vanagon/utilities/extra_files_signer_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
 - spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/vanagon/component/source/rewrite_spec.rb
-- spec/lib/vanagon/component/source/git_spec.rb
 - spec/lib/vanagon/component/source/http_spec.rb
+- spec/lib/vanagon/component/source/rewrite_spec.rb
 - spec/lib/vanagon/component/source/local_spec.rb
+- spec/lib/vanagon/component/source/git_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
-- spec/lib/vanagon/engine/hardware_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/platform/deb_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/platform/osx_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
+- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/platform/solaris_10_spec.rb
+- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/common/pathname_spec.rb
+- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/driver_spec.rb
+- spec/lib/vanagon/platform_spec.rb
+- spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/project_spec.rb
 - spec/lib/vanagon/engine/ec2_spec.rb
-- spec/lib/vanagon/engine/local_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
+- spec/lib/vanagon/engine/local_spec.rb
 - spec/lib/vanagon/engine/always_be_scheduling_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
-- spec/lib/git/rev_list_spec.rb
+- spec/lib/vanagon/engine/hardware_spec.rb
+- spec/lib/vanagon/cli_spec.rb
+- spec/lib/vanagon/utilities_spec.rb
+- spec/lib/makefile_spec.rb