vanagon 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85733d41e3c9a2981c37db8b12e17ccbf3beb30b217fd7c575f2d02f7cfc8167
-  data.tar.gz: 2547ea591a28c8e78b6745dc4bb2782d797fd6a418685325b51145e8198b10d6
+  metadata.gz: d2dda4b6ee0f2e7df4443eee96ac2d6a31a3b70045348a1659a377e3c6fe4d42
+  data.tar.gz: 3cbc04e6447435f41a9dedf83f8d0bc3eb0f606663032384c1e34f526e35dc00
 SHA512:
-  metadata.gz: 2d0dfd0cf748f471e75d2ddaefa8680d4ccfa77d65d578227de3a0c3bfe65a8b993a0c681522f97e3667fc920e4af9f4fa3a6e6e2414085f7a05faa7769caaaa
-  data.tar.gz: d55dc6da693eee3d063a01badceb19520c823229f2af1143f11fae0a7f4dd8deeca432de233d01676482d0110330df1d65397214c1d366e7ebe9601a8d526702
+  metadata.gz: 6395d2ab2f96b64637be1be8fc5ac0548da7cf9b17d3d4365e337fb725cab14c7df026df5e8b5bb632490cfb9ac233bc94e481463a00c2f516e8fc10a252a701
+  data.tar.gz: efb78d1686945d3ca0ca99409c1b4753c628ff077860dcaab5429e065545f48041f62c02472de05dc44295a8fb099d6f3eda47a4097d93d2ba13fa2849846070

data/lib/vanagon/utilities/extra_files_signer.rb

@@ -16,6 +16,8 @@ class Vanagon
           remote_host = "#{project.signing_username}@#{project.signing_hostname}"
           remote_destination_directory = "#{remote_host}:#{tempdir}"
           remote_signing_script_path = File.join(tempdir, File.basename('sign_extra_file'))
+          extra_flags = ''
+          extra_flags = '--extended-attributes' if project.platform.is_macos?
 
           project.extra_files_to_sign.each do |file|
             remote_file_to_sign_path = File.join(tempdir, File.basename(file))
@@ -25,9 +27,9 @@ class Vanagon
 
             commands += [
               "#{Vanagon::Utilities.ssh_command} #{remote_host} \"echo '#{project.signing_command} #{remote_file_to_sign_path}' > #{remote_signing_script_path}\"",
-              "scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no #{local_source_path} #{remote_destination_directory}",
+              "rsync -e '#{Vanagon::Utilities.ssh_command}' --verbose --recursive --hard-links --links --no-perms --no-owner --no-group #{extra_flags} #{local_source_path} #{remote_destination_directory}",
               "#{Vanagon::Utilities.ssh_command} #{remote_host} /bin/bash #{remote_signing_script_path}",
-              "scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no #{remote_source_path} #{local_destination_path}"
+              "rsync -e '#{Vanagon::Utilities.ssh_command}' --verbose --recursive --hard-links --links --no-perms --no-owner --no-group #{extra_flags} #{remote_source_path} #{local_destination_path}"
             ]
           end
 

data/spec/lib/vanagon/utilities/extra_files_signer_spec.rb

@@ -84,13 +84,13 @@ describe Vanagon::Utilities::ExtraFilesSigner do
             expect(commands).to match(
               [
                 %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc "echo 'codesign /tmp/xyz/a.rb' > /tmp/xyz/sign_extra_file"),
-                %q(scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $(tempdir)/dir/source_dir/test1/a.rb test@abc:/tmp/xyz),
+                %q(rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links --no-perms --no-owner --no-group --extended-attributes $(tempdir)/dir/source_dir/test1/a.rb test@abc:/tmp/xyz),
                 %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc /bin/bash /tmp/xyz/sign_extra_file),
-                %q(scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc:/tmp/xyz/a.rb $(tempdir)/dir/source_dir/test1/a.rb),
+                %q(rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links --no-perms --no-owner --no-group --extended-attributes test@abc:/tmp/xyz/a.rb $(tempdir)/dir/source_dir/test1/a.rb),
                 %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc "echo 'codesign /tmp/xyz/b.rb' > /tmp/xyz/sign_extra_file"),
-                %q(scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $(tempdir)/dir/source_dir/test2/b.rb test@abc:/tmp/xyz),
+                %q(rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links --no-perms --no-owner --no-group --extended-attributes $(tempdir)/dir/source_dir/test2/b.rb test@abc:/tmp/xyz),
                 %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc /bin/bash /tmp/xyz/sign_extra_file),
-                %q(scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc:/tmp/xyz/b.rb $(tempdir)/dir/source_dir/test2/b.rb)
+                %q(rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links --no-perms --no-owner --no-group --extended-attributes test@abc:/tmp/xyz/b.rb $(tempdir)/dir/source_dir/test2/b.rb)
               ]
             )
           end
@@ -110,13 +110,13 @@ describe Vanagon::Utilities::ExtraFilesSigner do
             expect(commands).to match(
               [
                 %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc "echo 'codesign /tmp/xyz/a.rb' > /tmp/xyz/sign_extra_file"),
-                %q(scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $(tempdir)/dir/source_dir/test1/a.rb test@abc:/tmp/xyz),
+                %q(rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links --no-perms --no-owner --no-group $(tempdir)/dir/source_dir/test1/a.rb test@abc:/tmp/xyz),
                 %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc /bin/bash /tmp/xyz/sign_extra_file),
-                %q(scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc:/tmp/xyz/a.rb $(tempdir)/dir/source_dir/test1/a.rb),
+                %q(rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links --no-perms --no-owner --no-group test@abc:/tmp/xyz/a.rb $(tempdir)/dir/source_dir/test1/a.rb),
                 %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc "echo 'codesign /tmp/xyz/b.rb' > /tmp/xyz/sign_extra_file"),
-                %q(scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $(tempdir)/dir/source_dir/test2/b.rb test@abc:/tmp/xyz),
+                %q(rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links --no-perms --no-owner --no-group $(tempdir)/dir/source_dir/test2/b.rb test@abc:/tmp/xyz),
                 %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc /bin/bash /tmp/xyz/sign_extra_file),
-                %q(scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc:/tmp/xyz/b.rb $(tempdir)/dir/source_dir/test2/b.rb)
+                %q(rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links --no-perms --no-owner --no-group test@abc:/tmp/xyz/b.rb $(tempdir)/dir/source_dir/test2/b.rb)
               ]
             )
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -333,42 +333,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/vanagon/environment_spec.rb
-- spec/lib/vanagon/project/dsl_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/shell_utilities_spec.rb
-- spec/lib/vanagon/utilities/extra_files_signer_spec.rb
-- spec/lib/vanagon/component/dsl_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/source/git_spec.rb
-- spec/lib/vanagon/component/source_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/extensions/string_spec.rb
 - spec/lib/vanagon/common/pathname_spec.rb
 - spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/driver_spec.rb
 - spec/lib/vanagon/platform_spec.rb
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/project_spec.rb
-- spec/lib/vanagon/engine/ec2_spec.rb
-- spec/lib/vanagon/engine/docker_spec.rb
+- spec/lib/vanagon/cli_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
+- spec/lib/vanagon/engine/docker_spec.rb
 - spec/lib/vanagon/engine/local_spec.rb
 - spec/lib/vanagon/engine/always_be_scheduling_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
+- spec/lib/vanagon/engine/ec2_spec.rb
 - spec/lib/vanagon/engine/hardware_spec.rb
-- spec/lib/vanagon/cli_spec.rb
+- spec/lib/vanagon/project_spec.rb
 - spec/lib/vanagon/utilities_spec.rb
+- spec/lib/vanagon/driver_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/component/source_spec.rb
+- spec/lib/vanagon/component/source/rewrite_spec.rb
+- spec/lib/vanagon/component/source/local_spec.rb
+- spec/lib/vanagon/component/source/http_spec.rb
+- spec/lib/vanagon/component/source/git_spec.rb
+- spec/lib/vanagon/component/dsl_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
+- spec/lib/vanagon/utilities/extra_files_signer_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
+- spec/lib/vanagon/platform/solaris_10_spec.rb
+- spec/lib/vanagon/platform/osx_spec.rb
+- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/platform/deb_spec.rb
+- spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/environment_spec.rb
+- spec/lib/vanagon/component_spec.rb
+- spec/lib/git/rev_list_spec.rb
 - spec/lib/makefile_spec.rb