vanagon 0.37.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b569137b6d209bf5bd4caa5d17063aa6779fb72b92dc33eb77acc35c47779de
-  data.tar.gz: 6b305a0234d8e5b68ee1a0c9ef46c1396f6ee43af941a60e3bf192fc1ab4c7f4
+  metadata.gz: eb2d7d400aa4b316d10e77574eef5bbd53f778347adf33873ea9f6a7610dafda
+  data.tar.gz: 426c75017aafe20dccfc9c49f158a3b43709a1196ee113ac91b6e4263f4e0876
 SHA512:
-  metadata.gz: 948f95345c029e5ff95212741a3d58e0c8b0bafe807996dcfb655ebf18374c7ed7b608edc88aac00b74ede53f20bb92d5a7c07214a1242c5c1d32e515144c79b
-  data.tar.gz: c555fad2d59dbe124168443ca5ec327bb9558d61c29cf96c07865bdd598fcc6f03c05cd69c0ab4dff3a040cc2883c69c9dca3ccc518e37d716cefafe94735d7b
+  metadata.gz: 33e272d98f5e9bd3a0f442663cf8194b65ee8ef5c8cde64cb5e6952ba3768b62c36975037ca1026adfd459796a78c1bbd981872df03fe603b1cd00b3fcf132b3
+  data.tar.gz: cf1073299d0ed161c6e6ae9c7b6c89155fa6df288dc27df2aa0727e0ba2ab77442f2f7028e11de58349672f8b5f97edf852f7cf29f3f43629748e1f2d2ca064c

data/lib/vanagon/platform/defaults/osx-13-arm64.rb

@@ -0,0 +1,24 @@
+platform 'osx-13-arm64' do |plat|
+    plat.brew '/opt/homebrew/bin/brew'
+    plat.servicetype 'launchd'
+    plat.servicedir '/Library/LaunchDaemons'
+    plat.codename 'ventura'
+
+    plat.provision_with 'export HOMEBREW_NO_EMOJI=true'
+    plat.provision_with 'export HOMEBREW_VERBOSE=true'
+    plat.provision_with "export HOMEBREW_NO_ANALYTICS=1"
+
+    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 'createhomedir -c -u test'
+    plat.provision_with 'su test -c \'echo | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"\''
+    plat.vmpooler_template 'macos-13-arm64'
+  end

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

@@ -0,0 +1,23 @@
+platform "osx-13-x86_64" do |plat|
+  plat.servicetype "launchd"
+  plat.servicedir "/Library/LaunchDaemons"
+  plat.codename "ventura"
+
+  plat.provision_with "export HOMEBREW_NO_EMOJI=true"
+  plat.provision_with "export HOMEBREW_VERBOSE=true"
+  plat.provision_with "export HOMEBREW_NO_ANALYTICS=1"
+
+  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 "createhomedir -c -u test"
+  plat.provision_with %Q(su test -c 'echo | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"')
+  plat.vmpooler_template "macos-13-x86_64"
+end

data/lib/vanagon/platform/dsl.rb

@@ -159,6 +159,13 @@ class Vanagon
         @platform.copy = copy_cmd
       end
 
+      # Set the path to Homebrew for the platform
+      #
+      # @param brew_cmd [String] Absolute path to Homebrew for the platform
+      def brew(brew_cmd)
+        @platform.brew = brew_cmd
+      end
+
       # Set the cross_compiled flag for the platform
       #
       # @param xcc [Boolean] True if this is a cross-compiled platform

data/lib/vanagon/platform/osx.rb

@@ -10,7 +10,7 @@ class Vanagon
         <<-HERE.undent
           mkdir -p /etc/homebrew
           cd /etc/homebrew
-          su test -c '/usr/local/bin/brew install #{list_build_dependencies.join(' ')}'
+          su test -c '#{@brew} install #{list_build_dependencies.join(' ')}'
         HERE
       end
 
@@ -135,6 +135,7 @@ class Vanagon
         @patch = "/usr/bin/patch"
         @num_cores = "/usr/sbin/sysctl -n hw.physicalcpu"
         @mktemp = "mktemp -d -t 'tmp'"
+        @brew = '/usr/local/bin/brew'
         super(name)
       end
     end

data/lib/vanagon/platform/windows.rb

@@ -317,7 +317,7 @@ class Vanagon
 
         if definition.scheme =~ /^(http|ftp|file)/
           if File.extname(definition.path) == '.ps1'
-            commands << %(powershell.exe -NoProfile -ExecutionPolicy Bypass -Command 'iex ((new-object net.webclient).DownloadString("#{definition}"))')
+            commands << %(powershell.exe -NoProfile -ExecutionPolicy Bypass -Command '[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12;iex ((new-object net.webclient).DownloadString("#{definition}"))')
           else
             commands << %(C:/ProgramData/chocolatey/bin/choco.exe source add -n #{definition.host}-#{definition.path.tr('/', '-')} -s "#{definition}" --debug || echo "Oops, it seems that you don't have chocolatey installed on this system. Please ensure it's there by adding something like 'plat.add_repository 'https://chocolatey.org/install.ps1'' to your platform definition.")
           end

data/lib/vanagon/platform.rb

@@ -54,6 +54,7 @@ class Vanagon
     attr_accessor :sort
     attr_accessor :tar
     attr_accessor :shasum
+    attr_accessor :brew # This is macOS specific
 
     # Hold a string containing the values that a given platform
     # should use when a Makefile is run - resolves to the CFLAGS

data/lib/vanagon/utilities.rb

@@ -290,7 +290,7 @@ class Vanagon
     # @return [String] the evaluated template
     def erb_string(erbfile, b = binding)
       template = File.read(erbfile)
-      message  = ERB.new(template, nil, "-")
+      message  = ERB.new(template, trim_mode: "-")
       message.result(b)
         .gsub(/[\n]+{3,}/, "\n\n")
         .squeeze("\s")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-16 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -173,6 +173,8 @@ files:
 - lib/vanagon/platform/defaults/osx-11-x86_64.rb
 - lib/vanagon/platform/defaults/osx-12-arm64.rb
 - lib/vanagon/platform/defaults/osx-12-x86_64.rb
+- lib/vanagon/platform/defaults/osx-13-arm64.rb
+- lib/vanagon/platform/defaults/osx-13-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