vanagon 0.26.1 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cf4b2903976bd6b4e46ec533501890578962d1b2b8287f001f6251f0423a831
-  data.tar.gz: e1e832fe449490ac75f40f6f1de0e02722a909b048ddf562d3a6f1e23dfa835a
+  metadata.gz: 438c2be5dadbbd1c1a7fb9eb3d9b2965afefbe753c494192ade66548224c0a5c
+  data.tar.gz: d91a50ecbaba25c85d285c19942f157d16fd4041875ef2220015a43512091b49
 SHA512:
-  metadata.gz: 2df9721d59ea2c8fcc081c8163f3b088b368bf52f17996a0a1c445b9813506f478078445c6949c1a91cccce1cdfd684bd0e088f6034c05858fcf63b87e327066
-  data.tar.gz: '0818564b741957d07b721398cf016861971a2dbb0b628abfe33291a07a5fa3d78d95f966117ad0a3e85e5f2028a4c7c09ec40b46bd25ac507a935658ffda8378'
+  metadata.gz: 85f94351218ff42271ff6cb521d6f4aa2813fe04079e8f5ea6f921fefdcd56fdf983ffd261c8169443257e7b1d5744f35a36137d330ae8ba040ad2781bc785ed
+  data.tar.gz: 686ad0b981cb619c791941e28ffdbf7583a38ddeb0b59ae050c62c78bfee98cf39c52f14cd8b627acaec41eac721cb44140f4756f5426463b980039a706d31e8

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/defaults/ubuntu-20.04-amd64.rb

@@ -4,8 +4,14 @@ platform "ubuntu-20.04-amd64" do |plat|
   plat.servicetype "systemd"
   plat.codename "focal"
 
+  # Temporary fix to add focal-updates.list repo file because it is missing from the vmpooler image
+  plat.provision_with "echo 'deb https://artifactory.delivery.puppetlabs.net/artifactory/ubuntu__remote focal-updates main restricted universe multiverse' > /etc/apt/sources.list.d/focal-updates.list;
+  echo 'deb-src https://artifactory.delivery.puppetlabs.net/artifactory/ubuntu__remote focal-updates main restricted universe multiverse' >> /etc/apt/sources.list.d/focal-updates.list"
+  
   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.provision_with "curl https://apt.puppet.com/DEB-GPG-KEY-puppet-20250406 | apt-key add -"
   plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends "
   plat.vmpooler_template "ubuntu-2004-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/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/spec/lib/vanagon/component/source/git_spec.rb

@@ -5,7 +5,7 @@ describe "Vanagon::Component::Source::Git" do
   before :all do
     @klass = Vanagon::Component::Source::Git
     # This repo will not be cloned over the network
-    @url = 'git://github.com/puppetlabs/facter.git'
+    @url = 'https://github.com/puppetlabs/facter.git'
     # This path will not be created on disk
     @local_url = "file://#{Dir.tmpdir}/puppet-agent"
     @ref_tag = 'refs/tags/2.2.0'

data/spec/lib/vanagon/component/source_spec.rb

@@ -8,7 +8,6 @@ describe "Vanagon::Component::Source" do
     let(:unrecognized_scheme) { "abcd" }
     let(:invalid_scheme) { "abcd|things" }
 
-    let(:public_git) { "git://github.com/abcd/things" }
     let(:private_git) { "git@github.com:abcd/things" }
     let(:http_git) { "http://github.com/abcd/things" }
     let(:https_git) { "https://github.com/abcd/things" }
@@ -53,12 +52,6 @@ describe "Vanagon::Component::Source" do
           .to eq Vanagon::Component::Source::Git
       end
 
-      it "returns a Git object for git:// repositories" do
-        component_source = klass.source(public_git, ref: ref, workdir: workdir)
-        expect(component_source.url.to_s).to eq public_git
-        expect(component_source.class).to eq Vanagon::Component::Source::Git
-      end
-
       it "returns a Git object for http:// repositories" do
         expect(klass.source(http_git, ref: ref, workdir: workdir).class)
           .to eq Vanagon::Component::Source::Git
@@ -74,7 +67,6 @@ describe "Vanagon::Component::Source" do
         expect(component_source.url.to_s).to eq 'http://github.com/abcd/things'
         expect(component_source.class).to eq Vanagon::Component::Source::Git
       end
-
     end
 
     context "takes a HTTP/HTTPS file" do

data/spec/lib/vanagon/component_spec.rb

@@ -258,12 +258,13 @@ describe "Vanagon::Component" do
   describe '#force_version' do
     let(:source) {
       allow(File).to receive(:realpath).and_return('/this/is/a/test')
-      Vanagon::Component::Source::Git.new('git://github.com/puppetlabs/facter', workdir: '/this/is/a/test')
+      WebMock.allow_net_connect!
+      Vanagon::Component::Source::Git.new('https://github.com/puppetlabs/facter', workdir: '/this/is/a/test')
     }
 
     let(:component) {
       Vanagon::Component.new('force-version-test', {}, {}).tap do |comp|
-        comp.url = 'git://github.com/puppetlabs/facter'
+        comp.url = 'https://github.com/puppetlabs/facter'
         comp.source = source
       end
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.27.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-29 00:00:00.000000000 Z
+date: 2022-06-06 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
@@ -184,6 +184,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
@@ -331,41 +333,41 @@ specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
 - spec/lib/git/rev_list_spec.rb
-- spec/lib/makefile_spec.rb
-- spec/lib/vanagon/project_spec.rb
 - spec/lib/vanagon/cli_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/vanagon/driver_spec.rb
+- spec/lib/vanagon/environment_spec.rb
 - spec/lib/vanagon/platform_spec.rb
-- spec/lib/vanagon/component/source/rewrite_spec.rb
-- spec/lib/vanagon/component/source/git_spec.rb
+- spec/lib/vanagon/engine/base_spec.rb
+- spec/lib/vanagon/engine/ec2_spec.rb
+- spec/lib/vanagon/engine/docker_spec.rb
+- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
+- spec/lib/vanagon/engine/hardware_spec.rb
+- spec/lib/vanagon/engine/pooler_spec.rb
+- spec/lib/vanagon/engine/local_spec.rb
+- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/common/pathname_spec.rb
+- spec/lib/vanagon/utilities/extra_files_signer_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/vanagon/component/source_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/rules_spec.rb
+- spec/lib/vanagon/component/source/git_spec.rb
 - spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/vanagon/component/source_spec.rb
-- spec/lib/vanagon/environment_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/utilities_spec.rb
+- spec/lib/vanagon/extensions/ostruct/json_spec.rb
+- spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/extensions/string_spec.rb
+- spec/lib/vanagon/driver_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
+- spec/lib/vanagon/component_spec.rb
 - spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/platform/solaris_10_spec.rb
 - spec/lib/vanagon/platform/osx_spec.rb
+- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/platform/rpm_spec.rb
 - spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/platform/solaris_10_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/extra_files_signer_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
-- spec/lib/vanagon/engine/ec2_spec.rb
-- spec/lib/vanagon/engine/pooler_spec.rb
-- spec/lib/vanagon/engine/hardware_spec.rb
-- spec/lib/vanagon/engine/local_spec.rb
-- spec/lib/vanagon/engine/docker_spec.rb
-- spec/lib/vanagon/engine/base_spec.rb
-- spec/lib/vanagon/common/pathname_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/platform/deb_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/project_spec.rb
+- spec/lib/makefile_spec.rb