facterdb 1.4.0 → 1.8.0

data/facts/Vagrantfile

@@ -150,7 +150,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     host.vm.provision "shell", path: "get_facts.sh"
     host.vm.provision "shell", inline: "/sbin/shutdown -h now"
   end
-
+  config.vm.define "almalinux-8-x86_64" do |host|
+    host.vm.box = "almalinux/8"
+    host.vm.synced_folder ".", "/vagrant"
+    host.vm.provision "shell", inline: "dnf -y install wget make gcc net-tools"
+    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+    host.vm.provision "shell", path: "get_facts.sh"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+  end
   config.vm.define "redhat-8-x86_64" do |host|
     host.vm.box = "generic/rhel8"
     host.vm.synced_folder ".", "/vagrant"

data/facts/get_facts.sh

@@ -37,6 +37,9 @@ elif test -f /etc/redhat-release ; then
   fedora*)
     osfamily='Fedora'
     ;;
+  almalinux*)
+    osfamily='AlmaLinux'
+    ;;
   *)
     echo 'Failed to determine osfamily from /etc/redhat-release'
     exit 1
@@ -150,6 +153,14 @@ case "${osfamily}" in
     yum remove -y puppet6-release
   fi
   ;;
+'AlmaLinux')
+  dnf localinstall -y "http://yum.puppetlabs.com/puppet6-release-el-${operatingsystemmajrelease}.noarch.rpm"
+  if dnf install -y puppet-agent; 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
+  ;;
 
 'Debian')
   if [[ "serena" =~ ${lsbdistcodename} ]]; then
@@ -300,6 +311,9 @@ bundle install --path vendor/bundler
 for version in 1.6.0 1.7.0 2.0.0 2.1.0 2.2.0 2.3.0 2.4.0 2.5.0; do
   FACTER_GEM_VERSION="~> ${version}" bundle update
   case "${operatingsystem}" in
+    almalinux)
+      break
+      ;;
     openbsd)
       output_file="/vagrant/$(bundle exec facter --version | cut -d. -f1,2)/${operatingsystem}-${operatingsystemrelease}-${hardwaremodel}.facts"
       ;;

data/lib/facterdb.rb

@@ -2,12 +2,22 @@ require 'facter'
 require 'jgrep'
 
 module FacterDB
+  module Errors
+    class InvalidFilter < RuntimeError; end
+  end
 
   # @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
 
+  # @note Call this method at the end of test suite, for example via after(:suite), to reclaim back the memory required to hold json data and filter cache
+  def self.cleanup
+    @database = nil
+    Thread.current[:facterdb_last_filter_seen] = nil
+    Thread.current[:facterdb_last_facts_seen] = nil
+  end
+
   # @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
@@ -92,18 +102,44 @@ module FacterDB
     get_facts(filter_str)
   end
 
-  def self.get_facts(filter=nil)
-    if filter.is_a?(Array)
-      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 ')
-    elsif filter.is_a?(String)
-      filter_str = filter
-    elsif filter == nil
-      filter_str = ''
+  # @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 (') + ')'
+    when ::Hash
+      filter.map { |k,v | "#{k}=#{v}" }.join(' and ')
+    when ::String
+      filter
+    when ::NilClass
+      ''
     else
-      raise 'filter must be either an Array a Hash or a String'
+      raise Errors::InvalidFilter, "filter must be either an Array a Hash, String, or nil, received #{filter.class}"
+    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
+  def self.valid_filters?(filters)
+    filter_str = generate_filter_str(filters)
+    JGrep.validate_filters(filter_str).nil?
+  rescue RuntimeError
+    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)
+    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] }] }
+    if cache
+      Thread.current[:facterdb_last_filter_seen] = filter
+      Thread.current[:facterdb_last_facts_seen] = result
     end
-    JGrep.jgrep(database, filter_str).map { |hash| Hash[hash.map{ |k, v| [k.to_sym, v] }] }
+    result
   end
 end

data/lib/facterdb/version.rb

@@ -1,5 +1,5 @@
 module FacterDB
   module Version
-    STRING = '1.4.0'
+    STRING = '1.8.0'
   end
 end

data/spec/facterdb_spec.rb

@@ -282,6 +282,42 @@ describe FacterDB do
     end
   end
 
+  describe '.valid_filters?' do
+    it 'invalid and false' do
+      expect( FacterDB.valid_filters?('and')).to be_falsey
+    end
+
+    it 'valid and true' do
+      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)
+    end
+
+    it 'with string' do
+      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")
+    end
+
+    it 'with Array' do
+      expect(FacterDB.generate_filter_str([:osfamily => 'Debian'])).to eq("(osfamily=Debian)")
+    end
+
+    it 'empty' do
+      expect(FacterDB.generate_filter_str('')).to eq('')
+    end
+
+    it 'nil filter' do
+      expect(FacterDB.generate_filter_str(nil)).to eq('')
+    end
+  end
+
   describe '.get_facts' do
     subject(:result) { FacterDB.get_facts(filter) }
 

data/spec/facts_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'digest'
+require 'pathname'
 
 RSpec::Matchers.define :have_a_unique_hash do
   match do |actual|
@@ -99,9 +100,15 @@ describe 'Default Facts' do
         expect(content['facterversion']).to have_facter_version(facter_dir_path, filepath)
       end
 
-      it 'contains an ipaddress fact' do
+      it 'contains an ipaddress or networking.ip fact' do
         pending KNOWN_IPADDRESS_PENDING[relative_path] if KNOWN_IPADDRESS_PENDING.key?(relative_path)
-        expect(content['ipaddress']).to not_be_nil.and not_be_empty
+        case content['facterversion']
+        when /^[1-3]/
+          expect(content['ipaddress']).to not_be_nil.and not_be_empty
+        else
+          expect(content['networking']['ip']).to not_be_nil.and not_be_empty
+        end
+        
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facterdb
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.8.0
 platform: ruby
 authors:
-- Mickaël Canévet
+- Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-09 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -66,40 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.10.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.10.4
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: jgrep
   requirement: !ruby/object:Gem::Requirement
@@ -116,15 +96,16 @@ dependencies:
         version: '0'
 description: Contains facts from many Facter version on many Operating Systems
 email:
-- mickael.canevet@camptocamp.com
+- voxpupuli@groups.io
 executables:
 - facterdb
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/release.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".gitmodules"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - HISTORY.md
@@ -238,6 +219,7 @@ files:
 - facts/1.7/centos-7-i386.facts
 - facts/1.7/centos-7-x86_64.facts
 - facts/1.7/centos-8-x86_64.facts
+- facts/1.7/centos-9-x86_64.facts
 - facts/1.7/debian-10-x86_64.facts
 - facts/1.7/debian-6-i386.facts
 - facts/1.7/debian-6-x86_64.facts
@@ -332,6 +314,7 @@ files:
 - facts/2.0/centos-7-i386.facts
 - facts/2.0/centos-7-x86_64.facts
 - facts/2.0/centos-8-x86_64.facts
+- facts/2.0/centos-9-x86_64.facts
 - facts/2.0/darwin-14-i386.facts
 - facts/2.0/darwin-14-x86_64.facts
 - facts/2.0/darwin-15-x86_64.facts
@@ -442,6 +425,7 @@ files:
 - facts/2.1/centos-7-i386.facts
 - facts/2.1/centos-7-x86_64.facts
 - facts/2.1/centos-8-x86_64.facts
+- facts/2.1/centos-9-x86_64.facts
 - facts/2.1/darwin-14-i386.facts
 - facts/2.1/darwin-14-x86_64.facts
 - facts/2.1/darwin-15-x86_64.facts
@@ -562,6 +546,7 @@ files:
 - facts/2.2/centos-7-i386.facts
 - facts/2.2/centos-7-x86_64.facts
 - facts/2.2/centos-8-x86_64.facts
+- facts/2.2/centos-9-x86_64.facts
 - facts/2.2/darwin-14-i386.facts
 - facts/2.2/darwin-14-x86_64.facts
 - facts/2.2/darwin-15-x86_64.facts
@@ -682,6 +667,7 @@ files:
 - facts/2.3/centos-7-i386.facts
 - facts/2.3/centos-7-x86_64.facts
 - facts/2.3/centos-8-x86_64.facts
+- facts/2.3/centos-9-x86_64.facts
 - facts/2.3/darwin-14-i386.facts
 - facts/2.3/darwin-14-x86_64.facts
 - facts/2.3/darwin-15-x86_64.facts
@@ -803,6 +789,7 @@ files:
 - facts/2.4/centos-7-i386.facts
 - facts/2.4/centos-7-x86_64.facts
 - facts/2.4/centos-8-x86_64.facts
+- facts/2.4/centos-9-x86_64.facts
 - facts/2.4/darwin-14-i386.facts
 - facts/2.4/darwin-14-x86_64.facts
 - facts/2.4/darwin-15-x86_64.facts
@@ -1292,6 +1279,7 @@ files:
 - facts/3.13/windows-2016-x86_64.facts
 - facts/3.13/windows-2019-x86_64.facts
 - facts/3.14/VirtuozzoLinux-7-x86_64.facts
+- facts/3.14/almalinux-8-x86_64.facts
 - facts/3.14/amazon-2-x86_64.facts
 - facts/3.14/amazon-2016-x86_64.facts
 - facts/3.14/archlinux-x86_64.facts
@@ -1301,6 +1289,8 @@ files:
 - facts/3.14/darwin-16-x86_64.facts
 - facts/3.14/darwin-17-x86_64.facts
 - facts/3.14/darwin-18-x86_64.facts
+- facts/3.14/darwin-19-x86_64.facts
+- facts/3.14/darwin-20-x86_64.facts
 - facts/3.14/debian-10-x86_64.facts
 - facts/3.14/debian-8-x86_64.facts
 - facts/3.14/debian-9-x86_64.facts
@@ -1710,6 +1700,12 @@ files:
 - facts/3.9/windows-2012-x86_64.facts
 - facts/3.9/windows-2016-x86_64.facts
 - facts/3.9/windows-2019-x86_64.facts
+- facts/4.0/almalinux-8-x86_64.facts
+- facts/4.0/centos-7-x86_64.facts
+- facts/4.0/debian-10-x86_64.facts
+- facts/4.0/solaris-11-sun4v.facts
+- facts/4.2/centos-9-x86_64.facts
+- facts/4.2/darwin-20-x86_64.facts
 - facts/Gemfile
 - facts/Vagrantfile
 - facts/Windows_README.md
@@ -1738,7 +1734,7 @@ files:
 - spec/facterdb_spec.rb
 - spec/facts_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/camptocamp/facterdb
+homepage: http://github.com/voxpupuli/facterdb
 licenses:
 - Apache-2.0
 metadata: {}
@@ -1757,8 +1753,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: A Database of OS facts provided by Facter

data/.travis.yml

@@ -1,28 +0,0 @@
-language: ruby
-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
-notifications:
-  email: false
-deploy:
-  provider: rubygems
-  api_key:
-    secure: Ja5JTWVsXcpYKVBrM35h9jLBoEuSm2f28A7UBk/culOC45dXzlS1BQfcxuVuNeRZ1/pPHHOnCM11yfliqJ2eF6FsNTqaLiFnNDAP/qPI2an9T1FO9dnBQ/EJp3jMp6DcXvb7CbYMS9n61CM+W0RzAdGpRK6AGLFAN5Ttba1SEIGPtlBV6e0MOu7Ma9DI7tFboqi3quSTPhvXUHpyYXDicQ+2/eijAWde/Tll3wJB8ir9lqmNh/xV9qHKdjZsAK8PG6PiuuaVsBUiQMFnapZD2OZmgLJFrOLnTvvntdcsQecsvlykHZXgbqta372KxDRIsJ2ld9a2GiL/wZDvZ9SWC+r5RAKxkvtKyQPezecO9yjJxaYAryY06YA92WibmZPBuODI4iz0MkueiulXjT4W5e/04Dj+oHtNTSGOucM5J8a08NN0UNW0IpJL/VDIw7viyXc2DzwrPJGzn/jfjzvjX7ITNKS2DIPNps/thmiGu88+Snx/5O3Cmg15OgrIlSQfkJmnLedR+qQHoE5Xk4laIJ/+4L3o9X5lFwzQYneY4u/xedKrZl66idlMGqxkbmzyf4gjKzq7pZPnFePavJwrJlCU7HXangYcOotBo4Lb2lwpeL2ilgrgLn1p7bfLdTlQcNCH4WyRAyOlVtN4vNPVc7+a3n+BL0gz7Y1B7NQUukQ=
-  gem: facterdb
-  on:
-    tags: true
-    repo: camptocamp/facterdb