packaging 0.122.2 → 0.122.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e48d6f7a03835d7aeb3ccf1b61d205d1ec9e883fdce5acda3a72f220048162f1
-  data.tar.gz: 893408cf9b6c255c399495ce527fb154cfc2f01a3816d5e5da16dcc38394210c
+  metadata.gz: 4b511825262b71e1da19c228431f2b67346497ad2313d90d36ba700bb2e0b362
+  data.tar.gz: c315cb8afda9da529a8ef60df8433bbd0fc5d71a96d7572354432d235b3fa7bc
 SHA512:
-  metadata.gz: 109885a133265aa119ea8d59e60a2210585e2c2bedb4a34427603e5e10856fa14d7f9201f042e6c810848c3c49be6a43c4774c8bcfee38e08b7732618dc99663
-  data.tar.gz: 8482abff1b4813dccf831fdc2c2bcdc16643857f0286a2122030c7f63173fa77310395aa42933bdce8fa29ce3a4703e686c7ec612236947987951253977b7fb6
+  metadata.gz: 65a6f3befb3a28b20ce75b23217eaa598dcb610a82953f3e4c3917d7587a0f7aea85196db40a9694adc3acae62e7df8d3027c1bbba11d0cd29c66d66f259f779
+  data.tar.gz: 3deff11d62a38dc6fac322a234f5922285befbc88fbc4eb908f3d3de6800acf7b366506ea38de40e4dcc028a709ac973f056337b7787f5c737291ca52c3d569b

data/lib/packaging/util/net.rb

@@ -184,7 +184,7 @@ module Pkg::Util::Net
         target_host: nil,
         extra_flags: nil,
         dryrun: ENV['DRYRUN']
-}.merge(opts.merge(opts.delete_if { |_, value| value.nil? })) # rubocop:disable Style/CollectionCompact
+}.merge(opts.merge(opts.delete_if { |_, value| value.nil? }))
 
       stdout, = Pkg::Util::Execution.capture3(rsync_cmd(source, options), true)
       stdout
@@ -216,15 +216,18 @@ module Pkg::Util::Net
       )
     end
 
-    def s3sync_to(source, target_bucket, target_directory = "", flags = [])
+    def s3sync_to(source, target_bucket, target_directory = '', flags = [])
       s3cmd = Pkg::Util::Tool.check_tool('s3cmd')
+      s3cfg_path = File.join(ENV['HOME'], '.s3cfg')
 
-      if Pkg::Util::File.file_exists?(File.join(ENV['HOME'], '.s3cfg'))
-        stdout, = Pkg::Util::Execution.capture3("#{s3cmd} sync #{flags.join(' ')} '#{source}' s3://#{target_bucket}/#{target_directory}/")
-        stdout
-      else
-        fail "#{File.join(ENV['HOME'], '.s3cfg')} does not exist. It is required to ship files using s3cmd."
+      unless File.exist?(s3cfg_path)
+        fail "#{s3cfg_path} does not exist. It is required to ship files using s3cmd."
       end
+
+      sync_command = "#{s3cmd} sync #{flags.join(' ')} '#{source}' " \
+                     "s3://#{target_bucket}/#{target_directory}/"
+
+      Pkg::Util::Execution.capture3(sync_command, true)
     end
 
     # This is fairly absurd. We're implementing curl by shelling out. What do I

data/spec/lib/packaging/util/net_spec.rb

@@ -182,8 +182,8 @@ describe 'Pkg::Util::Net' do
 
     it 'should fail if ~/.s3cfg is not present' do
       expect(Pkg::Util::Tool).to receive(:check_tool).with("s3cmd").and_return(s3cmd)
-      expect(Pkg::Util::File)
-        .to receive(:file_exists?)
+      expect(File)
+        .to receive(:exist?)
         .with(File.join(ENV['HOME'], '.s3cfg'))
         .and_return(false)
       expect { Pkg::Util::Net.s3sync_to('foo', 'bar', 'boo') }
@@ -192,25 +192,27 @@ describe 'Pkg::Util::Net' do
 
     it "should s3 sync 'thing' to 's3://foo@bar/home/foo/' with no flags" do
       expect(Pkg::Util::Tool).to receive(:check_tool).with("s3cmd").and_return(s3cmd)
-      expect(Pkg::Util::File)
-        .to receive(:file_exists?)
+      expect(File)
+        .to receive(:exist?)
         .with(File.join(ENV['HOME'], '.s3cfg'))
         .and_return(true)
       expect(Pkg::Util::Execution)
         .to receive(:capture3)
-        .with("#{s3cmd} sync  'thing' s3://foo@bar/home/foo/")
+        .with("#{s3cmd} sync  'thing' s3://foo@bar/home/foo/", anything)
       Pkg::Util::Net.s3sync_to("thing", "foo@bar", "home/foo")
     end
 
     it "should s3sync 'thing' to 's3://foo@bar/home/foo/' with --delete-removed and --acl-public" do
       expect(Pkg::Util::Tool).to receive(:check_tool).with("s3cmd").and_return(s3cmd)
-      expect(Pkg::Util::File)
-        .to receive(:file_exists?)
+      expect(File)
+        .to receive(:exist?)
         .with(File.join(ENV['HOME'], '.s3cfg'))
         .and_return(true)
       expect(Pkg::Util::Execution)
         .to receive(:capture3)
-        .with("#{s3cmd} sync --delete-removed --acl-public 'thing' s3://foo@bar/home/foo/")
+        .with(
+          "#{s3cmd} sync --delete-removed --acl-public 'thing' s3://foo@bar/home/foo/", anything
+        )
       Pkg::Util::Net.s3sync_to("thing", "foo@bar", "home/foo", ["--delete-removed", "--acl-public"])
     end
   end

data/tasks/nightly_repos.rake

@@ -181,15 +181,28 @@ namespace :pl do
     end
 
     task :deploy_signed_repos_to_s3, [:target_bucket] => "pl:fetch" do |t, args|
-      target_bucket = args.target_bucket or fail ":target_bucket is a required argument to #{t}"
+      fail ":target_bucket is a required argument to #{t}" unless args.target_bucket
+      target_bucket = args.target_bucket
 
-      # Ship it to the target for consumption
-      # First we ship the latest and clean up any repo-configs that are no longer valid with --delete-removed and --acl-public
-      Pkg::Util::Net.s3sync_to("pkg/#{Pkg::Config.project}-latest/", target_bucket, "#{Pkg::Config.project}-latest", ["--acl-public", "--delete-removed", "--follow-symlinks"])
-      # Then we ship the sha version with just --acl-public
-      Pkg::Util::Net.s3sync_to("pkg/#{Pkg::Config.project}/", target_bucket, Pkg::Config.project, ["--acl-public", "--follow-symlinks"])
+      # Ship it to the target for consumption.
 
-      puts "'#{Pkg::Config.ref}' of '#{Pkg::Config.project}' has been shipped via s3 to '#{target_bucket}'"
+      # First we ship the latest and clean up any repo-configs that
+      # are no longer valid with --delete-removed and --acl-public
+      source = "pkg/#{Pkg::Config.project}-latest/"
+      target_directory = "#{Pkg::Config.project}-latest"
+      puts("S3 sync from '#{Dir.pwd}/#{source}' to 's3://#{target_bucket}/#{target_directory}'")
+      Pkg::Util::Net.s3sync_to(source, target_bucket, target_directory,
+                               ['--acl-public', '--delete-removed', '--follow-symlinks'])
+
+      # Then we ship the sha version with just --acl-public
+      source = "pkg/#{Pkg::Config.project}/"
+      target_directory = Pkg::Config.project
+      puts("S3 sync from '#{Dir.pwd}/#{source}' to 's3://#{target_bucket}/#{target_directory}'")
+      Pkg::Util::Net.s3sync_to(source, target_bucket, target_directory,
+                               ['--acl-public', '--follow-symlinks'])
+
+      puts "'#{Pkg::Config.ref}' of '#{Pkg::Config.project}' has been uploaded to" \
+           "'s3://#{target_bucket}'"
     end
 
     task :generate_signed_repo_configs, [:target_prefix] => "pl:fetch" do |t, args|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.122.2
+  version: 0.122.3
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-07 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug
@@ -327,28 +327,28 @@ signing_key:
 specification_version: 4
 summary: Puppet by Perforce packaging automation
 test_files:
-- spec/lib/packaging_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/sign_spec.rb
+- spec/lib/packaging/config_spec.rb
 - spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/util/net_spec.rb
 - spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
 - spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/git_tag_spec.rb
 - spec/lib/packaging/util/gpg_spec.rb
-- spec/lib/packaging/util/net_spec.rb
+- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/os_spec.rb
 - spec/lib/packaging/util/version_spec.rb
 - spec/lib/packaging/util/file_spec.rb
 - spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/util/rake_utils_spec.rb
-- spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/util/git_tag_spec.rb
 - spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/platforms_spec.rb
 - spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/deb_spec.rb
 - spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging_spec.rb