packaging 0.108.1 → 0.108.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54d6abc8bcaa0d29d1580feff3d35577a3c49dc90721708623971cc189007f74
-  data.tar.gz: 0643a3a7bd158d488ae66b2b245ad3a36ce59875a0d067f7e3d5a88f6a1a0f52
+  metadata.gz: f3fd1a48b6b204c719549f2d857edefc600eb504da996e5ec68c0298a11734c0
+  data.tar.gz: 2ccdf98e53f9cea5aaa92346517679e5c468bcc32f6ed6f81c22144906f8b1fe
 SHA512:
-  metadata.gz: 0b095ae28da4b0843c4f15fa3e597ff18fe693d50556c89a246a735846be5608831fce42e4e44d34f794dc2f98b3db512e635bc74604a2df9fee9caa5e0e0079
-  data.tar.gz: a1e5cc54bdfbd24e529e0b7c99a22675f7c4911cb2f59046ea8a0ac0aa147069a13185351fe0654bb5ba936af39e16fc8dd3435ea3f93e8199ab1d8fb5be022a
+  metadata.gz: ef6517a8347b83b2adbe306302a4a6274a8854731b582f3ec0a1d1a7f6066e7655ad7bf953c40db9cdf359346068a4ebe4e0ebd9cb1cfac733533a1a7c27fe5f
+  data.tar.gz: e359e1e2c06be60e2cb668c2dd478cad89321e8bde6718968d697829dd6987d7800dde683c17325eb1c3be21470d8de497711da9f0610995ac7ea1aecde12697

data/lib/packaging/rpm/repo.rb

@@ -8,17 +8,35 @@ module Pkg::Rpm::Repo
       "http://#{Pkg::Config.builds_server}/#{Pkg::Config.project}/#{Pkg::Config.ref}"
     end
 
-    def ship_repo_configs(target = "repo_configs")
-      if Pkg::Util::File.empty_dir?("pkg/#{target}/rpm")
-        warn "No repo configs have been generated! Try pl:rpm_repo_configs."
+    def ship_repo_configs(repo_configs_directory = 'repo_configs')
+      local_repos_path = File.join('pkg', repo_configs_directory, 'rpm')
+
+      remote_repos_path = File.join(
+        Pkg::Config.jenkins_repo_path,
+        Pkg::Config.project,
+        Pkg::Config.ref,
+        repo_configs_directory,
+        'rpm'
+      )
+
+      if !Dir.exist?(local_repos_path) || Dir.empty?(local_repos_path)
+        warn "No repo_configs found in \"#{Dir.pwd}/#{local_repos_path}\". " \
+             'Skipping repo shipping.'
         return
       end
 
-      Pkg::Util::RakeUtils.invoke_task("pl:fetch")
-      repo_dir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}/#{target}/rpm"
-      Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
-      Pkg::Util::Execution.retry_on_fail(:times => 3) do
-        Pkg::Util::Net.rsync_to("pkg/#{target}/rpm/", Pkg::Config.distribution_server, repo_dir)
+      Pkg::Util::RakeUtils.invoke_task('pl:fetch')
+      Pkg::Util::Net.remote_execute(
+        Pkg::Config.distribution_server,
+        "mkdir -p #{remote_repos_path}"
+      )
+
+      Pkg::Util::Execution.retry_on_fail(times: 3) do
+        Pkg::Util::Net.rsync_to(
+          "#{local_repos_path}/",
+          Pkg::Config.distribution_server,
+          remote_repos_path
+        )
       end
     end
 

data/lib/packaging/sign/rpm.rb

@@ -86,11 +86,14 @@ module Pkg::Sign::Rpm
   end
 
   def passphrase_fd_flag
