packaging 0.104.0 → 0.106.1

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

@@ -4,32 +4,32 @@ require 'spec_helper'
 describe "Pkg::Util::Git_tag" do
   context "parse_ref!" do
     it "fails for a ref that doesn't exist'" do
-      expect { Pkg::Util::Git_tag.new("git://github.com/puppetlabs/leatherman.git", "garbagegarbage") }.to raise_error(RuntimeError, /ERROR : Not a ref or sha!/)
+      expect { Pkg::Util::Git_tag.new("https://github.com/puppetlabs/leatherman.git", "garbagegarbage") }.to raise_error(RuntimeError, /ERROR : Not a ref or sha!/)
     end
   end
 
   context "sha?" do
     it "sets ref type as a sha when passed a sha" do
-      git_tag = Pkg::Util::Git_tag.new("git://github.com/puppetlabs/leatherman.git", "4eef05389ebf418b62af17406c7f9f13fa51f975")
+      git_tag = Pkg::Util::Git_tag.new("https://github.com/puppetlabs/leatherman.git", "4eef05389ebf418b62af17406c7f9f13fa51f975")
       expect(git_tag.sha?).to eq(true)
     end
   end
 
   context "branch?" do
     it "sets ref type as a branch when passed a branch" do
-      git_tag = Pkg::Util::Git_tag.new("git://github.com/puppetlabs/leatherman.git", "main")
+      git_tag = Pkg::Util::Git_tag.new("https://github.com/puppetlabs/leatherman.git", "main")
       expect(git_tag.branch?).to eq(true)
     end
   end
 
   context "tag?" do
     it "sets ref type as a tag when passed a tag" do
-      git_tag = Pkg::Util::Git_tag.new("git://github.com/puppetlabs/leatherman.git", "tags/0.6.2")
+      git_tag = Pkg::Util::Git_tag.new("https://github.com/puppetlabs/leatherman.git", "tags/0.6.2")
       expect(git_tag.tag?).to eq(true)
     end
 
     it "sets ref type as a tag when passed a fully qualified tag" do
-      git_tag = Pkg::Util::Git_tag.new("git://github.com/puppetlabs/leatherman.git", "refs/tags/0.6.2")
+      git_tag = Pkg::Util::Git_tag.new("https://github.com/puppetlabs/leatherman.git", "refs/tags/0.6.2")
       expect(git_tag.tag?).to eq(true)
     end
   end

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

@@ -51,7 +51,6 @@ describe '#Pkg::Util::Ship' do
     pkg/sles/12/puppet6/ppc64le/puppet-agent-6.19.0-1.sles12.ppc64le.rpm
     pkg/sles/12/puppet6/x86_64/puppet-agent-6.19.0-1.sles12.x86_64.rpm
     pkg/sles/15/puppet6/x86_64/puppet-agent-6.19.0-1.sles15.x86_64.rpm
-    pkg/apple/10.14/puppet6/x86_64/puppet-agent-6.19.0-1.osx10.14.dmg
     pkg/apple/10.15/puppet6/x86_64/puppet-agent-6.19.0-1.osx10.15.dmg
     pkg/fedora/32/puppet6/x86_64/puppet-agent-6.19.0-1.fc32.x86_64.rpm
     pkg/windows/puppet-agent-6.19.0-x64.msi
@@ -71,7 +70,6 @@ describe '#Pkg::Util::Ship' do
     pkg/puppet6/sles/12/ppc64le/puppet-agent-6.19.0-1.sles12.ppc64le.rpm
     pkg/puppet6/sles/12/x86_64/puppet-agent-6.19.0-1.sles12.x86_64.rpm
     pkg/puppet6/sles/15/x86_64/puppet-agent-6.19.0-1.sles15.x86_64.rpm
-    pkg/mac/puppet6/10.14/x86_64/puppet-agent-6.19.0-1.osx10.14.dmg
     pkg/mac/puppet6/10.15/x86_64/puppet-agent-6.19.0-1.osx10.15.dmg
     pkg/puppet6/fedora/32/x86_64/puppet-agent-6.19.0-1.fc32.x86_64.rpm
     pkg/windows/puppet6/puppet-agent-6.19.0-x64.msi

data/tasks/30_metrics.rake

@@ -1,4 +1,4 @@
-@metrics          = []
+@metrics = []
 def add_shipped_metrics(args)
   @metrics << {
     :type         => 'shipped',
@@ -19,7 +19,7 @@ def post_shipped_metrics
     is_rc        = metric[:is_rc]
 
     uri = URI(Pkg::Config.metrics_url)
-    res = Net::HTTP.post_form(
+    Net::HTTP.post_form(
       uri,
       {
         'type'          => type,

data/tasks/apple.rake

@@ -18,8 +18,8 @@ PKGBUILD      = '/usr/bin/pkgbuild'
 task :setup do
   # Read the Apple file-mappings
   begin
-    @source_files        = Pkg::Util::Serialization.load_yaml('ext/osx/file_mapping.yaml')
-  rescue => e
+    @source_files = Pkg::Util::Serialization.load_yaml('ext/osx/file_mapping.yaml')
+  rescue StandardError => e
     fail "Could not load Apple file mappings from 'ext/osx/file_mapping.yaml'\n#{e}"
   end
   @package_name          = Pkg::Config.project
@@ -58,11 +58,11 @@ def make_directory_tree
   end
 
   if File.exists?('ext/osx/postflight.erb')
-    Pkg::Util::File.erb_file 'ext/osx/postflight.erb', "#{@working_tree["scripts"]}/postinstall", false, :binding => binding
+    Pkg::Util::File.erb_file 'ext/osx/postflight.erb', "#{@working_tree['scripts']}/postinstall", false, :binding => binding
   end
 
   if File.exists?('ext/osx/preflight.erb')
-    Pkg::Util::File.erb_file 'ext/osx/preflight.erb', "#{@working_tree["scripts"]}/preinstall", false, :binding => binding
+    Pkg::Util::File.erb_file 'ext/osx/preflight.erb', "#{@working_tree['scripts']}/preinstall", false, :binding => binding
   end
 
   if File.exists?('ext/osx/prototype.plist.erb')
@@ -72,7 +72,6 @@ def make_directory_tree
   if File.exists?('ext/packaging/static_artifacts/PackageInfo.plist')
     cp 'ext/packaging/static_artifacts/PackageInfo.plist', "#{@scratch}/PackageInfo.plist"
   end
-
 end
 
 # method:        build_dmg
@@ -113,14 +112,9 @@ def build_dmg
     -format #{dmg_format} \
     #{dmg_file}")
 
-  if File.directory?("#{pwd}/pkg/apple")
-    sh "sudo mv #{pwd}/#{dmg_file} #{pwd}/pkg/apple/#{dmg_file}"
-    puts "moved:   #{dmg_file} has been moved to #{pwd}/pkg/apple/#{dmg_file}"
-  else
-    mkdir_p("#{pwd}/pkg/apple")
-    sh "sudo mv #{pwd}/#{dmg_file} #{pwd}/pkg/apple/#{dmg_file}"
-    puts "moved:   #{dmg_file} has been moved to #{pwd}/pkg/apple/#{dmg_file}"
-  end
+  mkdir_p("#{pwd}/pkg/apple") unless File.directory?("#{pwd}/pkg/apple")
+  sh "sudo mv #{pwd}/#{dmg_file} #{pwd}/pkg/apple/#{dmg_file}"
+  puts "moved:   #{dmg_file} has been moved to #{pwd}/pkg/apple/#{dmg_file}"
 end
 
 # method:        pack_source
@@ -131,7 +125,7 @@ end
 #                installed as the package's payload.
 #
 def pack_source
-  work          = "#{@working_tree['working']}"
+  work = (@working_tree['working']).to_s
   source = pwd
 
   # Make all necessary directories

data/tasks/archive.rake

@@ -1,8 +1,7 @@
 namespace :pl do
   namespace :remote do
-
     desc "Move packages from repo paths to archive staging paths"
-    task :stage_archives, [:yum_directories, :apt_directories, :downloads_directories] => 'pl:fetch' do |_t, args|
+    task :stage_archives, %i[yum_directories apt_directories downloads_directories] => 'pl:fetch' do |_t, args|
       yum_directories = args.yum_directories ? args.yum_directories.split(' ') : []
       apt_directories = args.apt_directories ? args.apt_directories.split(' ') : []
       downloads_directories = args.downloads_directories ? args.downloads_directories.split(' ') : []

data/tasks/deb.rake

@@ -24,7 +24,7 @@ def debuild(args)
   results_dir = args[:work_dir]
   begin
     sh "debuild --no-lintian -uc -us"
-  rescue => e
+  rescue StandardError => e
     fail "Something went wrong. Hopefully the backscroll or #{results_dir}/#{Pkg::Config.project}_#{Pkg::Config.debversion}.build file has a clue.\n#{e}"
   end
 end
@@ -47,12 +47,11 @@ task :prep_deb_tars, :work_dir do |t, args|
     pkg_dir = "#{work_dir}/#{Pkg::Config.project}-#{Pkg::Config.debversion}"
     cd 'ext' do
       Pathname('debian').find do |file|
-        case
-        when file.to_s =~ /~$/, file.to_s =~ /^#/
+        if file.to_s =~ /~$/ || file.to_s =~ /^#/
           next
-        when file.directory?
+        elsif file.directory?
           mkdir_p "#{pkg_dir}/#{file}"
-        when file.extname == '.erb'
+        elsif file.extname == '.erb'
           Pkg::Util::File.erb_file(file, "#{pkg_dir}/#{file.sub(/\.[^\.]*$/, '')}", false, :binding => Pkg::Config.get_binding)
         else
           cp file, "#{pkg_dir}/#{file}"
@@ -70,10 +69,10 @@ task :build_deb, :deb_command, :cow do |t, args|
     work_dir  = Pkg::Util::File.mktemp
     subdir    = 'pe/' if Pkg::Config.build_pe
     codename = /base-(.*)-(.*)\.cow/.match(cow)[1] unless cow.nil?
-    dest_dir  = File.join(Pkg::Config.project_root, "pkg", "#{subdir}deb", codename.to_s, subrepo.to_s)
+    dest_dir = File.join(Pkg::Config.project_root, "pkg", "#{subdir}deb", codename.to_s, subrepo.to_s)
     Pkg::Util::Tool.check_tool(deb_build)
     mkdir_p dest_dir
-    deb_args  = { :work_dir => work_dir, :cow => cow }
+    deb_args = { :work_dir => work_dir, :cow => cow }
     Rake::Task[:prep_deb_tars].reenable
     Rake::Task[:prep_deb_tars].invoke(work_dir)
     cd "#{work_dir}/#{Pkg::Config.project}-#{Pkg::Config.debversion}" do
@@ -112,7 +111,7 @@ end
 
 namespace :pl do
   desc "Create a deb from this repo using the default cow #{Pkg::Config.default_cow}."
-  task :deb => "package:tar"  do
+  task :deb => "package:tar" do
     Pkg::Util.check_var('PE_VER', Pkg::Config.pe_version) if Pkg::Config.build_pe
     Rake::Task[:build_deb].invoke('pdebuild', Pkg::Config.default_cow)
   end

data/tasks/deb_repos.rake

@@ -10,6 +10,7 @@
 #
 namespace :pl do
   namespace :jenkins do
+    # The equivalent to invoking this task is calling Pkg::Util::Repo.deb_repos
     desc "Create apt repositories of build DEB packages for this SHA on the distributions erver"
     task :deb_repos => "pl:fetch" do
       Pkg::Deb::Repo.create_repos

data/tasks/doc.rake

@@ -12,9 +12,11 @@ if Pkg::Config.build_doc
     RDoc::Task.new(:doc) do |rdoc|
       rdoc.rdoc_dir = 'doc'
       rdoc.title = "#{Pkg::Config.project} version #{Pkg::Config.version}"
-      Pkg::Config.gem_rdoc_options.each do |option|
-        rdoc.options << option
-      end unless Pkg::Config.gem_rdoc_options.nil?
+      unless Pkg::Config.gem_rdoc_options.nil?
+        Pkg::Config.gem_rdoc_options.each do |option|
+          rdoc.options << option
+        end
+      end
     end
   end
 end

data/tasks/education.rake

@@ -1,7 +1,6 @@
 namespace :pl do
   namespace :jenkins do
-    task :deploy_learning_vm, [:vm, :md5, :target_bucket, :target_directory] => "pl:fetch" do |t, args|
-
+    task :deploy_learning_vm, %i[vm md5 target_bucket target_directory] => "pl:fetch" do |t, args|
       vm = args.vm or fail ":vm is a required argument for #{t}"
       md5 = args.md5 or fail ":md5 is a required argument for #{t}"
       target_bucket = args.target_bucket or fail ":target_bucket is a required argument for #{t}"
@@ -13,8 +12,7 @@ namespace :pl do
       puts "'#{vm}' and '#{md5}' have been shipped via s3 to '#{target_bucket}/#{target_directory}'"
     end
 
-    task :deploy_training_vm, [:vm, :md5, :target_host, :target_directory] => "pl:fetch" do |t, args|
-
+    task :deploy_training_vm, %i[vm md5 target_host target_directory] => "pl:fetch" do |t, args|
       vm = args.vm or fail ":vm is a required argument for #{t}"
       md5 = args.md5 or fail ":md5 is a required argument for #{t}"
       target_host = args.target_host or fail ":target_host is a required argument for #{t}"

data/tasks/fetch.rake

@@ -26,6 +26,7 @@ end
 # It uses curl to download the files, and places them in a temporary
 # directory, e.g. /tmp/somedirectory/{project,team}/Pkg::Config.builder_data_file
 namespace :pl do
+  # The equivalent to invoking this task is calling Pkg::Util::File.fetch
   desc "retrieve build-data configurations to override/extend local build_defaults"
   task :fetch do
     # Remove .packaging directory from old-style extras loading

data/tasks/gem.rake

@@ -57,18 +57,24 @@ def create_default_gem_spec
     s.test_files = FileList[Pkg::Config.gem_test_files.split(' ')]          unless Pkg::Config.gem_test_files.nil?
     s.license = Pkg::Config.gem_license                                     unless Pkg::Config.gem_license.nil?
     s.rubyforge_project = Pkg::Config.gem_forge_project                     unless Pkg::Config.gem_forge_project.nil?
-    Pkg::Config.gem_rdoc_options.each do |option|
-      s.rdoc_options << option
-    end unless Pkg::Config.gem_rdoc_options.nil?
+    unless Pkg::Config.gem_rdoc_options.nil?
+      Pkg::Config.gem_rdoc_options.each do |option|
+        s.rdoc_options << option
+      end
+    end
   end
 
-  Pkg::Config.gem_runtime_dependencies.each do |gem, version|
-    spec = add_gem_dependency(:spec => spec, :gem => gem, :version => version, :type => :runtime)
-  end unless Pkg::Config.gem_runtime_dependencies.nil?
+  unless Pkg::Config.gem_runtime_dependencies.nil?
+    Pkg::Config.gem_runtime_dependencies.each do |gem, version|
+      spec = add_gem_dependency(:spec => spec, :gem => gem, :version => version, :type => :runtime)
+    end
+  end
 
-  Pkg::Config.gem_development_dependencies.each do |gem, version|
-    spec = add_gem_dependency(:spec => spec, :gem => gem, :version => version, :type => :development)
-  end unless Pkg::Config.gem_development_dependencies.nil?
+  unless Pkg::Config.gem_development_dependencies.nil?
+    Pkg::Config.gem_development_dependencies.each do |gem, version|
+      spec = add_gem_dependency(:spec => spec, :gem => gem, :version => version, :type => :development)
+    end
+  end
   spec
 end
 
@@ -107,9 +113,11 @@ def create_platform_specific_gems
   Pkg::Config.gem_platform_dependencies.each do |platform, dependency_hash|
     spec = create_default_gem_spec
     pf = Gem::Platform.new(platform)
-    fail "
-      Platform: '#{platform}' is not recognized by rubygems.
-      This is probably an erroneous 'gem_platform_dependencies' entry!" if unknown_gems_platform?(pf)
+    if unknown_gems_platform?(pf)
+      fail "
+        Platform: '#{platform}' is not recognized by rubygems.
+        This is probably an erroneous 'gem_platform_dependencies' entry!"
+    end
     spec.platform = pf
     dependency_hash.each do |type, gems|
       t = case type

data/tasks/jenkins.rake

@@ -103,7 +103,7 @@ namespace :pl do
       # a PE build, so we always this along as an environment variable task
       # argument if its the case.
       #
-      Pkg::Config.task = { :task => "#{build_task}", :args => nil }
+      Pkg::Config.task = { :task => build_task.to_s, :args => nil }
       Pkg::Config.task[:args] = ["PE_BUILD=true"] if @build_pe
       #
       # Determine the type of build we're doing to inform jenkins
@@ -150,9 +150,9 @@ namespace :pl do
       # Construct the parameters, which is an array of hashes we turn into JSON
       parameters = [{ "name" => "BUILD_PROPERTIES", "file"  => "file0" },
                     { "name" => "PROJECT_BUNDLE",   "file"  => "file1" },
-                    { "name" => "PROJECT",          "value" => "#{Pkg::Config.project}" },
-                    { "name" => "BUILD_TYPE",       "label" => "#{build_type}" },
-                    { "name" => "METRICS",          "value" => "#{metrics}" }]
+                    { "name" => "PROJECT",          "value" => Pkg::Config.project.to_s },
+                    { "name" => "BUILD_TYPE",       "label" => build_type.to_s },
+                    { "name" => "METRICS",          "value" => metrics.to_s }]
 
       # Initialize the args array that will hold all of the arguments we pass
       # to the curl utility method.
@@ -172,7 +172,7 @@ namespace :pl do
       # Construct the remaining form arguments. For visual clarity, params that are tied
       # together are on the same line.
       #
-      args <<  [
+      args << [
       "-Fname=BUILD_PROPERTIES", "-Ffile0=@#{properties}",
       "-Fname=PROJECT_BUNDLE",   "-Ffile1=@#{bundle}",
       "-Fname=PROJECT",          "-Fvalue=#{Pkg::Config.project}",
@@ -250,7 +250,7 @@ namespace :pl do
     end
 
     task :uber_ship_lite => "pl:fetch" do
-      tasks = %w(
+      tasks = %w[
         jenkins:retrieve
         jenkins:sign_all
         ship_rpms
@@ -260,9 +260,9 @@ namespace :pl do
         ship_tar
         ship_msi
         ship_gem
-      )
+      ]
       tasks.map { |t| "pl:#{t}" }.each do |t|
-        puts "Running #{t} . . ."
+        puts "Running \"#{t}\""
         Rake::Task[t].invoke
       end
       # mark the build as successfully shipped
@@ -270,13 +270,16 @@ namespace :pl do
       # add the release to release-metrics
       begin
         Rake::Task["pl:update_release_metrics"].invoke
-      rescue => e
+      rescue StandardError => e
         fail "Error updating release-metrics:\n#{e}\nYou will need to add this release manually."
       end
     end
 
     task :stage_nightlies => "pl:fetch" do
-      tasks = %w(
+      # debian weirdness: ship_nightly_debs uses the old methodology that posts to
+      # apt.puppet.com; stage_nightly_debs uses the updated methodology that posts to
+      # apt.repos.puppet.com
+      tasks = %w[
         jenkins:retrieve
         jenkins:sign_all
         ship_nightly_rpms
@@ -284,17 +287,26 @@ namespace :pl do
         ship_nightly_dmg
         ship_nightly_swix
         ship_nightly_msi
-      )
+      ]
       tasks.map { |t| "pl:#{t}" }.each do |t|
-        puts "Running #{t}:"
+        puts "Running \"#{t}\""
         Rake::Task[t].invoke
       end
     end
 
     task :ship_nightlies => "pl:fetch" do
+      ## nightlies.puppet.com
       Rake::Task['pl:jenkins:stage_nightlies'].invoke
       Rake::Task['pl:remote:update_nightly_repos'].invoke
       Rake::Task['pl:remote:deploy_nightlies_to_s3'].invoke
+
+      # This serves as a cheap feature toggle to avoid things not ready to
+      # use it. It should be removed in future versions.
+      if ENV['NIGHTLY_SHIP_TO_GCP']
+        ## apt.repos.puppet.com
+        Rake::Task['pl:stage_nightly_debs'].invoke
+        Rake::Task['pl:remote:sync_apt_repo_to_gcp'].invoke
+      end
     end
 
     task :ship_final => "pl:fetch" do
@@ -324,7 +336,7 @@ namespace :pl do
 
     desc "Retrieve packages built by jenkins, sign, and ship all!"
     task :uber_ship => "pl:fetch" do
-      uber_tasks = %w(
+      uber_tasks = %w[
         jenkins:retrieve
         jenkins:sign_all
         uber_ship
@@ -342,7 +354,7 @@ namespace :pl do
         remote:deploy_yum_repo_to_s3
         remote:deploy_downloads_to_s3
         remote:deploy_to_rsync_server
-      )
+      ]
 
       if Pkg::Util.boolean_value(Pkg::Config.answer_override) && !Pkg::Config.foss_only
         fail "Using ANSWER_OVERRIDE without FOSS_ONLY=true is dangerous!"
@@ -518,7 +530,7 @@ namespace :pl do
       end
 
       # Assemble the JSON string for the JSON parameter
-      json = JSON.generate("parameter" => [{ "name" => "SHA", "value"  => "#{Pkg::Config.ref}" }])
+      json = JSON.generate("parameter" => [{ "name" => "SHA", "value" => Pkg::Config.ref.to_s }])
 
       # Assemble our arguments to the post
       args = [

data/tasks/jenkins_dynamic.rake

@@ -36,27 +36,27 @@ namespace :pl do
 
       # Generate an XML file for every job configuration erb and attempt to
       # create a jenkins job from that XML config
-      templates.each do |t|
-        erb_template  = File.join(template_dir, t)
-        xml_file = File.join(work_dir, t.gsub('.erb', ''))
+      templates.each do |template|
+        erb_template = File.join(template_dir, template)
+        xml_file = File.join(work_dir, template.gsub('.erb', ''))
         Pkg::Util::File.erb_file(erb_template, xml_file, nil, :binding => Pkg::Config.get_binding)
         # If we're creating a job meant to run on a windows box, we need to limit the path length
         # Max path length allowed is 260 chars, which we manage to exceed with this job name. Luckily,
         # simply using the short sha rather than the long sha gets us just under the length limit. Gross fix,
         # I know, but hey, it works for now.
-        if t == "msi.xml.erb"
+        if template == "msi.xml.erb"
           ref = Pkg::Config.short_ref
         else
           ref = Pkg::Config.ref
         end
-        job_name  = "#{Pkg::Config.project}-#{t.gsub('.xml.erb', '')}-#{Pkg::Config.build_date}-#{ref}"
+        job_name = "#{Pkg::Config.project}-#{template.gsub('.xml.erb', '')}-#{Pkg::Config.build_date}-#{ref}"
         puts "Checking for existence of #{job_name}..."
         if Pkg::Util::Jenkins.jenkins_job_exists?(job_name)
           raise "Job #{job_name} already exists on #{Pkg::Config.jenkins_build_host}"
         else
           Pkg::Util::Execution.retry_on_fail(:times => 3) do
             url = Pkg::Util::Jenkins.create_jenkins_job(job_name, xml_file)
-            if t == "packaging.xml.erb"
+            if template == "packaging.xml.erb"
               ENV["PACKAGE_BUILD_URL"] = url
             end
             puts "Verifying job created successfully..."
@@ -71,7 +71,7 @@ namespace :pl do
       packaging_name = "#{Pkg::Config.project}-packaging-#{Pkg::Config.build_date}-#{Pkg::Config.ref}"
       Pkg::Util::RakeUtils.invoke_task("pl:jenkins:trigger_dynamic_job", packaging_name)
 
-      if poll_interval > 0
+      if poll_interval.positive?
         ##
         # Wait for the '*packaging*' job to finish.
         #
@@ -155,15 +155,15 @@ namespace :pl do
       # Construct the parameters, which is an array of hashes we turn into JSON
       parameters = [{ "name" => "BUILD_PROPERTIES", "file"  => "file0" },
                     { "name" => "PROJECT_BUNDLE",   "file"  => "file1" },
-                    { "name" => "PROJECT",          "value" => "#{Pkg::Config.project}" },
-                    { "name" => "METRICS",          "value" => "#{metrics}" }]
+                    { "name" => "PROJECT",          "value" => Pkg::Config.project.to_s },
+                    { "name" => "METRICS",          "value" => metrics.to_s }]
 
       # Contruct the json string
       json = JSON.generate("parameter" => parameters)
 
       # The args array that holds  all of the arguments we pass
       # to the curl utility method.
-      curl_args =  [
+      curl_args = [
       "-Fname=BUILD_PROPERTIES", "-Ffile0=@#{properties}",
       "-Fname=PROJECT_BUNDLE",   "-Ffile1=@#{bundle}",
       "-Fname=PROJECT",          "-Fvalue=#{Pkg::Config.project}",

data/tasks/load_extras.rake

@@ -6,6 +6,7 @@
 # generic tasks with data not generally useful outside the
 # PL Release team
 namespace :pl do
+  # The equivalent to invoking this task is calling Pkg::Util::File.load_extras(temp_directory)
   task :load_extras, :tempdir do |t, args|
     unless ENV['PARAMS_FILE'] && ENV['PARAMS_FILE'] != ''
       tempdir = args.tempdir

data/tasks/mock.rake

@@ -37,17 +37,16 @@ def mock_artifact(mock_config, cmd_args, mockfile)
 
     # Return a FileList of the build artifacts
     return FileList[File.join(result_dir, '*.rpm')]
-
   rescue RuntimeError => error
     build_log = File.join(result_dir, 'build.log')
     root_log  = File.join(result_dir, 'root.log')
     content   = File.read(build_log) if File.readable?(build_log)
 
     if File.readable?(root_log)
-      $stderr.puts File.read(root_log)
+      warn File.read(root_log)
     end
     if content and content.lines.count > 2
-      $stderr.puts content
+      warn content
     end
 
     # Any useful info has now been gleaned from the logs in the case of a
@@ -99,7 +98,7 @@ def mock_el_family(mock_config)
     family = mock_config.match(/^pupent-(\d\.\d-)?([a-z]+)([0-9]+)-(.*)$/)[2]
   else
     first, second = mock_config.split('-')
-    if first == 'el' || first == 'fedora'
+    if ['el', 'fedora'].include?(first)
       family = first
     elsif first == 'pl'
       if second.match(/^\d+$/)
@@ -122,7 +121,7 @@ def mock_el_ver(mock_config)
     version = mock_config.match(/^pupent-(\d\.\d-)?([a-z]+)([0-9]+)-(.*)$/)[3]
   else
     first, second, third = mock_config.split('-')
-    if (first == 'el' || first == 'fedora') || (first == 'pl' && second.match(/^\d+$/))
+    if ['el', 'fedora'].include?(first) || (first == 'pl' && second.match(/^\d+$/))
       version = second
     else
       version = third
@@ -138,11 +137,11 @@ end
 def rpm_family_and_version
   if Pkg::Config.vanagon_project
     Pkg::Config.rpm_targets.split(' ').map do |target|
-      rpm_el_family, rpm_el_version, arch = target.split('-')
+      rpm_el_family, rpm_el_version, = target.split('-')
       "#{rpm_el_family}-#{rpm_el_version}"
     end
   else
-    Pkg::Config.final_mocks.split.map { |mock| "#{mock_el_family(mock)}-#{mock_el_ver(mock) }" }
+    Pkg::Config.final_mocks.split.map { |mock| "#{mock_el_family(mock)}-#{mock_el_ver(mock)}" }
   end
 end
 
@@ -174,7 +173,7 @@ def mock_defines(mock_config)
   version = mock_el_ver(mock_config)
   defines = ""
   if version =~ /^(4|5)$/ or family == "sles"
-    defines = %Q(--define "dist .#{family}#{version}" \
+    defines = %(--define "dist .#{family}#{version}" \
       --define "_source_filedigest_algorithm 1" \
       --define "_binary_filedigest_algorithm 1" \
       --define "_binary_payload w9.gzdio" \
@@ -318,7 +317,7 @@ end
 def randomize_mock_config_dir(mock_config, mockfile)
   # basedir will be the location of our temporary mock root
   basedir = Pkg::Util::File.mktemp
-  chown("#{ENV['USER']}", "mock", basedir)
+  chown((ENV['USER']).to_s, "mock", basedir)
   # Mock requires the sticky bit be set on the basedir
   chmod(02775, basedir)
   mockfile ||= File.join('/', 'etc', 'mock', "#{mock_config}.cfg")