vanagon 0.26.3 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d675c65a485d790f1c1270033c15282c2c2c6773fd2229f66a4a9203049619db
-  data.tar.gz: a79195a18df08e3103c7e9a69cd1551bf76149fa31275e11d5685b15576ff542
+  metadata.gz: 85733d41e3c9a2981c37db8b12e17ccbf3beb30b217fd7c575f2d02f7cfc8167
+  data.tar.gz: 2547ea591a28c8e78b6745dc4bb2782d797fd6a418685325b51145e8198b10d6
 SHA512:
-  metadata.gz: 64dccb409eb072492bf3c2a9e8bfe7aa98dcabc0055fcc61d671d836793704083b81b67ba05bea0d49be61e1e0ca5d1100278c8e370b3598ac17764a4af5bc9d
-  data.tar.gz: 7d2b511b858ff78c5268ed021cf033a4f6440fe722ada71d85bb8ef35766286045477846e3b7c485942b584984fe0c78ec866b160823d668cf0eab357cb030dd
+  metadata.gz: 2d0dfd0cf748f471e75d2ddaefa8680d4ccfa77d65d578227de3a0c3bfe65a8b993a0c681522f97e3667fc920e4af9f4fa3a6e6e2414085f7a05faa7769caaaa
+  data.tar.gz: d55dc6da693eee3d063a01badceb19520c823229f2af1143f11fae0a7f4dd8deeca432de233d01676482d0110330df1d65397214c1d366e7ebe9601a8d526702

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/lib/vanagon/utilities/extra_files_signer.rb

@@ -13,19 +13,21 @@ class Vanagon
             tempdir = Vanagon::Utilities::remote_ssh_command("#{project.signing_username}@#{project.signing_hostname}", "#{mktemp} 2>/dev/null", return_command_output: true)
           end
 
+          remote_host = "#{project.signing_username}@#{project.signing_hostname}"
+          remote_destination_directory = "#{remote_host}:#{tempdir}"
+          remote_signing_script_path = File.join(tempdir, File.basename('sign_extra_file'))
+
           project.extra_files_to_sign.each do |file|
-            file_location = File.join(tempdir, File.basename(file))
+            remote_file_to_sign_path = File.join(tempdir, File.basename(file))
             local_source_path = File.join('$(tempdir)', source_dir, file)
-            remote_host = "#{project.signing_username}@#{project.signing_hostname}"
-            remote_destination_path = "#{remote_host}:#{tempdir}"
-            remote_file_location = "#{remote_host}:#{file_location}"
-            extra_flags = ''
-            extra_flags = '--extended-attributes' if project.platform.is_macos?
+            remote_source_path = "#{remote_host}:#{remote_file_to_sign_path}"
+            local_destination_path = local_source_path
 
             commands += [
-              "rsync -e '#{Vanagon::Utilities.ssh_command}' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group #{extra_flags} #{local_source_path} #{remote_destination_path}",
-              "#{Vanagon::Utilities.ssh_command} #{remote_host} #{project.signing_command} #{file_location}",
-              "rsync -e '#{Vanagon::Utilities.ssh_command}' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group #{extra_flags} #{remote_file_location} #{local_source_path}"
+              "#{Vanagon::Utilities.ssh_command} #{remote_host} \"echo '#{project.signing_command} #{remote_file_to_sign_path}' > #{remote_signing_script_path}\"",
+              "scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no #{local_source_path} #{remote_destination_directory}",
+              "#{Vanagon::Utilities.ssh_command} #{remote_host} /bin/bash #{remote_signing_script_path}",
+              "scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no #{remote_source_path} #{local_destination_path}"
             ]
           end
 

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 -%>"/>

data/spec/lib/vanagon/utilities/extra_files_signer_spec.rb

