facterdb 1.1.0 → 1.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (63) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/.travis.yml +19 -11
  4. data/CHANGELOG.md +63 -5
  5. data/README.md +10 -5
  6. data/Rakefile +16 -4
  7. data/facterdb.gemspec +1 -2
  8. data/facts/1.6/amazon-2-x86_64.facts +53 -0
  9. data/facts/1.6/amazon-2016-x86_64.facts +62 -0
  10. data/facts/1.7/amazon-2-x86_64.facts +76 -0
  11. data/facts/1.7/amazon-2016-x86_64.facts +78 -0
  12. data/facts/2.0/amazon-2-x86_64.facts +77 -0
  13. data/facts/2.0/amazon-2016-x86_64.facts +79 -0
  14. data/facts/2.1/amazon-2-x86_64.facts +90 -0
  15. data/facts/2.1/amazon-2016-x86_64.facts +90 -0
  16. data/facts/2.2/amazon-2-x86_64.facts +106 -0
  17. data/facts/2.2/amazon-2016-x86_64.facts +113 -0
  18. data/facts/2.3/amazon-2-x86_64.facts +107 -0
  19. data/facts/2.3/amazon-2016-x86_64.facts +114 -0
  20. data/facts/2.4/amazon-2-x86_64.facts +110 -0
  21. data/facts/2.4/amazon-2016-x86_64.facts +117 -0
  22. data/facts/2.4/raspbian-9-armv6l.facts +116 -0
  23. data/facts/2.4/raspbian-9-armv7l.facts +116 -0
  24. data/facts/2.5/amazon-2-x86_64.facts +116 -0
  25. data/facts/2.5/amazon-2016-x86_64.facts +117 -0
  26. data/facts/3.0/amazon-4-x86_64.facts +123 -173
  27. data/facts/3.1/amazon-4-x86_64.facts +127 -177
  28. data/facts/3.10/amazon-2-x86_64.facts +382 -0
  29. data/facts/3.10/amazon-2016-x86_64.facts +324 -0
  30. data/facts/3.11/amazon-2-x86_64.facts +488 -0
  31. data/facts/3.11/amazon-2016-x86_64.facts +379 -0
  32. data/facts/3.11/archlinux-x86_64.facts +11 -1
  33. data/facts/3.11/raspbian-10-armv6l.facts +392 -0
  34. data/facts/3.11/raspbian-10-armv7l.facts +392 -0
  35. data/facts/3.11/solaris-11-i86pc.facts +647 -0
  36. data/facts/3.11/solaris-11-sun4v.facts +618 -0
  37. data/facts/3.12/amazon-2-x86_64.facts +385 -0
  38. data/facts/3.12/amazon-2016-x86_64.facts +327 -0
  39. data/facts/3.13/amazon-2-x86_64.facts +385 -0
  40. data/facts/3.13/amazon-2016-x86_64.facts +327 -0
  41. data/facts/3.13/debian-10-x86_64.facts +534 -0
  42. data/facts/3.14/amazon-2-x86_64.facts +385 -0
  43. data/facts/3.14/amazon-2016-x86_64.facts +327 -0
  44. data/facts/3.14/archlinux-x86_64.facts +15 -4
  45. data/facts/3.14/debian-10-x86_64.facts +534 -0
  46. data/facts/3.14/solaris-11-i86pc.facts +647 -0
  47. data/facts/3.14/solaris-11-sun4v.facts +618 -0
  48. data/facts/3.14/ubuntu-20.04-x86_64.facts +680 -0
  49. data/facts/3.3/amazon-4-x86_64.facts +127 -177
  50. data/facts/3.6/amazon-2-x86_64.facts +375 -0
  51. data/facts/3.6/amazon-2016-x86_64.facts +317 -0
  52. data/facts/3.7/amazon-2-x86_64.facts +375 -0
  53. data/facts/3.7/amazon-2016-x86_64.facts +317 -0
  54. data/facts/3.8/amazon-2-x86_64.facts +375 -0
  55. data/facts/3.8/amazon-2016-x86_64.facts +317 -0
  56. data/facts/3.9/amazon-2-x86_64.facts +381 -0
  57. data/facts/3.9/amazon-2016-x86_64.facts +323 -0
  58. data/facts/Vagrantfile +14 -0
  59. data/facts/get_facts.sh +8 -0
  60. data/lib/facterdb.rb +31 -10
  61. data/lib/facterdb/version.rb +1 -1
  62. data/spec/facterdb_spec.rb +36 -0
  63. metadata +52 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6054963540cb1c23a7c137189afbda3b013ceb886cc16877333c886179654f0c
4
- data.tar.gz: 748996b725827cc2677366ce3e4e85f449ccf9b001385823e1f5e673f78fed26
3
+ metadata.gz: e5eb3bbcb066410ca24dcee1141c904e40a5de502057714e214f1b5e2e53542c
4
+ data.tar.gz: 045b19c15ad161d4a892425de55c8ea3f467e906762d932e4b174870971f80d6
5
5
  SHA512:
6
- metadata.gz: bbbd51730a468d577bd0b1418e838fab58cc138545572a62db68062b9911d03253d7370d9baba14b830982e2203c51c8187cc61b3b8909237364d5e69b57c782
7
- data.tar.gz: 2d0de8d00c6ccf29a31d2aa2ab5cd52692f385cc5cd3fd3e6507eb09b72f127863e64bf3e599c981d739261c134684447468de3f3f50972d85a8b6c44a9873c9
6
+ metadata.gz: c04c8fbaceb78e90d5f3464cd5d84cf5bfb8440f228911304c33d4c26e64d472c52941c4682f3529fa294d8bc90efc08b79d8b8953acb210ed27c4f51f640b6b
7
+ data.tar.gz: 68de70690a83952f936a964669bb23119b774ffd6881e6e5e4765c7be3c75cdcb549ecec77ce220804704ecc5f75f5af063d2ab126df046838013006fe6f14b0
data/.gitignore CHANGED
@@ -4,6 +4,7 @@ coverage/
4
4
  .vagrant/
5
5
  .envrc
6
6
  vendor/
7
+ .vendor/
7
8
  packer_cache/
8
9
  *.box
9
10
  hugo/public
data/.travis.yml CHANGED
@@ -3,19 +3,27 @@ sudo: false
3
3
  cache: bundler
4
4
  script:
5
5
  - bundle exec rake spec
6
- rvm:
7
- - 2.3
8
- env:
9
- - FACTER_GEM_VERSION="~> 1.6.0"
10
- - FACTER_GEM_VERSION="~> 1.7.0"
11
- - FACTER_GEM_VERSION="~> 2.0.0"
12
- - FACTER_GEM_VERSION="~> 2.1.0"
13
- - FACTER_GEM_VERSION="~> 2.2.0"
14
- - FACTER_GEM_VERSION="~> 2.3.0"
15
- - FACTER_GEM_VERSION="~> 2.4.0"
16
- - FACTER_GEM_VERSION="~> 2.0" COVERAGE=yes
17
6
  matrix:
18
7
  fast_finish: true
8
+ include:
9
+ - rvm: 2.3
10
+ env: FACTER_GEM_VERSION="~> 1.6.0"
11
+ - rvm: 2.3
12
+ env: FACTER_GEM_VERSION="~> 1.7.0"
13
+ - rvm: 2.3
14
+ env: FACTER_GEM_VERSION="~> 2.0.0"
15
+ - rvm: 2.3
16
+ env: FACTER_GEM_VERSION="~> 2.1.0"
17
+ - rvm: 2.3
18
+ env: FACTER_GEM_VERSION="~> 2.2.0"
19
+ - rvm: 2.3
20
+ env: FACTER_GEM_VERSION="~> 2.3.0"
21
+ - rvm: 2.3
22
+ env: FACTER_GEM_VERSION="~> 2.4.0"
23
+ - rvm: 2.5
24
+ env: FACTER_GEM_VERSION="~> 2.0" COVERAGE=yes
25
+ - rvm: 2.7
26
+ env: FACTER_GEM_VERSION="~> 2.0"
19
27
  notifications:
20
28
  email: false
21
29
  deploy:
data/CHANGELOG.md CHANGED
@@ -1,5 +1,68 @@
1
1
  # Changelog
2
2
 
3
+ ## [1.6.0](https://rubygems.org/gems/facterdb/versions/1.6.0) (2020-12-21)
4
+
5
+ [Full Changelog](https://github.com/camptocamp/facterdb/compare/1.5.0...1.6.0)
6
+
7
+ **Closed issues:**
8
+
9
+ - New gem release required prior to Puppet 7 to resolve dependency issues [\#161](https://github.com/camptocamp/facterdb/issues/161)
10
+ - FacterDB appears to not give a os.family for solaris 11 on facter 4 [\#158](https://github.com/camptocamp/facterdb/issues/158)
11
+ - facterdb conflict [\#157](https://github.com/camptocamp/facterdb/issues/157)
12
+
13
+ **Merged pull requests:**
14
+
15
+ - Archlinux: Update fact sets [\#162](https://github.com/camptocamp/facterdb/pull/162) ([bastelfreak](https://github.com/bastelfreak))
16
+
17
+ ## [1.5.0](https://rubygems.org/gems/facterdb/versions/1.5.0) (2020-11-19)
18
+
19
+ [Full Changelog](https://github.com/camptocamp/facterdb/compare/1.4.0...1.5.0)
20
+
21
+ **Implemented enhancements:**
22
+
23
+ - add filter validation [\#19](https://github.com/camptocamp/facterdb/issues/19)
24
+
25
+ **Merged pull requests:**
26
+
27
+ - Fixes a bug with generate\_filter\_str [\#160](https://github.com/camptocamp/facterdb/pull/160) ([logicminds](https://github.com/logicminds))
28
+ - Fixes \#19 - add filter validation [\#159](https://github.com/camptocamp/facterdb/pull/159) ([logicminds](https://github.com/logicminds))
29
+ - Remove pin on facter \< 4 [\#156](https://github.com/camptocamp/facterdb/pull/156) ([sanfrancrisko](https://github.com/sanfrancrisko))
30
+ - Add ruby 2.5 and 2.7 testing [\#155](https://github.com/camptocamp/facterdb/pull/155) ([DavidS](https://github.com/DavidS))
31
+
32
+ ## [1.4.0](https://rubygems.org/gems/facterdb/versions/1.4.0) (2020-05-09)
33
+
34
+ [Full Changelog](https://github.com/camptocamp/facterdb/compare/1.3.0...1.4.0)
35
+
36
+ **Merged pull requests:**
37
+
38
+ - Add Ubuntu 20.04 factset [\#154](https://github.com/camptocamp/facterdb/pull/154) ([mmoll](https://github.com/mmoll))
39
+
40
+ ## [1.3.0](https://rubygems.org/gems/facterdb/versions/1.3.0) (2020-04-15)
41
+
42
+ [Full Changelog](https://github.com/camptocamp/facterdb/compare/1.2.0...1.3.0)
43
+
44
+ **Closed issues:**
45
+
46
+ - Raspbian support [\#135](https://github.com/camptocamp/facterdb/issues/135)
47
+
48
+ **Merged pull requests:**
49
+
50
+ - Add Debian 10 facter 3.13/3.14 sets [\#152](https://github.com/camptocamp/facterdb/pull/152) ([bastelfreak](https://github.com/bastelfreak))
51
+ - Pin to facter \< 4 to avoid automatic upgrade [\#151](https://github.com/camptocamp/facterdb/pull/151) ([raphink](https://github.com/raphink))
52
+ - Adding facts from Solaris 11 x86 & SPARC [\#149](https://github.com/camptocamp/facterdb/pull/149) ([genebean](https://github.com/genebean))
53
+ - AmazonLinux facts added [\#147](https://github.com/camptocamp/facterdb/pull/147) ([bFekete](https://github.com/bFekete))
54
+ - 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))
55
+
56
+ ## [1.2.0](https://rubygems.org/gems/facterdb/versions/1.2.0) (2020-01-08)
57
+
58
+ [Full Changelog](https://github.com/camptocamp/facterdb/compare/1.1.0...1.2.0)
59
+
60
+ **Merged pull requests:**
61
+
62
+ - \[Arch Linux\] Set correct hostname, domain, fqdn [\#146](https://github.com/camptocamp/facterdb/pull/146) ([dhoppe](https://github.com/dhoppe))
63
+ - drop json as runtime dependency [\#145](https://github.com/camptocamp/facterdb/pull/145) ([bastelfreak](https://github.com/bastelfreak))
64
+ - add .vendor to .gitignore [\#144](https://github.com/camptocamp/facterdb/pull/144) ([bastelfreak](https://github.com/bastelfreak))
65
+
3
66
  ## [1.1.0](https://rubygems.org/gems/facterdb/versions/1.1.0) (2020-01-07)
4
67
 
5
68
  [Full Changelog](https://github.com/camptocamp/facterdb/compare/1.0.0...1.1.0)
@@ -154,7 +217,6 @@
154
217
 
155
218
  **Merged pull requests:**
156
219
 
157
- - Release prep for 0.5.0 [\#70](https://github.com/camptocamp/facterdb/pull/70) ([DavidS](https://github.com/DavidS))
158
220
  - add freebsd\_11 facts [\#69](https://github.com/camptocamp/facterdb/pull/69) ([b4ldr](https://github.com/b4ldr))
159
221
  - add freebsd 10 facts for facter 2.5 and 3.9 [\#68](https://github.com/camptocamp/facterdb/pull/68) ([b4ldr](https://github.com/b4ldr))
160
222
  - openSUSE Support [\#63](https://github.com/camptocamp/facterdb/pull/63) ([genebean](https://github.com/genebean))
@@ -163,10 +225,6 @@
163
225
 
164
226
  [Full Changelog](https://github.com/camptocamp/facterdb/compare/0.4.0...0.4.1)
165
227
 
166
- **Implemented enhancements:**
167
-
168
- - Release prep for 0.4.0 [\#66](https://github.com/camptocamp/facterdb/pull/66) ([DavidS](https://github.com/DavidS))
169
-
170
228
  ## [0.4.0](https://rubygems.org/gems/facterdb/versions/0.4.0) (2017-10-24)
171
229
 
172
230
  [Full Changelog](https://github.com/camptocamp/facterdb/compare/0.3.12...0.4.0)
data/README.md CHANGED
@@ -2,7 +2,6 @@ facterdb
2
2
  ========
3
3
 
4
4
  [![Build Status](https://img.shields.io/travis/camptocamp/facterdb/master.svg)](https://travis-ci.org/camptocamp/facterdb)
5
- [![Code Climate](https://img.shields.io/codeclimate/github/camptocamp/facterdb.svg)](https://codeclimate.com/github/camptocamp/facterdb)
6
5
  [![Gem Version](https://img.shields.io/gem/v/facterdb.svg)](https://rubygems.org/gems/facterdb)
7
6
  [![Gem Downloads](https://img.shields.io/gem/dt/facterdb.svg)](https://rubygems.org/gems/facterdb)
8
7
  [![Coverage Status](https://img.shields.io/coveralls/camptocamp/facterdb.svg)](https://coveralls.io/r/camptocamp/facterdb?branch=master)
@@ -63,9 +62,11 @@ FacterDB::get_facts('osfamily=Debian')
63
62
  | AIX 5300 | | | | | | | | | | | 1 | | | | | | | | | | | | |
64
63
  | AIX 6100 | | | | | | | | | | | 1 | | | | | | | | | | | | |
65
64
  | AIX 7100 | | | | | | | | | | | 1 | | | | | | | 1 | | | | | |
66
- | Amazon | 1 | | | | | | | | | | | | | | | | | | | | | | |
65
+ | Amazon | 3 | | | | 1 | 1 | 1 | | | | | | | | | | | | | | | | |
66
+ | Amazon 2 | | | | | | | | 1 | | | | | | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
67
+ | Amazon 2016 | | | | | 1 | 1 | 1 | 1 | | | | | | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
67
68
  | Amazon 2017 | | | | | 1 | 1 | 1 | | | | | | | | 1 | | | | | | | | |
68
- | Amazon 4 | | 1 | 1 | 1 | | | | | 1 | 1 | | 1 | | | | | | | | | | | |
69
+ | Amazon 4 | | 3 | 3 | 3 | | | | | 1 | 1 | | 1 | | | | | | | | | | | |
69
70
  | Archlinux | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 1 | | | | | | | | | | 1 | 1 | 1 | 1 | 1 | 1 |
70
71
  | CentOS 5 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | | |
71
72
  | CentOS 6 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 1 | 1 | 1 |
@@ -77,7 +78,7 @@ FacterDB::get_facts('osfamily=Debian')
77
78
  | Darwin 16 | | | | | 1 | 1 | 1 | 1 | | | | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
78
79
  | Darwin 17 | | | | | 1 | 1 | 1 | 1 | | | | | | | | | | 1 | 1 | 1 | 1 | 1 | 1 |
79
80
  | Darwin 18 | | | | | 1 | 1 | 1 | 1 | | | | | | | | | | | | 1 | | 1 | 1 |
80
- | Debian 10 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | | | | | | | | | | | | 1 | | | |
81
+ | Debian 10 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | | | | | | | | | | | | 1 | | 1 | 1 |
81
82
  | Debian 6 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | 2 | 2 | | | | | | | | | | | | | |
82
83
  | Debian 7 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | 2 | 2 | 2 | 2 | 2 | 2 | | | | | | |
83
84
  | Debian 8 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | 2 | 2 | 2 | 2 | 2 | 2 | 1 | 1 | 1 | 1 | 1 | 1 |
@@ -113,6 +114,8 @@ FacterDB::get_facts('osfamily=Debian')
113
114
  | OracleLinux 5 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | 2 | 2 | 2 | 2 | 2 | 2 | 1 | 1 | 1 | | | |
114
115
  | OracleLinux 6 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | 2 | 2 | 2 | 2 | 2 | 2 | 1 | 1 | 2 | 1 | 1 | 1 |
115
116
  | OracleLinux 7 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 1 | 2 | 2 | | 2 | 1 | 1 | 2 | 1 | 1 | 1 | 1 | 2 | 1 | 1 | 1 |
117
+ | Raspbian 10 | | | | | | | | | | | | | | | | | | | | 2 | | | |
118
+ | Raspbian 9 | | | | | | | 2 | | | | | | | | | | | | | | | | |
116
119
  | RedHat 5 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | | |
117
120
  | RedHat 6 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | 2 | 2 | 2 | 3 | 2 | 2 | 2 | 2 | 2 | 1 | 1 | 1 |
118
121
  | RedHat 7 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 1 | 2 | 2 | | 2 | 1 | 1 | 2 | 1 | 1 | 1 | 1 | 2 | 1 | 1 | 1 |
@@ -126,7 +129,8 @@ FacterDB::get_facts('osfamily=Debian')
126
129
  | Solaris | | | | | | | | 1 | | | | | | | | | | 1 | | 1 | | | |
127
130
  | Solaris 1 | | | | | | | | 1 | | | | | | | | | | | | | | | |
128
131
  | Solaris 11 | 1 | 1 | | | | | | | | | | | | | | | | | | | | | |
129
- | Solaris 2 | | | 1 | 1 | 1 | 2 | 2 | | | | | | | | | | | | | | | | |
132
+ | Solaris 2 | | | 1 | 1 | 1 | 2 | 2 | | | | | | | | | | | | | 1 | | | 1 |
133
+ | Solaris 3 | | | | | | | | | | | | | | | | | | | | 1 | | | 1 |
130
134
  | Ubuntu 10.04 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | | | | | | | | | | | | | | | |
131
135
  | Ubuntu 12.04 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | 2 | 2 | 2 | | | | | | | | | |
132
136
  | 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 |
@@ -136,6 +140,7 @@ FacterDB::get_facts('osfamily=Debian')
136
140
  | Ubuntu 16.04 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | 2 | | 2 | 2 | 2 | 2 | 2 | 2 | 1 | 1 | 1 | 1 | 1 | 1 |
137
141
  | Ubuntu 16.10 | | | | | | | | | | | | | | | 2 | | | | | | | | |
138
142
  | Ubuntu 18.04 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | | | | | | | | | | 1 | 1 | 1 | 1 | 1 |
143
+ | Ubuntu 20.04 | | | | | | | | | | | | | | | | | | | | | | | 1 |
139
144
  | VirtuozzoLinux 7 | | | | | | | | | | | | | | | | | | | | | | | 1 |
140
145
  | Windows 10 | | | | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 |
141
146
  | Windows 7 | | | | 1 | 1 | 1 | 2 | 1 | 2 | 2 | | 1 | 1 | 1 | 1 | 1 | 1 | | | | | | |
data/Rakefile CHANGED
@@ -29,12 +29,23 @@ end
29
29
  def factset_to_os_label(fs)
30
30
  os_rel = '???'
31
31
  os_name = '????'
32
- if fs.key?(:os) && (fs[:os]['release']['major'] =~ /\d/)
32
+ if fs.key?(:os) && fs[:os].key?('release') && (fs[:os]['release']['major'] =~ /\d/)
33
33
  os_name = fs[:os]['name']
34
+ fail = Hash.new
35
+ os = fs[:os]
36
+ distro = os.fetch('lsb', os.fetch('distro', fail))
37
+ if distro.key?('id')
38
+ os_id = distro['id']
39
+ elsif distro.key?('distid')
40
+ os_id = distro['distid']
41
+ else
42
+ os_id = '@@@@@@@@@@'
43
+ end
34
44
  os_rel = fs[:os]['release']['major']
35
45
  os__rel = fs[:os]['release']['full']
36
46
  elsif fs.key? :operatingsystem
37
47
  os_name = fs[:operatingsystem]
48
+ os_id = fs.fetch(:lsbdistid, '@@@@@@@@@@')
38
49
  os_rel = fs.fetch(:operatingsystemmajrelease, fs.fetch(:lsbmajdistrelease, nil))
39
50
  os__rel = fs.fetch(:lsbdistrelease, fs.fetch(:operatingsystemrelease, '@@@'))
40
51
  else
@@ -42,7 +53,6 @@ def factset_to_os_label(fs)
42
53
  pp fs
43
54
  fail( 'ERROR: unrecognized facterset format' )
44
55
  end
45
-
46
56
  # Sanitize OS names to match the formats used in the facterdb README
47
57
  label = "#{os_name} #{os_rel}"
48
58
  if os_name =~ /^(Archlinux|Gentoo)$/
@@ -56,8 +66,10 @@ def factset_to_os_label(fs)
56
66
  label = "#{os_name} #{os__rel.split('.')[1]}"
57
67
  elsif fs[:_facterdb_filename] =~ /sles-15-/
58
68
  label = "SLES 15"
59
- elsif os_name.start_with?('Debian') && fs[:lsbdistid] == 'LinuxMint'
60
- label = "#{fs[:lsbdistid]} #{fs[:lsbmajdistrelease]}"
69
+ elsif os_name.start_with?('Debian') && os_id == 'LinuxMint'
70
+ label = "#{os_id} #{fs[:lsbmajdistrelease]}"
71
+ elsif os_name.start_with?('Debian') && os_id == 'Raspbian'
72
+ label = "#{os_id} #{os_rel}"
61
73
  elsif os_name =~ /^windows$/
62
74
  db_filename = fs[:_facterdb_filename] || 'there_is_no_filename'
63
75
  if db_filename =~ /windows-10-/
data/facterdb.gemspec CHANGED
@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
21
21
  s.add_development_dependency 'pry'
22
22
  s.add_development_dependency 'rspec'
23
23
  s.add_development_dependency 'github_changelog_generator', '~> 1.10', '< 1.10.4'
24
- s.add_runtime_dependency 'json' if RUBY_VERSION =~ /^1\.8/
25
- s.add_runtime_dependency 'facter'
24
+ s.add_runtime_dependency 'facter', '< 5.0.0'
26
25
  s.add_runtime_dependency 'jgrep'
27
26
  end
data/facts/1.6/amazon-2-x86_64.facts ADDED
@@ -0,0 +1,53 @@
1
+ {
2
+ "gem_version": "~> 1.6.0",
3
+ "architecture": "x86_64",
4
+ "kernel": "Linux",
5
+ "augeasversion": "1.12.0",
6
+ "domain": "example.com",
7
+ "macaddress": "08:00:27:d5:a3:c3",
8
+ "facterversion": "1.6.18",
9
+ "fqdn": "foo.example.com",
10
+ "hardwareisa": "x86_64",
11
+ "hardwaremodel": "x86_64",
12
+ "hostname": "foo",
13
+ "id": "root",
14
+ "interfaces": "eth0,lo",
15
+ "macaddress_eth0": "08:00:27:d5:a3:c3",
16
+ "ipaddress": "10.0.2.15",
17
+ "kernelmajversion": "4.14",
18
+ "kernelrelease": "4.14.154-128.181.amzn2.x86_64",
19
+ "kernelversion": "4.14.154",
20
+ "boardmanufacturer": "Oracle Corporation",
21
+ "boardproductname": "VirtualBox",
22
+ "boardserialnumber": "0",
23
+ "manufacturer": "innotek GmbH",
24
+ "productname": "VirtualBox",
25
+ "serialnumber": "0",
26
+ "type": "Other",
27
+ "memorysize": "985.54 MB",
28
+ "memoryfree": "813.95 MB",
29
+ "swapsize": "0.00 kB",
30
+ "swapfree": "0.00 kB",
31
+ "memorytotal": "985.54 MB",
32
+ "operatingsystem": "Amazon",
33
+ "operatingsystemrelease": "4.14.154-128.181.amzn2.x86_64",
34
+ "osfamily": "Linux",
35
+ "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",
36
+ "physicalprocessorcount": 1,
37
+ "processor0": "Intel(R) Core(TM) i9-8950HK CPU @ 2.90GHz",
38
+ "processorcount": "1",
39
+ "ps": "ps -ef",
40
+ "rubysitedir": "/opt/puppetlabs/puppet/lib/ruby/site_ruby/2.5.0",
41
+ "rubyversion": "2.5.3",
42
+ "selinux": "false",
43
+ "sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABAQCzt7VD+RI3cTlhjLrmXiEovOBn0PXzt5ezZmd/E5n3FCO6enAuc3gJZvE6Xhi44lGspTxYQ3bZDnASLF0/oEklrhof173tWAD/gm0JHz9FCXx/msL5VRt+m4kFZ5MRPCwXMYw8hjsuqj8DHtaBleoWyslZWZwBOjLKm7RKR668wrS5cuFtaqK0TrvVMUd6LKL37S/Hs7BPCbKLmgCZgyXuorDmvHvDf161MS/jsS32YfGyuKviDZlfMwK9EqtUlFCf5VNHbrl4CBE2ccLIhqqADZWGTYHqqP3XnJ/WylCPA4uewCg+4XZfqRcel77ny3dfsOQnZxerihHB81TTqv7b",
44
+ "sshecdsakey": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP7HYO0Z/t7NKY8iwAyq4Hg5I9fPSTSmZ27fz3u51rZwjoZYUkPMw6PxVUus8pJE4Lq09ifB+Z7UNnJYmp8r+7g=",
45
+ "timezone": "UTC",
46
+ "uniqueid": "007f0100",
47
+ "uptime": "0:06 hours",
48
+ "uptime_days": 0,
49
+ "uptime_hours": 0,
50
+ "uptime_seconds": 366,
51
+ "virtual": "kvm",
52
+ "is_virtual": "true"
53
+ }
data/facts/1.6/amazon-2016-x86_64.facts ADDED
@@ -0,0 +1,62 @@
1
+ {
2
+ "gem_version": "~> 1.6.0",
3
+ "architecture": "x86_64",
4
+ "kernel": "Linux",
5
+ "augeasversion": "1.12.0",
6
+ "domain": "example.com",
7
+ "macaddress": "08:00:27:24:46:86",
8
+ "facterversion": "1.6.18",
9
+ "fqdn": "foo.example.com",
10
+ "hardwareisa": "x86_64",
11
+ "hardwaremodel": "x86_64",
12
+ "hostname": "foo",
13
+ "id": "root",
14
+ "interfaces": "eth0,lo",
15
+ "ipaddress_eth0": "10.0.2.15",
16
+ "macaddress_eth0": "08:00:27:24:46:86",
17
+ "netmask_eth0": "255.255.255.0",
18
+ "mtu_eth0": "1500",
19
+ "ipaddress_lo": "127.0.0.1",
20
+ "netmask_lo": "255.0.0.0",
21
+ "mtu_lo": "65536",
22
+ "ipaddress": "10.0.2.15",
23
+ "kernelmajversion": "4.4",
24
+ "kernelrelease": "4.4.44-39.55.amzn1.x86_64",
25
+ "kernelversion": "4.4.44",
26
+ "boardmanufacturer": "Oracle Corporation",
27
+ "boardproductname": "VirtualBox",
28
+ "boardserialnumber": "0",
29
+ "manufacturer": "innotek GmbH",
30
+ "productname": "VirtualBox",
31
+ "serialnumber": "0",
32
+ "type": "Other",
33
+ "memorysize": "996.94 MB",
34
+ "memoryfree": "874.55 MB",
35
+ "swapsize": "0.00 kB",
36
+ "swapfree": "0.00 kB",
37
+ "memorytotal": "996.94 MB",
38
+ "netmask": "255.255.255.0",
39
+ "network_eth0": "10.0.2.0",
40
+ "network_lo": "127.0.0.0",
41
+ "operatingsystem": "Amazon",
42
+ "operatingsystemrelease": "4.4.44-39.55.amzn1.x86_64",
43
+ "osfamily": "Linux",
44
+ "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",
45
+ "physicalprocessorcount": 1,
46
+ "processor0": "Intel(R) Core(TM) i9-8950HK CPU @ 2.90GHz",
47
+ "processorcount": "1",
48
+ "ps": "ps -ef",
49
+ "rubysitedir": "/opt/puppetlabs/puppet/lib/ruby/site_ruby/2.5.0",
50
+ "rubyversion": "2.5.3",
51
+ "selinux": "false",
52
+ "sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABAQDZ1lqGL2XwHIZ9fAJbcht6kKAthGOPsz5aC5sM1QP+mY3ouLB5jrwSpQcV51KvIl30IHu3Rp/Jrl06TpN9nw2kZnSMV0dY1k24ujEwF0CpL4STuv9AHkjD0tUFOa1BqmUukLYFKz2cZroUkFO9GZ4l/Z1EZGquQt37x+q0rq45IKlcoWyttLYFmX6zQhK7ICwnrjfTNXs8ID8g0NEFSne1AoDrHa3QjY/Epa5QVQpEOvJ/hrS5yJ2wYp7Rlg3uR4J+sA/Dpn6UCYC/xlj/aXcl90HPORlIy50gLpzLj55fcH6rTIMcLp5hl5gVyr5lygk+Ep5FiuYBMUPzCeCQ6o0v",
53
+ "sshecdsakey": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIl9DhX/TT6XkAxp7ROAIP8/67ycpIo7t0+NSP4f0FJy9W2Ifj8m+l0i6zxMATRSOmgDNI+PL/TtLLWRZQ/VbQk=",
54
+ "timezone": "UTC",
55
+ "uniqueid": "007f0100",
56
+ "uptime": "0:05 hours",
57
+ "uptime_days": 0,
58
+ "uptime_hours": 0,
59
+ "uptime_seconds": 319,
60
+ "virtual": "kvm",
61
+ "is_virtual": "true"
62
+ }
data/facts/1.7/amazon-2-x86_64.facts ADDED
@@ -0,0 +1,76 @@
1
+ {
2
+ "gem_version": "~> 1.7.0",
3
+ "architecture": "x86_64",
4
+ "augeasversion": "1.12.0",
5
+ "kernel": "Linux",
6
+ "blockdevice_sda_size": 26843545600,
7
+ "blockdevice_sda_vendor": "ATA",
8
+ "blockdevice_sda_model": "VBOX HARDDISK",
9
+ "blockdevices": "sda",
10
+ "domain": "example.com",
11
+ "macaddress": "08:00:27:d5:a3:c3",
12
+ "osfamily": "RedHat",
13
+ "operatingsystem": "Amazon",
14
+ "facterversion": "1.7.6",
15
+ "filesystems": "xfs",
16
+ "fqdn": "foo.example.com",
17
+ "hardwareisa": "x86_64",
18
+ "hardwaremodel": "x86_64",
19
+ "hostname": "foo",
20
+ "id": "root",
21
+ "interfaces": "eth0,lo",
22
+ "ipaddress_eth0": "10.0.2.15",
23
+ "macaddress_eth0": "08:00:27:d5:a3:c3",
24
+ "netmask_eth0": "255.255.255.0",
25
+ "ipaddress_lo": "127.0.0.1",
26
+ "netmask_lo": "255.0.0.0",
27
+ "ipaddress": "10.0.2.15",
28
+ "kernelmajversion": "4.14",
29
+ "kernelrelease": "4.14.154-128.181.amzn2.x86_64",
30
+ "kernelversion": "4.14.154",
31
+ "boardmanufacturer": "Oracle Corporation",
32
+ "boardproductname": "VirtualBox",
33
+ "boardserialnumber": "0",
34
+ "bios_vendor": "innotek GmbH",
35
+ "bios_version": "VirtualBox",
36
+ "bios_release_date": "12/01/2006",
37
+ "manufacturer": "innotek GmbH",
38
+ "productname": "VirtualBox",
39
+ "serialnumber": "0",
40
+ "uuid": "2775E86A-EC06-4791-B2F2-C923CEB7A5C2",
41
+ "type": "Other",
42
+ "memorysize": "985.54 MB",
43
+ "memoryfree": "810.14 MB",
44
+ "swapsize": "0.00 MB",
45
+ "swapfree": "0.00 MB",
46
+ "swapsize_mb": "0.00",
47
+ "swapfree_mb": "0.00",
48
+ "memorysize_mb": "985.54",
49
+ "memoryfree_mb": "810.14",
50
+ "memorytotal": "985.54 MB",
51
+ "netmask": "255.255.255.0",
52
+ "network_eth0": "10.0.2.0",
53
+ "network_lo": "127.0.0.0",
54
+ "operatingsystemmajrelease": "4",
55
+ "operatingsystemrelease": "4.14.154-128.181.amzn2.x86_64",
56
+ "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",
57
+ "physicalprocessorcount": 1,
58
+ "processor0": "Intel(R) Core(TM) i9-8950HK CPU @ 2.90GHz",
59
+ "processorcount": "1",
60
+ "ps": "ps -ef",
61
+ "rubysitedir": "/opt/puppetlabs/puppet/lib/ruby/site_ruby/2.5.0",
62
+ "rubyversion": "2.5.3",
63
+ "selinux": "false",
64
+ "sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABAQCzt7VD+RI3cTlhjLrmXiEovOBn0PXzt5ezZmd/E5n3FCO6enAuc3gJZvE6Xhi44lGspTxYQ3bZDnASLF0/oEklrhof173tWAD/gm0JHz9FCXx/msL5VRt+m4kFZ5MRPCwXMYw8hjsuqj8DHtaBleoWyslZWZwBOjLKm7RKR668wrS5cuFtaqK0TrvVMUd6LKL37S/Hs7BPCbKLmgCZgyXuorDmvHvDf161MS/jsS32YfGyuKviDZlfMwK9EqtUlFCf5VNHbrl4CBE2ccLIhqqADZWGTYHqqP3XnJ/WylCPA4uewCg+4XZfqRcel77ny3dfsOQnZxerihHB81TTqv7b",
65
+ "sshfp_rsa": "SSHFP 1 1 ef92c5aad85bb02166cd22c177c9bda5f700bc51\nSSHFP 1 2 ee352de2e36afbc76bb1f19311d30f681ff6153a8a53d9766ddf81f35afdcfca",
66
+ "sshecdsakey": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP7HYO0Z/t7NKY8iwAyq4Hg5I9fPSTSmZ27fz3u51rZwjoZYUkPMw6PxVUus8pJE4Lq09ifB+Z7UNnJYmp8r+7g=",
67
+ "sshfp_ecdsa": "SSHFP 3 1 f85c1e7a914aa7b76694dc854e7311d01223a84b\nSSHFP 3 2 6fe18ab8c51fcfafb4497eeaf7e2da45e5e8d345d29678ce1acafbeb51647980",
68
+ "timezone": "UTC",
69
+ "uniqueid": "007f0100",
70
+ "uptime": "0:06 hours",
71
+ "uptime_days": 0,
72
+ "uptime_hours": 0,
73
+ "uptime_seconds": 370,
74
+ "virtual": "kvm",
75
+ "is_virtual": "true"
76
+ }