packaging 0.99.72 → 0.99.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d7bf70560a370066a2f9ab94c35c38093b5884e7baeabc9efe0926de62e262f
-  data.tar.gz: c6bf09ab5b588fa500b3db7408372194e2b7a1ac154ea98e1481085166deb28b
+  metadata.gz: 677398c044776b06ec554da49b2f87826fe5f6dbf322506e4801e05a758a387d
+  data.tar.gz: ff6818a73e27e693cbcc2609fda3eb5447d5d1e52ec44f008155af19dd95eb5a
 SHA512:
-  metadata.gz: 91aa048b12dfe8fd25867d9d5522db55559f2273284cafb3089362f0f14ee09ae536c3d039a04d63ebb95d0c1238a6467f60e27d8a1b41b512234ba609cb58ff
-  data.tar.gz: b26d4ff051f2b7ff0cddfdb1a8f3237377d237a3bc59511cbef6785ccb566eac8917d100108acbe41488d2748e8439860f26038069fd8f818d72c7474e4468e8
+  metadata.gz: f60c129d9f5ad5e5f8d052cfee9062242b540147b71c82eccfa3b2e1ab4694a303aceaa1c5afe482c87d80e6e3ddc0f4985c2e5d4abcb2749890857a36a3384a
+  data.tar.gz: d25c77758997edbea89aa83a64dad382987f832bfc406ad6b5bd7cd49ebd2fae087e9a923fefd456c87868287c7dbc231d5a40685fc2c52d90939f7f353de2b1

data/lib/packaging/paths.rb

@@ -117,7 +117,7 @@ module Pkg::Paths
 
       # In puppet7 and beyond, we moved the repo_name to the top to allow each
       # puppet major release to have its own apt repo.
-      if %w(puppet7 puppet7-nightly).include? repo_name
+      if %w(FUTURE-puppet7 FUTURE-puppet7-nightly).include? repo_name
         return File.join(prefix, apt_repo_name(is_nonfinal), debian_code_name)
       end
 
@@ -313,13 +313,16 @@ module Pkg::Paths
     # In puppet7 and beyond, we moved the puppet major version to near the top to allow each
     # puppet major release to have its own apt repo, for example:
     # /opt/repository/apt/puppet7/pool/bionic/p/puppet-agent
-    if %w(puppet7 puppet7-nightly).include? repo_name
+    if %w(FUTURE-puppet7 FUTURE-puppet7-nightly).include? repo_name
       return File.join(remote_repo_path, repo_name, 'pool', code_name, project[0], project)
     end
 
     # For repos prior to puppet7, the puppet version was part of the repository
     # For example: /opt/repository/apt/pool/bionic/puppet6/p/puppet-agent
-    if %w(puppet puppet5 puppet6 puppet-nightly puppet5-nightly puppet6-nightly).include? repo_name
+    if %w(puppet7 puppet7-nightly
+          puppet6 puppet6-nightly
+          puppet5 puppet5-nightly
+          puppet).include? repo_name
       return File.join(remote_repo_path, 'pool', code_name, repo_name, project[0], project)
     end
 

data/spec/lib/packaging/paths_spec.rb

@@ -64,8 +64,8 @@ describe 'Pkg::Paths' do
     end
 
     it 'should return repo_name for final version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet7')
-      expect(Pkg::Paths.repo_name).to eq('puppet7')
+      allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
+      expect(Pkg::Paths.repo_name).to eq('FUTURE-puppet7')
     end
 
     it 'should be empty string if repo_name is not set for final version' do
@@ -131,16 +131,16 @@ describe 'Pkg::Paths' do
 
     context 'after puppet 7 apt changes' do
       before :each do
-        allow(Pkg::Config).to receive(:repo_name).and_return('puppet7')
+        allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
       end
 
       it 'should be correct for bionic' do
         expect(Pkg::Paths.artifacts_path('ubuntu-18.04-amd64'))
-          .to eq('artifacts/puppet7/bionic')
+          .to eq('artifacts/FUTURE-puppet7/bionic')
       end
       it 'should be correct for focal' do
         expect(Pkg::Paths.artifacts_path('ubuntu-20.04-amd64'))
-          .to eq('artifacts/puppet7/focal')
+          .to eq('artifacts/FUTURE-puppet7/focal')
       end
     end
   end
@@ -201,13 +201,13 @@ describe 'Pkg::Paths' do
     end
 
     it 'should return nonfinal_repo_name for nonfinal version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet7')
