facterdb 1.17.0 → 1.18.0

data/facts/get_facts.sh

@@ -53,7 +53,7 @@ case "${osfamily}" in
   fi
   yum -y install "https://yum.puppetlabs.com/puppet6-release-${distcode}-${operatingsystemmajrelease}.noarch.rpm"
   if [[ "${?}" == 0 ]]; then
-    for puppet_agent_version in 6.25.0; do
+    for puppet_agent_version in 6.25.0 6.27.1; do
       if yum install -y puppet-agent-${puppet_agent_version}; then
         output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
         mkdir -p $(dirname ${output_file})
@@ -65,7 +65,7 @@ case "${osfamily}" in
   wget "http://yum.puppetlabs.com/puppet7-release-el-${operatingsystemmajrelease}.noarch.rpm" -O /tmp/puppet7-release.rpm
   if test -f /tmp/puppet7-release.rpm; then
     rpm -ivh /tmp/puppet7-release.rpm
-    for puppet_agent_version in 7.5.0 7.6.1 7.12.0; do
+    for puppet_agent_version in 7.5.0 7.6.1 7.17.0; do
       if yum install -y puppet-agent-${puppet_agent_version}; then
         output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
         mkdir -p $(dirname ${output_file})
@@ -78,7 +78,8 @@ case "${osfamily}" in
 'Debian')
   apt_install curl
   curl "https://apt.puppetlabs.com/puppet6-release-${lsbdistcodename}.deb" -o /tmp/puppet6-release.deb
-  if test "$?" -eq 0 -a -f /tmp/puppet6-release.deb; then
+  # apt.puppetlabs.com returns an html document if the requested deb doesn't exist and /tmp/puppet6-release.deb will be an html doc
+  if test "$?" -eq 0 -a -f /tmp/puppet6-release.deb && [[ "$(file -b /tmp/puppet6-release.deb)" =~ "Debian binary package".* ]] ; then
     dpkg --install /tmp/puppet6-release.deb
     apt-get update
     for puppet_agent_version in 6.2 6.4 6.6; do
@@ -91,7 +92,8 @@ case "${osfamily}" in
     apt-get -y remove --purge puppet6-release
   fi
   curl "https://apt.puppetlabs.com/puppet7-release-${lsbdistcodename}.deb" -o /tmp/puppet7-release.deb
-  if test "$?" -eq 0 -a -f /tmp/puppet7-release.deb; then
+  # apt.puppetlabs.com returns an html document if the requested deb doesn't exist and /tmp/puppet6-release.deb will be an html doc
+  if test "$?" -eq 0 -a -f /tmp/puppet7-release.deb && [[ "$(file -b /tmp/puppet6-release.deb)" =~ "Debian binary package".* ]] ; then
     dpkg --install /tmp/puppet7-release.deb
     apt-get update
     for puppet_agent_version in 7.5.0 7.6.1 7.12.0; do
@@ -105,9 +107,9 @@ case "${osfamily}" in
   fi
   apt_install make gcc libgmp-dev
 
-  # There are no puppet-agent packages for Buster yet, so generate a Facter 3.x
+  # There are no puppet-agent packages for $releasename yet, so generate a Facter 3.x
   # fact set from the official Debian package.
-  if [[ "buster" = "${lsbdistcodename}" || "hirsute" =~ ${lsbdistcodename} || "impish" =~ ${lsbdistcodename} ]]; then
+  if [[ "hirsute" =~ ${lsbdistcodename} || "impish" =~ ${lsbdistcodename} || "jammy" =~ ${lsbdistcodename} ]]; then
     apt_install ruby rubygems ruby-dev puppet facter
     output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
     mkdir -p $(dirname ${output_file})

data/lib/facterdb/version.rb

@@ -1,5 +1,5 @@
 module FacterDB
   module Version
-    STRING = '1.17.0'
+    STRING = '1.18.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facterdb
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -1309,6 +1309,7 @@ files:
 - facts/3.13/windows-2019-x86_64.facts
 - facts/3.14/VirtuozzoLinux-7-x86_64.facts
 - facts/3.14/almalinux-8-x86_64.facts
+- facts/3.14/almalinux-9-x86_64.facts
 - facts/3.14/amazon-2-x86_64.facts
 - facts/3.14/amazon-2016-x86_64.facts
 - facts/3.14/archlinux-x86_64.facts
@@ -1361,6 +1362,7 @@ files:
 - facts/3.14/ubuntu-20.04-x86_64.facts
 - facts/3.14/ubuntu-21.04-x86_64.facts
 - facts/3.14/ubuntu-21.10-x86_64.facts
+- facts/3.14/ubuntu-22.04-x86_64.facts
 - facts/3.14/windows-10-i386.facts
 - facts/3.14/windows-10-x86_64.facts
 - facts/3.14/windows-2012 r2-core-x86_64.facts
@@ -1744,6 +1746,7 @@ files:
 - facts/3.9/windows-2016-x86_64.facts
 - facts/3.9/windows-2019-x86_64.facts
 - facts/4.0/almalinux-8-x86_64.facts
+- facts/4.0/almalinux-9-x86_64.facts
 - facts/4.0/centos-7-x86_64.facts
 - facts/4.0/debian-10-x86_64.facts
 - facts/4.0/debian-11-x86_64.facts
@@ -1767,6 +1770,7 @@ files:
 - facts/4.0/ubuntu-21.04-x86_64.facts
 - facts/4.0/ubuntu-21.10-x86_64.facts
 - facts/4.1/almalinux-8-x86_64.facts
+- facts/4.1/almalinux-9-x86_64.facts
 - facts/4.1/debian-11-x86_64.facts
 - facts/4.1/fedora-32-x86_64.facts
 - facts/4.1/fedora-33-x86_64.facts
@@ -1784,6 +1788,7 @@ files:
 - facts/4.1/ubuntu-21.04-x86_64.facts
 - facts/4.1/ubuntu-21.10-x86_64.facts
 - facts/4.2/almalinux-8-x86_64.facts
+- facts/4.2/almalinux-9-x86_64.facts
 - facts/4.2/archlinux-x86_64.facts
 - facts/4.2/centos-7-x86_64.facts
 - facts/4.2/centos-8-x86_64.facts
@@ -1817,6 +1822,7 @@ files:
 - facts/4.2/ubuntu-20.04-x86_64.facts
 - facts/4.2/ubuntu-21.04-x86_64.facts
 - facts/4.2/ubuntu-21.10-x86_64.facts
+- facts/4.2/ubuntu-22.04-x86_64.facts
 - facts/Gemfile
 - facts/Vagrantfile
 - facts/Windows_README.md