-    if Pkg::Util.boolean_value(ENV['RPM_GPG_AGENT'])
-      ''
-    else
-      '--passphrase-fd 3'
-    end
+    # We use passphrase caching on GPG >= 2.1, so no passphrase-fd is needed.
+    return '' unless gpg_version_older_than_21?
+
+    # If the user has provided us their gpg agent setup, don't muck with it.
+    return '' if Pkg::Util.boolean_value(ENV['RPM_GPG_AGENT'])
+
+    # Assume our old setup where expect is providing input on fd 3
+    return '--passphrase-fd 3'
   end
 
   def define_gpg_check_password_cmd
@@ -101,7 +104,6 @@ module Pkg::Sign::Rpm
     end
   end
 
-
   def signed?(rpm)
     # This should allow the `Pkg::Util::Gpg.key` method to fail if gpg_key is
     # not set, before shelling out. We also only want the short key, all

data/spec/lib/packaging/rpm/repo_spec.rb

@@ -1,20 +1,22 @@
 require 'spec_helper'
 
-describe "Pkg::Rpm::Repo" do
-  let(:wget)          { "/opt/tools/bin/wget" }
-  let(:builds_server) { "saturn.puppetlabs.net" }
-  let(:project)       { "rpm_repos" }
-  let(:ref)           { "1234abcd" }
+describe 'Pkg::Rpm::Repo' do
+  let(:wget)          { '/opt/tools/bin/wget' }
+  let(:builds_server) { 'saturn.puppetlabs.net' }
+  let(:project)       { 'rpm_repos' }
+  let(:ref)           { '1234abcd' }
   let(:base_url)      { "http://#{builds_server}/#{project}/#{ref}" }
-  let(:mocks)         { ["el-5-i386", "el-5-x86_64", "el-5-SRPMS"] }
-  let(:wget_results)  {
-                        mocks.map do |mock|
-                          dist, version, arch = mock.split('-')
-                          "http://#{builds_server}/#{project}/#{ref}/repos/#{dist}/#{version}/products/#{arch}/repodata/"
-                        end.join("\n")
-                      }
-  let(:wget_garbage)  { "\nother things\n and an index\nhttp://somethingelse.com" }
-  let(:repo_configs)  { mocks.map { |mock| "pkg/repo_configs/rpm/pl-#{project}-#{ref}-#{mock}.repo" } }
+  let(:mocks)         { %w[el-5-i386 el-5-x86_64 el-5-SRPMS] }
+  let(:wget_results) do
+    mocks.map do |mock|
+      dist, version, arch = mock.split('-')
+      "http://#{builds_server}/#{project}/#{ref}/repos/#{dist}/#{version}/products/#{arch}/repodata/"
+    end.join("\n")
+  end
+  let(:wget_garbage) { "\nother things\n and an index\nhttp://somethingelse.com" }
+  let(:repo_configs) do
+    mocks.map { |mock| "pkg/repo_configs/rpm/pl-#{project}-#{ref}-#{mock}.repo" }
+  end
 
   # Setup and tear down for the tests
   around do |example|
@@ -34,99 +36,154 @@ describe "Pkg::Rpm::Repo" do
     Pkg::Config.jenkins_repo_path = orig_repo_path
   end
 
-  describe "#generate_repo_configs" do
-    it "fails if wget isn't available" do
-      Pkg::Util::Tool.stub(:find_tool).with("wget", {:required => true}) {false}
-      expect {Pkg::Rpm::Repo.generate_repo_configs}.to raise_error(RuntimeError)
+  describe '#generate_repo_configs' do
+    it 'fails if wget isn\'t available' do
+      allow(Pkg::Util::Tool)
+        .to receive(:find_tool)
+        .with('wget', { required: true })
+        .and_return(false)
+      expect { Pkg::Rpm::Repo.generate_repo_configs }.to raise_error(RuntimeError)
     end
 
