X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=lib%2Ffacter%2Fapt_updates.rb;h=66c6a892867be4b15161f41cc84aad3ea9ca0510;hb=refs%2Fheads%2Frelease-prep;hp=15d9473d6e63716cfd9048775bc8ca82a6857bdb;hpb=ea9f902543e0696286bf55ce2ad8c1818ffd5a84;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/lib/facter/apt_updates.rb b/lib/facter/apt_updates.rb
index 15d9473..66c6a89 100644
--- a/lib/facter/apt_updates.rb
+++ b/lib/facter/apt_updates.rb
@@ -1,9 +1,103 @@
-Facter.add("apt_updates") do
-  confine :osfamily => 'Debian'
-  setcode do
-    if File.executable?("/usr/lib/update-notifier/apt-check")
-      updates = Facter::Util::Resolution.exec('/usr/lib/update-notifier/apt-check 2>/dev/null')
-      Integer(updates.strip.split(';')[0])
+# frozen_string_literal: true
+
+apt_package_updates = nil
+apt_dist_updates = nil
+
+# Executes the upgrading of packages
+# @param
+#   upgrade_option Type of upgrade passed into apt-get command arguments i.e. 'upgrade' or 'dist-upgrade'
+def get_updates(upgrade_option)
+  apt_updates = nil
+  if File.executable?('/usr/bin/apt-get')
+    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|
+        next unless %r{^Inst\s}.match?(line)
+
+        package = line.gsub(%r{^Inst\s([^\s]+)\s.*}, '\1').strip
+        apt_updates[0].push(package)
+        security_matches = [
+          %r{ Debian-Security:},
+          %r{ Ubuntu[^\s]+-security[, ]},
+          %r{ gNewSense[^\s]+-security[, ]},
+        ]
+        re = Regexp.union(security_matches)
+        apt_updates[1].push(package) if line.match(re)
+      end
     end
   end
+  apt_updates
+end
+
+Facter.add('apt_has_updates') do
+  confine osfamily: 'Debian'
+  setcode do
+    apt_package_updates = get_updates('upgrade')
+    apt_package_updates != [[], []] if !apt_package_updates.nil? && apt_package_updates.length == 2
+  end
+end
+
+Facter.add('apt_has_dist_updates') do
+  confine osfamily: 'Debian'
+  setcode do
+    apt_dist_updates = get_updates('dist-upgrade')
+    apt_dist_updates != [[], []] if !apt_dist_updates.nil? && apt_dist_updates.length == 2
+  end
+end
+
+Facter.add('apt_package_updates') do
+  confine apt_has_updates: true
+  setcode do
+    apt_package_updates[0]
+  end
+end
+
+Facter.add('apt_package_dist_updates') do
+  confine apt_has_dist_updates: true
+  setcode do
+    apt_dist_updates[0]
+  end
+end
+
+Facter.add('apt_package_security_updates') do
+  confine apt_has_updates: true
+  setcode do
+    apt_package_updates[1]
+  end
+end
+
+Facter.add('apt_package_security_dist_updates') do
+  confine apt_has_dist_updates: true
+  setcode do
+    apt_dist_updates[1]
+  end
+end
+
+Facter.add('apt_updates') do
+  confine apt_has_updates: true
+  setcode do
+    Integer(apt_package_updates[0].length)
+  end
+end
+
+Facter.add('apt_dist_updates') do
+  confine apt_has_dist_updates: true
+  setcode do
+    Integer(apt_dist_updates[0].length)
+  end
+end
+
+Facter.add('apt_security_updates') do
+  confine apt_has_updates: true
+  setcode do
+    Integer(apt_package_updates[1].length)
+  end
+end
+
+Facter.add('apt_security_dist_updates') do
+  confine apt_has_dist_updates: true
+  setcode do
+    Integer(apt_dist_updates[1].length)
+  end
 end