-      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return('puppet7-nightly')
-      expect(Pkg::Paths.apt_repo_name(true)).to eq('puppet7-nightly')
+      allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
+      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return('FUTURE-puppet7-nightly')
+      expect(Pkg::Paths.apt_repo_name(true)).to eq('FUTURE-puppet7-nightly')
     end
 
     it 'should fail if nonfinal_repo_name is not set for non-final version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet7')
+      allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
       allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return(nil)
       expect { Pkg::Paths.apt_repo_name(true) }.to raise_error
     end
@@ -222,8 +222,8 @@ describe 'Pkg::Paths' do
 
     it 'should return `Pkg::Config.yum_repo_name` if `Pkg::Config.repo_name` is not set' do
       allow(Pkg::Config).to receive(:repo_name).and_return(nil)
-      allow(Pkg::Config).to receive(:yum_repo_name).and_return('puppet7')
-      expect(Pkg::Paths.yum_repo_name).to eq('puppet7')
+      allow(Pkg::Config).to receive(:yum_repo_name).and_return('FUTURE-puppet7')
+      expect(Pkg::Paths.yum_repo_name).to eq('FUTURE-puppet7')
     end
 
     it 'should return \'products\' if nothing is set' do
@@ -233,13 +233,13 @@ describe 'Pkg::Paths' do
     end
 
     it 'should return nonfinal_repo_name for nonfinal version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet7')
-      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return('puppet7-nightly')
-      expect(Pkg::Paths.yum_repo_name(true)).to eq('puppet7-nightly')
+      allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
+      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return('FUTURE-puppet7-nightly')
+      expect(Pkg::Paths.yum_repo_name(true)).to eq('FUTURE-puppet7-nightly')
     end
 
     it 'should fail if nonfinal_repo_name is not set for non-final version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet7')
+      allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
       allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return(nil)
       expect { Pkg::Paths.yum_repo_name(true) }.to raise_error
     end
@@ -319,15 +319,15 @@ describe 'Pkg::Paths' do
     context 'for puppet 7 and after' do
       it 'returns the approprate apt repo path' do
         allow(Pkg::Paths).to receive(:remote_repo_base).and_return('/opt/repository/apt')
-        expect(Pkg::Paths.apt_package_base_path('ubuntu-18.04-amd64', 'puppet7', 'puppet-agent'))
-          .to eq('/opt/repository/apt/puppet7/pool/bionic/p/puppet-agent')
-        expect(Pkg::Paths.apt_package_base_path('ubuntu-20.04-amd64', 'puppet7', 'puppet-agent'))
-          .to eq('/opt/repository/apt/puppet7/pool/focal/p/puppet-agent')
+        expect(Pkg::Paths.apt_package_base_path('ubuntu-18.04-amd64', 'FUTURE-puppet7', 'puppet-agent'))
+          .to eq('/opt/repository/apt/FUTURE-puppet7/pool/bionic/p/puppet-agent')
+        expect(Pkg::Paths.apt_package_base_path('ubuntu-20.04-amd64', 'FUTURE-puppet7', 'puppet-agent'))
+          .to eq('/opt/repository/apt/FUTURE-puppet7/pool/focal/p/puppet-agent')
       end
       it 'returns the appropriate nonfinal repo path' do
         allow(Pkg::Paths).to receive(:remote_repo_base).and_return('/opt/repository-nightlies/apt')
-        expect(Pkg::Paths.apt_package_base_path('debian-10-amd64', 'puppet7-nightly', 'pdk', true))
-          .to eq('/opt/repository-nightlies/apt/puppet7-nightly/pool/buster/p/pdk')
+        expect(Pkg::Paths.apt_package_base_path('debian-10-amd64', 'FUTURE-puppet7-nightly', 'pdk', true))
+          .to eq('/opt/repository-nightlies/apt/FUTURE-puppet7-nightly/pool/buster/p/pdk')
       end
     end
   end
@@ -371,8 +371,8 @@ describe 'Pkg::Paths' do
     end
 
     context 'for puppet 7' do
-      repo_name = 'puppet7'
-      nonfinal_repo_name = 'puppet7-nightly'
+      repo_name = 'FUTURE-puppet7'
+      nonfinal_repo_name = 'FUTURE-puppet7-nightly'
       yum_repo_path = '/opt/repository/yum'
       apt_repo_path = '/opt/repository/apt'
       nonfinal_yum_repo_path = '/opt/repository-nightlies/yum'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.72
+  version: 0.99.73
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec