packaging 0.99.77 → 0.99.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 365629e0e3cba195de934ccd1cee9ecff5c7ed684ac79e4befc883420037b191
-  data.tar.gz: 2498029caf73135b3ee7c5a2704e310ae6398c4eb7716c3687db487fc827dc0d
+  metadata.gz: 0340bf3301e12ac79afefe26c69ef76c9b826e03804d114fa00be1e94c558214
+  data.tar.gz: d79eb4d7206d75e38011f783890e8288f4ee12dfefba2c990e511ccbe508e847
 SHA512:
-  metadata.gz: 4a73420699b6ce732c52c527468c5b9cef405c0565aab9b33c3e592109ddee4aa965f162b4d3950a7900584994dba2994cc07602d75e36b0a53bf8dbbfcd23ec
-  data.tar.gz: f871e9711752e70ac48956663402fa3f0cdf2693ae08eff8aa0ac59384a0081e1dd27fdbac01a3a17964de4a135a9ded98d381808cace9d9dd62c6ac37d20a8d
+  metadata.gz: 25a54450f869fc920f1308d6446b255ebc9571397df63323d242f0270072a72f68d8febb44feb07c7e12d780656b0d18349f7f389a54bbdf54f970990b2451fb
+  data.tar.gz: 63ba12e182757008a631ee76551aa43570b97c5ba96787d83dbe1d5b3b5b5808a3a2fb9c2e26e1252febbad15855c4463c1fe531ffbc0dc7604ec9a79a2e52d5

data/lib/packaging/platforms.rb

@@ -46,6 +46,14 @@ module Pkg
           source_package_formats: DEBIAN_SOURCE_FORMATS,
           repo: true,
         },
