packaging 0.99.34 → 0.99.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 200b6ff64fb3ed9617fc5919244b28f1622cf87cd003e44f7d649f2714081e68
-  data.tar.gz: 6b46f9018fa27af7523d9285aa642e1d45a0965e4f55a3995b473082db95a046
+  metadata.gz: 96cc35674bee0a3c3ca29176ad645ea76dfa493d34ebc555f2a167f60362f5ca
+  data.tar.gz: 2c2868423e895361f84c81fa643f55e35acc08095c0396019758cd835bacbf57
 SHA512:
-  metadata.gz: 9b5df43f966a200425454dba7f64b01f2682f380c8f44afb2f450b221b48f744dd6cb980bc9d80c1fe2bf8d408f765f759de3f26094263e3433a732b516a8d9b
-  data.tar.gz: 972f46a09a7b5d586a2d63a174af9d329b4ecb28b325ebfe8790da4a0b99afbef970590f796ebd3d37de20a55732e49ea61ecc2e2f7d093614193ce6dc4c6276
+  metadata.gz: d7d96ecf671d935aa409bcb6be995bf60c14331727a30e4ab94ab3032a573383a5172ab2fbe55160a7c66fad58588cfca2885242004606988a7456b1e501c703
+  data.tar.gz: 84522235b00d2d1e1ea66a26f0da5c14315e95407b5b97d1ea5a8f275960868452a059332c6953b51cf4aa6051a70a6f4b25dc53e9d7f16a183e2f8dd06d332d

data/lib/packaging/sign/msi.rb

@@ -62,48 +62,54 @@ 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
-      if "/cygdrive/c/tools/osslsigncode-fork/osslsigncode.exe" verify -in "C:/#{work_dir}/$msi" ; then
-        echo "$msi is already signed, skipping . . ." ;
-      else
-          tries=5
-          sha1Servers=(http://timestamp.verisign.com/scripts/timstamp.dll
-            http://timestamp.globalsign.com/scripts/timstamp.dll
-            http://www.startssl.com/timestamp)
-              for timeserver in "${sha1Servers[@]}"; do
-                for ((try=1; try<=$tries; try++)) do
-                  ret=$(/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 "$timeserver" \
-                            -in "C:/#{work_dir}/$msi" \
-                            -out "C:/#{work_dir}/signed-$msi")
-                    if [[ $ret == *"Succeeded"* ]]; then break; fi
-                  done;
-              if [[ $ret == *"Succeeded"* ]]; then break; fi
-            done;
-            echo $ret
-            sha256Servers=(http://sha256timestamp.ws.symantec.com/sha256/timestamp
-              http://timestamp.comodoca.com?td=sha256)
-                for timeserver in "${sha256Servers[@]}"; do
-                  for ((try=1; try<=$tries; try++)) do
-                    ret=$(/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 "$timeserver" \
-                      -in "C:/#{work_dir}/signed-$msi" \
-                      -out "C:/#{work_dir}/$msi")
-                      if [[ $ret == *"Succeeded"* ]]; then break; fi
-                    done;
-                if [[ $ret == *"Succeeded"* ]]; then break; fi
-              done;
-              echo $ret
-      fi
-    done))
+    sign_command = <<-CMD
+for msi in #{msis.map { |d| File.basename(d) }.join(" ")}; do
+  if "/cygdrive/c/tools/osslsigncode-fork/osslsigncode.exe" verify -in "C:/#{work_dir}/$msi" ; then
+    echo "$msi is already signed, skipping . . ." ;
+  else
+    tries=5
+    sha1Servers=(http://timestamp.verisign.com/scripts/timstamp.dll
+    http://timestamp.globalsign.com/scripts/timstamp.dll
+    http://www.startssl.com/timestamp)
+    for timeserver in "${sha1Servers[@]}"; do
+      for ((try=1; try<=$tries; try++)) do
+        ret=$(/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 "$timeserver" \
+          -in "C:/#{work_dir}/$msi" \
+          -out "C:/#{work_dir}/signed-$msi")
+        if [[ $ret == *"Succeeded"* ]]; then break; fi
+      done;
+      if [[ $ret == *"Succeeded"* ]]; then break; fi
+    done;
+    echo $ret
+    if [[ $ret != *"Succeeded"* ]]; then exit 1; fi
+    sha256Servers=(http://sha256timestamp.ws.symantec.com/sha256/timestamp
+      http://timestamp.comodoca.com?td=sha256)
+    for timeserver in "${sha256Servers[@]}"; do
+      for ((try=1; try<=$tries; try++)) do
+        ret=$(/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 "$timeserver" \
+          -in "C:/#{work_dir}/signed-$msi" \
+          -out "C:/#{work_dir}/$msi")
+        if [[ $ret == *"Succeeded"* ]]; then break; fi
+      done;
+      if [[ $ret == *"Succeeded"* ]]; then break; fi
+    done;
+    echo $ret
+    if [[ $ret != *"Succeeded"* ]]; then exit 1; fi
+  fi
+done
+CMD
+
+    Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, sign_command, false, '', false)
     msis.each do | msi |
       Pkg::Util::Net.rsync_from("/cygdrive/c/#{work_dir}/#{File.basename(msi)}", rsync_host_string, File.dirname(msi))
     end

data/spec/fixtures/config/ext/build_defaults.yaml

@@ -1 +1 @@
-spec/fixtures/config/ext/../params.yaml
+../params.yaml

data/spec/fixtures/config/ext/project_data.yaml

@@ -1 +1 @@
-spec/fixtures/config/ext/../params.yaml
+../params.yaml

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.34
+  version: 0.99.35
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -225,34 +225,33 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
 - spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
 - spec/lib/packaging/sign_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
 - spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
 - spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/os_spec.rb
-- spec/lib/packaging/util/version_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/rake_utils_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
 - spec/lib/packaging/util/gpg_spec.rb
+- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/os_spec.rb
 - spec/lib/packaging/util/git_tag_spec.rb
+- spec/lib/packaging/util/version_spec.rb
 - spec/lib/packaging/util/file_spec.rb
-- spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/util/ship_spec.rb
-- spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/gem_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
 - spec/lib/packaging_spec.rb