vanagon 0.24.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 958967d126de3ae4bf36c6e13f2aa0dcbe387e7cf52621ba5386ef87e470402d
-  data.tar.gz: 57b2cb0b77c9d0fd82d79a935d2c5fd8676c3e46968c036f21dc86128e97303f
+  metadata.gz: 3cf4b2903976bd6b4e46ec533501890578962d1b2b8287f001f6251f0423a831
+  data.tar.gz: e1e832fe449490ac75f40f6f1de0e02722a909b048ddf562d3a6f1e23dfa835a
 SHA512:
-  metadata.gz: c6a328120e33ef21de286bbb5f1d086632ac855507c3c3a3913d392a7a99a04f447c90128cfeaca4f37674c8f541e5c07c326a70c5dde79a069a8a8339c052f3
-  data.tar.gz: 98ffb256fbd7b09fc1c7eea5157036ef666cbb80e9bc686077a2722d64b9371a516b60252a5f70f2956451e83a2f68e3538f3369115e8fdf26cbf18402fb030d
+  metadata.gz: 2df9721d59ea2c8fcc081c8163f3b088b368bf52f17996a0a1c445b9813506f478078445c6949c1a91cccce1cdfd684bd0e088f6034c05858fcf63b87e327066
+  data.tar.gz: '0818564b741957d07b721398cf016861971a2dbb0b628abfe33291a07a5fa3d78d95f966117ad0a3e85e5f2028a4c7c09ec40b46bd25ac507a935658ffda8378'

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/engine/always_be_scheduling.rb

@@ -346,7 +346,7 @@ class Vanagon
       end
 
       def build_request_object
-        user = ENV['USER'] || ENV['USERNAME'] || 'unknown'
+        user = ENV['USER'] || ENV['USERNAME'] || 'vanagon'
 
         @saved_job_id = user + "-" + DateTime.now.strftime('%Q')
         request_object = {
@@ -360,7 +360,7 @@ class Vanagon
                     :user              => user
                 },
             },
-            :priority => 1, # DO NOT use priority 1 in automated CI runs
+            :priority => 3, # DO NOT use priority 1 in automated CI runs
         }
         unless @token_vmpooler.nil?
           request_object[:vm_token] = @token_vmpooler

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/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.24.0
+  version: 0.26.1
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-03-29 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:
   - - ">="
@@ -326,42 +330,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/git/rev_list_spec.rb
+- spec/lib/makefile_spec.rb
 - spec/lib/vanagon/project_spec.rb
-- spec/lib/vanagon/utilities/extra_files_signer_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_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_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/common/pathname_spec.rb
 - spec/lib/vanagon/cli_spec.rb
-- spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/utilities_spec.rb
 - spec/lib/vanagon/project/dsl_spec.rb
 - spec/lib/vanagon/driver_spec.rb
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/environment_spec.rb
 - spec/lib/vanagon/platform_spec.rb
-- spec/lib/vanagon/engine/base_spec.rb
-- spec/lib/vanagon/engine/hardware_spec.rb
-- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
-- spec/lib/vanagon/engine/docker_spec.rb
-- spec/lib/vanagon/engine/local_spec.rb
-- spec/lib/vanagon/engine/ec2_spec.rb
-- spec/lib/vanagon/engine/pooler_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/local_spec.rb
-- spec/lib/vanagon/component/source/git_spec.rb
 - spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/git/rev_list_spec.rb
-- spec/lib/makefile_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/platform/solaris_11_spec.rb
+- spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/platform/osx_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