openvox 8.20.0 → 8.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91c67366f80e0f90b53567de5eea991ba6d36d5fa59af42d65a6975c619f119e
-  data.tar.gz: 2c8b8e00d4f6d2d468888e6126ee9bcc5db0f18748164e1c7cf2545cdd27de51
+  metadata.gz: 5350747e91f48038164954b5b9a3d243900ce54fb8290454cce3b76cb5ce1198
+  data.tar.gz: 824f2f3091e878863fb0dd40a5eea4733f0e1d033bc667947a5a3defc028f12d
 SHA512:
-  metadata.gz: 315686060fd5c3fd1a3df8c7163c5cf737ddd16e2a922175b0dc2901e6bd4763fad7315cbccc06fff944485cfbab6f3d232160e04b72898cdec10076cfbe3474
-  data.tar.gz: 1a5eecd081bc2d6ed326620a01b128056d2336002e0015b0627b0c7789a07be0f25ccc57e03db9f3ffbb35a7ee9e7b55f777bf42acdd03c511211ca11b27ac57
+  metadata.gz: 8fd89223b530093afa90b6da3b7e11160525893cb76142fe0feae14cf9cfffd2892439c417f98fc3ee4f9484a501a18ea9e656be7093197a8217fdc2e65b6788
+  data.tar.gz: 875ebeba054f6adeb70baede78f3c41e7b5e6f2d616d083e427617f279714926d4403468a972bb5875a66d87d45e842d7a9bf4cc6e64148cca50e257ccf58c7a

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [8.21.0](https://github.com/openvoxproject/openvox/tree/8.21.0) (2025-07-09)
+
+[Full Changelog](https://github.com/openvoxproject/openvox/compare/8.20.0...8.21.0)
+
+**Implemented enhancements:**
+
+- Remove facter from install.rb [\#147](https://github.com/OpenVoxProject/openvox/pull/147) ([ekohl](https://github.com/ekohl))
+
 ## [8.20.0](https://github.com/openvoxproject/openvox/tree/8.20.0) (2025-06-27)
 
 [Full Changelog](https://github.com/openvoxproject/openvox/compare/8.19.2...8.20.0)

data/install.rb

@@ -36,8 +36,7 @@ require 'tempfile'
 require 'optparse'
 require 'ostruct'
 
-PREREQS = %w{openssl facter cgi}
-MIN_FACTER_VERSION = 1.5
+IS_WINDOWS = RUBY_PLATFORM.match?(/(mswin|mingw)/)
 
 InstallOptions = OpenStruct.new
 
@@ -82,13 +81,7 @@ def do_man(man, strip = 'man/')
     FileUtils.makedirs(om, mode: 0755, verbose: true)
     FileUtils.chmod(0755, om)
     FileUtils.install(mf, omf, mode: 0644, preserve: true, verbose: true)
-    # Solaris does not support gzipped man pages. When called with
-    # --no-check-prereqs/without facter the default gzip behavior still applies
-    unless $osname == "Solaris"
-      gzip = %x{which gzip}
-      gzip.chomp!
-      %x{#{gzip} --force --no-name #{omf}}
-    end
+    %x{gzip --force --no-name #{omf}}
   end
 end
 
@@ -103,33 +96,11 @@ def do_locales(locale, strip = 'locales/')
   end
 end
 
-# Verify that all of the prereqs are installed
-def check_prereqs
-  PREREQS.each { |pre|
-    begin
-      require pre
-      if pre == "facter"
-        # to_f isn't quite exact for strings like "1.5.1" but is good
-        # enough for this purpose.
-        facter_version = Facter.version.to_f
-        if facter_version < MIN_FACTER_VERSION
-          puts "Facter version: #{facter_version}; minimum required: #{MIN_FACTER_VERSION}; cannot install"
-          exit(-1)
-        end
-      end
-    rescue LoadError
-      puts "Could not load #{pre}; cannot install"
-      exit(-1)
-    end
-  }
-end
-
 ##
 # Prepare the file installation.
 #
 def prepare_installation
   InstallOptions.configs = true
-  InstallOptions.check_prereqs = true
   InstallOptions.batch_files = true
 
   ARGV.options do |opts|
@@ -174,9 +145,6 @@ def prepare_installation
     opts.on('--mandir[=OPTIONAL]', 'Installation directory for man pages', 'overrides RbConfig::CONFIG["mandir"]') do |mandir|
       InstallOptions.mandir = mandir
     end
-    opts.on('--[no-]check-prereqs', 'Prevents validation of prerequisite libraries', 'Default on') do |prereq|
-      InstallOptions.check_prereqs = prereq
-    end
     opts.on('--no-batch-files', 'Prevents installation of batch files for windows', 'Default off') do |batch_files|
       InstallOptions.batch_files = false
     end
@@ -201,16 +169,9 @@ def prepare_installation
     RbConfig::CONFIG['bindir'] = "/usr/bin"
   end
 
-  # Here we only set $osname if we have opted to check for prereqs.
-  # Otherwise facter won't be guaranteed to be present.
-  if InstallOptions.check_prereqs
-    check_prereqs
-    $osname = Facter.value('os.name')
-  end
-
   if not InstallOptions.configdir.nil?
     configdir = InstallOptions.configdir
-  elsif $osname == "windows"
+  elsif IS_WINDOWS
     configdir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "etc")
   else
     configdir = "/etc/puppetlabs/puppet"
@@ -218,7 +179,7 @@ def prepare_installation
 
   if not InstallOptions.codedir.nil?
     codedir = InstallOptions.codedir
-  elsif $osname == "windows"
+  elsif IS_WINDOWS
     codedir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "code")
   else
     codedir = "/etc/puppetlabs/code"
@@ -226,7 +187,7 @@ def prepare_installation
 
   if not InstallOptions.vardir.nil?
     vardir = InstallOptions.vardir
-  elsif $osname == "windows"
+  elsif IS_WINDOWS
     vardir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "cache")
   else
     vardir = "/opt/puppetlabs/puppet/cache"
@@ -234,7 +195,7 @@ def prepare_installation
 
   if not InstallOptions.publicdir.nil?
     publicdir = InstallOptions.publicdir
-  elsif $osname == "windows"
+  elsif IS_WINDOWS
     publicdir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "public")
   else
     publicdir = "/opt/puppetlabs/puppet/public"
@@ -242,7 +203,7 @@ def prepare_installation
 
   if not InstallOptions.rundir.nil?
     rundir = InstallOptions.rundir
-  elsif $osname == "windows"
+  elsif IS_WINDOWS
     rundir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "var", "run")
   else
     rundir = "/var/run/puppetlabs"
@@ -250,7 +211,7 @@ def prepare_installation
 
   if not InstallOptions.logdir.nil?
     logdir = InstallOptions.logdir
-  elsif $osname == "windows"
+  elsif IS_WINDOWS
     logdir = File.join(ENV['ALLUSERSPROFILE'], "PuppetLabs", "puppet", "var", "log")
   else
     logdir = "/var/log/puppetlabs/puppet"
@@ -265,7 +226,7 @@ def prepare_installation
   if not InstallOptions.localedir.nil?
     localedir = InstallOptions.localedir
   else
-    if $osname == "windows"
+    if IS_WINDOWS
       localedir = File.join(ENV['PROGRAMFILES'], "Puppet Labs", "Puppet", "puppet", "share", "locale")
     else
       localedir = "/opt/puppetlabs/puppet/share/locale"
@@ -339,7 +300,7 @@ end
 # by stripping the drive letter, but only if the basedir is not empty.
 #
 def join(basedir, dir)
-  return "#{basedir}#{dir[2..-1]}" if $osname == "windows" and basedir.length > 0 and dir.length > 2
+  return "#{basedir}#{dir[2..-1]}" if IS_WINDOWS and basedir.length > 0 and dir.length > 2
 
   "#{basedir}#{dir}"
 end
@@ -360,14 +321,14 @@ def install_binfile(from, op_file, target)
 
   File.open(from) do |ip|
     File.open(tmp_file.path, "w") do |op|
-      op.puts "#!#{ruby}" unless $osname == "windows"
+      op.puts "#!#{ruby}" unless IS_WINDOWS
       contents = ip.readlines
       contents.shift if contents[0] =~ /^#!/
       op.write contents.join
     end
   end
 
-  if $osname == "windows" && InstallOptions.batch_files
+  if IS_WINDOWS && InstallOptions.batch_files
     installed_wrapper = false
 
     unless File.extname(from) =~ /\.(cmd|bat)/
@@ -415,14 +376,14 @@ FileUtils.cd File.dirname(__FILE__) do
 
   prepare_installation
 
-  if $osname == "windows"
+  if IS_WINDOWS
     windows_bins = glob(%w{ext/windows/*bat})
   end
 
   do_configs(configs, InstallOptions.config_dir) if InstallOptions.configs
   do_bins(bins, InstallOptions.bin_dir)
-  do_bins(windows_bins, InstallOptions.bin_dir, 'ext/windows/') if $osname == "windows" && InstallOptions.batch_files
+  do_bins(windows_bins, InstallOptions.bin_dir, 'ext/windows/') if IS_WINDOWS && InstallOptions.batch_files
   do_libs(libs)
   do_locales(locales)
-  do_man(man) unless $osname == "windows"
+  do_man(man) unless IS_WINDOWS
 end

data/lib/puppet/version.rb

@@ -8,7 +8,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '8.20.0'
+  PUPPETVERSION = '8.21.0'
   IMPLEMENTATION = 'openvox'
 
   ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openvox
 version: !ruby/object:Gem::Version
-  version: 8.20.0
+  version: 8.21.0
 platform: ruby
 authors:
 - OpenVox Project