simp-rspec-puppet-facts 3.6.0 → 3.6.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/simp/rspec-puppet-facts.rb +2 -1
  3. data/lib/simp/version.rb +1 -1
  4. metadata +86 -86
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a4599a1e1387dec0ec55de112bedcd82ea8ed0f164a384e8542c1106edf6a37b
4
- data.tar.gz: e4b86b0ff3a01f89da2de3d87c058fe5877367494884cd66e7384f0156cf9c34
3
+ metadata.gz: 6292c8cb7af7e82533a19a5f62f714c701e82f229f0a66abb0d06f72e8417180
4
+ data.tar.gz: 316c0358ba56e57df163f712f4b014df43b71f7fc91f3a1de986ca18b2952cc3
5
5
  SHA512:
6
- metadata.gz: 19c73ed746b19696ac0cf95fbae8162f8372f21044ea8beb72583bdad4bf5be6536868dccbfb2ef0e2aaa6ccae997624d497d8efa41bebff48b2f2a80521e3eb
7
- data.tar.gz: b656f22f09e07f945d2fe0f5dafb21b2945feb9b51f56282bfae87ebee891bd709834c99c0647a33d478554dc7b9ba6388af5f0f9224a01342447aa62798db7c
6
+ metadata.gz: 8579593b20bd2b216e7df14aad76719d88821942cb2f33466d5a77fcf1fcdedf83f901960ea1995d42c34d9219acacd0e8c68a8fa3da5d0af9b95f4a11dd4399
7
+ data.tar.gz: 7a4a4bd8802aa337ae8e6ca527d25f17ca145243610871b5794fca5650382da6889d13906373e5afa2bfe661b41db4d6ca859415491235089637f571a870bc71
data/lib/simp/rspec-puppet-facts.rb CHANGED
@@ -76,7 +76,8 @@ module Simp::RspecPuppetFacts
76
76
  rfh_h = {}
77
77
  rfh_h = Simp::RspecPuppetFacts::Shim.on_supported_os(masked_opts) unless masked_opts[:supported_os]&.empty?
78
78
 
79
- merged_os_hash = rfh_h.merge(simp_h)
79
+ #merged_os_hash = rfh_h.merge(simp_h) # we should NOT merge default facterdb factsets
80
+ merged_os_hash = simp_h
80
81
  h = merged_os_hash.select{|k,v| supported_os_strings(opts, merged_os_hash.keys).include? k}
81
82
 
82
83
  h.each do | os, facts |
data/lib/simp/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Simp; end
2
2
  module Simp::RspecPuppetFacts
3
- VERSION = '3.6.0'
3
+ VERSION = '3.6.1'
4
4
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: simp-rspec-puppet-facts
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.6.0
4
+ version: 3.6.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2023-03-23 00:00:00.000000000 Z
12
+ date: 2023-04-17 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rspec-puppet-facts
@@ -265,113 +265,113 @@ required_rubygems_version: !ruby/object:Gem::Requirement
265
265
  version: '0'
266
266
  requirements:
267
267
  - rspec-puppet-facts
268
- rubygems_version: 3.0.3.1
268
+ rubygems_version: 3.1.6
269
269
  signing_key:
270
270
  specification_version: 4
271
271
  summary: standard SIMP facts fixtures for Puppet
272
272
  test_files:
273
273
  - Rakefile
274
- - spec/spec_helper.rb
275
- - spec/fixtures/metadata.json_with_missing_operatingsystem_support
276
- - spec/fixtures/metadata.json
277
- - spec/spec_helper_acceptance.rb
278
274
  - spec/acceptance/suites/default/00_default_spec.rb
279
275
  - spec/acceptance/suites/default/nodesets
280
- - spec/acceptance/nodesets/almalinux8.yml
281
- - spec/acceptance/nodesets/win_2012r2.yml
282
- - spec/acceptance/nodesets/win_2022.yml
283
- - spec/acceptance/nodesets/rhel9.yml
284
- - spec/acceptance/nodesets/rhel7.yml
285
276
  - spec/acceptance/nodesets/win_2019.yml
286
- - spec/acceptance/nodesets/centos7.yml
287
- - spec/acceptance/nodesets/oel7.yml
288
- - spec/acceptance/nodesets/amzn2.yml
277
+ - spec/acceptance/nodesets/centos8.yml
278
+ - spec/acceptance/nodesets/oel8.yml
279
+ - spec/acceptance/nodesets/almalinux8.yml
289
280
  - spec/acceptance/nodesets/win_2016.yml
290
281
  - spec/acceptance/nodesets/rhel8.yml
291
- - spec/acceptance/nodesets/rocky8.yml
292
- - spec/acceptance/nodesets/centos8.yml
282
+ - spec/acceptance/nodesets/oel7.yml
293
283
  - spec/acceptance/nodesets/almalinux9.yml
294
- - spec/acceptance/nodesets/oel8.yml
284
+ - spec/acceptance/nodesets/win_2022.yml
285
+ - spec/acceptance/nodesets/amzn2.yml
286
+ - spec/acceptance/nodesets/rocky8.yml
287
+ - spec/acceptance/nodesets/win_2012r2.yml
288
+ - spec/acceptance/nodesets/rhel7.yml
295
289
  - spec/acceptance/nodesets/centos9.yml
290
+ - spec/acceptance/nodesets/rhel9.yml
291
+ - spec/acceptance/nodesets/centos7.yml
296
292
  - spec/data_normalization_spec.rb
293
+ - spec/spec_helper.rb
294
+ - spec/fixtures/metadata.json_with_missing_operatingsystem_support
295
+ - spec/fixtures/metadata.json
297
296
  - spec/simp_rspec_puppet_facts_spec.rb
298
- - facts/puppetfiles/Puppetfile.6.0.0-0
299
- - facts/4.2/windows-2016-x64.facts
300
- - facts/4.2/redhat-9-x86_64.facts
301
- - facts/4.2/amazon-2-x86_64.facts
302
- - facts/4.2/windows-2012_r2-x64.facts
303
- - facts/4.2/rocky-8-x86_64.facts
304
- - facts/4.2/oraclelinux-7-x86_64.facts
305
- - facts/4.2/centos-8-x86_64.facts
306
- - facts/4.2/oraclelinux-8-x86_64.facts
307
- - facts/4.2/windows-2019-x64.facts
308
- - facts/4.2/redhat-8-x86_64.facts
309
- - facts/4.2/centos-7-x86_64.facts
310
- - facts/4.2/centos-9-x86_64.facts
311
- - facts/4.2/almalinux-9-x86_64.facts
312
- - facts/4.2/windows-2022-x64.facts
313
- - facts/4.2/redhat-7-x86_64.facts
314
- - facts/4.2/almalinux-8-x86_64.facts
315
- - facts/3.4/centos-6-x86_64.facts
297
+ - spec/spec_helper_acceptance.rb
298
+ - facts/Gemfile
316
299
  - facts/3.4/oraclelinux-6-x86_64.facts
300
+ - facts/3.4/centos-6-x86_64.facts
301
+ - facts/3.4/redhat-7-x86_64.facts
302
+ - facts/3.4/centos-7-x86_64.facts
317
303
  - facts/3.4/redhat-6-x86_64.facts
318
304
  - facts/3.4/oraclelinux-7-x86_64.facts
