vanagon 0.25.0 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c5942e2eb5cb60b0d61c7bb691fd41796d06a34f6ab4ad6558d12e2b368f04c
-  data.tar.gz: 2c169e9c4fa08538310e90e18dc4336ecd98596f6b6b47a8c86efe20c0bc5a16
+  metadata.gz: 710560a9b3a7ca3a3161c658eb4b6422870bb226bbff4396f9749546488bccb0
+  data.tar.gz: 5bcc31eccdad2d206662b7dc99624cb7b10ff79186730a947696deb3af2957ba
 SHA512:
-  metadata.gz: ca9a2db8658afe0d71ac7300e07edb6f6b874c0e8ff753f03536da144b8070ac41f7389eaacf1067e1f0ab0937a253fc88f1e3011b2383dbba7acb3056233020
-  data.tar.gz: 67f11f91d870a2fce2890a5115947729b4f590c581932a71317ac936de74826ecc3f7a213540b34e34f71e51e075bb127421e2e8a1aa778bb6748046a702521a
+  metadata.gz: 7015b26ff75b4589b79bdcb88401366e8e6e58f9e8dfc7cef50a519b6f8f5f2e855936874509785db1923d7b227531bd767f958ad229dcd07e209564ba59a122
+  data.tar.gz: 93bfbc527dc52f69f217902e53e71738928f196b08340ad422f5fc8d378be9965e61b7ee6b673d8ba1c66e54a0213f6572bff67003d56ab43405933b9b55a1aa

data/lib/git/basic_submodules.rb

@@ -36,7 +36,7 @@ module BasicSubmodules
   # @option options [Boolean] :recursive recurse into nested submodules
   # @return options [String] any output produced by `git` when submodules are initialized
   def update_submodules(**options)
-    self.lib.update_submodules(options)
+    self.lib.update_submodules(**options)
   end
 end
 

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

@@ -50,7 +50,7 @@ class Vanagon
 
           def valid_remote?(url, timeout = 0)
             Timeout.timeout(timeout) do
-              Vanagon::Utilities.local_command("git ls-remote #{url} > /dev/null 2>&1")
+              Vanagon::Utilities.local_command("git ls-remote --heads #{url} > /dev/null 2>&1")
               return false unless $?.exitstatus.zero?
               return true
             end

data/lib/vanagon/component.rb

@@ -258,7 +258,7 @@ class Vanagon
       mirrors.to_a.shuffle.each do |mirror|
         begin
           VanagonLogger.info %(Attempting to fetch from mirror URL "#{mirror}")
-          @source = Vanagon::Component::Source.source(mirror, options)
+          @source = Vanagon::Component::Source.source(mirror, **options)
           return true if source.fetch
         rescue SocketError
           # SocketError means that there was no DNS/name resolution
@@ -281,7 +281,7 @@ class Vanagon
     #   or False otherwise
     def fetch_url(options)
       VanagonLogger.info %(Attempting to fetch from canonical URL "#{url}")
-      @source = Vanagon::Component::Source.source(url, options)
+      @source = Vanagon::Component::Source.source(url, **options)
       # Explicitly coerce the return value of #source.fetch,
       # because each subclass of Vanagon::Component::Source returns
       # an inconsistent value if #fetch is successful.

data/lib/vanagon/platform/defaults/osx-12-x86_64.rb

@@ -0,0 +1,20 @@
+platform "osx-12-x86_64" do |plat|
+  plat.servicetype "launchd"
+  plat.servicedir "/Library/LaunchDaemons"
+  plat.codename "monterey"
+  plat.provision_with "export HOMEBREW_NO_EMOJI=true"
+  plat.provision_with "export HOMEBREW_VERBOSE=true"
+  plat.provision_with "sudo dscl . -create /Users/test"
+  plat.provision_with "sudo dscl . -create /Users/test UserShell /bin/bash"
+  plat.provision_with "sudo dscl . -create /Users/test UniqueID 1001"
+  plat.provision_with "sudo dscl . -create /Users/test PrimaryGroupID 1000"
+  plat.provision_with "sudo dscl . -create /Users/test NFSHomeDirectory /Users/test"
+  plat.provision_with "sudo dscl . -passwd /Users/test password"
+  plat.provision_with "sudo dscl . -merge /Groups/admin GroupMembership test"
+  plat.provision_with "echo 'test ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/username"
+  plat.provision_with "mkdir -p /etc/homebrew"
+  plat.provision_with "cd /etc/homebrew"
+  plat.provision_with %Q(su test -c 'echo | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"')
+  plat.provision_with "sudo chown -R test:admin /Users/test/"
+  plat.vmpooler_template "macos-12-x86_64"
+end

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/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
     }

data/spec/lib/vanagon/engine/ec2_spec.rb

@@ -1,5 +1,4 @@
-begin
-  require 'aws-sdk'
+begin require 'aws-sdk'
 rescue LoadError
   $stderr.puts "Unable to load AWS SDK; skipping optional EC2 engine spec tests"
 end
@@ -28,7 +27,10 @@ if defined? ::Aws
 
     it 'returns "ec2" name' do
       stub_request(:get, "http://169.254.169.254/latest/meta-data/iam/security-credentials/").
+        to_return(status: 200, body: "", headers: {})
+      stub_request(:put, "http://169.254.169.254/latest/api/token").
           to_return(status: 200, body: "", headers: {})
+
       expect(Vanagon::Engine::Ec2.new(platform_ec2).name).to eq('ec2')
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.2
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -171,6 +171,7 @@ files:
 - lib/vanagon/platform/defaults/fedora-34-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
 - lib/vanagon/platform/defaults/redhatfips-7-x86_64.rb
 - lib/vanagon/platform/defaults/redhatfips-8-x86_64.rb
 - lib/vanagon/platform/defaults/sles-12-x86_64.rb
@@ -312,9 +313,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.3'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -327,41 +331,41 @@ 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/utilities/shell_utilities_spec.rb
-- spec/lib/vanagon/utilities/extra_files_signer_spec.rb
-- spec/lib/vanagon/project_spec.rb
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/common/pathname_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/component/source/local_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/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/http_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_spec.rb
-- spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/driver_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/cli_spec.rb
-- spec/lib/vanagon/common/pathname_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/engine/hardware_spec.rb
+- spec/lib/vanagon/engine/ec2_spec.rb
 - spec/lib/vanagon/engine/local_spec.rb
-- spec/lib/vanagon/engine/base_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/ec2_spec.rb
-- spec/lib/vanagon/platform_spec.rb
-- spec/lib/vanagon/environment_spec.rb
-- spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/project/dsl_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