facter: update to 4.9.0

This has been build tested only. This updates facter to
a much newer release.

It also adapts to copying versus patching in the gemspec
(Which was pull from the facter repository):

https://github.com/puppetlabs/facter/blob/main/facter.gemspec

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

4 files changed, 73 insertions, 42 deletions

diff --git a/recipes-support/facter/facter/add_facter_gemspec.patch b/recipes-support/facter/facter/add_facter_gemspec.patch
deleted file mode 100644
index a5095cb..0000000
--- a/recipes-support/facter/facter/add_facter_gemspec.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN facter-2.3.0_ori/facter.gemspec facter-2.3.0/facter.gemspec
---- facter-2.3.0_ori/facter.gemspec     1970-01-01 08:00:00.000000000 +0800
-+++ facter-2.3.0/facter.gemspec 2014-11-12 14:30:07.000000000 +0800
-@@ -0,0 +1,19 @@
-+$:.unshift(File.dirname(__FILE__) + '/lib')
-+require 'facter/version'
-+
-+Gem::Specification.new do |s|
-+  s.name = 'facter'
-+  s.version = Facter::FACTERVERSION
-+  s.platform = Gem::Platform::RUBY
-+  s.summary = 'Facter gathers basic facts about nodes (systems)'
-+  s.description = s.summary
-+  s.author = 'Yang Haibo'
-+  s.email = 'b40869@freescale.com'
-+  s.homepage = 'http://puppetlabs.com/facter'
-+  s.license = 'Apache 2.0'
-+
-+  s.bindir       = 'bin'
-+  s.executables  = ['facter']
-+  s.require_path = 'lib'
-+  s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
-+end
diff --git a/recipes-support/facter/facter/facter.gemspec b/recipes-support/facter/facter/facter.gemspec
new file mode 100644
index 0000000..af162bf
--- /dev/null
+++ b/recipes-support/facter/facter/facter.gemspec
@@ -0,0 +1,49 @@
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+Gem::Specification.new do |spec|
+  spec.name          = 'facter'
+  spec.version       = '4.10.0'
+  spec.authors       = ['Puppet']
+  spec.email         = ['team-nw@puppet.com']
+  spec.homepage      = 'https://github.com/puppetlabs/facter'
+
+  spec.summary       = 'Facter, a system inventory tool'
+  spec.description   = 'You can prove anything with facts!'
+  spec.license       = 'Apache-2.0'
+
+  dirs =
+    Dir[File.join(__dir__, 'bin/facter')] +
+    Dir[File.join(__dir__, 'LICENSE')] +
+    Dir[File.join(__dir__, 'lib/**/*.rb')] +
+    Dir[File.join(__dir__, 'lib/**/*.json')] +
+    Dir[File.join(__dir__, 'lib/**/*.conf')] +
+    Dir[File.join(__dir__, 'lib/**/*.erb')]
+  base = "#{__dir__}#{File::SEPARATOR}"
+  spec.files = dirs.map { |path| path.sub(base, '') }
+
+  spec.required_ruby_version = '>= 2.5', '< 4.0'
+  spec.bindir = 'bin'
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  # While we require both ffi and sys-filesystem in parts of Facter, we specify
+  # them as development, not runtime, dependencies. Both gems either directly
+  # or indirectly contain native extensions. The intent behind excluding these
+  # gems from runtime dependencies is to allow users to be able to install
+  # Facter without a compiler.
+  # ffi 1.16.0 - 1.16.2 are broken on Windows
+  spec.add_development_dependency 'ffi', '>= 1.15.5', '< 1.17.0', '!= 1.16.0', '!= 1.16.1', '!= 1.16.2'
+  spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop', '~> 1.28' # last version to support 2.5
+  spec.add_development_dependency 'rubocop-performance', '~> 1.5.2'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.10' # last version to support 2.5
+  spec.add_development_dependency 'simplecov', '~> 0.17.1'
+  spec.add_development_dependency 'sys-filesystem', ['>= 1.4.0', '<= 1.5.0']
+  spec.add_development_dependency 'webmock', '~> 3.12'
+  spec.add_development_dependency 'yard', '~> 0.9'
+
+  spec.add_runtime_dependency 'hocon', '~> 1.3'
+  spec.add_runtime_dependency 'thor', ['>= 1.0.1', '< 1.3'] # Thor 1.3.0 drops support for Ruby 2.5
+end
diff --git a/recipes-support/facter/facter_2.5.0.bb b/recipes-support/facter/facter_2.5.0.bb
deleted file mode 100644
index ef04e93..0000000
--- a/recipes-support/facter/facter_2.5.0.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Facter gathers basic facts about nodes (systems)"
-HOMEPAGE = "http://puppetlabs.com/facter"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ce69a88023d6f6ab282865ddef9f1e41"
-
-SRC_URI = " \
-    http://downloads.puppetlabs.com/facter/facter-${PV}.tar.gz \
-    file://add_facter_gemspec.patch \
-"
-SRC_URI[md5sum] = "58b6b609f19d1c146c600c4dc6e7fa39"
-SRC_URI[sha256sum] = "47ccbfb8a69e4d48c3c88e47ac1ae754fcc583d4090fa9d838461b3ede7b07cb"
-
-inherit ruby
-
-DEPENDS += " \
-        ruby \
-"
-
-RUBY_INSTALL_GEMS = "facter-${PV}.gem"
diff --git a/recipes-support/facter/facter_4.9.0.bb b/recipes-support/facter/facter_4.9.0.bb
new file mode 100644
index 0000000..502861d
--- /dev/null
+++ b/recipes-support/facter/facter_4.9.0.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Facter gathers basic facts about nodes (systems)"
+HOMEPAGE = "http://puppetlabs.com/facter"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
+
+SRC_URI = " \
+    http://downloads.puppetlabs.com/facter/facter-${PV}.tar.gz \
+    file://facter.gemspec \
+"
+SRC_URI[md5sum] = "676406153803d3d79d3d7149280a4bcd"
+SRC_URI[sha256sum] = "2cacccc9d7745953014bffe3b2f46468b5022026765751519d2659551aa55dc8"
+
+inherit ruby
+
+DEPENDS += " \
+        ruby \
+"
+
+RUBY_INSTALL_GEMS = "facter-4.10.0.gem"
+RUBY_GEM_VERSION = "3.3.0"
+
+do_compile:prepend() {
+    cp ${UNPACKDIR}/facter.gemspec ${S}
+}