packaging 0.99.20 → 0.99.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 804655457090e137a8f4566d13c77e4d4e792666939db68d790eb88d7ed63a9a
-  data.tar.gz: 0140bb84f7b2913dd0b20a8c73bf4f0ad62b6f6c133cb75d3cda1fd5dbbb52be
+  metadata.gz: 0f27625bd6bdb946ecb72f13d077107c99f8deed39fb1476f050f9cc0f6a36be
+  data.tar.gz: 98e16357d4462b0d3922bb324e19693266539fe4bd30c9c49822b34f7a1a0416
 SHA512:
-  metadata.gz: fd0c5cb26659c58f2ed3bad60ab46a2d1f4445cc59059994a3b41de175625ba5a97b11bd5e7fd09bb4a30bdf71667ed8570eb00d6fb03754444604f9098055da
-  data.tar.gz: da1e8c55b4efeb18bb9cef07fe0a540eecbfa34921ae56da0c04cb45c2868b8a84dd23b29437f424e7f9a8b2ca5cf557c770b4bbb64e9308ad7d44a914788207
+  metadata.gz: d80e4dec3981814422e2f5209ed2441c219425317514ba73bb2df41eefb5da4304188dd38220708aa1aeebdb3bda5ae9b5f379b4bd1b550109eb82cbee63ac21
+  data.tar.gz: 4ef4ffa39932705e464cfa88a2c0fd3537386f082fa4a74adf1d145ccfecbb0b3be501935dd65af8a7423555cbdc47c7127f752f18c956cae7667136d0a48052

data/lib/packaging/util/net.rb

@@ -293,7 +293,7 @@ module Pkg::Util::Net
     #   @option :excludes [Array] Strings you want to exclude from your search,
     #     e.g. 'agent' if only searching for 'puppet'.
     def remote_create_latest_symlink(package_name, dir, platform_ext, options = {})
-      ls_cmd = "ls -1 *.#{platform_ext} | grep -v latest | grep -v rc | grep #{package_name} "
+      ls_cmd = "ls -1 *.#{platform_ext} | grep -v latest | grep -v rc | grep -P #{package_name}-\d "
 
       # store this in a separate var to avoid side affects
       full_package_name = String.new(package_name)

data/lib/packaging/util/ship.rb

@@ -70,7 +70,7 @@ module Pkg::Util::Ship
     # First find the packages to be shipped. We must find them before moving
     # to our temporary staging directory
     local_packages = collect_packages(pkg_exts, options[:excludes])
-    return if local_packages.empty?
+    return false if local_packages.empty?
 
     tmpdir = Dir.mktmpdir
     staged_pkgs = reorganize_packages(local_packages, tmpdir, options[:platform_independent], options[:nonfinal])
@@ -100,6 +100,7 @@ module Pkg::Util::Ship
           Pkg::Util::Net.remote_set_immutable(staging_server, [remote_pkg]) if options[:chattr]
         end
       end
+      return true
     end
   end
 
@@ -132,13 +133,15 @@ module Pkg::Util::Ship
   end
 
   def ship_dmg(local_staging_directory, remote_path, opts = {})
-    ship_pkgs(["#{local_staging_directory}/**/*.dmg"], Pkg::Config.dmg_staging_server, remote_path, opts)
+    packages_have_shipped = ship_pkgs(["#{local_staging_directory}/**/*.dmg"], Pkg::Config.dmg_staging_server, remote_path, opts)
 
     create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('osx'), Pkg::Config.dmg_staging_server, remote_path, opts[:nonfinal])
 
-    Pkg::Platforms.platform_tags_for_package_format('dmg').each do |platform_tag|
-      # Create the latest symlink for the current supported repo
-      Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(platform_tag, remote_path), 'dmg')
+    if packages_have_shipped
+      Pkg::Platforms.platform_tags_for_package_format('dmg').each do |platform_tag|
+        # Create the latest symlink for the current supported repo
+        Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(platform_tag, remote_path), 'dmg')
+      end
     end
   end
 
@@ -149,12 +152,14 @@ module Pkg::Util::Ship
   end
 
   def ship_msi(local_staging_directory, remote_path, opts = {})
-    ship_pkgs(["#{local_staging_directory}/**/*.msi"], Pkg::Config.msi_staging_server, remote_path, opts)
+    packages_have_shipped = ship_pkgs(["#{local_staging_directory}/**/*.msi"], Pkg::Config.msi_staging_server, remote_path, opts)
 
     create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('windows'), Pkg::Config.msi_staging_server, remote_path, opts[:nonfinal])
-    # Create the symlinks for the latest supported repo
-    Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path), 'msi', arch: 'x64')
-    Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path), 'msi', arch: 'x86')
+    if packages_have_shipped
+      # Create the symlinks for the latest supported repo
+      Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path), 'msi', arch: 'x64')
+      Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path), 'msi', arch: 'x86')
+    end
   end
 
   def ship_gem(local_staging_directory, remote_path, opts = {})

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

@@ -95,7 +95,7 @@ new_pkgs = [
       expect(Pkg::Util::Net).to receive(:remote_set_permissions).with(test_staging_server, '775', anything).exactly(local_pkgs.count).times
       expect(Pkg::Util::Net).to receive(:remote_set_permissions).with(test_staging_server, '0664', anything).exactly(local_pkgs.count).times
       expect(Pkg::Util::Net).to receive(:remote_set_immutable).with(test_staging_server, anything).exactly(local_pkgs.count).times
-      Pkg::Util::Ship.ship_pkgs(['pkg/**/*.rpm'], test_staging_server, test_remote_path)
+      expect(Pkg::Util::Ship.ship_pkgs(['pkg/**/*.rpm'], test_staging_server, test_remote_path)).to eq(true)
     end
 
     it 'ships packages containing the string `pkg` to the right place' do
@@ -111,7 +111,11 @@ new_pkgs = [
       expect(Pkg::Util::Net).to receive(:remote_set_permissions).with(test_staging_server, '775', anything)
       expect(Pkg::Util::Net).to receive(:remote_set_permissions).with(test_staging_server, '0664', anything)
       expect(Pkg::Util::Net).to receive(:remote_set_immutable).with(test_staging_server, anything)
-      Pkg::Util::Ship.ship_pkgs(['pkg/**/*.rpm'], test_staging_server, test_remote_path, excludes: ['puppet-agent'])
+      expect(Pkg::Util::Ship.ship_pkgs(['pkg/**/*.rpm'], test_staging_server, test_remote_path, excludes: ['puppet-agent'])).to eq(true)
+    end
+
+    it 'returns false if there are no packages to ship' do
+      expect(Pkg::Util::Ship.ship_pkgs(['pkg/**/*.msi'], test_staging_server, test_remote_path)).to eq(false)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.20
+  version: 0.99.21
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-17 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -228,27 +228,27 @@ signing_key:
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/deb_spec.rb
 - spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
 - spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/tar_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/file_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/gpg_spec.rb
 - spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/file_spec.rb
-- spec/lib/packaging/util/net_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
 - spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/net_spec.rb
+- spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/util/rake_utils_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/artifactory_spec.rb
+- spec/lib/packaging/util/version_spec.rb
 - spec/lib/packaging_spec.rb