facterdb 1.6.0 → 1.10.0

data/facts/4.2/ubuntu-20.04-x86_64.facts

@@ -0,0 +1,267 @@
+{
+  "aio_agent_version": "6.24.0",
+  "augeas": {
+    "version": "1.12.0"
+  },
+  "disks": {
+    "sda": {
+      "model": "HARDDISK",
+      "size": "40.00 GiB",
+      "size_bytes": 42949672960,
+      "type": "hdd",
+      "vendor": "VBOX"
+    },
+    "sdb": {
+      "model": "HARDDISK",
+      "size": "10.00 MiB",
+      "size_bytes": 10485760,
+      "type": "hdd",
+      "vendor": "VBOX"
+    }
+  },
+  "dmi": {
+    "bios": {
+      "release_date": "12/01/2006",
+      "vendor": "innotek GmbH",
+      "version": "VirtualBox"
+    },
+    "board": {
+      "manufacturer": "Oracle Corporation",
+      "product": "VirtualBox",
+      "serial_number": "0"
+    },
+    "chassis": {
+      "type": "Other"
+    },
+    "manufacturer": "innotek GmbH",
+    "product": {
+      "name": "VirtualBox",
+      "serial_number": "0",
+      "uuid": "20900609-227b-df4c-8c9d-78b9c4fbacc7"
+    }
+  },
+  "facterversion": "4.2.4",
+  "filesystems": "btrfs,ext2,ext3,ext4,iso9660,squashfs,vfat",
+  "fips_enabled": false,
+  "gem_version": "~> 4.2.0",
+  "hypervisors": {
+    "virtualbox": {
+      "revision": "145957",
+      "version": "6.1.26"
+    }
+  },
+  "identity": {
+    "gid": 0,
+    "group": "root",
+    "privileged": true,
+    "uid": 0,
+    "user": "root"
+  },
+  "is_virtual": true,
+  "kernel": "Linux",
+  "kernelmajversion": "5.4",
+  "kernelrelease": "5.4.0-86-generic",
+  "kernelversion": "5.4.0",
+  "load_averages": {
+    "15m": 0.19,
+    "1m": 1.08,
+    "5m": 0.5
+  },
+  "memory": {
+    "system": {
+      "available": "641.32 MiB",
+      "available_bytes": 672473088,
+      "capacity": "34.63%",
+      "total": "981.04 MiB",
+      "total_bytes": 1028689920,
+      "used": "339.71 MiB",
+      "used_bytes": 356216832
+    }
+  },
+  "networking": {
+    "dhcp": "10.0.2.2",
+    "domain": "example.com",
+    "fqdn": "foo.example.com",
+    "hostname": "foo",
+    "interfaces": {
+      "enp0s3": {
+        "bindings": [
+          {
+            "address": "10.0.2.15",
+            "netmask": "255.255.255.0",
+            "network": "10.0.2.0"
+          }
+        ],
+        "bindings6": [
+          {
+            "address": "fe80::46:98ff:fed9:c9f4",
+            "netmask": "ffff:ffff:ffff:ffff::",
+            "network": "fe80::",
+            "scope6": "link",
+            "flags": [
+              "permanent"
+            ]
+          }
+        ],
+        "dhcp": "10.0.2.2",
+        "ip": "10.0.2.15",
+        "ip6": "fe80::46:98ff:fed9:c9f4",
+        "mac": "02:46:98:d9:c9:f4",
+        "mtu": 1500,
+        "netmask": "255.255.255.0",
+        "netmask6": "ffff:ffff:ffff:ffff::",
+        "network": "10.0.2.0",
+        "network6": "fe80::",
+        "scope6": "link"
+      },
+      "lo": {
+        "bindings": [
+          {
+            "address": "127.0.0.1",
+            "netmask": "255.0.0.0",
+            "network": "127.0.0.0"
+          }
+        ],
+        "bindings6": [
+          {
+            "address": "::1",
+            "netmask": "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
+            "network": "::1",
+            "scope6": "host",
+            "flags": [
+              "permanent"
+            ]
+          }
+        ],
+        "ip": "127.0.0.1",
+        "ip6": "::1",
+        "mtu": 65536,
+        "netmask": "255.0.0.0",
+        "netmask6": "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
+        "network": "127.0.0.0",
+        "network6": "::1",
+        "scope6": "host"
+      }
+    },
+    "ip": "10.0.2.15",
+    "ip6": "fe80::46:98ff:fed9:c9f4",
+    "mac": "02:46:98:d9:c9:f4",
+    "mtu": 1500,
+    "netmask": "255.255.255.0",
+    "netmask6": "ffff:ffff:ffff:ffff::",
+    "network": "10.0.2.0",
+    "network6": "fe80::",
+    "primary": "enp0s3",
+    "scope6": "link"
+  },
+  "os": {
+    "architecture": "amd64",
+    "distro": {
+      "codename": "focal",
+      "description": "Ubuntu 20.04.3 LTS",
+      "id": "Ubuntu",
+      "release": {
+        "full": "20.04",
+        "major": "20.04"
+      }
+    },
+    "family": "Debian",
+    "hardware": "x86_64",
+    "name": "Ubuntu",
+    "release": {
+      "full": "20.04",
+      "major": "20.04"
+    },
+    "selinux": {
+      "enabled": false
+    }
+  },
+  "partitions": {
+    "/dev/loop0": {
+      "backing_file": "/var/lib/snapd/snaps/core20_1081.snap",
+      "filesystem": "squashfs",
+      "size": "61.77 MiB",
+      "size_bytes": 64770048
+    },
+    "/dev/loop1": {
+      "backing_file": "/var/lib/snapd/snaps/lxd_21545.snap",
+      "filesystem": "squashfs",
+      "size": "67.25 MiB",
+      "size_bytes": 70516736
+    },
+    "/dev/loop2": {
+      "backing_file": "/var/lib/snapd/snaps/snapd_12883.snap",
+      "filesystem": "squashfs",
+      "size": "32.30 MiB",
+      "size_bytes": 33869824
+    },
+    "/dev/sda1": {
+      "filesystem": "ext4",
+      "label": "cloudimg-rootfs",
+      "partuuid": "bbed7fa6-01",
+      "size": "40.00 GiB",
+      "size_bytes": 42948607488,
+      "uuid": "167d8723-2972-4ac5-869e-c16609de3e76"
+    }
+  },
+  "path": "/home/vagrant/vendor/bundler/ruby/2.5.0/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin",
+  "processors": {
+    "cores": 2,
+    "count": 2,
+    "isa": "x86_64",
+    "models": [
+      "AMD Ryzen 7 PRO 4750U with Radeon Graphics",
+      "AMD Ryzen 7 PRO 4750U with Radeon Graphics"
+    ],
+    "physicalcount": 1,
+    "speed": "1.70 GHz",
+    "threads": 1
+  },
+  "ruby": {
+    "platform": "x86_64-linux",
+    "sitedir": "/opt/puppetlabs/puppet/lib/ruby/site_ruby/2.5.0",
+    "version": "2.5.9"
+  },
+  "ssh": {
+    "dsa": {
+      "fingerprints": {
+        "sha1": "SSHFP 2 1 18325a14254dc680e869c0c1457ce059267e6103",
+        "sha256": "SSHFP 2 2 4cebdf45493df91ee9eb244aa41094bf7b7fefbad79a3dd74596516b9267caf1"
+      },
+      "key": "AAAAB3NzaC1kc3MAAACBAMH2b2w5mLFY74z64UlktrtaFVFhf99YuxboH3SNtenbX6Kfm1LqT9aTgvac2g1DVBFywQl/aspONf36UMMNpA8DAbHFHYSBKOBzzB18XctJ0AvgGBs1HOCrEsvHzAahwHtSLzXjPxGq4krsCLkxYN9qTZYGJUFtit/bh8oNCobtAAAAFQC87ZmuYGWJtPG/zC6Azm8NOkcM0wAAAIBMkEEAi5od8QrGiTZ3fTXdUCPQl3YEx2PXWpc1QSMnQFv96kmRfOGl8J6IuWjNAm2pPosbOrdIKfpyALQhXQG4XzcBzw+Pt4/blGKNkNoNK47lTdHgW6THWGQ/LeaNfEHic6pijTUdAJVuy+ml96ljX+Up2Dyq6SN/9nY4ztn92wAAAIEAoFeU5R3bsVw0+rOP8RoU6yOhybFPu1I3YrdvbEORp9SpBhxEUdrZXzIByXxL1bDl7wZTIn57952aJc6jYLAYRM5dhFjfKzrS3lrEiO2msskXkVvYgoefBXKvwuOHhrqzGZuo4aqDWWP5clJYedHVgCVag7Q5ZbF8R+04uF5Q4wg=",
+      "type": "ssh-dss"
+    },
+    "ecdsa": {
+      "fingerprints": {
+        "sha1": "SSHFP 3 1 359f47ecbe281e8a3e175249c4ef46db156c0b55",
+        "sha256": "SSHFP 3 2 5ec3008ca9c6e0d0b761f2d1dfd89fbcf3dc4d19383bb49ef4d015f6acf47311"
+      },
+      "key": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPFcXtgXA8xYWa2INIoOJ+VrNvBgr2iwLJ2LoHpMLNOx6ykRuGasmcmx20huVTQSQgM0GFLZB2wrG9pd0QJForo=",
+      "type": "ecdsa-sha2-nistp256"
+    },
+    "ed25519": {
+      "fingerprints": {
+        "sha1": "SSHFP 4 1 15d83e2f036c4c1a6474e6ccb7d8c149e2d2ea9f",
+        "sha256": "SSHFP 4 2 11a98b5150cc41d3c66f268fc32c8663df431a35851dbb1d10f2b7204a134532"
+      },
+      "key": "AAAAC3NzaC1lZDI1NTE5AAAAIM4Q2KY/Qo2UJXcbx2bYK1C22cHsupThHGbYf7Lk2gpe",
+      "type": "ssh-ed25519"
+    },
+    "rsa": {
+      "fingerprints": {
+        "sha1": "SSHFP 1 1 d3540c138c56a8446b4a57b7be2136c2ae024d2b",
+        "sha256": "SSHFP 1 2 b93587fe58a49c106594e2dc4e9090eb972674b10237aba1501c3af190065ccf"
+      },
+      "key": "AAAAB3NzaC1yc2EAAAADAQABAAABgQD0M14x9dPiCKdjzmtbBKJzVi9R+e3Is/mu75NXO/hbhwFZisP1tL3Cqt4oaCR/x6DgAr9PE4MnXtUErTdqz9IhDOfuWnns+Y+o3j8m8Vbn0FoN3z92ygZXbXHWQRejgdK1l2KOiSAeWuBtsPU5pENFbjt8v7mfo1/q5hoDfxVbusfHahF0uUzfw+uqkBoPsy/KddMi4INgGxBw7rFmnqyG9fhL74F+oZSZpY5p58dg4liG+eHJwDHo2HVGOZqonYgm978hWFAqeXx930w94jSYzFyN2He7+H7JEdptRmcFwhYA/4D5RXGzu7yAFYHh1ZstTu1xkr+GnycKn1pmS86Ld8GRCrEQsiTHFiXYPsMqouhZgDNOE1LDloUHWFmfl0/m+DHKFvn46xqY7YnKzf2Dbqk02MvNJF+r7rN+UWUQm44Zl1pG1qIDCtJM9h0jMJxKyBBC2FfwsQsa4oAddEJlwNDoIpcll8D1jmpkYZ7JJAGbkcRYDzYT4ctluAgvcDs=",
+      "type": "ssh-rsa"
+    }
+  },
+  "system_uptime": {
+    "days": 0,
+    "hours": 0,
+    "seconds": 147,
+    "uptime": "0:02 hours"
+  },
+  "timezone": "UTC",
+  "virtual": "virtualbox"
+}

data/facts/Gemfile

@@ -1,6 +1,7 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 gem 'json', :require => false
+gem 'ffi'
 
 if facterversion = ENV['FACTER_GEM_VERSION']
   gem 'facter', facterversion, :require => false

data/facts/Vagrantfile

@@ -48,6 +48,12 @@ 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 "debian-11-x86_64" do |host|
+    host.vm.box = "boxomatic/debian-11"
+    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-10.04-x86_64" do |host|
     host.vm.box = "ubuntu-server-10044-x64-vbox4210-nocm"
     host.vm.box_url = "http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box"
@@ -150,7 +156,22 @@ 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 "almalinux-8-x86_64" do |host|
+    host.vm.box = "almalinux/8"
+    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 "rockylinux-8-x86_64" do |host|
+    host.vm.box = "https://github.com/anoncam/rocky-linux-vagrant/blob/main/rockylinux.box"
+    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 "redhat-8-x86_64" do |host|
     host.vm.box = "generic/rhel8"
     host.vm.synced_folder ".", "/vagrant"
@@ -298,20 +319,26 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
     host.vm.provision "shell", path: "get_facts.sh"
   end
+  config.vm.define "freebsd-11-x86_64" do |host|
+    host.vm.box = "bento/freebsd-11"
+    host.vm.synced_folder ".", "/vagrant"
+    host.vm.provision "shell", inline: "pkg install -y bash devel/ruby-gems"
+    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+    host.vm.provision "shell", path: "get_facts.sh"
+    host.vm.provision "shell", inline: "/sbin/shutdown -p now"
+  end
   config.vm.define "freebsd-12-x86_64" do |host|
-    host.vm.box = "bento/freebsd-12.0"
+    host.vm.box = "bento/freebsd-12"
     host.vm.synced_folder ".", "/vagrant"
     host.vm.provision "shell", inline: "pkg install -y bash devel/ruby-gems"
-    host.vm.provision "shell", inline: "ln -sf /usr/local/bin/bash /bin/bash"
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
     host.vm.provision "shell", path: "get_facts.sh"
     host.vm.provision "shell", inline: "/sbin/shutdown -p now"
   end
-  config.vm.define "freebsd-11-x86_64" do |host|
-    host.vm.box = "bento/freebsd-11.2"
+  config.vm.define "freebsd-13-x86_64" do |host|
+    host.vm.box = "bento/freebsd-13"
     host.vm.synced_folder ".", "/vagrant"
     host.vm.provision "shell", inline: "pkg install -y bash devel/ruby-gems"
-    host.vm.provision "shell", inline: "ln -sf /usr/local/bin/bash /bin/bash"
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
     host.vm.provision "shell", path: "get_facts.sh"
     host.vm.provision "shell", inline: "/sbin/shutdown -p now"
@@ -340,7 +367,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       . ~/.profile
 
       pkg_info -qe 'bash->=0' || pkg_add -I bash
-      ln -sf /usr/local/bin/bash /bin
     SCRIPT
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
     host.vm.provision "shell", path: "get_facts.sh"
