facterdb 1.20.0 → 1.22.0

data/facts/get_facts.sh

@@ -65,7 +65,7 @@ case "${osfamily}" in
   wget "http://yum.puppetlabs.com/puppet7-release-el-${operatingsystemmajrelease}.noarch.rpm" -O /tmp/puppet7-release.rpm
   if test -f /tmp/puppet7-release.rpm; then
     rpm -ivh /tmp/puppet7-release.rpm
-    for puppet_agent_version in 7.5.0 7.6.1 7.17.0; do
+    for puppet_agent_version in 7.5.0 7.6.1 7.17.0 7.24.0; do
       if yum install -y puppet-agent-${puppet_agent_version}; 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})
@@ -74,15 +74,29 @@ case "${osfamily}" in
     done
     yum remove -y puppet7-release
   fi
+  wget "http://yum.puppetlabs.com/puppet8-release-el-${operatingsystemmajrelease}.noarch.rpm" -O /tmp/puppet8-release.rpm
+  if test -f /tmp/puppet8-release.rpm; then
+    rpm -ivh /tmp/puppet8-release.rpm
+    for puppet_agent_version in 8.0.0; do
+      if yum install -y puppet-agent-${puppet_agent_version}; then
+        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter os.name | tr '[:upper:]' '[:lower:]')-$(facter os.release.major)-$(facter os.hardware).facts"
+        mkdir -p $(dirname ${output_file})
+        facter --show-legacy -p -j | tee ${output_file}
+      fi
+    done
+    yum remove -y puppet8-release
+  fi
   ;;
 'Debian')
-  apt_install curl
+  apt_install curl file
   curl "https://apt.puppetlabs.com/puppet6-release-${lsbdistcodename}.deb" -o /tmp/puppet6-release.deb
   # apt.puppetlabs.com returns an html document if the requested deb doesn't exist and /tmp/puppet6-release.deb will be an html doc
   if test "$?" -eq 0 -a -f /tmp/puppet6-release.deb && [[ "$(file -b /tmp/puppet6-release.deb)" =~ "Debian binary package".* ]] ; then
     dpkg --install /tmp/puppet6-release.deb
     apt-get update
-    for puppet_agent_version in 6.2 6.4 6.6; do
+    # as of 2023-04-27 older 6.x series aren't available (i.e. facter 3.12)
+    # the trailing dot is so that 6.4.* is the match so we get the last in the 6.4 series and not 6.40
+    for puppet_agent_version in 6.4. 6.28.; do
       if apt_install puppet-agent=${puppet_agent_version}*; 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})
@@ -93,10 +107,10 @@ case "${osfamily}" in
   fi
   curl "https://apt.puppetlabs.com/puppet7-release-${lsbdistcodename}.deb" -o /tmp/puppet7-release.deb
   # apt.puppetlabs.com returns an html document if the requested deb doesn't exist and /tmp/puppet6-release.deb will be an html doc
-  if test "$?" -eq 0 -a -f /tmp/puppet7-release.deb && [[ "$(file -b /tmp/puppet6-release.deb)" =~ "Debian binary package".* ]] ; then
+  if test "$?" -eq 0 -a -f /tmp/puppet7-release.deb && [[ "$(file -b /tmp/puppet7-release.deb)" =~ "Debian binary package".* ]] ; then
     dpkg --install /tmp/puppet7-release.deb
     apt-get update
-    for puppet_agent_version in 7.5.0 7.6.1 7.12.0; do
+    for puppet_agent_version in 7.5.0 7.6.1 7.12.0 7.24.0; do
       if apt_install puppet-agent=${puppet_agent_version}*; 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})
@@ -105,11 +119,33 @@ case "${osfamily}" in
     done
     apt-get -y remove --purge puppet7-release
   fi
-  apt_install make gcc libgmp-dev
+  curl "https://apt.puppetlabs.com/puppet8-release-${lsbdistcodename}.deb" -o /tmp/puppet8-release.deb
+  # apt.puppetlabs.com returns an html document if the requested deb doesn't exist and /tmp/puppet6-release.deb will be an html doc
+  if test "$?" -eq 0 -a -f /tmp/puppet8-release.deb && [[ "$(file -b /tmp/puppet8-release.deb)" =~ "Debian binary package".* ]] ; then
+    dpkg --install /tmp/puppet8-release.deb
+    apt-get update
+    for puppet_agent_version in 8.0.0; do
+      if apt_install puppet-agent=${puppet_agent_version}*; then
+        output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter os.name | tr '[:upper:]' '[:lower:]')-$(facter os.release.major)-$(facter os.hardware).facts"
+        mkdir -p $(dirname ${output_file})
+        facter --show-legacy -p -j | tee ${output_file}
+      fi
+    done
+    apt-get -y remove --purge puppet8-release
+  fi
+  # libc6-dev needed to build the ffi gem
+  apt_install make gcc libgmp-dev libc6-dev
+
+  # puppetlabs repos/packages not yet available on bookworm https://puppet.atlassian.net/browse/PA-4995
+  # simply install puppet-agent that comes with the distro
+  if [[ "bookworm" =~ ${lsbdistcodename} ]]; then
+    apt_install ruby rubygems ruby-dev
+    facter --show-legacy -p -j | tee ${output_file}
+  fi
 
   # There are no puppet-agent packages for $releasename yet, so generate a Facter 3.x
   # fact set from the official Debian package.
-  if [[ "hirsute" =~ ${lsbdistcodename} || "impish" =~ ${lsbdistcodename} || "jammy" =~ ${lsbdistcodename} ]]; then
+  if [[ "hirsute" =~ ${lsbdistcodename} || "impish" =~ ${lsbdistcodename} || "jammy" =~ ${lsbdistcodename} || "kinetic" =~ ${lsbdistcodename} ]]; then
     apt_install ruby rubygems ruby-dev puppet facter
     output_file="/vagrant/$(facter --version | cut -d. -f1,2)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
     mkdir -p $(dirname ${output_file})
@@ -151,7 +187,7 @@ case "${osfamily}" in
     http_method='https'
   fi
   if rpm -Uvh ${http_method}://yum.puppet.com/puppet6-release-sles-${operatingsystemmajrelease}.noarch.rpm; then
-    for puppet_agent_version in 6.2.0 6.4.2 6.6.0; do
+    for puppet_agent_version in 6.25.0 6.27.1; do
       if zypper --gpg-auto-import-keys --non-interactive install puppet-agent-${puppet_agent_version}; 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})
@@ -160,6 +196,26 @@ case "${osfamily}" in
     done
     zypper --non-interactive remove puppet6-release
   fi
+  if rpm -Uvh ${http_method}://yum.puppet.com/puppet7-release-sles-${operatingsystemmajrelease}.noarch.rpm; then
+    for puppet_agent_version in 7.5.0 7.6.1 7.12.0 7.24.0; do
+      if zypper --gpg-auto-import-keys --non-interactive install puppet-agent-${puppet_agent_version}; 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
+    done
+    zypper --non-interactive remove puppet7-release
+  fi
+  if rpm -Uvh ${http_method}://yum.puppet.com/puppet8-release-sles-${operatingsystemmajrelease}.noarch.rpm; then
+    for puppet_agent_version in 8.0.0; do
+      if zypper --gpg-auto-import-keys --non-interactive install puppet-agent-${puppet_agent_version}; 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
+    done
+    zypper --non-interactive remove puppet8-release
+  fi
   ;;
 'Archlinux')
   pacman -Syu --noconfirm ruby puppet ruby-bundler base-devel dnsutils facter
@@ -174,6 +230,9 @@ case "${osfamily}" in
   facter --show-legacy -p -j | tee ${output_file}
 esac
 
+# this lower section relies on the ruby version and facter version that came
+# with the last installed puppet_agent per above
+# puppet-agent 8.0.0 has ruby 3.2.2 and it cant install 4.0.0, 4.1.0 facter gem
 operatingsystem=$(facter operatingsystem | tr '[:upper:]' '[:lower:]')
 operatingsystemrelease=$(facter operatingsystemrelease)
 operatingsystemmajrelease=$(facter operatingsystemmajrelease)
@@ -190,7 +249,7 @@ else
 fi
 bundle install --path vendor/bundler
 
-for version in 4.0.0 4.1.0 4.2.0; do
+for version in 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0; do
   FACTER_GEM_VERSION="~> ${version}" bundle update
   # sometimes all versions of facter are not possible, if the bundle update fails, skip the rest of the loop
   if [ $? -ne 0 ]; then
@@ -223,4 +282,3 @@ for version in 4.0.0 4.1.0 4.2.0; do
     FACTER_GEM_VERSION="~> ${version}" bundle exec facter --show-legacy --json | bundle exec ruby -e 'require "json"; jj JSON.parse gets' | tee $output_file ||
     FACTER_GEM_VERSION="~> ${version}" bundle exec facter --show-legacy --json | tee $output_file
 done
-

data/lib/facterdb/bin.rb

@@ -8,7 +8,7 @@ module FacterDB
     end
 
     def run
-      puts JSON.pretty_generate(FacterDB::get_os_facts('*', @args[0]))
+      puts JSON.pretty_generate(FacterDB.get_os_facts('*', @args[0]))
     end
   end
 end

data/lib/facterdb/version.rb

@@ -1,5 +1,5 @@
 module FacterDB
   module Version
-    STRING = '1.20.0'
+    STRING = '1.22.0'
   end
 end

data/lib/facterdb.rb

@@ -6,7 +6,7 @@ module FacterDB
     class InvalidFilter < RuntimeError; end
   end
 
-  # @return [String] -  returns a giant incomprehensible string of concatenated json data
+  # @return [String] returns a giant incomprehensible string of concatenated json data
   def self.database
     @database ||= "[#{facterdb_fact_files.map { |f| read_json_file(f) }.join(',')}]\n"
   end
@@ -18,14 +18,14 @@ module FacterDB
     Thread.current[:facterdb_last_facts_seen] = nil
   end
 
-  # @return [Boolean] - returns true if we should use the default facterdb database, false otherwise
+  # @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
   def self.use_defaultdb?
     ENV['FACTERDB_SKIP_DEFAULTDB'].nil?
   end
 
-  # @return [Boolean] - returns true if we should inject the source file name and file path into the json factsets.
+  # @return [Boolean] returns true if we should inject the source file name and file path into the json factsets.
   # The default is false.
   def self.inject_source?
     !ENV['FACTERDB_INJECT_SOURCE'].nil?
@@ -34,9 +34,11 @@ module FacterDB
   def self.read_json_file(f)
     content = File.read(f)
     return content unless inject_source?
+
     # Find the opening brace
     first_brace = content.index('{')
     return content if first_brace.nil?
+
     # Inject source file information
     json_injection =  "\"_facterdb_filename\": #{File.basename(f).to_json}, "
     json_injection += "\"_facterdb_path\": #{File.expand_path(f).to_json}, "
@@ -44,19 +46,21 @@ module FacterDB
   end
   private_class_method :read_json_file
 
-  # @return [Array[String]] -  list of all files found in the default facterdb facts path
+  # @return [Array[String]] list of all files found in the default facterdb facts path
   def self.default_fact_files
     return [] unless use_defaultdb?
+
     proj_root = File.join(File.dirname(File.dirname(__FILE__)))
     facts_dir = File.expand_path(File.join(proj_root, 'facts'))
-    Dir.glob(File.join(facts_dir, "**", '*.facts'))
+    Dir.glob(File.join(facts_dir, '**', '*.facts'))
   end
 
-  # @return [Array[String]] -  list of all files found in the user supplied facterdb facts path
-  # @param fact_paths [String] - a comma separated list of paths to search for fact files
-  def self.external_fact_files(fact_paths = ENV['FACTERDB_SEARCH_PATHS'])
+  # @return [Array[String]] list of all files found in the user supplied facterdb facts path
+  # @param fact_paths [String] a comma separated list of paths to search for fact files
+  def self.external_fact_files(fact_paths = ENV.fetch('FACTERDB_SEARCH_PATHS', nil))
     fact_paths ||= ''
     return [] if fact_paths.empty?
+
     paths = fact_paths.split(File::PATH_SEPARATOR).map do |fact_path|
       unless File.directory?(fact_path)
         warn("[FACTERDB] Ignoring external facts path #{fact_path} as it is not a directory")
@@ -68,33 +72,36 @@ module FacterDB
     Dir.glob(paths)
   end
 
-  # @return [Array[String]] -  list of all files found in the default facterdb facts path and user supplied path
+  # @return [Array[String]] list of all files found in the default facterdb facts path and user supplied path
   # @note external fact files supplied by the user will take precedence over default fact files found in this gem
   def self.facterdb_fact_files
     (external_fact_files + default_fact_files).uniq
   end
 
-  def self.get_os_facts(facter_version='*', filter=[])
+  # @deprecated Use {.get_facts} instead.
+  def self.get_os_facts(facter_version = '*', filter = [])
     if facter_version == '*'
       if filter.is_a?(Array)
-        filter_str = filter.map { |f| f.map { |k,v | "#{k}=#{v}" }.join(' and ') }.join(' or ')
+        filter_str = filter.map { |f| f.map { |k, v| "#{k}=#{v}" }.join(' and ') }.join(' or ')
       elsif filter.is_a?(Hash)
-        filter_str = filter.map { |k,v | "#{k}=#{v}" }.join(' and ')
+        filter_str = filter.map { |k, v| "#{k}=#{v}" }.join(' and ')
       elsif filter.is_a?(String)
         filter_str = filter
       else
         raise 'filter must be either an Array a Hash or a String'
       end
+    elsif filter.is_a?(Array)
+      filter_str = "facterversion=/^#{facter_version}/ and (#{filter.map do |f|
+                                                                f.map do |k, v|
+                                                                  "#{k}=#{v}"
+                                                                end.join(' and ')
+                                                              end.join(' or ')})"
+    elsif filter.is_a?(Hash)
+      filter_str = "facterversion=/^#{facter_version}/ and (#{filter.map { |k, v| "#{k}=#{v}" }.join(' and ')})"
+    elsif filter.is_a?(String)
+      filter_str = "facterversion=/^#{facter_version}/ and (#{filter})"
     else
-      if filter.is_a?(Array)
-        filter_str = "facterversion=/^#{facter_version}/ and (#{filter.map { |f| f.map { |k,v | "#{k}=#{v}" }.join(' and ') }.join(' or ')})"
-      elsif filter.is_a?(Hash)
-        filter_str = "facterversion=/^#{facter_version}/ and (#{filter.map { |k,v | "#{k}=#{v}" }.join(' and ')})"
-      elsif filter.is_a?(String)
-        filter_str = "facterversion=/^#{facter_version}/ and (#{filter})"
-      else
-        raise 'filter must be either an Array a Hash or a String'
-      end
+      raise 'filter must be either an Array a Hash or a String'
     end
 
     warn "[DEPRECATION] `get_os_facts` is deprecated. Please use `get_facts(#{filter_str})` instead."
@@ -102,14 +109,14 @@ module FacterDB
     get_facts(filter_str)
   end
 
-  # @return [String] - the string filter
-  # @param filter [Object] - The filter to convert to jgrep string
-  def self.generate_filter_str(filter=nil)
+  # @return [String] the string filter
+  # @param filter [Object] The filter to convert to jgrep string
+  def self.generate_filter_str(filter = nil)
     case filter
     when ::Array
-      '(' + filter.map { |f| f.map { |k,v | "#{k}=#{v}" }.join(' and ') }.join(') or (') + ')'
+      '(' + filter.map { |f| f.map { |k, v| "#{k}=#{v}" }.join(' and ') }.join(') or (') + ')'
     when ::Hash
-      filter.map { |k,v | "#{k}=#{v}" }.join(' and ')
+      filter.map { |k, v| "#{k}=#{v}" }.join(' and ')
     when ::String
       filter
     when ::NilClass
@@ -119,8 +126,8 @@ module FacterDB
     end
   end
 
-  # @return [Boolean] - true if the filter is valid against the jgrep filter validator
-  # @param filter [Object] - The filter to convert to jgrep string
+  # @return [Boolean] true if the filter is valid against the jgrep filter validator
+  # @param filters [Object] The filter to convert to jgrep string
   def self.valid_filters?(filters)
     filter_str = generate_filter_str(filters)
     JGrep.validate_filters(filter_str).nil?
@@ -128,14 +135,15 @@ module FacterDB
     false
   end
 
-  # @return [Array] - array of hashes of facts
-  # @param filter [Object] - The filter to convert to jgrep string
-  def self.get_facts(filter=nil, cache=true)
+  # @return [Array[Hash[Symbol, Any]]] array of hashes of facts
+  # @param filter [Object] The filter to convert to jgrep string
+  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)
-    result = 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.map { |k, v| [k.to_sym, v] }.to_h }
     if cache
       Thread.current[:facterdb_last_filter_seen] = filter
       Thread.current[:facterdb_last_facts_seen] = result

data/rakelib/rhel_alts.rake

@@ -3,22 +3,16 @@ task :rhel_alts do
   Dir[File.join(__dir__, '..', 'facts', '*', 'centos-*-x86_64.facts')].each do |f|
     centos_factset = File.read(f)
 
-    rhel_path = f.gsub(%r{centos-}, 'redhat-')
-    File.open(rhel_path, 'w') do |fd|
-      fd.puts centos_factset.gsub(%r{CentOS}, 'RedHat')
-    end
+    rhel_path = f.gsub('centos-', 'redhat-')
+    File.write(rhel_path, centos_factset.gsub('CentOS', 'RedHat'))
 
-    oracle_path = f.gsub(%r{centos-}, 'oraclelinux-')
-    File.open(oracle_path, 'w') do |fd|
-      fd.puts centos_factset.gsub(%r{CentOS}, 'OracleLinux')
-    end
+    oracle_path = f.gsub('centos-', 'oraclelinux-')
+    File.write(oracle_path, centos_factset.gsub('CentOS', 'OracleLinux'))
 
     # Scientific isn't going to be updated to 8
-    if File.basename(f)[%r{-(\d+)-}, 1].to_i <= 7
-      scientific_path = f.gsub(%r{centos-}, 'scientific-')
-      File.open(scientific_path, 'w') do |fd|
-        fd.puts centos_factset.gsub(%r{CentOS}, 'Scientific')
-      end
-    end
+    next unless File.basename(f)[/-(\d+)-/, 1].to_i <= 7
+
+    scientific_path = f.gsub('centos-', 'scientific-')
+    File.write(scientific_path, centos_factset.gsub('CentOS', 'Scientific'))
   end
 end

data/spec/facterdb_spec.rb

@@ -16,14 +16,14 @@ describe FacterDB do
   end
 
   let(:facts_24_path)  { File.join(project_dir, 'facts', '2.4') }
-  let(:facts_24_count) { Dir.glob(File.join(facts_24_path,'*.facts')).count }
+  let(:facts_24_count) { Dir.glob(File.join(facts_24_path, '*.facts')).count }
   let(:facts_23_path)  { File.join(project_dir, 'facts', '2.3') }
-  let(:facts_23_count) { Dir.glob(File.join(facts_23_path,'*.facts')).count }
+  let(:facts_23_count) { Dir.glob(File.join(facts_23_path, '*.facts')).count }
 
   describe '.use_defaultdb?' do
     subject { described_class.use_defaultdb? }
 
-    before(:each) do
+    before do
       ENV.delete('FACTERDB_SKIP_DEFAULTDB')
     end
 
@@ -32,7 +32,7 @@ describe FacterDB do
     end
 
     context 'when FACTERDB_SKIP_DEFAULTDB environment variable is set' do
-      before(:each) do
+      before do
         ENV['FACTERDB_SKIP_DEFAULTDB'] = '1'
       end
 
@@ -45,7 +45,7 @@ describe FacterDB do
 
     let(:non_directory_path) { File.join('this', 'is', 'not', 'a', 'directory') }
 
-    before(:each) do
+    before do
       ENV.delete('FACTERDB_SEARCH_PATHS')
       allow(File).to receive(:directory?).and_call_original
       allow(File).to receive(:directory?).with(non_directory_path).and_return(false)
@@ -73,7 +73,7 @@ describe FacterDB do
 
         object = defined?(Warning) ? Warning : Kernel
         allow(object).to receive(:warn).and_call_original
-        allow(object).to receive(:warn).with(a_string_matching(%r{is not a directory}))
+        allow(object).to receive(:warn).with(a_string_matching(/is not a directory/))
 
         expect(file_count).to eq(facts_24_count)
       end
@@ -105,7 +105,7 @@ describe FacterDB do
         it 'ignores the path that is not a directory' do
           object = defined?(Warning) ? Warning : Kernel
           allow(object).to receive(:warn).and_call_original
-          allow(object).to receive(:warn).with(a_string_matching(%r{is not a directory}))
+          allow(object).to receive(:warn).with(a_string_matching(/is not a directory/))
 
           expect(file_count).to eq(facts_24_count)
         end
@@ -116,7 +116,7 @@ describe FacterDB do
   describe '.default_fact_files' do
     subject(:default_fact_files) { described_class.default_fact_files }
 
-    before(:each) do
+    before do
       ENV.delete('FACTERDB_SKIP_DEFAULTDB')
     end
 
@@ -128,7 +128,7 @@ describe FacterDB do
     end
 
     context 'when FACTERDB_SKIP_DEFAULTDB environment variable is set' do
-      before(:each) do
+      before do
         ENV['FACTERDB_SKIP_DEFAULTDB'] = '1'
       end
 
@@ -139,11 +139,11 @@ describe FacterDB do
   describe '.facterdb_fact_files' do
     subject(:facterdb_fact_files) { described_class.facterdb_fact_files }
 
-    before(:each) do
+    before do
       ENV.delete('FACTERDB_SKIP_DEFAULTDB')
     end
 
-    after(:each) do
+    after do
       ENV.delete('FACTERDB_SEARCH_PATHS')
     end
 
@@ -154,7 +154,7 @@ describe FacterDB do
     end
 
     context 'with no loaded fact sets' do
-      before(:each) do
+      before do
         ENV['FACTERDB_SKIP_DEFAULTDB'] = '1'
         ENV.delete('FACTERDB_SEARCH_PATHS')
       end
@@ -166,7 +166,7 @@ describe FacterDB do
   describe '.database' do
     subject(:database) { described_class.database }
 
-    before(:each) do
+    before do
       ENV.delete('FACTERDB_SKIP_DEFAULTDB')
       ENV.delete('FACTERDB_SEARCH_PATHS')
       FacterDB.instance_variable_set(:@database, nil)
@@ -183,7 +183,7 @@ describe FacterDB do
     context 'when FACTERDB_INJECT_SOURCE environment variable is set' do
       subject(:json_database) { JSON.parse(database) }
 
-      before(:each) do
+      before do
         ENV['FACTERDB_INJECT_SOURCE'] = '1'
       end
 
@@ -200,14 +200,14 @@ describe FacterDB do
   describe '.get_os_facts' do
     subject(:result) { FacterDB.get_os_facts(facter_version, filter) }
 
-    before(:each) do
+    before do
       object = defined?(Warning) ? Warning : Kernel
       allow(object).to receive(:warn).and_call_original
-      allow(object).to receive(:warn).with(a_string_matching(%r{`get_os_facts` is deprecated}))
+      allow(object).to receive(:warn).with(a_string_matching(/`get_os_facts` is deprecated/))
     end
 
     context 'without parameters' do
-      subject(:result) { FacterDB.get_os_facts() }
+      subject(:result) { FacterDB.get_os_facts }
 
       include_examples 'returns a result'
     end
@@ -216,13 +216,13 @@ describe FacterDB do
       let(:facter_version) { '*' }
 
       context 'with an Array filter' do
-        let(:filter) { [{ :osfamily => 'Debian' }] }
+        let(:filter) { [{ osfamily: 'Debian' }] }
 
         include_examples 'returns a result'
       end
 
       context 'with a Hash filter' do
-        let(:filter) { { :osfamily => 'Debian' } }
+        let(:filter) { { osfamily: 'Debian' } }
 
         include_examples 'returns a result'
       end
@@ -237,7 +237,7 @@ describe FacterDB do
         let(:filter) { true }
 
         it 'raises an error' do
-          expect { result }.to raise_error(%r{filter must be either})
+          expect { result }.to raise_error(/filter must be either/)
         end
       end
     end
@@ -247,19 +247,19 @@ describe FacterDB do
 
       shared_examples 'returns only the specified version' do
         it 'only includes fact sets for the specified version' do
-          expect(result).to all(include(:facterversion => match(%r{\A2\.4})))
+          expect(result).to all(include(facterversion: match(/\A2\.4/)))
         end
       end
 
       context 'with an Array filter' do
-        let(:filter) { [{ :osfamily => 'Debian' }] }
+        let(:filter) { [{ osfamily: 'Debian' }] }
 
         include_examples 'returns a result'
         include_examples 'returns only the specified version'
       end
 
       context 'with a Hash filter' do
-        let(:filter) { { :osfamily => 'Debian' } }
+        let(:filter) { { osfamily: 'Debian' } }
 
         include_examples 'returns a result'
         include_examples 'returns only the specified version'
@@ -276,7 +276,7 @@ describe FacterDB do
         let(:filter) { true }
 
         it 'raises an error' do
-          expect { result }.to raise_error(%r{filter must be either})
+          expect { result }.to raise_error(/filter must be either/)
         end
       end
     end
@@ -284,29 +284,29 @@ describe FacterDB do
 
   describe '.valid_filters?' do
     it 'invalid and false' do
-      expect( FacterDB.valid_filters?('and')).to be_falsey
+      expect(FacterDB.valid_filters?('and')).to be_falsey
     end
 
     it 'valid and true' do
-      expect( FacterDB.valid_filters?('foo')).to be_truthy
+      expect(FacterDB.valid_filters?('foo')).to be_truthy
     end
   end
 
   describe '.generate_filter_str' do
     it 'invalid type' do
-      expect{FacterDB.generate_filter_str(3)}.to raise_error(FacterDB::Errors::InvalidFilter)
+      expect { FacterDB.generate_filter_str(3) }.to raise_error(FacterDB::Errors::InvalidFilter)
     end
 
     it 'with string' do
-      expect(FacterDB.generate_filter_str('foo')).to eq("foo")
+      expect(FacterDB.generate_filter_str('foo')).to eq('foo')
     end
 
     it 'with hash' do
-        expect(FacterDB.generate_filter_str({:osfamily => 'Debian'})).to eq("osfamily=Debian")
+      expect(FacterDB.generate_filter_str({ osfamily: 'Debian' })).to eq('osfamily=Debian')
     end
 
     it 'with Array' do
-      expect(FacterDB.generate_filter_str([:osfamily => 'Debian'])).to eq("(osfamily=Debian)")
+      expect(FacterDB.generate_filter_str([osfamily: 'Debian'])).to eq('(osfamily=Debian)')
     end
 
     it 'empty' do
@@ -324,32 +324,32 @@ describe FacterDB do
     let(:filter) { nil }
 
     context 'without parameters' do
-      include_examples "returns a result"
+      include_examples 'returns a result'
     end
 
     context 'with an Array filter' do
-      let(:filter) { [:osfamily => 'Debian'] }
+      let(:filter) { [osfamily: 'Debian'] }
 
-      include_examples "returns a result"
+      include_examples 'returns a result'
     end
 
     context 'with a Hash filter' do
-      let(:filter) { { :osfamily => 'Debian' } }
+      let(:filter) { { osfamily: 'Debian' } }
 
-      include_examples "returns a result"
+      include_examples 'returns a result'
     end
 
     context 'with a String filter' do
       let(:filter) { 'osfamily=Debian' }
 
-      include_examples "returns a result"
+      include_examples 'returns a result'
     end
 
     context 'with a filter of an unsupported type' do
       let(:filter) { true }
 
       it 'raises an error' do
-        expect { result }.to raise_error(%r{filter must be either})
+        expect { result }.to raise_error(/filter must be either/)
       end
     end
   end