Skip to content

Commit f7a1e25

Browse files
committed
Use FacterDB.filter_results
1 parent 2663141 commit f7a1e25

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ group :coverage, optional: ENV['COVERAGE']!='yes' do
1212
gem 'codecov', :require => false
1313
gem 'simplecov-console', :require => false
1414
end
15+
16+
gem 'facterdb', github: 'ekohl/facterdb', branch: 'filter-results'

lib/rspec-puppet-facts.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,7 @@ def on_supported_os_implementation(opts = {})
128128
# facter data (see FacterDB 0.5.2 for Facter releases 3.8 and 3.9). In this situation we need to
129129
# cycle through and downgrade Facter versions per platform type until we find matching Facter data.
130130
filter.each do |filter_spec|
131-
versions = JGrep.jgrep(db.to_json, FacterDB.generate_filter_str(filter_spec)) \
132-
.to_h do |facts|
133-
result = facts.to_h { |k, v| [k.to_sym, v] }
134-
[Gem::Version.new(result[:facterversion]), result]
135-
end
131+
versions = FacterDB.filter_results(db, filter_spec).to_h { |facts| [Gem::Version.new(facts[:facterversion]), facts] }
136132

137133
version, facts = versions.select { |v, _f| strict_requirement =~ v }.max_by { |v, _f| v }
138134

0 commit comments

Comments
 (0)