-    it "warns if there are no rpm repos available for the build" do
-      Pkg::Util::Tool.should_receive(:find_tool).with("wget", {:required => true}).and_return(wget)
-      Pkg::Util::Execution.should_receive(:capture3).with("#{wget} --spider -r -l 5 --no-parent #{base_url}/repos/ 2>&1").and_return("")
-      Pkg::Rpm::Repo.should_receive(:warn).with("No rpm repos were found to generate configs from!")
+    it 'warns if there are no rpm repos available for the build' do
+      expect(Pkg::Util::Tool)
+        .to receive(:find_tool)
+        .with('wget', { required: true })
+        .and_return(wget)
+      expect(Pkg::Util::Execution)
+        .to receive(:capture3)
+        .with("#{wget} --spider -r -l 5 --no-parent #{base_url}/repos/ 2>&1")
+        .and_return('')
+      expect(Pkg::Rpm::Repo)
+        .to receive(:warn)
+        .with("No rpm repos were found to generate configs from!")
       Pkg::Rpm::Repo.generate_repo_configs
     end
 
-    it "writes the expected repo configs to disk" do
-      Pkg::Util::Tool.should_receive(:find_tool).with("wget", {:required => true}).and_return(wget)
-      Pkg::Util::Execution.should_receive(:capture3).with("#{wget} --spider -r -l 5 --no-parent #{base_url}/repos/ 2>&1").and_return(wget_results + wget_garbage)
+    it 'writes the expected repo configs to disk' do
+      expect(Pkg::Util::Tool)
+        .to receive(:find_tool)
+        .with("wget", { required: true })
+        .and_return(wget)
+      expect(Pkg::Util::Execution)
+        .to receive(:capture3)
+        .with("#{wget} --spider -r -l 5 --no-parent #{base_url}/repos/ 2>&1")
+        .and_return(wget_results + wget_garbage)
       wget_results.split.each do |result|
         cur_result = result.chomp('repodata/')
-        Pkg::Util::Execution.should_receive(:capture3).with("#{wget} --spider -r -l 1 --no-parent #{cur_result} 2>&1").and_return("#{cur_result}/thing.rpm")
+        expect(Pkg::Util::Execution)
+          .to receive(:capture3)
+          .with("#{wget} --spider -r -l 1 --no-parent #{cur_result} 2>&1")
+          .and_return("#{cur_result}/thing.rpm")
       end
-      FileUtils.should_receive(:mkdir_p).with("pkg/repo_configs/rpm")
+      expect(FileUtils).to receive(:mkdir_p).with('pkg/repo_configs/rpm')
       config = []
       repo_configs.each_with_index do |repo_config, i|
-        Pkg::Paths.should_receive(:tag_from_artifact_path).and_return(mocks[i])
-        Pkg::Platforms.should_receive(:parse_platform_tag).and_return(mocks[i].split('-'))
+        expect(Pkg::Paths).to receive(:tag_from_artifact_path).and_return(mocks[i])
+        expect(Pkg::Platforms).to receive(:parse_platform_tag).and_return(mocks[i].split('-'))
         config[i] = double(File)
-        File.should_receive(:open).with(repo_config, 'w').and_yield(config[i])
-        config[i].should_receive(:puts)
+        expect(File).to receive(:open).with(repo_config, 'w').and_yield(config[i])
+        expect(config[i]).to receive(:puts)
       end
       Pkg::Rpm::Repo.generate_repo_configs
     end
   end
 
-  describe "#retrieve_repo_configs" do
-    it "fails if wget isn't available" do
-      Pkg::Util::Tool.stub(:find_tool).with("wget", {:required => true}) {false}
-      expect {Pkg::Rpm::Repo.generate_repo_configs}.to raise_error(RuntimeError)
+  describe '#retrieve_repo_configs' do
+    it 'fails if wget isn\'t available' do
+      allow(Pkg::Util::Tool)
+        .to receive(:find_tool)
+        .with('wget', { required: true })
+        .and_return(false)
+      expect { Pkg::Rpm::Repo.generate_repo_configs }.to raise_error(RuntimeError)
     end
 
