packaging 0.99.16 → 0.99.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba40288bf9de9dbf2c4c11bedf8f93e2087c13e4
-  data.tar.gz: 789a3b029228ac1fb9315b90c88885c5a0062ccb
+  metadata.gz: d2879d7a20f5285bdc8f4a9f07819692dcfa8e89
+  data.tar.gz: f8ecc83a7b786126738ed1e467b5fb2bfb688d38
 SHA512:
-  metadata.gz: cf2d7f7ce4a5fb50fe3d69255f329ada8a4df3a8a6a96f396e9e5fc2a99a144ef4cc00f857a198b529e4ee1f715f697cbab0aee5c93723ec957b8671c742e32f
-  data.tar.gz: 9c6cb8d484ae4bbc673502f23c914207868054c41a0763929a7dce7cb9a0f0bcaa0d06a42d6689ed445ffeb920ebe427522dd40ece7b46069f5f273f2b87c964
+  metadata.gz: f0a75e30fb5cc80265632db2e97d51c309d3482248f5d0e59a6097f1f8f34bb812e4a5b3217a6614b17a7853a127c0251738695ae51d530744d96559539adea2
+  data.tar.gz: ca2bfcaccb9caf985c6e5dec61e8c35dfa80a40dd978229c3e2de39f244aa90257a89f0a6b442eacf0ace689bd5df868aeaf6b944c1db27cfa7359505c456185

data/lib/packaging/paths.rb

@@ -103,12 +103,9 @@ module Pkg::Paths
     return Pkg::Config.repo_name || Pkg::Config.apt_repo_name || 'main'
   end
 
-  def link_name
-    if Pkg::Util::Version.final?
-      Pkg::Config.repo_link_target || nil
-    else
-      Pkg::Config.nonfinal_repo_link_target || nil
-    end
+  def link_name(nonfinal = false)
+    return Pkg::Config.nonfinal_repo_link_target if nonfinal
+    return Pkg::Config.repo_link_target
   end
 
   # TODO: please please please clean this up
@@ -128,34 +125,34 @@ module Pkg::Paths
       if is_legacy_repo?(yum_repo_name(nonfinal))
         [File.join(path_prefix, platform, version, yum_repo_name(nonfinal)), nil]
       else
-        [File.join(path_prefix, yum_repo_name(nonfinal)), link_name.nil? ? nil : File.join(path_prefix, link_name)]
+        [File.join(path_prefix, yum_repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, link_name(nonfinal))]
       end
     when 'swix'
       if is_legacy_repo?(repo_name(nonfinal))
         [File.join(path_prefix, platform, version, repo_name(nonfinal)), nil]
       else
-        [File.join(path_prefix, platform, repo_name(nonfinal)), link_name.nil? ? nil : File.join(path_prefix, platform, link_name)]
+        [File.join(path_prefix, platform, repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, platform, link_name(nonfinal))]
       end
     when 'deb'
       [File.join(path_prefix, Pkg::Platforms.get_attribute(platform_tag, :codename), apt_repo_name(nonfinal)),
-       link_name.nil? ? nil : File.join(path_prefix, Pkg::Platforms.get_attribute(platform_tag, :codename), link_name)]
+       link_name(nonfinal).nil? ? nil : File.join(path_prefix, Pkg::Platforms.get_attribute(platform_tag, :codename), link_name(nonfinal))]
     when 'svr4', 'ips'
       if is_legacy_repo?(repo_name(nonfinal))
         [File.join(path_prefix, 'solaris', repo_name(nonfinal), version), nil]
       else
-        [File.join(path_prefix, 'solaris', repo_name(nonfinal)), link_name.nil? ? nil : File.join(path_prefix, 'solaris', link_name)]
+        [File.join(path_prefix, 'solaris', repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, 'solaris', link_name(nonfinal))]
       end
     when 'dmg'
       if is_legacy_repo?(repo_name(nonfinal))
         [File.join(path_prefix, 'mac', version, repo_name(nonfinal)), nil]
       else
-        [File.join(path_prefix, 'mac', repo_name(nonfinal)), link_name.nil? ? nil : File.join(path_prefix, 'mac', link_name)]
+        [File.join(path_prefix, 'mac', repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, 'mac', link_name(nonfinal))]
       end
     when 'msi'
       if is_legacy_repo?(repo_name(nonfinal))
         [File.join(path_prefix, 'windows'), nil]
       else
