vanagon 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae6556da0f96b7521a38d26be19def6e520dbfbcfcb29518dd64a4ffee5e370c
-  data.tar.gz: 171786b0b94db1a5caf4ad280d47b816e34a4c72f5e8049b6e970ad088c2202f
+  metadata.gz: 4f8772f1446c288009a4909d14a0443687fa83ed0013062b5110bf87dd07bdf4
+  data.tar.gz: 63412e68e08b5a2d4eb4f39bc04ac2840373127ab2869a9aa7a9842298abe2b8
 SHA512:
-  metadata.gz: 2b31b5db82382402b119c009a896e6a43edcb90cf9dcb322f606f2d805f8af1d5abdbbc0b0c59eb79a97949d7100821142c379807ab0e8affcdb20673e5c694a
-  data.tar.gz: fc3d985c8ad2fa6b5aabb3d9e1d715eb9b615aeef71f7054379afae466c74b261f073d3d22245933ded9996c1cc04d7ce2f084aa62191c148f12ec5c0335a6de
+  metadata.gz: 8777b1881b31ea9c3f34a97730a5cd5f4fd136de88364ccc8efabdbf55507b11b0302859d56dec8ef9b3a9bf0dad115cf271a81e895bade588b1394bf941246f
+  data.tar.gz: bf3bc5fdeb639925bcfe284aa5e088bff53fe2ec581a60ba01cb971690256b31ff627d78aa5153f39bef4324ca93a8457d514479e1cf6adbc1a719ff89106a85

data/lib/vanagon/engine/base.rb

@@ -9,8 +9,9 @@ class Vanagon
       def initialize(platform, target = nil, **opts)
         @platform = platform
         @required_attributes = ["ssh_port"]
-        @target = target if target
-        @target_user = @platform.target_user
+        parse_target_defaults(target) if target
+        @target_port ||= @platform.ssh_port
+        @target_user ||= @platform.target_user
         @remote_workdir_path = opts[:remote_workdir]
       end
 
@@ -19,6 +20,17 @@ class Vanagon
         'base'
       end
 
+      def parse_target_defaults(target)
+        # If there's no scheme, we need to add // to make it parse properly
+        target_uri = target.include?('//') ? URI.parse(target) : URI.parse("//#{target}")
+        @target = target_uri.hostname
+        @target_port = target_uri.port
+        @target_user = target_uri.user
+      rescue URI::Error
+        # Just assume it's not meant to be a URI
+        @target = target
+      end
+
       # Get the engine specific name of the host to build on
       def build_host_name
         raise Vanagon::Error, '#build_host_name has not been implemented for your engine.'
@@ -32,7 +44,7 @@ class Vanagon
 
       # Dispatches the command for execution
       def dispatch(command, return_output = false)
-        Vanagon::Utilities.remote_ssh_command("#{@target_user}@#{@target}", command, @platform.ssh_port, return_command_output: return_output)
+        Vanagon::Utilities.remote_ssh_command("#{@target_user}@#{@target}", command, @target_port, return_command_output: return_output)
       end
 
       # Steps needed to tear down or clean up the system after the build is
@@ -70,7 +82,7 @@ class Vanagon
       end
 
       def ship_workdir(workdir)
-        Vanagon::Utilities.rsync_to("#{workdir}/*", "#{@target_user}@#{@target}", @remote_workdir, @platform.ssh_port)
+        Vanagon::Utilities.rsync_to("#{workdir}/*", "#{@target_user}@#{@target}", @remote_workdir, @target_port)
       end
 
       def retrieve_built_artifact(artifacts_to_fetch, no_packaging)
@@ -80,7 +92,7 @@ class Vanagon
           artifacts_to_fetch << "#{@remote_workdir}/output/*"
         end
         artifacts_to_fetch.each do |path|
-          Vanagon::Utilities.rsync_from(path, "#{@target_user}@#{@target}", output_path, @platform.ssh_port)
+          Vanagon::Utilities.rsync_from(path, "#{@target_user}@#{@target}", output_path, @target_port)
         end
       end
 

data/lib/vanagon/engine/docker.rb

@@ -36,11 +36,11 @@ class Vanagon
       # a docker container.
       # @raise [Vanagon::Error] if a target cannot be obtained
       def select_target
-        ssh_args = @platform.use_docker_exec ? '' : "-p #{@platform.ssh_port}:22"
+        ssh_args = @platform.use_docker_exec ? '' : "-p #{@target_port}:22"
         extra_args = @platform.docker_run_args.nil? ? [] : @platform.docker_run_args
 
         Vanagon::Utilities.ex("#{@docker_cmd} run -d --name #{build_host_name}-builder #{ssh_args} #{extra_args.join(' ')} #{@platform.docker_image}")
-        @target = 'localhost'
+        @target = URI.new('localhost')
 
         wait_for_ssh unless @platform.use_docker_exec
       rescue StandardError => e
@@ -141,7 +141,7 @@ class Vanagon
       def wait_for_ssh
         Vanagon::Utilities.retry_with_timeout(5, 5) do
           begin
-            Vanagon::Utilities.remote_ssh_command("#{@target_user}@#{@target}", 'exit', @platform.ssh_port)
+            Vanagon::Utilities.remote_ssh_command("#{@target_user}@#{@target}", 'exit', @target_port)
           rescue StandardError => e
             sleep(1) # Give SSHD some time to start.
             raise e

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

@@ -5,6 +5,8 @@ platform "osx-10.15-x86_64" do |plat|
 
   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"
@@ -15,7 +17,7 @@ platform "osx-10.15-x86_64" do |plat|
   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.provision_with "sudo chown -R test:admin /Users/test/"
   plat.vmpooler_template "osx-1015-x86_64"
 end

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

@@ -0,0 +1,24 @@
+platform "osx-11-arm64" do |plat|
+  plat.servicetype "launchd"
+  plat.servicedir "/Library/LaunchDaemons"
+  plat.codename "bigsur"
+
+  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-112-x86_64"
+  plat.cross_compiled true
+end

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

@@ -2,8 +2,11 @@ platform "osx-11-x86_64" do |plat|
   plat.servicetype "launchd"
   plat.servicedir "/Library/LaunchDaemons"
   plat.codename "bigsur"
+
   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"
@@ -14,7 +17,7 @@ platform "osx-11-x86_64" do |plat|
   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.provision_with "sudo chown -R test:admin /Users/test/"
   plat.vmpooler_template "macos-112-x86_64"
 end

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

@@ -0,0 +1,24 @@
+platform 'osx-12-arm64' 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 "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-12-x86_64'
+    plat.cross_compiled true
+  end

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

@@ -2,8 +2,11 @@ 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 "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"
@@ -14,7 +17,7 @@ platform "osx-12-x86_64" do |plat|
   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.provision_with "sudo chown -R test:admin /Users/test/"
   plat.vmpooler_template "macos-12-x86_64"
 end

data/resources/Makefile.erb

@@ -15,15 +15,19 @@ all: file-list-before-build <%= package_name %>
 file-list-before-build:
 <%- if dirnames.empty? -%>
 	touch file-list-before-build
+<%- elsif @platform.is_windows? -%>
+	(<%= @platform.find %> -H "<%= dirnames.map do |f| "$(shell cygpath -ml '#{f}')" end.join('" "') %>" 2>/dev/null || <%= @platform.find %> "<%= dirnames.map do |f| "$(shell cygpath -ml '#{f}')" end.join('" "') %>" 2>/dev/null) | <%= @platform.sort %> | uniq > file-list-before-build
 <%- else -%>
-	(<%= @platform.find %> -H "<%= dirnames.join('" "') %>" 2>/dev/null || <%= @platform.find %> "<%= dirnames.join('" "') %>" 2>/dev/null) | <%= "xargs -I[] cygpath --mixed --long-name --absolute [] |" if @platform.is_windows? %> <%= @platform.sort %> | uniq > file-list-before-build
+	(<%= @platform.find %> -H "<%= dirnames.join('" "') %>" 2>/dev/null || <%= @platform.find %> "<%= dirnames.join('" "') %>" 2>/dev/null) | <%= @platform.sort %> | uniq > file-list-before-build
 <%- end -%>
 
 file-list-after-build: <%= @components.map {|comp| comp.name }.join(" ") %>
 <%- if dirnames.empty? -%>
 	touch file-list-after-build
