Merge pull request #147 from ekohl/remove-facter-from-install.rb

Remove facter from install.rb

Author: bastelfreak

install.rb

@@ -36,8 +36,7 @@
 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,56 +169,49 @@ 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"
   end
 
   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"
   end
 
   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"
   end
 
   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"
   end
 
   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"
   end
 
   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 @@ def prepare_installation
 # 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 @@ def install_binfile(from, op_file, target)
 
   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