vanagon 0.37.1 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8800b5b2c66ce4ad1539a97f635cbb02d2b70bb7a5ab87a27bc4d01f0bc40d3f
-  data.tar.gz: 2e2ee62e6afbd6046b799f0d4738fbcaebb5308f5057f56b826c02b964e22454
+  metadata.gz: 4ac97aec522601e6c06e6b246356b9fd2eef1a94d1548b501424224d4d51522c
+  data.tar.gz: 557d3080596d55cc84819bd59b5d30d566c66d3620cc3687ea8bb889c8f50118
 SHA512:
-  metadata.gz: 710f4323b5df300ab73417c7946eadba090a2f5ba7c3b9ac422508ee9bc38ba14d7935b175b65aacd71593eecf94474c7723ee239966db706237760dde378d29
-  data.tar.gz: 0017cd5415da427864b9288533a07248671a81b28ed0eece98f3583571227b621ccf0355677707b731c14bf6fadcbce96077a3b0d31d57544e789249afeaf894
+  metadata.gz: 007b36851f55746bd042d54f1b4aa6ab2557b18f81f0d759730554080153b7cdbda44d8a16476f36f63556f906631eaca1bfa8de066c9c7b0bf4cc8da543e4e4
+  data.tar.gz: fe4fa81aeb5246f3892cee17cea50b9545fce5f8dda33f491f7b92ad6f58c624e09540d3476353b2eeef58518fd730e310288140bdf03181b8d7c3137e8d6f3b

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

@@ -18,7 +18,7 @@ class Vanagon
     class DSL
       # Constructor for the DSL object
       #
-      # @param name [String] name of the platform
+      # @param platform_name [String] name of the platform
       # @return [Vanagon::Platform::DSL] A DSL object to describe the {Vanagon::Platform}
       def initialize(platform_name)
         @name = platform_name
@@ -26,9 +26,15 @@ class Vanagon
 
       # Primary way of interacting with the DSL. Also a simple factory to get the right platform object.
       #
-      # @param name [String] name of the platform
+      # @param platform_name [String] name of the platform
+      # @param override_name [Boolean] whether the specified `platform_name` should override the basename
       # @param block [Proc] DSL definition of the platform to call
-      def platform(platform_name, &block)
+      def platform(platform_name, override_name: false, &block)
+        # By default, the Vanagon::Platform's name/version/arch will be based on
+        # the filename of the platform definition. But if override_name is true,
+        # then use the `platform_name` passed into this method instead.
+        @name = platform_name if override_name
+
         @platform = case platform_name
                     when /^aix-/
                       Vanagon::Platform::RPM::AIX.new(@name)
@@ -159,6 +165,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.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.37.1
+  version: 0.39.0
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2023-08-08 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