facterdb 1.0.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 401e0d526289b354ac7f10f0d8b15b64b4ca082bfaaa827232888ec9046b279f
-  data.tar.gz: f46c50cee1e9420ce41644262dd2966176aefabca8c3359a2103f6939aa3a822
+  metadata.gz: d3c5507c6727a268578ec7d76730523df6fea54b3eb52c0bb5d3d4fd5dfd5eee
+  data.tar.gz: 99ee4c368b24f08a646a9d936507b07fcd1c71c38c202b704676055b4018b6d1
 SHA512:
-  metadata.gz: 321e0ce6b78b426670713d28365e37fc9667d25455ba9e6970b86b4676400ec009e7f7b3d19a0aa5da8b748c6e6f3bf850b1565eb1c401ccf44c9079ff999b2d
-  data.tar.gz: 30856d891cae1334ed5ba28986b5b036d7b05f55cb89a7d745825d9629533515a91ce5be60e4505655cdf234f9a16339a08a91125603f376862a59a906b252ab
+  metadata.gz: b13f056772f354c139d0674121b3e7d249931b24ee67f7c71336e988276aa537a0e2e09859fecee7ccfe4d5a47c0b6ac7914cef20635a6afbbf4f53b4af8979f
+  data.tar.gz: 6c9b28b139fef0ecdc7e5003994882fb1996a32cfd641249960c60c4c65b909ee03e9e5083ed1286f1fb96b3666a96c7e773c18767bc70954a36df7efa748caa

data/.gitignore

@@ -4,6 +4,7 @@ coverage/
 .vagrant/
 .envrc
 vendor/
+.vendor/
 packer_cache/
 *.box
 hugo/public

data/.travis.yml

@@ -3,19 +3,27 @@ sudo: false
 cache: bundler
 script:
 - bundle exec rake spec
-rvm:
-- 2.3
-env:
-- FACTER_GEM_VERSION="~> 1.6.0"
-- FACTER_GEM_VERSION="~> 1.7.0"
-- FACTER_GEM_VERSION="~> 2.0.0"
-- FACTER_GEM_VERSION="~> 2.1.0"
-- FACTER_GEM_VERSION="~> 2.2.0"
-- FACTER_GEM_VERSION="~> 2.3.0"
-- FACTER_GEM_VERSION="~> 2.4.0"
-- FACTER_GEM_VERSION="~> 2.0" COVERAGE=yes
 matrix:
   fast_finish: true
+  include:
+  - rvm: 2.3
+    env: FACTER_GEM_VERSION="~> 1.6.0"
+  - rvm: 2.3
+    env: FACTER_GEM_VERSION="~> 1.7.0"
+  - rvm: 2.3
+    env: FACTER_GEM_VERSION="~> 2.0.0"
+  - rvm: 2.3
+    env: FACTER_GEM_VERSION="~> 2.1.0"
+  - rvm: 2.3
+    env: FACTER_GEM_VERSION="~> 2.2.0"
+  - rvm: 2.3
+    env: FACTER_GEM_VERSION="~> 2.3.0"
+  - rvm: 2.3
+    env: FACTER_GEM_VERSION="~> 2.4.0"
+  - rvm: 2.5
+    env: FACTER_GEM_VERSION="~> 2.0" COVERAGE=yes
+  - rvm: 2.7
+    env: FACTER_GEM_VERSION="~> 2.0"
 notifications:
   email: false
 deploy:

data/CHANGELOG.md

@@ -1,6 +1,73 @@
 # Changelog
 
-## [1.0.0](https://rubygems.org/gems/facterdb/versions/1.0.0) (2019-10-28)
+## [1.5.0](https://rubygems.org/gems/facterdb/versions/1.5.0) (2020-11-19)
+
+[Full Changelog](https://github.com/camptocamp/facterdb/compare/1.4.0...1.5.0)
+
+**Implemented enhancements:**
+
+- add filter validation [\#19](https://github.com/camptocamp/facterdb/issues/19)
+
+**Merged pull requests:**
+
+- Fixes a bug with generate\_filter\_str [\#160](https://github.com/camptocamp/facterdb/pull/160) ([logicminds](https://github.com/logicminds))
+- Fixes \#19 - add filter validation [\#159](https://github.com/camptocamp/facterdb/pull/159) ([logicminds](https://github.com/logicminds))
+- Remove pin on facter \< 4 [\#156](https://github.com/camptocamp/facterdb/pull/156) ([sanfrancrisko](https://github.com/sanfrancrisko))
+- Add ruby 2.5 and 2.7 testing [\#155](https://github.com/camptocamp/facterdb/pull/155) ([DavidS](https://github.com/DavidS))
+
+## [1.4.0](https://rubygems.org/gems/facterdb/versions/1.4.0) (2020-05-09)
+
+[Full Changelog](https://github.com/camptocamp/facterdb/compare/1.3.0...1.4.0)
+
+**Merged pull requests:**
+
+- Add Ubuntu 20.04 factset [\#154](https://github.com/camptocamp/facterdb/pull/154) ([mmoll](https://github.com/mmoll))
+
+## [1.3.0](https://rubygems.org/gems/facterdb/versions/1.3.0) (2020-04-15)
+
+[Full Changelog](https://github.com/camptocamp/facterdb/compare/1.2.0...1.3.0)
+
+**Closed issues:**
+
+- Raspbian support [\#135](https://github.com/camptocamp/facterdb/issues/135)
+
+**Merged pull requests:**
+
+- Add Debian 10 facter 3.13/3.14 sets [\#152](https://github.com/camptocamp/facterdb/pull/152) ([bastelfreak](https://github.com/bastelfreak))
+- Pin to facter \< 4 to avoid automatic upgrade [\#151](https://github.com/camptocamp/facterdb/pull/151) ([raphink](https://github.com/raphink))
+- Adding facts from Solaris 11 x86 & SPARC [\#149](https://github.com/camptocamp/facterdb/pull/149) ([genebean](https://github.com/genebean))
+- AmazonLinux facts added [\#147](https://github.com/camptocamp/facterdb/pull/147) ([bFekete](https://github.com/bFekete))
+- Add facts for Raspbian 9 and 10; alter Rakefile to support Raspbian [\#136](https://github.com/camptocamp/facterdb/pull/136) ([threepistons](https://github.com/threepistons))
+
+## [1.2.0](https://rubygems.org/gems/facterdb/versions/1.2.0) (2020-01-08)
+
+[Full Changelog](https://github.com/camptocamp/facterdb/compare/1.1.0...1.2.0)
+
+**Merged pull requests:**
+
+- \[Arch Linux\] Set correct hostname, domain, fqdn [\#146](https://github.com/camptocamp/facterdb/pull/146) ([dhoppe](https://github.com/dhoppe))
+- drop json as runtime dependency [\#145](https://github.com/camptocamp/facterdb/pull/145) ([bastelfreak](https://github.com/bastelfreak))
+- add .vendor to .gitignore [\#144](https://github.com/camptocamp/facterdb/pull/144) ([bastelfreak](https://github.com/bastelfreak))
+
+## [1.1.0](https://rubygems.org/gems/facterdb/versions/1.1.0) (2020-01-07)
+
+[Full Changelog](https://github.com/camptocamp/facterdb/compare/1.0.0...1.1.0)
+
+**Closed issues:**
+
+- Please provider Gentoo facts for 3.14 [\#139](https://github.com/camptocamp/facterdb/issues/139)
+- Archlinux legacy facts missing in 3.x fact sets. [\#132](https://github.com/camptocamp/facterdb/issues/132)
+
+**Merged pull requests:**
+
+- Adding facts from Solaris 11 x86 & SPARC [\#149](https://github.com/camptocamp/facterdb/pull/149) ([genebean](https://github.com/genebean))
+- Add Gentoo 3.11 factset [\#143](https://github.com/camptocamp/facterdb/pull/143) ([bastelfreak](https://github.com/bastelfreak))
+- archlinux: set correct FQDN/hostname [\#142](https://github.com/camptocamp/facterdb/pull/142) ([bastelfreak](https://github.com/bastelfreak))
+- Add Fedora 30 facts for Facter 3.11 [\#141](https://github.com/camptocamp/facterdb/pull/141) ([baurmatt](https://github.com/baurmatt))
+- Add Gentoo facts for Facter 3.14 [\#140](https://github.com/camptocamp/facterdb/pull/140) ([baurmatt](https://github.com/baurmatt))
+- Add CentOS 8 facts [\#137](https://github.com/camptocamp/facterdb/pull/137) ([traylenator](https://github.com/traylenator))
+
+## [1.0.0](https://rubygems.org/gems/facterdb/versions/1.0.0) (2019-10-29)
 
 [Full Changelog](https://github.com/camptocamp/facterdb/compare/0.8.2...1.0.0)
 
@@ -107,14 +174,21 @@
 - facts/2.5/fedora-28-x86\_64.facts broken [\#91](https://github.com/camptocamp/facterdb/issues/91)
 - Add facter 2.5 Gentoo facts [\#90](https://github.com/camptocamp/facterdb/issues/90)
 
+**Merged pull requests:**
+
+- \(maint\) Add `rake table` task + update README.md + better Windows detection [\#76](https://github.com/camptocamp/facterdb/pull/76) ([glennsarti](https://github.com/glennsarti))
+
 ## [0.5.2](https://rubygems.org/gems/facterdb/versions/0.5.2) (2018-04-30)
 
 [Full Changelog](https://github.com/camptocamp/facterdb/compare/0.5.1...0.5.2)
 
+**Implemented enhancements:**
+
+- Release prep for 0.4.0 [\#66](https://github.com/camptocamp/facterdb/pull/66) ([DavidS](https://github.com/DavidS))
+
 **Merged pull requests:**
 
 - add Ubuntu 18.04 facts [\#82](https://github.com/camptocamp/facterdb/pull/82) ([bastelfreak](https://github.com/bastelfreak))
-- \(maint\) Add `rake table` task + update README.md + better Windows detection [\#76](https://github.com/camptocamp/facterdb/pull/76) ([glennsarti](https://github.com/glennsarti))
 - Added Solaris 10 facts on Facter 3.9 [\#75](https://github.com/camptocamp/facterdb/pull/75) ([sirinek](https://github.com/sirinek))
 
 ## [0.5.1](https://rubygems.org/gems/facterdb/versions/0.5.1) (2018-03-06)
@@ -146,10 +220,6 @@
 
 [Full Changelog](https://github.com/camptocamp/facterdb/compare/0.4.0...0.4.1)
 
-**Implemented enhancements:**
-
-- Release prep for 0.4.0 [\#66](https://github.com/camptocamp/facterdb/pull/66) ([DavidS](https://github.com/DavidS))
-
 ## [0.4.0](https://rubygems.org/gems/facterdb/versions/0.4.0) (2017-10-24)
 
 [Full Changelog](https://github.com/camptocamp/facterdb/compare/0.3.12...0.4.0)

data/README.md

@@ -2,7 +2,6 @@ facterdb
 ========
 
 [![Build Status](https://img.shields.io/travis/camptocamp/facterdb/master.svg)](https://travis-ci.org/camptocamp/facterdb)
-[![Code Climate](https://img.shields.io/codeclimate/github/camptocamp/facterdb.svg)](https://codeclimate.com/github/camptocamp/facterdb)
 [![Gem Version](https://img.shields.io/gem/v/facterdb.svg)](https://rubygems.org/gems/facterdb)
 [![Gem Downloads](https://img.shields.io/gem/dt/facterdb.svg)](https://rubygems.org/gems/facterdb)
 [![Coverage Status](https://img.shields.io/coveralls/camptocamp/facterdb.svg)](https://coveralls.io/r/camptocamp/facterdb?branch=master)
@@ -63,20 +62,23 @@ FacterDB::get_facts('osfamily=Debian')
 | AIX 5300                    |     |     |     |     |     |     |     |     |     |     |  1  |     |     |     |     |     |     |     |     |     |     |     |     |
 | AIX 6100                    |     |     |     |     |     |     |     |     |     |     |  1  |     |     |     |     |     |     |     |     |     |     |     |     |
 | AIX 7100                    |     |     |     |     |     |     |     |     |     |     |  1  |     |     |     |     |     |     |  1  |     |     |     |     |     |
-| Amazon                      |  1  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+| Amazon                      |  3  |     |     |     |  1  |  1  |  1  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+| Amazon 2                    |     |     |     |     |     |     |     |  1  |     |     |     |     |     |     |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |
+| Amazon 2016                 |     |     |     |     |  1  |  1  |  1  |  1  |     |     |     |     |     |     |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |
 | Amazon 2017                 |     |     |     |     |  1  |  1  |  1  |     |     |     |     |     |     |     |  1  |     |     |     |     |     |     |     |     |
-| Amazon 4                    |     |  1  |  1  |  1  |     |     |     |     |  1  |  1  |     |  1  |     |     |     |     |     |     |     |     |     |     |     |
+| Amazon 4                    |     |  3  |  3  |  3  |     |     |     |     |  1  |  1  |     |  1  |     |     |     |     |     |     |     |     |     |     |     |
 | Archlinux                   |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  1  |     |     |     |     |     |     |     |     |     |  1  |  1  |  1  |  1  |  1  |  1  |
 | CentOS 5                    |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |     |     |
 | CentOS 6                    |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  1  |  1  |  1  |
 | CentOS 7                    |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  1  |  2  |  2  |     |  2  |  1  |  1  |  2  |  1  |  1  |  1  |  1  |  2  |  1  |  1  |  1  |
+| CentOS 8                    |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |     |     |     |     |     |     |     |     |     |     |     |  1  |  1  |  1  |  1  |
 | Darwin                      |     |     |  4  |  4  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
 | Darwin 14                   |     |     |  2  |  2  |  2  |  2  |  2  |  1  |     |  1  |     |  1  |  1  |  1  |  1  |  1  |  1  |     |     |     |     |     |     |
 | Darwin 15                   |     |     |     |     |  1  |  1  |  1  |  1  |     |  1  |     |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |     |     |     |     |
 | Darwin 16                   |     |     |     |     |  1  |  1  |  1  |  1  |     |     |     |     |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |
 | Darwin 17                   |     |     |     |     |  1  |  1  |  1  |  1  |     |     |     |     |     |     |     |     |     |  1  |  1  |  1  |  1  |  1  |  1  |
 | Darwin 18                   |     |     |     |     |  1  |  1  |  1  |  1  |     |     |     |     |     |     |     |     |     |     |     |  1  |     |  1  |  1  |
-| Debian 10                   |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |     |     |     |     |     |     |     |     |     |     |     |  1  |     |     |     |
+| Debian 10                   |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |     |     |     |     |     |     |     |     |     |     |     |  1  |     |  1  |  1  |
 | Debian 6                    |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |  2  |  2  |     |     |     |     |     |     |     |     |     |     |     |     |     |
 | Debian 7                    |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |  2  |  2  |  2  |  2  |  2  |  2  |     |     |     |     |     |     |
 | Debian 8                    |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |  2  |  2  |  2  |  2  |  2  |  2  |  1  |  1  |  1  |  1  |  1  |  1  |
@@ -90,12 +92,12 @@ FacterDB::get_facts('osfamily=Debian')
 | Fedora 27                   |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |     |     |     |     |     |     |  1  |     |     |     |     |  1  |     |     |     |
 | Fedora 28                   |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |     |     |     |     |     |     |     |     |     |     |     |  1  |  1  |  1  |  1  |
 | Fedora 29                   |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |     |     |     |     |     |     |     |     |     |     |     |  1  |  1  |  1  |  1  |
-| Fedora 30                   |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |  1  |
+| Fedora 30                   |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |     |     |     |     |     |     |     |     |     |     |     |  1  |     |     |  1  |
 | FreeBSD 10                  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  1  |     |     |     |     |     |     |     |     |     |  1  |     |     |     |     |     |
 | FreeBSD 11                  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |     |     |     |     |     |     |     |     |     |  1  |  1  |  1  |  1  |  1  |  1  |
 | FreeBSD 12                  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |     |     |     |     |     |     |     |     |     |  1  |  1  |  1  |  1  |  1  |  1  |
 | FreeBSD 9                   |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
-| Gentoo                      |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+| Gentoo                      |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |     |     |     |     |     |     |     |     |     |     |  1  |     |     |  1  |
 | LinuxMint 18                |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |     |  1  |     |  1  |     |     |     |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |
 | LinuxMint 19                |  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |     |     |     |     |     |     |     |     |     |     |     |  1  |  1  |  1  |  1  |
 | OpenBSD 5.7                 |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
@@ -112,6 +114,8 @@ FacterDB::get_facts('osfamily=Debian')
 | OracleLinux 5               |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |  2  |  2  |  2  |  2  |  2  |  2  |  1  |  1  |  1  |     |     |     |
 | OracleLinux 6               |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |  2  |  2  |  2  |  2  |  2  |  2  |  1  |  1  |  2  |  1  |  1  |  1  |
 | OracleLinux 7               |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  1  |  2  |  2  |     |  2  |  1  |  1  |  2  |  1  |  1  |  1  |  1  |  2  |  1  |  1  |  1  |
+| Raspbian 10                 |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |  2  |     |     |     |
+| Raspbian 9                  |     |     |     |     |     |     |  2  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
 | RedHat 5                    |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |     |     |
 | RedHat 6                    |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |  2  |  2  |  2  |  3  |  2  |  2  |  2  |  2  |  2  |  1  |  1  |  1  |
 | RedHat 7                    |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  1  |  2  |  2  |     |  2  |  1  |  1  |  2  |  1  |  1  |  1  |  1  |  2  |  1  |  1  |  1  |
@@ -125,7 +129,8 @@ FacterDB::get_facts('osfamily=Debian')
 | Solaris                     |     |     |     |     |     |     |     |  1  |     |     |     |     |     |     |     |     |     |  1  |     |  1  |     |     |     |
 | Solaris 1                   |     |     |     |     |     |     |     |  1  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
 | Solaris 11                  |  1  |  1  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
-| Solaris 2                   |     |     |  1  |  1  |  1  |  2  |  2  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+| Solaris 2                   |     |     |  1  |  1  |  1  |  2  |  2  |     |     |     |     |     |     |     |     |     |     |     |     |  1  |     |     |  1  |
+| Solaris 3                   |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |  1  |     |     |  1  |
 | Ubuntu 10.04                |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
 | Ubuntu 12.04                |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |  2  |  2  |  2  |     |     |     |     |     |     |     |     |     |
 | Ubuntu 14.04                |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |  2  |  2  |  2  |  2  |  2  |  2  |  1  |  1  |  1  |  1  |  1  |  1  |
@@ -135,6 +140,7 @@ FacterDB::get_facts('osfamily=Debian')
 | Ubuntu 16.04                |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |  2  |     |  2  |  2  |  2  |  2  |  2  |  2  |  1  |  1  |  1  |  1  |  1  |  1  |
 | Ubuntu 16.10                |     |     |     |     |     |     |     |     |     |     |     |     |     |     |  2  |     |     |     |     |     |     |     |     |
 | Ubuntu 18.04                |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |     |     |     |     |     |     |     |     |     |  1  |  1  |  1  |  1  |  1  |
+| Ubuntu 20.04                |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |  1  |
 | VirtuozzoLinux 7            |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |  1  |
 | Windows 10                  |     |     |     |  2  |  2  |  2  |  2  |  2  |  2  |  2  |     |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |  2  |
 | Windows 7                   |     |     |     |  1  |  1  |  1  |  2  |  1  |  2  |  2  |     |  1  |  1  |  1  |  1  |  1  |  1  |     |     |     |     |     |     |

data/Rakefile

@@ -29,12 +29,23 @@ end
 def factset_to_os_label(fs)
   os_rel  = '???'
   os_name = '????'
-  if fs.key?(:os)  && (fs[:os]['release']['major'] =~ /\d/)
+  if fs.key?(:os) && fs[:os].key?('release') && (fs[:os]['release']['major'] =~ /\d/)
     os_name = fs[:os]['name']
+    fail    = Hash.new
+    os      = fs[:os]
+    distro = os.fetch('lsb', os.fetch('distro', fail))
+    if distro.key?('id')
+      os_id = distro['id']
+    elsif distro.key?('distid')
+      os_id = distro['distid']
+    else
+      os_id = '@@@@@@@@@@'
+    end
     os_rel  = fs[:os]['release']['major']
     os__rel = fs[:os]['release']['full']
   elsif fs.key? :operatingsystem
     os_name  = fs[:operatingsystem]
+    os_id    = fs.fetch(:lsbdistid, '@@@@@@@@@@')
     os_rel   = fs.fetch(:operatingsystemmajrelease, fs.fetch(:lsbmajdistrelease, nil))
     os__rel  = fs.fetch(:lsbdistrelease, fs.fetch(:operatingsystemrelease, '@@@'))
   else
@@ -42,7 +53,6 @@ def factset_to_os_label(fs)
     pp fs
     fail( 'ERROR: unrecognized facterset format' )
   end
-
   # Sanitize OS names to match the formats used in the facterdb README
   label = "#{os_name} #{os_rel}"
   if os_name =~ /^(Archlinux|Gentoo)$/
@@ -56,8 +66,10 @@ def factset_to_os_label(fs)
     label = "#{os_name} #{os__rel.split('.')[1]}"
   elsif fs[:_facterdb_filename] =~ /sles-15-/
     label = "SLES 15"
-  elsif os_name.start_with?('Debian') && fs[:lsbdistid] == 'LinuxMint'
-    label = "#{fs[:lsbdistid]} #{fs[:lsbmajdistrelease]}"
+  elsif os_name.start_with?('Debian') && os_id == 'LinuxMint'
+    label = "#{os_id} #{fs[:lsbmajdistrelease]}"
+  elsif os_name.start_with?('Debian') && os_id == 'Raspbian'
+    label = "#{os_id} #{os_rel}"
   elsif os_name =~ /^windows$/
     db_filename = fs[:_facterdb_filename] || 'there_is_no_filename'
     if db_filename =~ /windows-10-/

data/facterdb.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'github_changelog_generator', '~> 1.10', '< 1.10.4'
-  s.add_runtime_dependency 'json' if RUBY_VERSION =~ /^1\.8/
-  s.add_runtime_dependency 'facter'
+  s.add_runtime_dependency 'facter', '< 5.0.0'
   s.add_runtime_dependency 'jgrep'
 end

data/facts/1.6/amazon-2-x86_64.facts

@@ -0,0 +1,53 @@
+{
+  "gem_version": "~> 1.6.0",
+  "architecture": "x86_64",
+  "kernel": "Linux",
+  "augeasversion": "1.12.0",
+  "domain": "example.com",
+  "macaddress": "08:00:27:d5:a3:c3",
+  "facterversion": "1.6.18",
+  "fqdn": "foo.example.com",
+  "hardwareisa": "x86_64",
+  "hardwaremodel": "x86_64",
+  "hostname": "foo",
+  "id": "root",
+  "interfaces": "eth0,lo",
+  "macaddress_eth0": "08:00:27:d5:a3:c3",
+  "ipaddress": "10.0.2.15",
+  "kernelmajversion": "4.14",
+  "kernelrelease": "4.14.154-128.181.amzn2.x86_64",
+  "kernelversion": "4.14.154",
+  "boardmanufacturer": "Oracle Corporation",
+  "boardproductname": "VirtualBox",
+  "boardserialnumber": "0",
+  "manufacturer": "innotek GmbH",
+  "productname": "VirtualBox",
+  "serialnumber": "0",
+  "type": "Other",
+  "memorysize": "985.54 MB",
+  "memoryfree": "813.95 MB",
+  "swapsize": "0.00 kB",
+  "swapfree": "0.00 kB",
+  "memorytotal": "985.54 MB",
+  "operatingsystem": "Amazon",
+  "operatingsystemrelease": "4.14.154-128.181.amzn2.x86_64",
+  "osfamily": "Linux",
+  "path": "/home/vagrant/vendor/bundler/ruby/2.5.0/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin",
+  "physicalprocessorcount": 1,
+  "processor0": "Intel(R) Core(TM) i9-8950HK CPU @ 2.90GHz",
+  "processorcount": "1",
+  "ps": "ps -ef",
+  "rubysitedir": "/opt/puppetlabs/puppet/lib/ruby/site_ruby/2.5.0",
+  "rubyversion": "2.5.3",
+  "selinux": "false",
+  "sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABAQCzt7VD+RI3cTlhjLrmXiEovOBn0PXzt5ezZmd/E5n3FCO6enAuc3gJZvE6Xhi44lGspTxYQ3bZDnASLF0/oEklrhof173tWAD/gm0JHz9FCXx/msL5VRt+m4kFZ5MRPCwXMYw8hjsuqj8DHtaBleoWyslZWZwBOjLKm7RKR668wrS5cuFtaqK0TrvVMUd6LKL37S/Hs7BPCbKLmgCZgyXuorDmvHvDf161MS/jsS32YfGyuKviDZlfMwK9EqtUlFCf5VNHbrl4CBE2ccLIhqqADZWGTYHqqP3XnJ/WylCPA4uewCg+4XZfqRcel77ny3dfsOQnZxerihHB81TTqv7b",
+  "sshecdsakey": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP7HYO0Z/t7NKY8iwAyq4Hg5I9fPSTSmZ27fz3u51rZwjoZYUkPMw6PxVUus8pJE4Lq09ifB+Z7UNnJYmp8r+7g=",
+  "timezone": "UTC",
+  "uniqueid": "007f0100",
+  "uptime": "0:06 hours",
+  "uptime_days": 0,
+  "uptime_hours": 0,
+  "uptime_seconds": 366,
+  "virtual": "kvm",
+  "is_virtual": "true"
+}

data/facts/1.6/amazon-2016-x86_64.facts

@@ -0,0 +1,62 @@
+{
+  "gem_version": "~> 1.6.0",
+  "architecture": "x86_64",
+  "kernel": "Linux",
+  "augeasversion": "1.12.0",
+  "domain": "example.com",
+  "macaddress": "08:00:27:24:46:86",
+  "facterversion": "1.6.18",
+  "fqdn": "foo.example.com",
+  "hardwareisa": "x86_64",
+  "hardwaremodel": "x86_64",
+  "hostname": "foo",
+  "id": "root",
+  "interfaces": "eth0,lo",
+  "ipaddress_eth0": "10.0.2.15",
+  "macaddress_eth0": "08:00:27:24:46:86",
+  "netmask_eth0": "255.255.255.0",
+  "mtu_eth0": "1500",
+  "ipaddress_lo": "127.0.0.1",
+  "netmask_lo": "255.0.0.0",
+  "mtu_lo": "65536",
+  "ipaddress": "10.0.2.15",
+  "kernelmajversion": "4.4",
+  "kernelrelease": "4.4.44-39.55.amzn1.x86_64",
+  "kernelversion": "4.4.44",
+  "boardmanufacturer": "Oracle Corporation",
+  "boardproductname": "VirtualBox",
+  "boardserialnumber": "0",
+  "manufacturer": "innotek GmbH",
+  "productname": "VirtualBox",
+  "serialnumber": "0",
+  "type": "Other",
+  "memorysize": "996.94 MB",
+  "memoryfree": "874.55 MB",
+  "swapsize": "0.00 kB",
+  "swapfree": "0.00 kB",
+  "memorytotal": "996.94 MB",
+  "netmask": "255.255.255.0",
+  "network_eth0": "10.0.2.0",
+  "network_lo": "127.0.0.0",
+  "operatingsystem": "Amazon",
+  "operatingsystemrelease": "4.4.44-39.55.amzn1.x86_64",
+  "osfamily": "Linux",
+  "path": "/home/vagrant/vendor/bundler/ruby/2.5.0/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/opt/aws/bin:/root/bin",
+  "physicalprocessorcount": 1,
+  "processor0": "Intel(R) Core(TM) i9-8950HK CPU @ 2.90GHz",
+  "processorcount": "1",
+  "ps": "ps -ef",
+  "rubysitedir": "/opt/puppetlabs/puppet/lib/ruby/site_ruby/2.5.0",
+  "rubyversion": "2.5.3",
+  "selinux": "false",
+  "sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABAQDZ1lqGL2XwHIZ9fAJbcht6kKAthGOPsz5aC5sM1QP+mY3ouLB5jrwSpQcV51KvIl30IHu3Rp/Jrl06TpN9nw2kZnSMV0dY1k24ujEwF0CpL4STuv9AHkjD0tUFOa1BqmUukLYFKz2cZroUkFO9GZ4l/Z1EZGquQt37x+q0rq45IKlcoWyttLYFmX6zQhK7ICwnrjfTNXs8ID8g0NEFSne1AoDrHa3QjY/Epa5QVQpEOvJ/hrS5yJ2wYp7Rlg3uR4J+sA/Dpn6UCYC/xlj/aXcl90HPORlIy50gLpzLj55fcH6rTIMcLp5hl5gVyr5lygk+Ep5FiuYBMUPzCeCQ6o0v",
+  "sshecdsakey": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIl9DhX/TT6XkAxp7ROAIP8/67ycpIo7t0+NSP4f0FJy9W2Ifj8m+l0i6zxMATRSOmgDNI+PL/TtLLWRZQ/VbQk=",
+  "timezone": "UTC",
+  "uniqueid": "007f0100",
+  "uptime": "0:05 hours",
+  "uptime_days": 0,
+  "uptime_hours": 0,
+  "uptime_seconds": 319,
+  "virtual": "kvm",
+  "is_virtual": "true"
+}

data/facts/1.6/centos-8-x86_64.facts

@@ -0,0 +1,59 @@
+{
+  "gem_version": "~> 1.6.0",
+  "architecture": "x86_64",
+  "kernel": "Linux",
+  "augeasversion": "1.12.0",
+  "domain": "example.com",
+  "macaddress": "00:0a:95:9d:68:16",
+  "facterversion": "1.6.18",
+  "fqdn": "foo.example.com",
+  "hardwareisa": "x86_64",
+  "hardwaremodel": "x86_64",
+  "hostname": "foo",
+  "id": "root",
+  "interfaces": "eth0,lo",
+  "macaddress_eth0": "00:0a:95:9d:68:16",
+  "ipaddress": "10.0.2.15",
+  "kernelmajversion": "4.18",
+  "kernelrelease": "4.18.0-80.el8.x86_64",
+  "kernelversion": "4.18.0",
+  "boardmanufacturer": "Oracle Corporation",
+  "boardproductname": "VirtualBox",
+  "boardserialnumber": "0",
+  "manufacturer": "innotek GmbH",
+  "productname": "VirtualBox",
+  "serialnumber": "0",
+  "type": "Other",
+  "memorysize": "477.41 MB",
+  "memoryfree": "310.43 MB",
+  "swapsize": "2.00 GB",
+  "swapfree": "1.98 GB",
+  "memorytotal": "477.41 MB",
+  "operatingsystem": "CentOS",
+  "operatingsystemrelease": "8.0.1905",
+  "osfamily": "RedHat",
+  "path": "/home/vagrant/vendor/bundler/ruby/2.5.0/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:/usr/local/sbin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin",
+  "physicalprocessorcount": 1,
+  "processor0": "Intel Core Processor (Broadwell, IBRS)",
+  "processorcount": "1",
+  "ps": "ps -ef",
+  "rubysitedir": "/opt/puppetlabs/puppet/lib/ruby/site_ruby/2.5.0",
+  "rubyversion": "2.5.3",
+  "selinux": "true",
+  "selinux_enforced": "true",
+  "selinux_policyversion": "31",
+  "selinux_current_mode": "enforcing",
+  "selinux_config_mode": "enforcing",
+  "selinux_config_policy": "unknown",
+  "selinux_mode": "unknown",
+  "sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABAQC/ZfDSV1GAanLrOMXOPgrgRjfeGk/gCRcsdECLwfWDMft306K8t1B/UsK9UM+/m3qzNAGGuF3RP+YQ+Y+/2vJv8nCw72OGDSu/r1lj6VWeLdNE8Pvakb+jmbNpz80UMIliJP/Q68Omy//LcuI/Tc2Gz0bVlw4nLfB8+aNZsf+/2wljYBSjsKbouTfqhkxCy8ro9F0PWUlj65bCIsiYN20OEcptabz2T0ElxKtj23e5Samrf5W8A9WeNTzeyhqAjp0/qLVlsFrcvpi9OXPgTAaFZkExUp8AszcfbDjeUDX4DBMNtrScTc00RYl5keNfon2jZf/wyGNNBOmW/VOAsWaN",
+  "sshecdsakey": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNgF8jA2VyzG9T3XiXu4Tg+X0omtP2qBh0bTMT2AY0OYfuqEQYb6ER2XBq8VPt1XqvI1ogEBSKezWpwM4ELMH64=",
+  "timezone": "UTC",
+  "uniqueid": "007f0100",
+  "uptime": "0:06 hours",
+  "uptime_days": 0,
+  "uptime_hours": 0,
+  "uptime_seconds": 362,
+  "virtual": "kvm",
+  "is_virtual": "true"
+}