packaging 0.88.77 → 0.99.0

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

@@ -54,82 +54,62 @@ describe "Pkg::Util::Net" do
   end
 
   describe "remote_ssh_cmd" do
-    it "should be able to call via deprecated shim" do
-      Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
-      Pkg::Util::Execution.should_receive(:capture3).with("#{ssh}  -t foo 'set -e;bar'")
-      Pkg::Util::Execution.should_receive(:success?).and_return(true)
-      Pkg::Util::Net.remote_ssh_cmd("foo", "bar", true)
-    end
-  end
-
-  describe "remote_execute" do
     it "should fail if ssh is not present" do
       Pkg::Util::Tool.stub(:find_tool).with("ssh") { fail }
       Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_raise(RuntimeError)
-      expect{ Pkg::Util::Net.remote_execute("foo", "bar") }.to raise_error(RuntimeError)
+      expect{ Pkg::Util::Net.remote_ssh_cmd("foo", "bar") }.to raise_error(RuntimeError)
     end
 
     it "should be able to not fail fast" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
         Kernel.should_receive(:system).with("#{ssh}  -t foo 'bar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(true)
-        Pkg::Util::Net.remote_execute(
-          "foo", "bar", capture_output: false, extra_options: '', fail_fast: false)
-    end
-
-    it "should be able to trace output" do
-        Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
-        Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -x;bar'")
-        Pkg::Util::Execution.should_receive(:success?).and_return(true)
-        Pkg::Util::Net.remote_execute(
-          "foo", "bar", capture_output: false, fail_fast: false, trace: true)
-    end
+        Pkg::Util::Net.remote_ssh_cmd("foo", "bar", false, '', false)
+     end
 
     context "without output captured" do
       it "should execute a command :foo on a host :bar using Kernel" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
-        Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -e;bar'")
+        Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -e; bar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(true)
-        Pkg::Util::Net.remote_execute("foo", "bar")
+        Pkg::Util::Net.remote_ssh_cmd("foo", "bar")
       end
 
       it "should escape single quotes in the command" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
-        Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -e;b'\\''ar'")
+        Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -e; b'\\''ar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(true)
-        Pkg::Util::Net.remote_execute("foo", "b'ar")
+        Pkg::Util::Net.remote_ssh_cmd("foo", "b'ar")
       end
 
       it "should raise an error if ssh fails" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
-        Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -e;bar'")
+        Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -e; bar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(false)
-        expect{ Pkg::Util::Net.remote_execute("foo", "bar") }
-          .to raise_error(RuntimeError, /failed./)
+        expect{ Pkg::Util::Net.remote_ssh_cmd("foo", "bar") }.to raise_error(RuntimeError, /Remote ssh command failed./)
       end
     end
 
     context "with output captured" do
       it "should execute a command :foo on a host :bar using Pkg::Util::Execution.capture3" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
-        Pkg::Util::Execution.should_receive(:capture3).with("#{ssh}  -t foo 'set -e;bar'")
+        Pkg::Util::Execution.should_receive(:capture3).with("#{ssh}  -t foo 'set -e; bar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(true)
-        Pkg::Util::Net.remote_execute("foo", "bar", capture_output: true)
+        Pkg::Util::Net.remote_ssh_cmd("foo", "bar", true)
       end
 
       it "should escape single quotes in the command" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
-        Pkg::Util::Execution.should_receive(:capture3).with("#{ssh}  -t foo 'set -e;b'\\''ar'")
+        Pkg::Util::Execution.should_receive(:capture3).with("#{ssh}  -t foo 'set -e; b'\\''ar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(true)
-        Pkg::Util::Net.remote_execute("foo", "b'ar", capture_output: true)
+        Pkg::Util::Net.remote_ssh_cmd("foo", "b'ar", true)
       end
 
       it "should raise an error if ssh fails" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
-        Pkg::Util::Execution.should_receive(:capture3).with("#{ssh}  -t foo 'set -e;bar'")
+        Pkg::Util::Execution.should_receive(:capture3).with("#{ssh}  -t foo 'set -e; bar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(false)
-        expect{ Pkg::Util::Net.remote_execute("foo", "bar", capture_output: true) }
-          .to raise_error(RuntimeError, /failed./)
+        expect{ Pkg::Util::Net.remote_ssh_cmd("foo", "bar", true) }.to raise_error(RuntimeError, /Remote ssh command failed./)
       end
     end
   end

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

@@ -2,112 +2,80 @@ require 'spec_helper'
 
 describe '#Pkg::Util::Ship' do
   describe '#collect_packages' do
-    msi_packages = %w[
-      pkg/windows/puppet6/puppet-agent-6.19.0-x64.msi
-      pkg/windows/puppet6/puppet-agent-6.19.0-x86.msi
-      pkg/windowsfips/puppet6/puppet-agent-6.19.0-x64.msi
-      pkg/windows/puppet6/puppet-agent-x86.msi
-      pkg/windowsfips/puppet6/puppet-agent-x64.msi
+    msi_pkgs = [
+      'pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi',
+      'pkg/windows/puppet5/puppet-agent-x86.msi'
     ]
-    solaris_packages = %w[
-      pkg/solaris/10/puppet6/puppet-agent-6.9.0-1.sparc.pkg.gz
-      pkg/solaris/10/puppet6/puppet-agent-6.9.0-1.sparc.pkg.gz.asc
+    swix_pkgs = [
+      'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix',
+      'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix.asc',
     ]
 
     it 'returns an array of packages found on the filesystem' do
-      allow(Dir).to receive(:glob).with('pkg/**/*.sparc*').and_return(solaris_packages)
-      expect(Pkg::Util::Ship.collect_packages(['pkg/**/*.sparc*'])).to eq(solaris_packages)
+      allow(Dir).to receive(:glob).with('pkg/**/*.swix*').and_return(swix_pkgs)
+      expect(Pkg::Util::Ship.collect_packages(['pkg/**/*.swix*'])).to eq(swix_pkgs)
     end
 
-    context 'excluding packages' do
+    describe 'define excludes' do
       before :each do
-        allow(Dir).to receive(:glob).with('pkg/**/*.msi').and_return(msi_packages)
+        allow(Dir).to receive(:glob).with('pkg/**/*.msi').and_return(msi_pkgs)
       end
       it 'correctly excludes any packages that match a passed excludes argument' do
-        expect(Pkg::Util::Ship.collect_packages(['pkg/**/*.msi'], ['puppet-agent-x(86|64).msi']))
-          .not_to include('pkg/windows/puppet6/puppet-agent-x86.msi')
-        expect(Pkg::Util::Ship.collect_packages(['pkg/**/*.msi'], ['puppet-agent-x(86|64).msi']))
-          .not_to include('pkg/windows/puppet6/puppet-agent-x64.msi')
+        expect(Pkg::Util::Ship.collect_packages(['pkg/**/*.msi'], ['puppet-agent-x(86|64).msi'])).not_to include('pkg/windows/puppet5/puppet-agent-x86.msi')
       end
       it 'correctly includes packages that do not match a passed excluded argument' do
-        expect(Pkg::Util::Ship.collect_packages(['pkg/**/*.msi'],
-                                                ['bogus-puppet-agent-x(86|64).msi']))
-          .to match_array(msi_packages)
+        expect(Pkg::Util::Ship.collect_packages(['pkg/**/*.msi'], ['puppet-agent-x(86|64).msi'])).to include('pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi')
       end
     end
 
-    it 'returns an empty array when it cannot find any packages' do
+    it 'fails when it cannot find any packages at all' do
       allow(Dir).to receive(:glob).with('pkg/**/*.html').and_return([])
       expect(Pkg::Util::Ship.collect_packages(['pkg/**/*.html'])).to be_empty
     end
   end
 
-  # Sample data for #reorganize_packages and #ship_pkgs specs
-  retrieved_packages = %w[
-    pkg/deb/bionic/puppet6/puppet-agent_6.19.0-1bionic_amd64.deb
-    pkg/el/7/puppet6/aarch64/puppet-agent-6.19.0-1.el7.aarch64.rpm
-    pkg/el/7/puppet6/ppc64le/puppet-agent-6.19.0-1.el7.ppc64le.rpm
-    pkg/el/7/puppet6/x86_64/puppet-agent-6.19.0-1.el7.x86_64.rpm
-    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
-    pkg/windows/puppet-agent-6.19.0-x86.msi
-    pkg/windowsfips/puppet-agent-6.19.0-x64.msi
-    pkg/windows/puppet6/puppet-agent-x86.msi
-    pkg/windowsfips/puppet6/puppet-agent-x64.msi
-  ]
-
-  # After reorganization, the packages should look like this.
-  # Beware apple->mac transforms.
-  expected_reorganized_packages = %w[
-    pkg/bionic/puppet6/puppet-agent_6.19.0-1bionic_amd64.deb
-    pkg/puppet6/el/7/aarch64/puppet-agent-6.19.0-1.el7.aarch64.rpm
-    pkg/puppet6/el/7/ppc64le/puppet-agent-6.19.0-1.el7.ppc64le.rpm
-    pkg/puppet6/el/7/x86_64/puppet-agent-6.19.0-1.el7.x86_64.rpm
-    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
-    pkg/windows/puppet6/puppet-agent-6.19.0-x86.msi
-    pkg/windowsfips/puppet6/puppet-agent-6.19.0-x64.msi
-    pkg/windows/puppet6/puppet-agent-x86.msi
-    pkg/windowsfips/puppet6/puppet-agent-x64.msi
-  ]
+local_pkgs = [
+  'pkg/deb/cumulus/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1cumulus_amd64.deb',
+  'pkg/deb/wheezy/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1wheezy_i386.deb',
+  'pkg/el/5/puppet5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.el5.x86_64.rpm',
+  'pkg/sles/11/puppet5/i386/puppet-agent-1.4.1.2904.g8023dd1-1.sles11.i386.rpm',
+  'pkg/mac/10.10/puppet5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.osx10.10.dmg',
+  'pkg/eos/4/puppet5/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix',
+  'pkg/eos/4/puppet5/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix.asc',
+  'pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi',
+]
+new_pkgs = [
+  'pkg/cumulus/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1cumulus_amd64.deb',
+  'pkg/wheezy/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1wheezy_i386.deb',
+  'pkg/puppet5/el/5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.el5.x86_64.rpm',
+  'pkg/puppet5/sles/11/i386/puppet-agent-1.4.1.2904.g8023dd1-1.sles11.i386.rpm',
+  'pkg/mac/puppet5/10.10/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.osx10.10.dmg',
+  'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix',
+  'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix.asc',
+  'pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi',
+]
 
   describe '#reorganize_packages' do
-    # This is a sampling of packages found on builds.delivery.puppetlabs.net in
-    # '/opt/jenkins-builds/puppet-agent/<version>/artifacts'
-    # pl:jenkins:retrieve replaces 'artifacts' with 'pkg', so we pick up the
-    # action from that point by pretending that we've scanned the directory and
-    # made this list:
-
-    scratch_directory = Dir.mktmpdir
+    tmpdir = Dir.mktmpdir
 
     before :each do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet6')
-      expect(FileUtils).to receive(:cp).at_least(:once).and_return(true)
+      allow(Pkg::Paths).to receive(:repo_name).and_return('puppet5')
+      expect(FileUtils).to receive(:cp).at_least(:once)
     end
 
-    original_packages = retrieved_packages
+    it 'makes a temporary directory' do
+      expect(FileUtils).to receive(:mkdir_p).at_least(:once)
+      Pkg::Util::Ship.reorganize_packages(local_pkgs, tmpdir)
+    end
 
     it 'leaves the old packages in place' do
-      reorganized_packages = Pkg::Util::Ship
-                               .reorganize_packages(retrieved_packages, scratch_directory)
-
-      expect(retrieved_packages).to eq(original_packages)
+      orig = local_pkgs
+      Pkg::Util::Ship.reorganize_packages(local_pkgs, tmpdir)
+      expect(local_pkgs).to eq(orig)
     end
 
-    it 'returns a list of properly reorganized packages' do
-      reorganized_packages = Pkg::Util::Ship
-                               .reorganize_packages(retrieved_packages, scratch_directory)
-      expect(reorganized_packages).to eq(expected_reorganized_packages)
+    it 'returns a list of packages that do not have the temp dir in the path' do
+      expect(Pkg::Util::Ship.reorganize_packages(local_pkgs, tmpdir)).to eq(new_pkgs)
     end
   end
 
@@ -116,84 +84,34 @@ describe '#Pkg::Util::Ship' do
     test_remote_path = '/opt/repository/yum'
 
     it 'ships the packages to the staging server' do
-      allow(Pkg::Util::Ship)
-        .to receive(:collect_packages)
-              .and_return(retrieved_packages)
-      allow(Pkg::Util::Ship)
-        .to receive(:reorganize_packages)
-              .and_return(expected_reorganized_packages)
+      allow(Pkg::Util::Ship).to receive(:collect_packages).and_return(local_pkgs)
+      allow(Pkg::Util::Ship).to receive(:reorganize_packages).and_return(new_pkgs)
       allow(Pkg::Util).to receive(:ask_yes_or_no).and_return(true)
       # All of these expects must be called in the same block in order for the
       # tests to work without actually shipping anything
-      expect(Pkg::Util::Net)
-        .to receive(:remote_execute)
-              .with(test_staging_server, /#{test_remote_path}/)
-              .exactly(retrieved_packages.count).times
-      expect(Pkg::Util::Net)
-        .to receive(:rsync_to)
-              .with(anything, test_staging_server, /#{test_remote_path}/, anything)
-              .exactly(retrieved_packages.count).times
-      expect(Pkg::Util::Net)
-        .to receive(:remote_set_ownership)
-              .with(test_staging_server, 'root', 'release', anything)
-              .exactly(retrieved_packages.count).times
-      expect(Pkg::Util::Net)
-        .to receive(:remote_set_permissions)
-              .with(test_staging_server, '775', anything)
-              .exactly(retrieved_packages.count).times
-      expect(Pkg::Util::Net)
-        .to receive(:remote_set_permissions)
-              .with(test_staging_server, '0664', anything)
-              .exactly(retrieved_packages.count).times
-      expect(Pkg::Util::Net)
-        .to receive(:remote_set_immutable)
-              .with(test_staging_server, anything)
-              .exactly(retrieved_packages.count).times
-      expect(Pkg::Util::Ship.ship_pkgs(['pkg/**/*.rpm'], test_staging_server, test_remote_path))
-        .to eq(true)
+      expect(Pkg::Util::Net).to receive(:remote_ssh_cmd).with(test_staging_server, /#{test_remote_path}/).exactly(local_pkgs.count).times
+      expect(Pkg::Util::Net).to receive(:rsync_to).with(anything, test_staging_server, /#{test_remote_path}/, anything).exactly(local_pkgs.count).times
+      expect(Pkg::Util::Net).to receive(:remote_set_ownership).with(test_staging_server, 'root', 'release', anything).exactly(local_pkgs.count).times
+      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)
     end
 
     it 'ships packages containing the string `pkg` to the right place' do
-      retrieved_package =   'pkg/el/7/puppet6/x86_64/puppet-agent-6.19.0-1.el7.x86_64.rpm'
-      reorganized_package = 'pkg/puppet6/el/7/x86_64/puppet-agent-6.19.0-1.el7.x86_64.rpm'
-      package_basename = File.basename(reorganized_package)
-      repository_base_path = '/opt/repository/yum/puppet6/el/7/x86_64'
-
-      allow(Pkg::Util::Ship).to receive(:collect_packages).and_return([retrieved_package])
-      allow(Pkg::Util::Ship).to receive(:reorganize_packages).and_return([reorganized_package])
+      allow(Pkg::Util::Ship).to receive(:collect_packages).and_return(['pkg/el/5/puppet5/x86_64/my-super-sweet-pkg-1.0.0-1.el5.x86_64.rpm' ])
+      allow(Pkg::Util::Ship).to receive(:reorganize_packages).and_return(['pkg/puppet5/el/5/x86_64/my-super-sweet-pkg-1.0.0-1.el5.x86_64.rpm'])
       allow(Pkg::Util).to receive(:ask_yes_or_no).and_return(true)
       allow(Dir).to receive(:mktmpdir).and_return('/tmp/test')
-
       # All of these expects must be called in the same block in order for the
       # tests to work without actually shipping anything
-      expect(Pkg::Util::Net)
-        .to receive(:remote_execute)
-              .with(test_staging_server, /#{test_remote_path}/)
-      expect(Pkg::Util::Net)
-        .to receive(:rsync_to)
-              .with(anything, test_staging_server, /#{test_remote_path}/, anything)
-      expect(Pkg::Util::Net)
-        .to receive(:remote_set_ownership)
-              .with(test_staging_server, 'root', 'release',
-                    [repository_base_path, "#{repository_base_path}/#{package_basename}"])
-      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)
-      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)
+      expect(Pkg::Util::Net).to receive(:remote_ssh_cmd).with(test_staging_server, /#{test_remote_path}/)
+      expect(Pkg::Util::Net).to receive(:rsync_to).with(anything, test_staging_server, /#{test_remote_path}/, anything)
+      expect(Pkg::Util::Net).to receive(:remote_set_ownership).with(test_staging_server, 'root', 'release', ['/opt/repository/yum/puppet5/el/5/x86_64', '/opt/repository/yum/puppet5/el/5/x86_64/my-super-sweet-pkg-1.0.0-1.el5.x86_64.rpm'])
+      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'])
     end
   end
 end

data/spec/spec_helper.rb

@@ -20,3 +20,17 @@ def reset_env(keys)
     ENV[key] = nil
   end
 end
+
+RSpec.configure do |config|
+  if Pkg::Util::OS.windows? && RUBY_VERSION =~ /^1\./
+    require 'win32console'
+    config.output_stream = $stdout
+    config.error_stream = $stderr
+
+    config.formatters.each do |f|
+      if not f.instance_variable_get(:@output).kind_of?(::File)
+        f.instance_variable_set(:@output, $stdout)
+      end
+    end
+  end
+end

data/tasks/00_utils.rake

@@ -119,10 +119,7 @@ end
 # purport to both return the results of the command execution (ala `%x{cmd}`)
 # while also raising an exception if a command does not succeed (ala `sh "cmd"`).
 def ex(command)
-  # We haven't done anything about this deprecation and our log files
-  # have too many warnings from this.
-  # Turn off the notice for now until packaging is refactored.
-  # Pkg::Util.deprecate("ex", "Pkg::Util::Execution.ex")
+  Pkg::Util.deprecate("ex", "Pkg::Util::Execution.ex")
   Pkg::Util::Execution.ex(command)
 end
 
@@ -198,6 +195,11 @@ def deprecate(old_cmd, new_cmd = nil)
   Pkg::Util.deprecate(old_cmd, new_cmd)
 end
 
+def remote_bootstrap(host, treeish, tar_cmd = nil, tarball = nil)
+  Pkg::Util.deprecate('remote_bootstrap', 'Pkg::Util::Net.remote_bootstrap')
+  Pkg::Util::Net.remote_bootstrap(host, treeish, tar_cmd, tarball)
+end
+
 def remote_buildparams(host, build)
   Pkg::Util.deprecate('remote_buildparams', 'Pkg::Util::Net.remote_buildparams')
   Pkg::Util::Net.remote_buildparams(host, build)

data/tasks/apple.rake

@@ -86,7 +86,6 @@ end
 def build_dmg
   # Local Variables
   dmg_format_code   = 'UDZO'
-  dmg_filesystem    = 'HFS+'
   zlib_level        = '9'
   dmg_format_option = "-imagekey zlib-level=#{zlib_level}"
   dmg_format        = "#{dmg_format_code} #{dmg_format_option}"
@@ -109,7 +108,6 @@ def build_dmg
     -uid 99 \
     -gid 99 \
     -ov \
-    -fs #{dmg_filesystem} \
     -format #{dmg_format} \
     #{dmg_file}")
 

data/tasks/config.rake

@@ -6,11 +6,6 @@ namespace :config do
     end
   end
 
-  desc "validate Pkg::Config values for this repo"
-  task :validate do
-    Pkg::Config.perform_validations
-  end
-
   task :print_hosts => 'pl:fetch' do
     Pkg::Util.filter_configs('host').each do |key, value|
       puts "#{key}: #{value}"

data/tasks/education.rake

@@ -35,7 +35,7 @@ namespace :pl do
       end
 
       # If the archive directory exists, move old VMs to it
-      Pkg::Util::Net.remote_execute(target_host, "if [ -d #{target_directory}/archive ]; then #{archive_cmd}; fi")
+      Pkg::Util::Net.remote_ssh_cmd(target_host, "if [ -d #{target_directory}/archive ]; then #{archive_cmd}; fi")
 
       # Ship VM and md5 to host
       Pkg::Util::Net.rsync_to(vm, target_host, target_directory)
@@ -45,10 +45,10 @@ namespace :pl do
       link_target.each do |link|
         link_path = File.join(target_directory, link)
         link_md5_path = "#{link_path}.md5"
-        Pkg::Util::Net.remote_execute(target_host, "if [[ -L '#{link_path}' ]] && [[ ! -e '#{link_path}' ]] ; then echo '#{link_path} is a broken link, deleting' ; unlink '#{link_path}' ; fi")
-        Pkg::Util::Net.remote_execute(target_host, "if [[ -L '#{link_md5_path}' ]] && [[ ! -e '#{link_md5_path}' ]] ; then echo '#{link_md5_path} is a broken link, deleting' ; unlink '#{link_md5_path}' ; fi")
-        Pkg::Util::Net.remote_execute(target_host, "cd #{target_directory} ; ln -sf #{File.basename(vm)} #{link}")
-        Pkg::Util::Net.remote_execute(target_host, "cd #{target_directory} ; ln -sf #{File.basename(md5)} #{link}.md5")
+        Pkg::Util::Net.remote_ssh_cmd(target_host, "if [[ -L '#{link_path}' ]] && [[ ! -e '#{link_path}' ]] ; then echo '#{link_path} is a broken link, deleting' ; unlink '#{link_path}' ; fi")
+        Pkg::Util::Net.remote_ssh_cmd(target_host, "if [[ -L '#{link_md5_path}' ]] && [[ ! -e '#{link_md5_path}' ]] ; then echo '#{link_md5_path} is a broken link, deleting' ; unlink '#{link_md5_path}' ; fi")
+        Pkg::Util::Net.remote_ssh_cmd(target_host, "cd #{target_directory} ; ln -sf #{File.basename(vm)} #{link}")
+        Pkg::Util::Net.remote_ssh_cmd(target_host, "cd #{target_directory} ; ln -sf #{File.basename(md5)} #{link}.md5")
       end
 
       puts "'#{vm}' and '#{md5}' have been shipped via rsync to '#{target_host}/#{target_directory}'"

data/tasks/fetch.rake

@@ -30,31 +30,28 @@ namespace :pl do
   task :fetch do
     # Remove .packaging directory from old-style extras loading
     rm_rf "#{ENV['HOME']}/.packaging" if File.directory?("#{ENV['HOME']}/.packaging")
-
     # Touch the .packaging file which is allows packaging to present remote tasks
     touch "#{ENV['HOME']}/.packaging"
 
     begin
-      build_data_directory = Pkg::Util::File.mktemp
-      %x(git clone #{data_repo} #{build_data_directory})
-      unless $?.success?
-        fail 'Error: could not fetch the build-data repo. Maybe you do not have the correct permissions?'
-      end
-
-      Dir.chdir(build_data_directory) do
-        [team_data_branch, project_data_branch].each do |branch|
-          %x(git checkout #{branch})
-          unless $?.success?
-            warn "Warning: no build_defaults found in branch '#{branch}' of '#{data_repo}'. Skipping."
-            next
+      temp_build_data_dir = Pkg::Util::File.mktemp
+      %x(git clone #{data_repo} #{temp_build_data_dir})
+      if $?.success?
+        Dir.chdir(temp_build_data_dir) do
+          [team_data_branch, project_data_branch].each do |branch|
+            %x(git checkout #{branch})
+            if $?.success?
+              Pkg::Util::RakeUtils.invoke_task("pl:load_extras", temp_build_data_dir)
+            else
+              warn "Unable to load build_defaults from branch '#{branch}' in '#{data_repo}'. Skipping."
+            end
           end
-          Pkg::Util::RakeUtils.invoke_task('pl:load_extras', build_data_directory)
         end
+      else
+        fail "There was an error attempting to fetch the build-data repo. Maybe you do not have the correct permissions?"
       end
     ensure
-      rm_rf build_data_directory
+      rm_rf temp_build_data_dir
     end
-
-    Pkg::Util::RakeUtils.invoke_task('config:validate')
   end
 end