vanagon 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c5942e2eb5cb60b0d61c7bb691fd41796d06a34f6ab4ad6558d12e2b368f04c
-  data.tar.gz: 2c169e9c4fa08538310e90e18dc4336ecd98596f6b6b47a8c86efe20c0bc5a16
+  metadata.gz: a9b054ba055927fcdbc69228b433ec3c01e52841c4fd93841394d3ab371bcb0e
+  data.tar.gz: 787e12bc102de7ab7a16b7b0f9a0f9fbff4f60fece396fdcc3a9b752f8c933aa
 SHA512:
-  metadata.gz: ca9a2db8658afe0d71ac7300e07edb6f6b874c0e8ff753f03536da144b8070ac41f7389eaacf1067e1f0ab0937a253fc88f1e3011b2383dbba7acb3056233020
-  data.tar.gz: 67f11f91d870a2fce2890a5115947729b4f590c581932a71317ac936de74826ecc3f7a213540b34e34f71e51e075bb127421e2e8a1aa778bb6748046a702521a
+  metadata.gz: e0220c7ab2bd7f07945dc0d313976693616ac8ef99103d526da8a89b85c21f8089ed54117a6df5201ca7cb17b40fa6f8c32e8ed359a1da0e75afc831e961860c
+  data.tar.gz: b460870be764e84925886041b21bc017fa3016575c57a005bfd482ec7242abf668f0e03b2fe7e243f42ae5d3612f99b4fb177322eed0845033eb2a99cec0f6e7

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/osx.rb

@@ -41,6 +41,8 @@ class Vanagon
           sign_commands = []
         end
 
+        signing_host = "jenkins@osx-signer-prod-2.delivery.puppetlabs.net"
+
          # Setup build directories
         ["bash -c 'mkdir -p $(tempdir)/osx/build/{dmg,pkg,scripts,resources,root,payload,plugins}'",
          "mkdir -p $(tempdir)/osx/build/root/#{project.name}-#{project.version}",
@@ -56,8 +58,26 @@ class Vanagon
 
          bom_install,
 
+         #  The signing commands below should not cause `vanagon build` to fail. Many devs need to run `vanagon build`
+         #  locally and do not necessarily need signed packages. The `|| :` will rescue failures by evaluating as successful.
+         #  /Users/binaries will be a list of all binaries that need to be signed
+         "touch /Users/binaries || :",
+         #  Find all of the executables (Mach-O files), and put the in /Users/binaries
+         "for item in `find $(tempdir)/osx/build/ -perm -0100 -type f` ; do file $$item | grep 'Mach-O' ; done | awk '{print $$1}' | sed 's/\:$$//' > /Users/binaries || :",
+         #  A tmpdir is created on the signing_host, all of the executables will be rsyncd there to be signed
+         "#{Vanagon::Utilities.ssh_command}  #{signing_host} mkdir -p /tmp/$(binaries_dir) || :",
+         "rsync -e '#{Vanagon::Utilities.ssh_command}' --no-perms --no-owner --no-group --files-from=/Users/binaries / #{signing_host}:/tmp/$(binaries_dir) || :",
+         "rsync -e '#{Vanagon::Utilities.ssh_command}' --no-perms --no-owner --no-group /Users/binaries #{signing_host}:/tmp/$(binaries_dir)/binaries_list || :",
+         #  The binaries are signed, and then rsynced back
+         "#{Vanagon::Utilities.ssh_command}  #{signing_host} /usr/local/bin/sign.sh $(binaries_dir) || :",
+         "rsync -e '#{Vanagon::Utilities.ssh_command}' --no-perms --no-owner --no-group -r #{signing_host}:/tmp/$(binaries_dir)/var/ /var || :",
+
          # Sign extra files
          sign_commands,
+         # Some extra files are created during the signing process that are not needed, so we delete them! Otherwise
+         # notarization gets confused by these extra files.
+          "for item in `find $(tempdir)/osx/build -type d -name Resources` ; do rm -rf $$item ; done || :",
+
 
          # Package the project
          "(cd $(tempdir)/osx/build/; #{@pkgbuild} --root root/#{project.name}-#{project.version} \

data/resources/Makefile.erb

@@ -9,6 +9,10 @@ workdir := $(PWD)
 
 all: file-list-before-build <%= package_name %>
 
+<%- if @platform.is_macos? -%>
+binaries_dir := $(shell <%= @platform.mktemp %> 2>/dev/null)
+<%- end -%>
+
 <%= package_name %>: <%= @name %>-<%= @version %>.tar.gz
 	<%= generate_package.join("\n\t") %>
 

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.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -312,9 +312,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 +330,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/common/user_spec.rb
+- spec/lib/vanagon/common/pathname_spec.rb
+- spec/lib/vanagon/utilities_spec.rb
+- spec/lib/vanagon/project_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/extensions/ostruct/json_spec.rb
-- spec/lib/vanagon/extensions/string_spec.rb
-- spec/lib/vanagon/component/source/local_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_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/local_spec.rb
+- spec/lib/vanagon/driver_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/local_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/engine/always_be_scheduling_spec.rb
+- spec/lib/vanagon/engine/pooler_spec.rb
+- spec/lib/vanagon/engine/docker_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
+- spec/lib/vanagon/component_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/platform/solaris_11_spec.rb
 - spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/platform/solaris_10_spec.rb
+- spec/lib/vanagon/platform/dsl_spec.rb
 - spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
+- spec/lib/vanagon/platform/windows_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/environment_spec.rb
+- spec/lib/vanagon/platform_spec.rb
+- spec/lib/vanagon/component/source_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/component/source/local_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/dsl_spec.rb
 - spec/lib/git/rev_list_spec.rb