-    it "fails if there are no deb repos available for the build" do
-      Pkg::Util::Tool.should_receive(:find_tool).with("wget", {:required => true}).and_return(wget)
-      FileUtils.should_receive(:mkdir_p).with("pkg/repo_configs").and_return(true)
-      Pkg::Util::Execution.should_receive(:capture3).with("#{wget} -r -np -nH --cut-dirs 3 -P pkg/repo_configs --reject 'index*' #{base_url}/repo_configs/rpm/").and_raise(RuntimeError)
-      expect {Pkg::Rpm::Repo.retrieve_repo_configs}.to raise_error(RuntimeError, /Couldn't retrieve rpm yum repo configs/)
+    it 'fails if there are no deb repos available for the build' do
+      expect(Pkg::Util::Tool)
+        .to receive(:find_tool)
+        .with('wget', { required: true })
+        .and_return(wget)
+      expect(FileUtils)
+        .to receive(:mkdir_p)
+        .with('pkg/repo_configs')
+        .and_return(true)
+      expect(Pkg::Util::Execution)
+        .to receive(:capture3)
+        .with("#{wget} -r -np -nH --cut-dirs 3 -P pkg/repo_configs --reject 'index*' #{base_url}/repo_configs/rpm/")
+        .and_raise(RuntimeError)
+      expect { Pkg::Rpm::Repo.retrieve_repo_configs }
+        .to raise_error(RuntimeError, /Couldn't retrieve rpm yum repo configs/)
     end
   end
 
-  describe "#create_local_repos" do
-    let(:command) { "/usr/bin/make some repos" }
-    let(:target_directory) { "/tmp/dir/thing" }
+  describe '#create_local_repos' do
+    let(:command) { '/usr/bin/make some repos' }
+    let(:target_directory) { '/tmp/dir/thing' }
 
-    it "makes a repo in the target directory" do
-      Pkg::Rpm::Repo.should_receive(:repo_creation_command).with(target_directory).and_return("run this thing")
-      Pkg::Util::Execution.should_receive(:capture3).with("bash -c 'run this thing'")
+    it 'makes a repo in the target directory' do
+      expect(Pkg::Rpm::Repo)
+        .to receive(:repo_creation_command)
+        .with(target_directory)
+        .and_return("run this thing")
+      expect(Pkg::Util::Execution)
+        .to receive(:capture3)
+        .with("bash -c 'run this thing'")
       Pkg::Rpm::Repo.create_local_repos(target_directory)
     end
   end
 
-  describe "#create_remote_repos" do
-    let(:command) { "/usr/bin/make some repos" }
-    let(:artifact_directory) { "/tmp/dir/thing" }
+  describe '#create_remote_repos' do
+    let(:command) { '/usr/bin/make some repos' }
+    let(:artifact_directory) { '/tmp/dir/thing' }
     let(:pkg_directories) { ['el-6-i386', 'el/7/x86_64'] }
 
-    it "makes a repo in the target directory" do
-      File.stub(:join) {artifact_directory}
-      Pkg::Repo.should_receive(:directories_that_contain_packages).and_return(pkg_directories)
-      Pkg::Repo.should_receive(:populate_repo_directory)
-      Pkg::Rpm::Repo.should_receive(:repo_creation_command).and_return(command)
-      Pkg::Util::Net.should_receive(:remote_execute).with(Pkg::Config.distribution_server, command)
-      Pkg::Rpm::Repo.should_receive(:generate_repo_configs)
-      Pkg::Rpm::Repo.should_receive(:ship_repo_configs)
-      Pkg::Util::Net.should_receive(:remote_execute).with(Pkg::Config.distribution_server, "rm -f #{artifact_directory}/repos/.lock" )
+    it 'makes a repo in the target directory' do
+      allow(File).to receive(:join).and_return(artifact_directory)
+      expect(Pkg::Repo).to receive(:directories_that_contain_packages).and_return(pkg_directories)
+      expect(Pkg::Repo).to receive(:populate_repo_directory)
+      expect(Pkg::Rpm::Repo).to receive(:repo_creation_command).and_return(command)
+      expect(Pkg::Util::Net)
+        .to receive(:remote_execute)
+        .with(Pkg::Config.distribution_server, command)
+      expect(Pkg::Rpm::Repo).to receive(:generate_repo_configs)
+      expect(Pkg::Rpm::Repo).to receive(:ship_repo_configs)
+      expect(Pkg::Util::Net)
+        .to receive(:remote_execute)
+        .with(Pkg::Config.distribution_server, "rm -f #{artifact_directory}/repos/.lock")
       Pkg::Rpm::Repo.create_remote_repos
     end
   end
 
-  describe "#ship_repo_configs" do
-    it "warn if there are no repo configs to ship" do
-      Pkg::Util::File.should_receive(:empty_dir?).with("pkg/repo_configs/rpm").and_return(true)
-      Pkg::Rpm::Repo.should_receive(:warn).with("No repo configs have been generated! Try pl:rpm_repo_configs.")
+  describe '#ship_repo_configs' do
+    it 'warn if there are no repo configs to ship' do
+      Pkg::Config.jenkins_repo_path = '/a/b/c/d'
+      expect(Dir).to receive(:exist?).with("pkg/repo_configs/rpm").and_return(false)
+      expect(Pkg::Rpm::Repo).to receive(:warn)
+      expect(Pkg::Util::RakeUtils).not_to receive(:invoke_task)
       Pkg::Rpm::Repo.ship_repo_configs
     end
 
-    it "ships repo configs to the build server" do
-      Pkg::Config.jenkins_repo_path = "/a/b/c/d"
-      Pkg::Config.project = "thing2"
-      Pkg::Config.ref = "abcd1234"
-      Pkg::Config.distribution_server = "a.host.that.wont.exist"
-      repo_dir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}/repo_configs/rpm"
-      Pkg::Util::File.should_receive(:empty_dir?).with("pkg/repo_configs/rpm").and_return(false)
-      Pkg::Util::RakeUtils.should_receive(:invoke_task).with("pl:fetch")
-      Pkg::Util::Net.should_receive(:remote_execute).with(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
-      Pkg::Util::Execution.should_receive(:retry_on_fail).with(:times => 3)
+    it 'ships repo configs to the build server' do
+      Pkg::Config.jenkins_repo_path = '/a/b/c/d'
+      Pkg::Config.project = 'thing2'
+      Pkg::Config.ref = 'abcd1234'
+      Pkg::Config.distribution_server = 'a.host.that.wont.exist'
+      repo_dir = File.join(
+        Pkg::Config.jenkins_repo_path,
+        Pkg::Config.project,
+        Pkg::Config.ref,
+        'repo_configs',
+        'rpm'
+      )
+      expect(Dir).to receive(:exist?).with('pkg/repo_configs/rpm').and_return(true)
+      expect(Dir).to receive(:empty?).with('pkg/repo_configs/rpm').and_return(false)
+      expect(Pkg::Util::RakeUtils).to receive(:invoke_task).with('pl:fetch')
+      expect(Pkg::Util::Net)
+        .to receive(:remote_execute)
+        .with(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
+      expect(Pkg::Util::Net)
+        .to receive(:rsync_to)
+        .with('pkg/repo_configs/rpm/', Pkg::Config.distribution_server, repo_dir)
       Pkg::Rpm::Repo.ship_repo_configs
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.108.1
+  version: 0.108.2
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -295,28 +295,28 @@ signing_key:
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
-- spec/lib/packaging_spec.rb
-- spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
 - spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/platforms_spec.rb
 - spec/lib/packaging/gem_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/sign_spec.rb
 - spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/ship_spec.rb
-- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/util/git_spec.rb
 - spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
 - spec/lib/packaging/util/git_tag_spec.rb
+- spec/lib/packaging/util/net_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
 - spec/lib/packaging/util/rake_utils_spec.rb
-- spec/lib/packaging/util/gpg_spec.rb
 - spec/lib/packaging/util/file_spec.rb
-- spec/lib/packaging/util/net_spec.rb
+- spec/lib/packaging/util/version_spec.rb
 - spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging_spec.rb