319
- - facts/3.4/centos-7-x86_64.facts
320
- - facts/3.4/redhat-7-x86_64.facts
321
- - facts/3.5/centos-6-x86_64.facts
322
- - facts/3.5/oraclelinux-6-x86_64.facts
323
- - facts/3.5/redhat-6-x86_64.facts
324
- - facts/3.5/oraclelinux-7-x86_64.facts
325
- - facts/3.5/centos-7-x86_64.facts
326
- - facts/3.5/redhat-7-x86_64.facts
327
- - facts/scripts/get_facts_for_each_facter.sh
328
- - facts/scripts/get_facts.rb
329
- - facts/scripts/gce_scrub_data.rb
330
- - facts/scripts/gce_scrub_data/oraclelinux-6-x86_64.scrub.yaml
331
- - facts/scripts/gce_scrub_data/centos-6-x86_64.scrub.yaml
332
- - facts/scripts/gce_scrub_data/redhat-7-x86_64.scrub.yaml
333
- - facts/scripts/gce_scrub_data/redhat-6-x86_64.scrub.yaml
334
- - facts/scripts/gce_scrub_data/centos-7-x86_64.scrub.yaml
335
- - facts/scripts/gce_scrub_data/oraclelinux-7-x86_64.scrub.yaml
336
- - facts/Vagrantfile
337
- - facts/3.6/centos-6-x86_64.facts
338
305
  - facts/3.6/oraclelinux-6-x86_64.facts
306
+ - facts/3.6/centos-6-x86_64.facts
307
+ - facts/3.6/redhat-7-x86_64.facts
308
+ - facts/3.6/centos-7-x86_64.facts
339
309
  - facts/3.6/redhat-6-x86_64.facts
340
- - facts/3.6/amazon-2-x86_64.facts
341
310
  - facts/3.6/oraclelinux-7-x86_64.facts
342
- - facts/3.6/centos-7-x86_64.facts
343
- - facts/3.6/redhat-7-x86_64.facts
344
- - facts/Gemfile
345
- - facts/4.3/windows-2012_r2-x64.facts
346
- - facts/4.3/rocky-8-x86_64.facts
347
- - facts/4.3/centos-8-x86_64.facts
348
- - facts/4.3/oraclelinux-8-x86_64.facts
349
- - facts/4.3/windows-2019-x64.facts
350
- - facts/4.3/centos-7-x86_64.facts
351
- - facts/4.3/centos-9-x86_64.facts
352
- - facts/4.3/almalinux-9-x86_64.facts
353
- - facts/4.3/windows-2022-x64.facts
354
- - facts/4.3/almalinux-8-x86_64.facts
311
+ - facts/3.6/amazon-2-x86_64.facts
312
+ - facts/2.5/rocky-8-x86_64.facts
313
+ - facts/2.5/centos-9-x86_64.facts
314
+ - facts/2.5/windows-2019-x86_64.facts
315
+ - facts/2.5/oraclelinux-6-x86_64.facts
355
316
  - facts/2.5/windows-2016-x64.facts
356
- - facts/2.5/windows-2012-r2-x86_64.facts
357
- - facts/2.5/redhat-9-x86_64.facts
317
+ - facts/2.5/windows-2022-x64.facts
318
+ - facts/2.5/centos-8-x86_64.facts
319
+ - facts/2.5/oraclelinux-8-x86_64.facts
358
320
  - facts/2.5/centos-6-x86_64.facts
359
- - facts/2.5/oraclelinux-6-x86_64.facts
321
+ - facts/2.5/redhat-7-x86_64.facts
322
+ - facts/2.5/centos-7-x86_64.facts
323
+ - facts/2.5/almalinux-8-x86_64.facts
324
+ - facts/2.5/windows-2019-x64.facts
360
325
  - facts/2.5/redhat-7.9-x86_64.facts
326
+ - facts/2.5/almalinux-9-x86_64.facts
361
327
  - facts/2.5/redhat-6-x86_64.facts
362
- - facts/2.5/amazon-2-x86_64.facts
363
- - facts/2.5/windows-2012_r2-x64.facts
364
- - facts/2.5/rocky-8-x86_64.facts
365
328
  - facts/2.5/oraclelinux-7-x86_64.facts
366
- - facts/2.5/centos-8-x86_64.facts
367
- - facts/2.5/oraclelinux-8-x86_64.facts
368
- - facts/2.5/windows-2019-x64.facts
369
- - facts/2.5/redhat-8-x86_64.facts
370
- - facts/2.5/windows-2019-x86_64.facts
371
- - facts/2.5/centos-7-x86_64.facts
329
+ - facts/2.5/amazon-2-x86_64.facts
330
+ - facts/2.5/redhat-9-x86_64.facts
372
331
  - facts/2.5/windows-2016-x86_64.facts
373
- - facts/2.5/centos-9-x86_64.facts
374
- - facts/2.5/almalinux-9-x86_64.facts
375
- - facts/2.5/windows-2022-x64.facts
376
- - facts/2.5/redhat-7-x86_64.facts
377
- - facts/2.5/almalinux-8-x86_64.facts
332
+ - facts/2.5/redhat-8-x86_64.facts
333
+ - facts/2.5/windows-2012_r2-x64.facts
334
+ - facts/2.5/windows-2012-r2-x86_64.facts
335
+ - facts/4.3/rocky-8-x86_64.facts
336
+ - facts/4.3/centos-9-x86_64.facts
337
+ - facts/4.3/windows-2022-x64.facts
338
+ - facts/4.3/centos-8-x86_64.facts
339
+ - facts/4.3/oraclelinux-8-x86_64.facts
340
+ - facts/4.3/centos-7-x86_64.facts
341
+ - facts/4.3/almalinux-8-x86_64.facts
342
+ - facts/4.3/windows-2019-x64.facts
343
+ - facts/4.3/almalinux-9-x86_64.facts
344
+ - facts/4.3/windows-2012_r2-x64.facts
345
+ - facts/puppetfiles/Puppetfile.6.0.0-0
346
+ - facts/3.5/oraclelinux-6-x86_64.facts
347
+ - facts/3.5/centos-6-x86_64.facts
348
+ - facts/3.5/redhat-7-x86_64.facts
349
+ - facts/3.5/centos-7-x86_64.facts
350
+ - facts/3.5/redhat-6-x86_64.facts
351
+ - facts/3.5/oraclelinux-7-x86_64.facts
352
+ - facts/Vagrantfile
353
+ - facts/scripts/get_facts.rb
354
+ - facts/scripts/get_facts_for_each_facter.sh
355
+ - facts/scripts/gce_scrub_data.rb
356
+ - facts/scripts/gce_scrub_data/oraclelinux-6-x86_64.scrub.yaml
357
+ - facts/scripts/gce_scrub_data/redhat-7-x86_64.scrub.yaml
358
+ - facts/scripts/gce_scrub_data/redhat-6-x86_64.scrub.yaml
359
+ - facts/scripts/gce_scrub_data/oraclelinux-7-x86_64.scrub.yaml
360
+ - facts/scripts/gce_scrub_data/centos-7-x86_64.scrub.yaml
361
+ - facts/scripts/gce_scrub_data/centos-6-x86_64.scrub.yaml
362
+ - facts/4.2/rocky-8-x86_64.facts
363
+ - facts/4.2/centos-9-x86_64.facts
364
+ - facts/4.2/windows-2016-x64.facts
365
+ - facts/4.2/windows-2022-x64.facts
366
+ - facts/4.2/centos-8-x86_64.facts
367
+ - facts/4.2/oraclelinux-8-x86_64.facts
368
+ - facts/4.2/redhat-7-x86_64.facts
369
+ - facts/4.2/centos-7-x86_64.facts
370
+ - facts/4.2/almalinux-8-x86_64.facts
371
+ - facts/4.2/windows-2019-x64.facts
372
+ - facts/4.2/almalinux-9-x86_64.facts
373
+ - facts/4.2/oraclelinux-7-x86_64.facts
374
+ - facts/4.2/amazon-2-x86_64.facts
375
+ - facts/4.2/redhat-9-x86_64.facts
376
+ - facts/4.2/redhat-8-x86_64.facts
377
+ - facts/4.2/windows-2012_r2-x64.facts