+        '11' => {
+          codename: 'bullseye',
+          architectures: ['amd64'],
+          source_architecture: 'source',
+          package_format: 'deb',
+          source_package_formats: DEBIAN_SOURCE_FORMATS,
+          repo: true,
+        },
       },
 
       'el' => {

data/lib/packaging/sign/dmg.rb

@@ -1,41 +1,71 @@
 module Pkg::Sign::Dmg
   module_function
 
-  def sign(target_dir = 'pkg')
-    use_identity = "-i #{Pkg::Config.osx_signing_ssh_key}" unless Pkg::Config.osx_signing_ssh_key.nil?
-
-    if Pkg::Config.osx_signing_server =~ /@/
-      host_string = "#{Pkg::Config.osx_signing_server}"
-    else
-      host_string = "#{ENV['USER']}@#{Pkg::Config.osx_signing_server}"
+  def sign(pkg_directory = 'pkg')
+    use_identity = ''
+    unless Pkg::Config.osx_signing_ssh_key.nil?
+      use_identity = "-i #{Pkg::Config.osx_signing_ssh_key}"
     end
+
+    host_string = "#{ENV['USER']}@#{Pkg::Config.osx_signing_server}"
+    host_string = "#{Pkg::Config.osx_signing_server}" if Pkg::Config.osx_signing_server =~ /@/
+
     ssh_host_string = "#{use_identity} #{host_string}"
     rsync_host_string = "-e 'ssh #{use_identity}' #{host_string}"
 
-    work_dir  = "/tmp/#{Pkg::Util.rand_string}"
-    mount     = File.join(work_dir, "mount")
-    signed    = File.join(work_dir, "signed")
-    Pkg::Util::Net.remote_execute(ssh_host_string, "mkdir -p #{mount} #{signed}")
-    dmgs = Dir.glob("#{target_dir}/apple/**/*.dmg")
-    Pkg::Util::Net.rsync_to(dmgs.join(" "), rsync_host_string, work_dir)
-    Pkg::Util::Net.remote_execute(ssh_host_string, %Q[for dmg in #{dmgs.map { |d| File.basename(d, ".dmg") }.join(" ")}; do
-      /usr/bin/hdiutil attach #{work_dir}/$dmg.dmg -mountpoint #{mount} -nobrowse -quiet ;
-      /usr/bin/security -q unlock-keychain -p "#{Pkg::Config.osx_signing_keychain_pw}" "#{Pkg::Config.osx_signing_keychain}" ;
-        for pkg in $(ls #{mount}/*.pkg | xargs -n 1 basename); do
-          if /usr/sbin/pkgutil --check-signature #{mount}/$pkg ; then
-            echo "$pkg is already signed, skipping . . ." ;
-            cp #{mount}/$pkg #{signed}/$pkg ;
-          else
-            /usr/bin/productsign --keychain "#{Pkg::Config.osx_signing_keychain}" --sign "#{Pkg::Config.osx_signing_cert}" #{mount}/$pkg #{signed}/$pkg ;
-          fi
-        done
-      /usr/bin/hdiutil detach #{mount} -quiet ;
-      /bin/rm #{work_dir}/$dmg.dmg ;
-      /usr/bin/hdiutil create -volname $dmg -srcfolder #{signed}/ #{work_dir}/$dmg.dmg ;
-      /bin/rm #{signed}/* ; done])
-    dmgs.each do | dmg |
-      Pkg::Util::Net.rsync_from("#{work_dir}/#{File.basename(dmg)}", rsync_host_string, File.dirname(dmg))
+    remote_working_directory = "/tmp/#{Pkg::Util.rand_string}"
+    dmg_mount_point = File.join(remote_working_directory, "mount")
+    signed_items_directory    = File.join(remote_working_directory, "signed")
+
+    dmgs = Dir.glob("#{pkg_directory}/{apple,mac,osx}/**/*.dmg")
+    if dmgs.empty?
+      $stderr.puts "Error: no dmgs found in #{pkg_directory}/{apple,mac,osx}."
+      exit 1
+    end
+
+    dmg_basenames = dmgs.map { |d| File.basename(d, '.dmg') }.join(' ')
+
+    sign_package_command = %W[
+      for dmg in #{dmg_basenames}; do
+        /usr/bin/hdiutil attach #{remote_working_directory}/$dmg.dmg
+          -mountpoint #{dmg_mount_point} -nobrowse -quiet ;
+
+        /usr/bin/security -q unlock-keychain
+          -p "#{Pkg::Config.osx_signing_keychain_pw}" "#{Pkg::Config.osx_signing_keychain}" ;
+
+        for pkg in #{dmg_mount_point}/*.pkg; do
+          pkg_basename=$(basename $pkg) ;
+          if /usr/sbin/pkgutil --check-signature $pkg ; then
+            echo "Warning: $pkg is already signed, skipping" ;
+            cp $pkg #{signed_items_directory}/$pkg_basename ;
+            continue ;
+          fi ;
+
+          /usr/bin/productsign --keychain "#{Pkg::Config.osx_signing_keychain}"
+            --sign "#{Pkg::Config.osx_signing_cert}"
+            $pkg #{signed_items_directory}/$pkg_basename ;
+        done ;
+
+        /usr/bin/hdiutil detach #{dmg_mount_point} -quiet ;
+        /bin/rm #{remote_working_directory}/$dmg.dmg ;
+        /usr/bin/hdiutil create -volname $dmg
+          -srcfolder #{signed_items_directory}/ #{remote_working_directory}/$dmg.dmg ;
+        /bin/rm #{signed_items_directory}/* ;
+      done
+    ].join(' ')
+
+    Pkg::Util::Net.remote_execute(ssh_host_string,
+                                  "mkdir -p #{dmg_mount_point} #{signed_items_directory}")
+
+    Pkg::Util::Net.rsync_to(dmgs.join(' '), rsync_host_string, remote_working_directory)
+
+    Pkg::Util::Net.remote_execute(ssh_host_string, sign_package_command)
+
+    dmgs.each do |dmg|
+      Pkg::Util::Net.rsync_from(
+        "#{remote_working_directory}/#{File.basename(dmg)}", rsync_host_string, File.dirname(dmg))
     end
-    Pkg::Util::Net.remote_execute(ssh_host_string, "if [ -d '#{work_dir}' ]; then rm -rf '#{work_dir}'; fi")
+
+    Pkg::Util::Net.remote_execute(ssh_host_string, "rm -rf '#{remote_working_directory}'")
   end
 end

data/spec/lib/packaging/platforms_spec.rb

@@ -36,7 +36,7 @@ describe 'Pkg::Platforms' do
 
   describe '#codenames' do
     it 'should return all codenames for a given platform' do
-      codenames = ['focal', 'bionic', 'buster', 'cosmic', 'jessie', 'stretch', 'trusty', 'xenial']
+      codenames = ['focal', 'bionic', 'bullseye', 'buster', 'cosmic', 'jessie', 'stretch', 'trusty', 'xenial']
       expect(Pkg::Platforms.codenames).to match_array(codenames)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.77
+  version: 0.99.78
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -260,28 +260,28 @@ signing_key:
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
-- spec/lib/packaging_spec.rb
 - spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
 - spec/lib/packaging/retrieve_spec.rb
 - spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
+- spec/lib/packaging/tar_spec.rb
 - spec/lib/packaging/util/jenkins_spec.rb
 - spec/lib/packaging/util/gpg_spec.rb
-- spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/util/os_spec.rb
 - spec/lib/packaging/util/rake_utils_spec.rb
-- spec/lib/packaging/util/net_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
 - spec/lib/packaging/util/file_spec.rb
 - spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/os_spec.rb
 - spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/net_spec.rb
 - spec/lib/packaging/util/ship_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
+- spec/lib/packaging/util/git_tag_spec.rb
 - spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging_spec.rb