+<%- elsif @platform.is_windows? -%>
+	(<%= @platform.find %> -H "<%= dirnames.map do |f| "$(shell cygpath -ml '#{f}')" end.join('" "') %>" 2>/dev/null || <%= @platform.find %> "<%= dirnames.map do |f| "$(shell cygpath -ml '#{f}')" end.join('" "') %>" 2>/dev/null) | <%= @platform.sort %> | uniq > file-list-after-build
 <%- else -%>
-	(<%= @platform.find %> -H "<%= dirnames.join('" "') %>" 2>/dev/null || <%= @platform.find %> "<%= dirnames.join('" "') %>" 2>/dev/null) | <%= "xargs -I[] cygpath --mixed --long-name --absolute [] |" if @platform.is_windows? %> <%= @platform.sort %> | uniq > file-list-after-build
+	(<%= @platform.find %> -H "<%= dirnames.join('" "') %>" 2>/dev/null || <%= @platform.find %> "<%= dirnames.join('" "') %>" 2>/dev/null) | <%= @platform.sort %> | uniq > file-list-after-build
 <%- end -%>
 
 <%= @name %>-<%= @version %>.tar.gz: file-list <%= @cleanup ? 'cleanup-components' : '' %>

data/spec/lib/vanagon/engine/pooler_spec.rb

@@ -2,7 +2,7 @@ require 'vanagon/engine/pooler'
 require 'vanagon/platform'
 
 describe 'Vanagon::Engine::Pooler' do
-  let (:platform) { double(Vanagon::Platform, :target_user => 'root') }
+  let (:platform) { double(Vanagon::Platform, :target_user => 'root', :ssh_port => 22) }
   let (:platform_with_vcloud_name) {
     plat = Vanagon::Platform::DSL.new('debian-6-i386')
     plat.instance_eval("platform 'debian-6-i386' do |plat|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-16 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -168,7 +168,9 @@ files:
 - lib/vanagon/platform/defaults/el-9-x86_64.rb
 - lib/vanagon/platform/defaults/fedora-36-x86_64.rb
 - lib/vanagon/platform/defaults/osx-10.15-x86_64.rb
+- lib/vanagon/platform/defaults/osx-11-arm64.rb
 - 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/redhatfips-7-x86_64.rb
 - lib/vanagon/platform/defaults/redhatfips-8-x86_64.rb
@@ -328,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/vanagon/project_spec.rb
+- spec/lib/vanagon/utilities_spec.rb
 - spec/lib/vanagon/common/pathname_spec.rb
 - spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/project_spec.rb
 - spec/lib/vanagon/platform_spec.rb
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/cli_spec.rb
-- spec/lib/vanagon/driver_spec.rb
-- spec/lib/vanagon/environment_spec.rb
-- spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/vanagon/engine/hardware_spec.rb
-- spec/lib/vanagon/engine/always_be_scheduling_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/engine/ec2_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
-- spec/lib/vanagon/engine/base_spec.rb
+- spec/lib/vanagon/engine/hardware_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
 - spec/lib/vanagon/engine/local_spec.rb
-- spec/lib/vanagon/extensions/ostruct/json_spec.rb
-- spec/lib/vanagon/extensions/set/json_spec.rb
-- spec/lib/vanagon/extensions/string_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
+- spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
-- spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/vanagon/component/source/rewrite_spec.rb
 - spec/lib/vanagon/component/source/git_spec.rb
-- spec/lib/vanagon/component/source/local_spec.rb
 - spec/lib/vanagon/component/source/http_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/component/source/local_spec.rb
+- spec/lib/vanagon/component/source/rewrite_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/component/dsl_spec.rb
 - spec/lib/vanagon/platform/rpm_spec.rb
 - spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
+- spec/lib/vanagon/platform/windows_spec.rb
 - spec/lib/vanagon/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/platform/deb_spec.rb
 - spec/lib/vanagon/platform/solaris_10_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
 - spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/environment_spec.rb
+- spec/lib/vanagon/driver_spec.rb
 - spec/lib/vanagon/utilities/extra_files_signer_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/vanagon/cli_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
 - spec/lib/git/rev_list_spec.rb
 - spec/lib/makefile_spec.rb