def get_updates(upgrade_option)
apt_updates = nil
if File.executable?('/usr/bin/apt-get')
- apt_get_result = Facter::Util::Resolution.exec("/usr/bin/apt-get -s -o Debug::NoLocking=true #{upgrade_option} 2>&1")
+ apt_get_result = Facter::Core::Execution.execute("/usr/bin/apt-get -s -o Debug::NoLocking=true #{upgrade_option} 2>&1")
unless apt_get_result.nil?
apt_updates = [[], []]
apt_get_result.each_line do |line|
$sourcelist = epp('apt/source.list.epp', {
'comment' => $comment,
'includes' => $includes,
- 'options' => delete_undef_values( {
+ 'options' => delete_undef_values({
'arch' => $architecture,
'trusted' => $allow_unsigned ? { true => 'yes', false => undef },
'allow-insecure' => $allow_insecure ? { true => 'yes', false => undef },
before(:each) do
allow(Facter.fact(:osfamily)).to receive(:value).once.and_return('Debian')
allow(File).to receive(:executable?) # Stub all other calls
- allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls
+ allow(Facter::Core::Execution).to receive(:execute) # Catch all other calls
allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true)
- allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return('test')
+ allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return('test')
apt_output = "Inst extremetuxracer [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
"Conf extremetuxracer (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
"Inst planet.rb [13-1.1] (22-2~bpo8+1 Debian Backports:stretch-backports [all])\n" \
"Conf planet.rb (22-2~bpo8+1 Debian Backports:stretch-backports [all])\n"
- allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').and_return(apt_output)
+ allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').and_return(apt_output)
end
it { is_expected.to be true }
end
before(:each) do
allow(Facter.fact(:osfamily)).to receive(:value).and_return('Debian')
allow(File).to receive(:executable?) # Stub all other calls
- allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls
+ allow(Facter::Core::Execution).to receive(:execute) # Catch all other calls
allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true)
- allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return('test')
+ allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return('test')
allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true)
- allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').and_return(apt_get_upgrade_output)
+ allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').and_return(apt_get_upgrade_output)
end
describe 'on Debian' do
before(:each) do
allow(Facter.fact(:osfamily)).to receive(:value).and_return('Debian')
allow(File).to receive(:executable?) # Stub all other calls
- allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls
+ allow(Facter::Core::Execution).to receive(:execute) # Catch all other calls
allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true)
- allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return('test')
+ allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return('test')
allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true)
apt_output = "Inst extremetuxracer [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
"Conf extremetuxracer (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
"Inst planet.rb [13-1.1] (22-2~bpo8+1 Debian Backports:-backports [all])\n" \
"Conf planet.rb (22-2~bpo8+1 Debian Backports:-backports [all])\n"
- allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').and_return(apt_output)
+ allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').and_return(apt_output)
end
it { is_expected.to eq(['extremetuxracer', 'planet.rb']) }
end
before(:each) do
allow(Facter.fact(:osfamily)).to receive(:value).and_return('Debian')
allow(File).to receive(:executable?) # Stub all other calls
- allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls
+ allow(Facter::Core::Execution).to receive(:execute) # Catch all other calls
allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true)
- allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return('test')
+ allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return('test')
allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true)
- allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').and_return(apt_get_upgrade_output)
+ allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').and_return(apt_get_upgrade_output)
end
describe 'on Debian' do
before(:each) do
allow(Facter.fact(:osfamily)).to receive(:value).and_return('Debian')
allow(File).to receive(:executable?) # Stub all other calls
- allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls
+ allow(Facter::Core::Execution).to receive(:execute) # Catch all other calls
allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true)
- allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return('test')
+ allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return('test')
allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true)
apt_output = "Inst extremetuxracer [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
"Conf extremetuxracer (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
"Inst planet.rb [13-1.1] (22-2~bpo8+1 Debian Backports:-backports [all])\n" \
"Conf planet.rb (22-2~bpo8+1 Debian Backports:-backports [all])\n"
- allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').and_return(apt_output)
+ allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true dist-upgrade 2>&1').and_return(apt_output)
end
it { is_expected.to eq(2) }
end
before(:each) do
allow(Facter.fact(:osfamily)).to receive(:value).and_return('Debian')
allow(File).to receive(:executable?) # Stub all other calls
- allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls
+ allow(Facter::Core::Execution).to receive(:execute) # Catch all other calls
allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true)
apt_output = "Inst tzdata [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
"Conf tzdata (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
"Inst unhide.rb [13-1.1] (22-2~bpo8+1 Debian Backports:-backports [all])\n" \
"Conf unhide.rb (22-2~bpo8+1 Debian Backports:-backports [all])\n"
- allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return(apt_output)
+ allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return(apt_output)
end
it { is_expected.to be true }
end
before(:each) do
allow(Facter.fact(:osfamily)).to receive(:value).and_return('Debian')
allow(File).to receive(:executable?) # Stub all other calls
- allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls
+ allow(Facter::Core::Execution).to receive(:execute) # Catch all other calls
allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true)
- allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return(apt_get_upgrade_output)
+ allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return(apt_get_upgrade_output)
end
describe 'on Debian' do
before(:each) do
allow(Facter.fact(:osfamily)).to receive(:value).and_return('Debian')
allow(File).to receive(:executable?) # Stub all other calls
- allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls
+ allow(Facter::Core::Execution).to receive(:execute) # Catch all other calls
allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true)
apt_output = "Inst tzdata [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
"Conf tzdata (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
"Inst unhide.rb [13-1.1] (22-2~bpo8+1 Debian Backports:-backports [all])\n" \
"Conf unhide.rb (22-2~bpo8+1 Debian Backports:-backports [all])\n"
- allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return(apt_output)
+ allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return(apt_output)
end
it { is_expected.to eq(['tzdata', 'unhide.rb']) }
end
before(:each) do
allow(Facter.fact(:osfamily)).to receive(:value).and_return('Debian')
allow(File).to receive(:executable?) # Stub all other calls
- allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls
+ allow(Facter::Core::Execution).to receive(:execute) # Catch all other calls
allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true)
- allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return(apt_get_upgrade_output)
+ allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return(apt_get_upgrade_output)
end
describe 'on Debian' do
before(:each) do
allow(Facter.fact(:osfamily)).to receive(:value).and_return('Debian')
allow(File).to receive(:executable?) # Stub all other calls
- allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls
+ allow(Facter::Core::Execution).to receive(:execute) # Catch all other calls
allow(File).to receive(:executable?).with('/usr/bin/apt-get').and_return(true)
apt_output = "Inst tzdata [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
"Conf tzdata (2015g-0+deb8u1 Debian:stable-updates [all])\n" \
"Inst unhide.rb [13-1.1] (22-2~bpo8+1 Debian Backports:-backports [all])\n" \
"Conf unhide.rb (22-2~bpo8+1 Debian Backports:-backports [all])\n"
- allow(Facter::Util::Resolution).to receive(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return(apt_output)
+ allow(Facter::Core::Execution).to receive(:execute).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').and_return(apt_output)
end
it { is_expected.to eq(2) }
end