facterdb 1.10.1 → 1.12.2

data/facts/Vagrantfile

@@ -43,6 +43,24 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     host.vm.provision "shell", path: "get_facts.sh"
     host.vm.provision "shell", inline: "/sbin/shutdown -h now"
   end
+  config.vm.define "ubuntu-20.04-x86_64" do |host|
+    host.vm.box = "ubuntu/focal64"
+    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+    host.vm.provision "shell", path: "get_facts.sh"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+  end
+  config.vm.define "ubuntu-21.04-x86_64" do |host|
+    host.vm.box = "ubuntu/hirsute64"
+    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+    host.vm.provision "shell", path: "get_facts.sh"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+  end
+  config.vm.define "ubuntu-21.10-x86_64" do |host|
+    host.vm.box = "ubuntu/impish64"
+    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+    host.vm.provision "shell", path: "get_facts.sh"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+  end
   config.vm.define "centos-7-x86_64" do |host|
     host.vm.box = "centos/7"
     host.vm.network :private_network, ip: '10.0.0.2'
@@ -70,7 +88,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     host.vm.provision "shell", inline: "/sbin/shutdown -h now"
   end
   config.vm.define "rockylinux-8-x86_64" do |host|
-    host.vm.box = "https://github.com/anoncam/rocky-linux-vagrant/blob/main/rockylinux.box"
+    host.vm.box = "generic/rocky8"
     host.vm.synced_folder ".", "/vagrant"
     host.vm.provision "shell", inline: "dnf -y install wget make gcc net-tools"
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
@@ -280,4 +298,39 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     host.vm.provision "shell", path: "get_facts.sh"
     host.vm.provision "shell", inline: "/sbin/shutdown -h now"
   end
+  config.vm.define "fedora-32-x86_64" do |host|
+    host.vm.box = "generic/fedora32"
+    host.vm.synced_folder ".", "/vagrant"
+    host.vm.provision "shell", inline: "dnf -y install wget make gcc net-tools"
+    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+    host.vm.provision "shell", path: "get_facts.sh"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+  end
+  config.vm.define "fedora-33-x86_64" do |host|
+    host.vm.box = "generic/fedora33"
+    host.vm.synced_folder ".", "/vagrant"
+    # there's no official support for fedora 33, so we need ruby and facter from Fedora
+    host.vm.provision "shell", inline: "dnf -y install wget make gcc net-tools ruby ruby-devel facter"
+    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+    host.vm.provision "shell", path: "get_facts.sh"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+  end
+  config.vm.define "fedora-34-x86_64" do |host|
+    host.vm.box = "generic/fedora34"
+    host.vm.synced_folder ".", "/vagrant"
+    host.vm.provision "shell", inline: "dnf -y install wget make gcc net-tools"
+    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+    host.vm.provision "shell", path: "get_facts.sh"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+  end
+  config.vm.define "fedora-35-x86_64" do |host|
+    host.vm.box = "generic/fedora35"
+    host.vm.synced_folder ".", "/vagrant"
+    # there's no official support for fedora 35, so we need ruby 2.7 and facter from Fedora
+    host.vm.provision "shell", inline: "dnf -y module install ruby:2.7/default"
+    host.vm.provision "shell", inline: "dnf -y install wget make gcc net-tools facter ruby-devel"
+    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+    host.vm.provision "shell", path: "get_facts.sh"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+  end
 end

data/facts/get_facts.sh

@@ -97,9 +97,10 @@ case "${osfamily}" in
     done
     yum remove -y puppet5-release
   fi
+  # Puppet 6
   yum install -y "https://yum.puppetlabs.com/puppet6-release-fedora-${operatingsystemmajrelease}.noarch.rpm"
   if [[ "${?}" == 0 ]]; then
-    for puppet_agent_version in 6.2.0-1 6.4.2-1 6.6.0-1; do
+    for puppet_agent_version in 6.25.0-1; do
       dnf install -y "puppet-agent-${puppet_agent_version}.fc${operatingsystemmajrelease}"
       if [[ "${?}" == 0 ]]; then
         output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
@@ -109,6 +110,24 @@ case "${osfamily}" in
     done
     yum remove -y puppet6-release
   fi
+  # Puppet 7
+  if [[ $operatingsystemmajrelease == '33' ]] && command -v facter &> /dev/null; 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})
+    facter --show-legacy -p -j | tee ${output_file}
+  fi
+  yum install -y "https://yum.puppetlabs.com/puppet7-release-fedora-${operatingsystemmajrelease}.noarch.rpm"
+  if [[ "${?}" == 0 ]]; then
+    for puppet_agent_version in 7.12.0-1; do
+      dnf install -y "puppet-agent-${puppet_agent_version}.fc${operatingsystemmajrelease}"
+      if [[ "${?}" == 0 ]]; 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})
+        facter --show-legacy -p -j | tee ${output_file}
+      fi
+    done
+    yum remove -y puppet7-release
+  fi
   ;;
 'RedHat')
   if [[ ${operatingsystemmajrelease} -eq 5 ]]; then
@@ -155,6 +174,18 @@ case "${osfamily}" in
     done
     yum remove -y puppet6-release
   fi
+  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
+      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})
+        facter --show-legacy -p -j | tee ${output_file}
+      fi
+    done
+    yum remove -y puppet7-release
+  fi
   ;;
 'RockyLinux'|'AlmaLinux')
   dnf localinstall -y "http://yum.puppetlabs.com/puppet6-release-el-${operatingsystemmajrelease}.noarch.rpm"
@@ -212,11 +243,24 @@ case "${osfamily}" in
     done
     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
+    dpkg --install /tmp/puppet7-release.deb
+    apt-get update
+    for puppet_agent_version in 7.5.0 7.6.1 7.12.0; do
+      if apt_install 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})
+        facter --show-legacy -p -j | tee ${output_file}
+      fi
+    done
+    apt-get -y remove --purge puppet7-release
+  fi
   apt_install make gcc libgmp-dev
 
   # There are no puppet-agent packages for Buster yet, so generate a Facter 3.x
   # fact set from the official Debian package.
-  if [[ "buster" = "${lsbdistcodename}" ]]; then
+  if [[ "buster" = "${lsbdistcodename}" || "hirsute" =~ ${lsbdistcodename} || "impish" =~ ${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})
@@ -326,9 +370,6 @@ for version in 4.0.0 4.1.0 4.2.0; do
   ls -l /vagrant > /dev/null
 
   case "${operatingsystem}" in
-    almalinux|rocky)
-      break
-      ;;
     openbsd)
       output_file="/vagrant/$(bundle exec facter --version | cut -d. -f1,2)/${operatingsystem}-${operatingsystemrelease}-${hardwaremodel}.facts"
       ;;

data/lib/facterdb/version.rb

@@ -1,5 +1,5 @@
 module FacterDB
   module Version
-    STRING = '1.10.1'
+    STRING = '1.12.2'
   end
 end

data/spec/facts_spec.rb

@@ -62,26 +62,6 @@ describe 'Default Facts' do
     end
   end
 
-  KNOWN_IPADDRESS_PENDING = {
-    'facts/1.6/fedora-19-i386.facts' => 'unable to regenerate facts',
-    'facts/1.6/fedora-19-x86_64.facts' => 'unable to regenerate facts',
-    'facts/2.1/archlinux-x86_64.facts' => 'no ifconfig package',
-    'facts/3.10/ubuntu-18.04-aarch64.facts' => 'unable to regenerate facts',
-    'facts/1.6/archlinux-x86_64.facts' => 'no ifconfig package',
-    'facts/2.4/archlinux-x86_64.facts' => 'no ifconfig package',
-    'facts/3.2/aix-61-powerpc.facts' => 'unable to regenerate facts',
-    'facts/3.2/aix-71-powerpc.facts' => 'unable to regenerate facts',
-    'facts/3.2/aix-53-powerpc.facts' => 'unable to regenerate facts',
-    'facts/2.3/archlinux-x86_64.facts' => 'no ifconfig package',
-    'facts/2.5/archlinux-x86_64.facts' => 'no ifconfig package',
-    'facts/1.7/archlinux-x86_64.facts' => 'no ifconfig package',
-    'facts/2.0/archlinux-x86_64.facts' => 'no ifconfig package',
-    'facts/2.2/archlinux-x86_64.facts' => 'no ifconfig package',
-    'facts/3.6/pcs-6-x86_64.facts' => 'unable to regenerate facts',
-    'facts/3.0/ubuntu-15.10-x86_64.facts' => 'no puppet-agent package',
-    'facts/3.0/ubuntu-15.10-i386.facts' => 'no puppet-agent package',
-  }
-
   project_dir = Pathname.new(__dir__).parent
   FacterDB.default_fact_files.each do |filepath|
     relative_path = Pathname.new(filepath).relative_path_from(project_dir).to_s
@@ -100,15 +80,35 @@ describe 'Default Facts' do
         expect(content['facterversion']).to have_facter_version(facter_dir_path, filepath)
       end
 
-      it 'contains an ipaddress or networking.ip fact' do
-        pending KNOWN_IPADDRESS_PENDING[relative_path] if KNOWN_IPADDRESS_PENDING.key?(relative_path)
-        case content['facterversion']
-        when /^[1-3]/
-          expect(content['ipaddress']).to not_be_nil.and not_be_empty
-        else
+      it 'contains newer networking facts hash' do
+        if Gem::Version.new(content['facterversion']) >= Gem::Version.new('3.0.0')
           expect(content['networking']['ip']).to not_be_nil.and not_be_empty
+          expect(content['networking']['hostname']).to eq('foo')
+          expect(content['networking']['domain']).to eq('example.com')
+          expect(content['networking']['fqdn']).to eq('foo.example.com')
         end
-        
+      end
+      it 'contains the legacy ipaddress fact' do
+        expect(content['ipaddress']).to not_be_nil.and not_be_empty
+      end
+      it 'contains no facts from puppetlabs/stdlib' do
+        expect(content['root_home']).to be_nil
+        expect(content['service_provider']).to be_nil
+        expect(content['puppet_vardir']).to be_nil
+        expect(content['puppet_environmentpath']).to be_nil
+        expect(content['puppet_server']).to be_nil
+        expect(content['pe_version']).to be_nil
+        expect(content['package_provider']).to be_nil
+      end
+      it 'contains no facts from puppet/systemd' do
+        expect(content['systemd']).to be_nil
+        expect(content['systemd_version']).to be_nil
+        expect(content['systemd_internal_services']).to be_nil
+      end
+      it 'contains a legacy hostname, domain and fqdn fact' do
+        expect(content['hostname']).to eq('foo')
+        expect(content['fqdn']).to eq('foo.example.com')
+        expect(content['domain']).to eq('example.com')
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facterdb
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.12.2
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-09 00:00:00.000000000 Z
+date: 2021-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -1325,6 +1325,9 @@ files:
 - facts/3.14/fedora-28-x86_64.facts
 - facts/3.14/fedora-29-x86_64.facts
 - facts/3.14/fedora-30-x86_64.facts
+- facts/3.14/fedora-32-x86_64.facts
+- facts/3.14/fedora-33-x86_64.facts
+- facts/3.14/fedora-34-x86_64.facts
 - facts/3.14/freebsd-11-amd64.facts
 - facts/3.14/freebsd-11-x86_64.facts
 - facts/3.14/freebsd-12-amd64.facts
@@ -1351,6 +1354,8 @@ files:
 - facts/3.14/ubuntu-16.04-x86_64.facts
 - facts/3.14/ubuntu-18.04-x86_64.facts
 - 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/windows-10-i386.facts
 - facts/3.14/windows-10-x86_64.facts
 - facts/3.14/windows-2012 r2-core-x86_64.facts
@@ -1737,20 +1742,39 @@ files:
 - facts/4.0/centos-7-x86_64.facts
 - facts/4.0/debian-10-x86_64.facts
 - facts/4.0/debian-11-x86_64.facts
+- facts/4.0/fedora-32-x86_64.facts
+- facts/4.0/fedora-33-x86_64.facts
+- facts/4.0/fedora-34-x86_64.facts
+- facts/4.0/fedora-35-x86_64.facts
 - facts/4.0/freebsd-11-x86_64.facts
 - facts/4.0/freebsd-12-x86_64.facts
 - facts/4.0/freebsd-13-x86_64.facts
+- facts/4.0/oraclelinux-7-x86_64.facts
+- facts/4.0/redhat-7-x86_64.facts
 - facts/4.0/redhat-8-x86_64.facts
+- facts/4.0/rocky-8-x86_64.facts
+- facts/4.0/scientific-7-x86_64.facts
 - facts/4.0/solaris-11-sun4v.facts
 - facts/4.0/ubuntu-18.04-x86_64.facts
 - facts/4.0/ubuntu-20.04-x86_64.facts
+- 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/debian-11-x86_64.facts
+- facts/4.1/fedora-32-x86_64.facts
+- facts/4.1/fedora-33-x86_64.facts
+- facts/4.1/fedora-34-x86_64.facts
+- facts/4.1/fedora-35-x86_64.facts
 - facts/4.1/freebsd-11-x86_64.facts
 - facts/4.1/freebsd-12-x86_64.facts
 - facts/4.1/freebsd-13-x86_64.facts
 - facts/4.1/redhat-8-x86_64.facts
+- facts/4.1/rocky-8-x86_64.facts
 - facts/4.1/ubuntu-18.04-x86_64.facts
 - facts/4.1/ubuntu-20.04-x86_64.facts
+- 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/centos-7-x86_64.facts
 - facts/4.2/centos-8-x86_64.facts
 - facts/4.2/centos-9-x86_64.facts
@@ -1758,13 +1782,25 @@ files:
 - facts/4.2/debian-10-x86_64.facts
 - facts/4.2/debian-11-x86_64.facts
 - facts/4.2/debian-9-x86_64.facts
+- facts/4.2/fedora-32-x86_64.facts
+- facts/4.2/fedora-33-x86_64.facts
+- facts/4.2/fedora-34-x86_64.facts
+- facts/4.2/fedora-35-x86_64.facts
 - facts/4.2/freebsd-11-x86_64.facts
 - facts/4.2/freebsd-12-x86_64.facts
 - facts/4.2/freebsd-13-x86_64.facts
+- facts/4.2/oraclelinux-7-x86_64.facts
 - facts/4.2/oraclelinux-8-x86_64.facts
+- facts/4.2/oraclelinux-9-x86_64.facts
+- facts/4.2/redhat-7-x86_64.facts
 - facts/4.2/redhat-8-x86_64.facts
+- facts/4.2/redhat-9-x86_64.facts
+- facts/4.2/rocky-8-x86_64.facts
+- facts/4.2/scientific-7-x86_64.facts
 - facts/4.2/ubuntu-18.04-x86_64.facts
 - 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/Gemfile
 - facts/Vagrantfile
 - facts/Windows_README.md
@@ -1812,7 +1848,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: A Database of OS facts provided by Facter