@@ -83,12 +83,14 @@ describe Vanagon::Utilities::ExtraFilesSigner do
             commands = Vanagon::Utilities::ExtraFilesSigner.commands(project._project, mktemp, source_dir)
             expect(commands).to match(
               [
-                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group --extended-attributes $(tempdir)/dir/source_dir/test1/a.rb test@abc:/tmp/xyz",
-                "/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc codesign /tmp/xyz/a.rb",
-                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group --extended-attributes test@abc:/tmp/xyz/a.rb $(tempdir)/dir/source_dir/test1/a.rb",
-                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group --extended-attributes $(tempdir)/dir/source_dir/test2/b.rb test@abc:/tmp/xyz",
-                "/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc codesign /tmp/xyz/b.rb",
-                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group --extended-attributes test@abc:/tmp/xyz/b.rb $(tempdir)/dir/source_dir/test2/b.rb"
+                %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc "echo 'codesign /tmp/xyz/a.rb' > /tmp/xyz/sign_extra_file"),
+                %q(scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $(tempdir)/dir/source_dir/test1/a.rb test@abc:/tmp/xyz),
+                %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc /bin/bash /tmp/xyz/sign_extra_file),
+                %q(scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc:/tmp/xyz/a.rb $(tempdir)/dir/source_dir/test1/a.rb),
+                %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc "echo 'codesign /tmp/xyz/b.rb' > /tmp/xyz/sign_extra_file"),
+                %q(scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $(tempdir)/dir/source_dir/test2/b.rb test@abc:/tmp/xyz),
+                %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc /bin/bash /tmp/xyz/sign_extra_file),
+                %q(scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc:/tmp/xyz/b.rb $(tempdir)/dir/source_dir/test2/b.rb)
               ]
             )
           end
@@ -107,12 +109,14 @@ describe Vanagon::Utilities::ExtraFilesSigner do
             commands = Vanagon::Utilities::ExtraFilesSigner.commands(project._project, mktemp, source_dir)
             expect(commands).to match(
               [
-                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group  $(tempdir)/dir/source_dir/test1/a.rb test@abc:/tmp/xyz",
-                "/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc codesign /tmp/xyz/a.rb",
-                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group  test@abc:/tmp/xyz/a.rb $(tempdir)/dir/source_dir/test1/a.rb",
-                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group  $(tempdir)/dir/source_dir/test2/b.rb test@abc:/tmp/xyz",
-                "/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc codesign /tmp/xyz/b.rb",
-                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group  test@abc:/tmp/xyz/b.rb $(tempdir)/dir/source_dir/test2/b.rb"
+                %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc "echo 'codesign /tmp/xyz/a.rb' > /tmp/xyz/sign_extra_file"),
+                %q(scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $(tempdir)/dir/source_dir/test1/a.rb test@abc:/tmp/xyz),
+                %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc /bin/bash /tmp/xyz/sign_extra_file),
+                %q(scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc:/tmp/xyz/a.rb $(tempdir)/dir/source_dir/test1/a.rb),
+                %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc "echo 'codesign /tmp/xyz/b.rb' > /tmp/xyz/sign_extra_file"),
+                %q(scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $(tempdir)/dir/source_dir/test2/b.rb test@abc:/tmp/xyz),
+                %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc /bin/bash /tmp/xyz/sign_extra_file),
+                %q(scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc:/tmp/xyz/b.rb $(tempdir)/dir/source_dir/test2/b.rb)
               ]
             )
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.26.3
+  version: 0.29.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-11 00:00:00.000000000 Z
+date: 2022-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -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/git/rev_list_spec.rb
-- spec/lib/vanagon/platform_spec.rb
+- spec/lib/vanagon/environment_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
+- spec/lib/vanagon/extensions/string_spec.rb
+- spec/lib/vanagon/extensions/set/json_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/common/pathname_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
 - spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/vanagon/component/source/git_spec.rb
 - spec/lib/vanagon/component/source/http_spec.rb
-- spec/lib/vanagon/component/source/local_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/platform/dsl_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/osx_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
 - spec/lib/vanagon/platform/solaris_10_spec.rb
 - spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/project_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/extensions/set/json_spec.rb
-- spec/lib/vanagon/extensions/string_spec.rb
-- spec/lib/vanagon/extensions/ostruct/json_spec.rb
-- spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/vanagon/environment_spec.rb
-- spec/lib/vanagon/cli_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
+- spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/engine/ec2_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/base_spec.rb
 - spec/lib/vanagon/engine/always_be_scheduling_spec.rb
+- spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/hardware_spec.rb
-- spec/lib/vanagon/engine/pooler_spec.rb
-- spec/lib/vanagon/engine/ec2_spec.rb
-- spec/lib/vanagon/driver_spec.rb
+- spec/lib/vanagon/cli_spec.rb
+- spec/lib/vanagon/utilities_spec.rb
+- spec/lib/makefile_spec.rb