-        [File.join(path_prefix, 'windows', repo_name(nonfinal)), link_name.nil? ? nil : File.join(path_prefix, 'windows', link_name)]
+        [File.join(path_prefix, 'windows', repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, 'windows', link_name(nonfinal))]
       end
     else
       raise "Not sure where to find packages with a package format of '#{package_format}'"
@@ -268,4 +265,21 @@ module Pkg::Paths
       raise "Not sure what to do with a package format of '#{package_format}'"
     end
   end
+
+  def release_package_link_path(platform_tag, nonfinal = false)
+    platform, version, arch = Pkg::Platforms.parse_platform_tag(platform_tag)
+    package_format = Pkg::Platforms.package_format_for_tag(platform_tag)
+    case package_format
+    when 'rpm'
+      base_path = nonfinal ? Pkg::Config.nonfinal_yum_repo_path : Pkg::Config.yum_repo_path
+      return File.join(base_path, "#{repo_name(nonfinal)}-release-#{platform}-#{version}.noarch.rpm")
+    when 'deb'
+      base_path = nonfinal ? Pkg::Config.nonfinal_apt_repo_path : Pkg::Config.apt_repo_path
+      codename = Pkg::Platforms.codename_for_platform_version(platform, version)
+      return File.join(base_path, "#{repo_name(nonfinal)}-release-#{codename}.deb")
+    else
+      warn "No release packages for package format '#{package_format}', skipping . . ."
+      return nil
+    end
+  end
 end

data/lib/packaging/util/net.rb

@@ -130,7 +130,7 @@ module Pkg::Util::Net
       raise(ArgumentError, "Cannot sync between two remote hosts") if
         options[:origin_host] && options[:target_host]
 
-      raise(ArgumentError, "Cannot sync path '#{origin}' to itself") unless
+      raise(ArgumentError, "Cannot sync path '#{origin}' because both origin_host and target_host are nil. Perhaps you need to set TEAM=release ?") unless
         options[:origin_host] || options[:target_host]
 
       cmd = %W(

data/spec/lib/packaging/paths_spec.rb

@@ -235,4 +235,37 @@ describe 'Pkg::Paths' do
       expect(Pkg::Paths.is_legacy_repo?('puppet')).to be_false
     end
   end
+
+  describe '#release_package_link_path' do
+    repo_name = 'puppet6'
+    nonfinal_repo_name = 'puppet6-nightly'
+    yum_repo_path = '/opt/repository/yum'
+    apt_repo_path = '/opt/repository/apt'
+    nonfinal_yum_repo_path = '/opt/repository-nightlies/yum'
+    nonfinal_apt_repo_path = '/opt/repository-nightlies/apt'
+    before :each do
+      allow(Pkg::Config).to receive(:repo_name).and_return(repo_name)
+      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return(nonfinal_repo_name)
+      allow(Pkg::Config).to receive(:yum_repo_path).and_return(yum_repo_path)
+      allow(Pkg::Config).to receive(:apt_repo_path).and_return(apt_repo_path)
+      allow(Pkg::Config).to receive(:nonfinal_yum_repo_path).and_return(nonfinal_yum_repo_path)
+      allow(Pkg::Config).to receive(:nonfinal_apt_repo_path).and_return(nonfinal_apt_repo_path)
+    end
+    it 'returns the appropriate link path for rpm release packages' do
+      expect(Pkg::Paths.release_package_link_path('sles-12-ppc64le')).to eq("#{yum_repo_path}/#{repo_name}-release-sles-12.noarch.rpm")
+    end
+    it 'returns the appropriate link path for deb release packages' do
+      expect(Pkg::Paths.release_package_link_path('ubuntu-16.04-amd64')).to eq("#{apt_repo_path}/#{repo_name}-release-xenial.deb")
+    end
+    it 'returns the appropriate link path for nonfinal rpm release packages' do
+      expect(Pkg::Paths.release_package_link_path('el-7-x86_64', true)).to eq("#{nonfinal_yum_repo_path}/#{nonfinal_repo_name}-release-el-7.noarch.rpm")
+    end
+    it 'returns the appropriate link path for nonfinal deb release packages' do
+      expect(Pkg::Paths.release_package_link_path('debian-9-i386', true)).to eq("#{nonfinal_apt_repo_path}/#{nonfinal_repo_name}-release-stretch.deb")
+    end
+    it 'returns nil for package formats that do not have release packages' do
+      expect(Pkg::Paths.release_package_link_path('osx-10.13-x86_64')).to eq(nil)
+      expect(Pkg::Paths.release_package_link_path('windows-2012-x86')).to eq(nil)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.16
+  version: 0.99.17
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec