packaging 0.99.14 → 0.99.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d531163c04b1c58685d689cbe17fed75a16a949
-  data.tar.gz: 48b0be1ef8d71c9c8f1651efb05ee0bed87eeb47
+  metadata.gz: ca6653015d4e31dbea9cfa4b0136806f5e69c20a
+  data.tar.gz: 14e5a1a07951e3ab6dec659999b2e834849ef12e
 SHA512:
-  metadata.gz: 7c5e87803ae9837081ea3a4132b406b5388d12117647203d1c4c58163d35db0dc7bd785d1cac7dd5b36e360a3196bec956145b3f6ea875d151ed192c94aa0564
-  data.tar.gz: 4af015434724b5f1cbe6924d2140d0dd58511894ec44225c3fdfdc049de85e2ce62470f00bf0c67f381151ecd2cdbb9169256c93c97935a6bcf192bd19696a06
+  metadata.gz: 431aba7afd7ece6a6c07586487ce0aa7a5e40ae5dfc9f4df2e7728378e5c62b582de1849a5752aeb21c22697c26ed74cfb1a14fabaff08a8f6d1661f728db3c1
+  data.tar.gz: 4ef0b19842d16f4c80b01de5fdb06affc2ce66f00b4ba94575acf84d51cc0fed4b0b3f3b0e7a25efff539c8902427d73a63ef9ac623a6ba63dcc337d4d28ff35

data/README.md

@@ -135,7 +135,7 @@ groups, e.g. to use mock on the builder, membership in the mock group. This is
 a major hurdle, and is resolved with the `jenkins` tasks below.
 
 ## legacy `:jenkins:` workflow tasks
-(Deprecated - see "dyamic jenkins task workflow" below)
+(Deprecated - see "dynamic jenkins task workflow" below)
 Jenkins tasks are similar to the `:remote:` tasks, but they do not require ssh
 access to the builders. They do require being on the local network - the
 jenkins instance that performs package builds is an internal server only,
@@ -502,7 +502,7 @@ author: 'Puppet'
 email: 'info@puppet.com'
 homepage: 'https://github.com/puppetlabs/hiera'
 summary: 'Light weight hierarchical data store'
-description: 'A pluggable data store for hierarcical data'
+description: 'A pluggable data store for hierarchical data'
 # file containing hard coded version information, if present
 version_file: '/lib/hiera.rb'
 # A string indicating the version strategy for the project (one of 'odd_even' or 'rc_final'), defaults to rc_final

data/lib/packaging/config/params.rb

@@ -106,6 +106,7 @@ module Pkg::Params
                   :nonfinal_apt_repo_path,
                   :nonfinal_apt_repo_staging_path,
                   :nonfinal_dmg_path,
+                  :nonfinal_gem_path,
                   :nonfinal_ips_path,
                   :nonfinal_msi_path,
                   :nonfinal_p5p_path,
@@ -243,6 +244,7 @@ module Pkg::Params
               { :var => :nonfinal_apt_repo_path,  :envvar => :NONFINAL_APT_REPO_PATH },
               { :var => :nonfinal_apt_repo_staging_path, :envvar => :NONFINAL_APT_REPO_STAGING_PATH },
               { :var => :nonfinal_dmg_path,       :envvar => :NONFINAL_DMG_PATH },
+              { :var => :nonfinal_gem_path,       :envvar => :NONFINAL_GEM_PATH },
               { :var => :nonfinal_ips_path,       :envvar => :NONFINAL_IPS_PATH },
               { :var => :nonfinal_msi_path,       :envvar => :NONFINAL_MSI_PATH },
               { :var => :nonfinal_p5p_path,       :envvar => :NONFINAL_P5P_PATH },
@@ -305,7 +307,7 @@ module Pkg::Params
               { :var => :build_data_repo,         :val => 'https://github.com/puppetlabs/build-data.git' },
               { :var => :build_date,              :val => Pkg::Util::Date.timestamp('-') },
               { :var => :release,                 :val => '1' },
-              { :var => :internal_gem_host,       :val => 'https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/' },
+              { :var => :internal_gem_host,       :val => 'https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems' },
               { :var => :build_tar,               :val => true },
               { :var => :dev_build,               :val => false },
               { :var => :osx_signing_cert,        :val => '$OSX_SIGNING_CERT' },

data/lib/packaging/gem.rb

@@ -18,9 +18,12 @@ module Pkg::Gem
     # Ship a Ruby gem file to rubygems.org. Requires the existence
     # of a ~/.gem/credentials file or else rubygems.org won't have
     # any idea who you are.
-    def ship_to_rubygems(file)
+    def ship_to_rubygems(file, options = {})
       Pkg::Util::File.file_exists?("#{ENV['HOME']}/.gem/credentials", :required => true)
-      Pkg::Util::Execution.capture3("gem push #{file}")
+      gem_push_command = "gem push #{file}"
+      gem_push_command << " --host #{options[:host]}" if options[:host]
+      gem_push_command << " --key #{options[:key]}" if options[:key]
+      Pkg::Util::Execution.capture3(gem_push_command)
     rescue => e
       puts "###########################################"
       puts "#  Publishing to rubygems failed. Make sure your .gem/credentials"
@@ -30,5 +33,10 @@ module Pkg::Gem
       puts e
       raise e
     end
+
+    def ship_to_internal_mirror(file)
+      internal_mirror_api_key_name = 'artifactory_api_key'
+      ship_to_rubygems(file, { :host => Pkg::Config.internal_gem_host, :key => internal_mirror_api_key_name })
+    end
   end
 end

data/lib/packaging/platforms.rb

@@ -294,6 +294,14 @@ module Pkg
           source_package_formats: DEBIAN_SOURCE_FORMATS,
           repo: true,
         },
+        '18.10' => {
+          codename: 'cosmic',
+          architectures: ['amd64', 'ppc64el'],
+          source_architecture: 'source',
+          package_format: 'deb',
+          source_package_formats: DEBIAN_SOURCE_FORMATS,
+          repo: true,
+        },
       },
 
       'windows' => {

data/lib/packaging/sign/dmg.rb

@@ -22,7 +22,12 @@ module Pkg::Sign::Dmg
       /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
-          /usr/bin/productsign --keychain "#{Pkg::Config.osx_signing_keychain}" --sign "#{Pkg::Config.osx_signing_cert}" #{mount}/$pkg #{signed}/$pkg ;
+          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 ;

data/lib/packaging/sign/msi.rb

@@ -63,23 +63,27 @@ module Pkg::Sign::Msi
     # Once we no longer support Windows 8/Windows Vista, we can remove the
     # first Sha1 signature.
     Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, %Q(for msi in #{msis.map { |d| File.basename(d) }.join(" ")}; do
-      "/cygdrive/c/tools/osslsigncode-fork/osslsigncode.exe" sign \
-        -n "Puppet" -i "http://www.puppet.com" \
-        -h sha1 \
-        -pkcs12 "#{Pkg::Config.msi_signing_cert}" \
-        -pass "#{Pkg::Config.msi_signing_cert_pw}" \
-        -t "http://timestamp.verisign.com/scripts/timstamp.dll" \
-        -in "C:/#{work_dir}/$msi" \
-        -out "C:/#{work_dir}/signed-$msi"
-      "/cygdrive/c/tools/osslsigncode-fork/osslsigncode.exe" sign \
-        -n "Puppet" -i "http://www.puppet.com" \
-        -nest -h sha256 \
-        -pkcs12 "#{Pkg::Config.msi_signing_cert}" \
-        -pass "#{Pkg::Config.msi_signing_cert_pw}" \
-        -ts "http://sha256timestamp.ws.symantec.com/sha256/timestamp" \
-        -in "C:/#{work_dir}/signed-$msi" \
-        -out "C:/#{work_dir}/$msi"
-      rm "C:/#{work_dir}/signed-$msi"
+      if "/cygdrive/c/tools/osslsigncode-fork/osslsigncode.exe" verify -in "C:/#{work_dir}/$msi" ; then
+        echo "$msi is already signed, skipping . . ." ;
+      else
+        "/cygdrive/c/tools/osslsigncode-fork/osslsigncode.exe" sign \
+          -n "Puppet" -i "http://www.puppet.com" \
+          -h sha1 \
+          -pkcs12 "#{Pkg::Config.msi_signing_cert}" \
+          -pass "#{Pkg::Config.msi_signing_cert_pw}" \
+          -t "http://timestamp.verisign.com/scripts/timstamp.dll" \
+          -in "C:/#{work_dir}/$msi" \
+          -out "C:/#{work_dir}/signed-$msi"
+        "/cygdrive/c/tools/osslsigncode-fork/osslsigncode.exe" sign \
+          -n "Puppet" -i "http://www.puppet.com" \
+          -nest -h sha256 \
+          -pkcs12 "#{Pkg::Config.msi_signing_cert}" \
+          -pass "#{Pkg::Config.msi_signing_cert_pw}" \
+          -ts "http://sha256timestamp.ws.symantec.com/sha256/timestamp" \
+          -in "C:/#{work_dir}/signed-$msi" \
+          -out "C:/#{work_dir}/$msi"
+        rm "C:/#{work_dir}/signed-$msi" ;
+      fi
     done))
     msis.each do | msi |
       Pkg::Util::Net.rsync_from("/cygdrive/c/#{work_dir}/#{File.basename(msi)}", rsync_host_string, File.dirname(msi))

