vanagon 0.26.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9b054ba055927fcdbc69228b433ec3c01e52841c4fd93841394d3ab371bcb0e
-  data.tar.gz: 787e12bc102de7ab7a16b7b0f9a0f9fbff4f60fece396fdcc3a9b752f8c933aa
+  metadata.gz: 3cf4b2903976bd6b4e46ec533501890578962d1b2b8287f001f6251f0423a831
+  data.tar.gz: e1e832fe449490ac75f40f6f1de0e02722a909b048ddf562d3a6f1e23dfa835a
 SHA512:
-  metadata.gz: e0220c7ab2bd7f07945dc0d313976693616ac8ef99103d526da8a89b85c21f8089ed54117a6df5201ca7cb17b40fa6f8c32e8ed359a1da0e75afc831e961860c
-  data.tar.gz: b460870be764e84925886041b21bc017fa3016575c57a005bfd482ec7242abf668f0e03b2fe7e243f42ae5d3612f99b4fb177322eed0845033eb2a99cec0f6e7
+  metadata.gz: 2df9721d59ea2c8fcc081c8163f3b088b368bf52f17996a0a1c445b9813506f478078445c6949c1a91cccce1cdfd684bd0e088f6034c05858fcf63b87e327066
+  data.tar.gz: '0818564b741957d07b721398cf016861971a2dbb0b628abfe33291a07a5fa3d78d95f966117ad0a3e85e5f2028a4c7c09ec40b46bd25ac507a935658ffda8378'

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

@@ -41,8 +41,6 @@ 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}",
@@ -58,26 +56,8 @@ 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,10 +9,6 @@ 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") %>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.26.1
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-10 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
@@ -329,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/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/cli_spec.rb
-- spec/lib/vanagon/driver_spec.rb
-- spec/lib/vanagon/engine/base_spec.rb
-- spec/lib/vanagon/engine/local_spec.rb
-- spec/lib/vanagon/engine/hardware_spec.rb
-- spec/lib/vanagon/engine/ec2_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/utilities_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/windows_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/environment_spec.rb
+- spec/lib/vanagon/driver_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/rewrite_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/source/local_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
 - spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/git/rev_list_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