@@ -354,7 +380,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       . ~/.profile
 
       pkg_info -qe 'bash->=0' || pkg_add -I bash
-      ln -sf /usr/local/bin/bash /bin
     SCRIPT
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
     host.vm.provision "shell", path: "get_facts.sh"
@@ -369,7 +394,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       . ~/.profile
 
       pkg_info -qe 'bash->=0' || pkg_add bash
-      ln -sf /usr/local/bin/bash /bin
       pkg_add facter puppet-5.5.6
       ln -sf /usr/local/bin/gem24 /usr/bin/gem
       ln -sf /usr/local/bin/ruby24 /usr/bin/ruby

data/facts/get_facts.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export PATH=/opt/puppetlabs/bin:$PATH
 
@@ -31,12 +31,18 @@ elif test -f /usr/bin/apt-get; then
 elif test -f /etc/redhat-release ; then
   operatingsystemmajrelease=$(rpm -qf /etc/redhat-release --queryformat '%{version}' | cut -f1 -d'.')
   case $(rpm -qf /etc/redhat-release --queryformat '%{name}') in
+  almalinux*)
+    osfamily='AlmaLinux'
+    ;;
   centos*|redhat*)
     osfamily='RedHat'
     ;;
   fedora*)
     osfamily='Fedora'
     ;;
+  rocky-*)
+    osfamily='RockyLinux'
+    ;;
   *)
     echo 'Failed to determine osfamily from /etc/redhat-release'
     exit 1
@@ -150,6 +156,14 @@ case "${osfamily}" in
     yum remove -y puppet6-release
   fi
   ;;
+'RockyLinux'|'AlmaLinux')
+  dnf localinstall -y "http://yum.puppetlabs.com/puppet6-release-el-${operatingsystemmajrelease}.noarch.rpm"
+  if dnf install -y puppet-agent; 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
+  ;;
 
 'Debian')
   if [[ "serena" =~ ${lsbdistcodename} ]]; then
@@ -211,15 +225,20 @@ case "${osfamily}" in
   ;;
 'FreeBSD')
   pkg update
-  pkg install -y sysutils/puppet5 sysutils/facter sysutils/rubygem-bundler
-  # something about the pkg update process causes the shared folder mount to
-  # get into an unusable state, so we remount it here before generating any
-  # fact sets.
-  umount /vagrant
-  mount -t vboxvfs Vagrant /vagrant
-  output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
-  mkdir -p $(dirname ${output_file})
-  [ ! -f ${output_file} ] && facter --show-legacy -p -j | tee ${output_file}
+  for facter_package in facter rubygem-facter ; do
+    pkg install -fy ${facter_package}
+
+    # something about the pkg update process causes the shared folder mount to
+    # get into an unusable state, so we remount it here before generating any
+    # fact sets.
+    umount /vagrant
+    mount -t vboxvfs Vagrant /vagrant
+    hardwaremodel=$(facter hardwaremodel)
+    [ "${hardwaremodel}" = 'amd64' ] && hardwaremodel=x86_64
+    output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-${hardwaremodel}.facts"
+    mkdir -p $(dirname ${output_file})
+    [ ! -f ${output_file} ] && facter --show-legacy -p -j | tee ${output_file}
+  done
   ;;
 'OpenBSD')
   hardwaremodel=$(facter hardwaremodel)
@@ -290,16 +309,26 @@ hardwaremodel=$(facter hardwaremodel)
 
 PATH=/opt/puppetlabs/puppet/bin:$PATH
 
-if ruby -e 'puts RUBY_VERSION' | grep -e '^2\.3'; then
-    gem install bundler --no-ri --no-rdoc --no-format-executable
+if [ "$(ruby -e 'puts Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.3")')" = "true" ]; then
+    gem install bundler --no-document --no-format-executable
 else
     gem install bundler --version '~> 1.0' --no-ri --no-rdoc --no-format-executable
 fi
 bundle install --path vendor/bundler
 
-for version in 1.6.0 1.7.0 2.0.0 2.1.0 2.2.0 2.3.0 2.4.0 2.5.0; do
+for version in 1.6.0 1.7.0 2.0.0 2.1.0 2.2.0 2.3.0 2.4.0 2.5.0 4.0.0 4.1.0 4.2.0; do
   FACTER_GEM_VERSION="~> ${version}" bundle update
+
+  # This is another workaround for shared folder on FreeBSD.  "Accessing"
+  # /vagrant helps to not encounter a bug where we try to access files in
+  # /vagrant/subdir/file
+  ls -d /vagrant > /dev/null
+  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"
       ;;
@@ -310,6 +339,9 @@ for version in 1.6.0 1.7.0 2.0.0 2.1.0 2.2.0 2.3.0 2.4.0 2.5.0; do
       output_file="/vagrant/$(bundle exec facter --version | cut -d. -f1,2)/${operatingsystem}-${operatingsystemmajrelease}-${hardwaremodel}.facts"
       ;;
   esac
+  if [ -f $output_file ]; then
+    continue
+  fi
   mkdir -p $(dirname $output_file)
   echo $version | grep -q -E '^1\.' &&
     FACTER_GEM_VERSION="~> ${version}" bundle exec facter -j | bundle exec ruby -e 'require "json"; jj JSON.parse gets' | tee $output_file ||

data/lib/facterdb/version.rb

@@ -1,5 +1,5 @@
 module FacterDB
   module Version
-    STRING = '1.6.0'
+    STRING = '1.10.0'
   end
 end

data/lib/facterdb.rb

@@ -11,6 +11,13 @@ module FacterDB
     @database ||= "[#{facterdb_fact_files.map { |f| read_json_file(f) }.join(',')}]\n"
   end
 
+  # @note Call this method at the end of test suite, for example via after(:suite), to reclaim back the memory required to hold json data and filter cache
+  def self.cleanup
+    @database = nil
+    Thread.current[:facterdb_last_filter_seen] = nil
+    Thread.current[:facterdb_last_facts_seen] = nil
+  end
+
   # @return [Boolean] - returns true if we should use the default facterdb database, false otherwise
   # @note If the user passes anything to the FACTERDB_SKIP_DEFAULTDB environment variable we assume
   # they want to skip the default db
@@ -123,8 +130,16 @@ module FacterDB
 
   # @return [Array] - array of hashes of facts
   # @param filter [Object] - The filter to convert to jgrep string
-  def self.get_facts(filter=nil)
+  def self.get_facts(filter=nil, cache=true)
+    if cache && filter && filter == Thread.current[:facterdb_last_filter_seen]
+      return Thread.current[:facterdb_last_facts_seen]
+    end
     filter_str = generate_filter_str(filter)
-    JGrep.jgrep(database, filter_str).map { |hash| Hash[hash.map{ |k, v| [k.to_sym, v] }] }
+    result = JGrep.jgrep(database, filter_str).map { |hash| Hash[hash.map{ |k, v| [k.to_sym, v] }] }
+    if cache
+      Thread.current[:facterdb_last_filter_seen] = filter
+      Thread.current[:facterdb_last_facts_seen] = result
+    end
+    result
   end
 end

data/spec/facts_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'digest'
+require 'pathname'
 
 RSpec::Matchers.define :have_a_unique_hash do
   match do |actual|
@@ -99,9 +100,15 @@ describe 'Default Facts' do
         expect(content['facterversion']).to have_facter_version(facter_dir_path, filepath)
       end
 
-      it 'contains an ipaddress fact' do
+      it 'contains an ipaddress or networking.ip fact' do
         pending KNOWN_IPADDRESS_PENDING[relative_path] if KNOWN_IPADDRESS_PENDING.key?(relative_path)
-        expect(content['ipaddress']).to not_be_nil.and not_be_empty
+        case content['facterversion']
+        when /^[1-3]/
+          expect(content['ipaddress']).to not_be_nil.and not_be_empty
+        else
+          expect(content['networking']['ip']).to not_be_nil.and not_be_empty
+        end
+        
       end
     end
   end