data/spec/lib/packaging/config_spec.rb

@@ -80,6 +80,7 @@ describe "Pkg::Config" do
                   :nonfinal_apt_repo_path,
                   :nonfinal_apt_repo_staging_path,
                   :nonfinal_dmg_path,
+                  :nonfinal_gem_path,
                   :nonfinal_ips_path,
                   :nonfinal_msi_path,
                   :nonfinal_p5p_path,

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 = ['bionic', 'buster', 'cumulus', 'wheezy', 'jessie', 'stretch', 'trusty', 'xenial']
+      codenames = ['bionic', 'buster', 'cosmic', 'cumulus', 'wheezy', 'jessie', 'stretch', 'trusty', 'xenial']
       expect(Pkg::Platforms.codenames).to match_array(codenames)
     end
   end

data/tasks/ship.rake

@@ -283,7 +283,6 @@ namespace :pl do
           puts "Do you want to start shipping the rubygem '#{gem_file}'?"
           next unless Pkg::Util.ask_yes_or_no
           Rake::Task['pl:ship_gem_to_rubygems'].execute(file: gem_file)
-          Rake::Task['pl:ship_gem_to_internal_mirror'].execute(file: gem_file)
         end
 
         Rake::Task['pl:ship_gem_to_downloads'].invoke
@@ -293,6 +292,22 @@ namespace :pl do
     end
   end
 
+  desc 'Ship built gem to internal Gem mirror and public nightlies file server'
+  task ship_nightly_gem: 'pl:fetch' do
+    # We want to ship a Gem only for projects that build gems, so
+    # all of the Gem shipping tasks are wrapped in an `if`.
+    if Pkg::Config.build_gem
+      fail 'Value `Pkg::Config.gem_host` not defined, skipping nightly ship' unless Pkg::Config.gem_host
+      fail 'Value `Pkg::Config.nonfinal_gem_path` not defined, skipping nightly ship' unless Pkg::Config.nonfinal_gem_path
+      FileList['pkg/*.gem'].each do |gem_file|
+        Pkg::Gem.ship_to_internal_mirror(gem_file)
+      end
+      Pkg::Util::Execution.retry_on_fail(times: 3) do
+        Pkg::Util::Ship.ship_gem('pkg', Pkg::Config.nonfinal_gem_path, platform_independent: true)
+      end
+    end
+  end
+
   desc 'Ship built gem to rubygems.org'
   task :ship_gem_to_rubygems, [:file] => 'pl:fetch' do |_t, args|
     puts "Do you want to ship #{args[:file]} to rubygems.org?"
@@ -304,13 +319,6 @@ namespace :pl do
     end
   end
 
-  desc "Ship built gems to internal Gem server (#{Pkg::Config.internal_gem_host})"
-  task :ship_gem_to_internal_mirror, [:file] => 'pl:fetch' do |_t, args|
-    unless Pkg::Config.internal_gem_host
-      warn 'Value `Pkg::Config.internal_gem_host` not defined; skipping internal ship'
-    end
-  end
-
   desc "Ship built gems to public Downloads server (#{Pkg::Config.gem_host})"
   task :ship_gem_to_downloads => 'pl:fetch' do
     unless Pkg::Config.gem_host

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.14
+  version: 0.99.15
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2018-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec