facter 1.6.4 → 1.6.5

data/CHANGELOG

@@ -1,6 +1,38 @@
+1.6.5
+===
+71d3d3d (#12077) Add pciutils RPM dependency
+1df5b46 (#11566) Add windows support for ec2 facts
+d1a33e5 (#11848) Don't hard code ruby install paths in Windows batch files
+14cad7e Build a Rake task for building Apple Packages
+5a60ca6 (#11559) Switch to RbConfig & Provide alias for RbConfig for pre-1.8.5
+88c9429 (#10271) Identifying 'Amazon' using '/etc/system-release'
+2de7b84 (#11661) EC2 rspec tests were using throw not raise to simulate a timeout
+b51ccf0 (#11583) Add basic coverage to the ec2 fact
+82692ba (#9599) Generalize zone detection
+e6cebd3 (#9599) Add nexenta facts
+9401b78 (#11583) Switch request method to open-uri monkey patch 'open'
+3ccac87 (#9708) Amend requires in specs to use simple requires
+b0b5282 (#9708) Confine facts by kernel not operating system and remove confine for hardwareisa
+c473e3f (#10309) Remove the with_verbose_disabled method
+a99d87c (#10309) Rename tmpfile to tmpfilename to make function clear
+d50fc48 (#10309) Move all fixture data in spec/unit/data to spec/fixtures
+d6e8523 (#10309) Integrate new PuppetlabsSpec helpers into our existing facter spec code and general spec cleanup
+c1604c7 (#10309) Add puppetlabs_spec helper library based on Puppets own puppet_spec helpers
+d141e7e (maint) Fix requirement for FileUtils as operatingsystem_spec needs it now
+9c224d3 (#11436) Unify memorysize and memorytotal facts
+5c6322a (maint) Joined conditional statements for domain
+a1dba38 (#11196) Scan all arp entries for an ec2 mac
+5cd30eb (#8279) Join ec2 fact output with commas
+4633996 (#9789) Extend coverage of operatingsystem specs
+6d21f90 Move Linux specific virtual tests to correct block.
+cb4e294 (#7753) Added error checking when adding resolves
+6201820 (maint) remove redundant arch detection
+4f9da1c (#11328) Fix uptime detection on OpenBSD
+3f99f16 (#11328) Add virtualisation detection for OpenBSD
+
 1.6.4
 ===
-6406c8f (##11041) Add dmidecode as a requirement for rpm
+6406c8f (#11041) Add dmidecode as a requirement for rpm
 ed81492 (#10444) Add identification of system boards to Facter
 bdbb2da (#10885) Malformed facter.bat when ruby dir contains backreferences
 0bad18b (#10490) Handle case where no macaddress can be found

data/conf/redhat/facter.spec

@@ -1,4 +1,4 @@
-%{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
+%{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Object.const_get(defined?(RbConfig) ? :RbConfig : :Config)::CONFIG["sitelibdir"]'
 
 %define has_ruby_abi 0%{?fedora} || 0%{?rhel} >= 5
 %define has_ruby_noarch %has_ruby_abi
@@ -22,6 +22,7 @@ BuildArch: noarch
 Requires: ruby >= 1.8.1
 Requires: which
 Requires: dmidecode
+Requires: pciutils
 %if %has_ruby_abi
 Requires: ruby(abi) = 1.8
 %endif

data/install.rb

@@ -46,6 +46,12 @@ rescue LoadError
   $haverdoc = false
 end
 
+# Monkey patch RbConfig->Config for Rubies older then 1.8.5.
+unless defined? ::RbConfig
+  require 'rbconfig'
+  ::RbConfig = ::Config
+end
+
 begin
   if $haverdoc
      rst2man = %x{which rst2man.py}
@@ -180,16 +186,16 @@ def prepare_installation
     opts.on('--destdir[=OPTIONAL]', 'Installation prefix for all targets', 'Default essentially /') do |destdir|
       InstallOptions.destdir = destdir
     end
-    opts.on('--bindir[=OPTIONAL]', 'Installation directory for binaries', 'overrides Config::CONFIG["bindir"]') do |bindir|
+    opts.on('--bindir[=OPTIONAL]', 'Installation directory for binaries', 'overrides RbConfig::CONFIG["bindir"]') do |bindir|
       InstallOptions.bindir = bindir
     end
-    opts.on('--sbindir[=OPTIONAL]', 'Installation directory for system binaries', 'overrides Config::CONFIG["sbindir"]') do |sbindir|
+    opts.on('--sbindir[=OPTIONAL]', 'Installation directory for system binaries', 'overrides RbConfig::CONFIG["sbindir"]') do |sbindir|
       InstallOptions.sbindir = sbindir
     end
-    opts.on('--sitelibdir[=OPTIONAL]', 'Installation directory for libraries', 'overrides Config::CONFIG["sitelibdir"]') do |sitelibdir|
+    opts.on('--sitelibdir[=OPTIONAL]', 'Installation directory for libraries', 'overrides RbConfig::CONFIG["sitelibdir"]') do |sitelibdir|
       InstallOptions.sitelibdir = sitelibdir
     end
-    opts.on('--mandir[=OPTIONAL]', 'Installation directory for man pages', 'overrides Config::CONFIG["mandir"]') do |mandir|
+    opts.on('--mandir[=OPTIONAL]', 'Installation directory for man pages', 'overrides RbConfig::CONFIG["mandir"]') do |mandir|
       InstallOptions.mandir = mandir
     end
     opts.on('--quick', 'Performs a quick installation. Only the', 'installation is done.') do |quick|
@@ -213,8 +219,8 @@ def prepare_installation
 
   tmpdirs = [ENV['TMP'], ENV['TEMP'], "/tmp", "/var/tmp", "."]
 
-  version = [Config::CONFIG["MAJOR"], Config::CONFIG["MINOR"]].join(".")
-  libdir = File.join(Config::CONFIG["libdir"], "ruby", version)
+  version = [RbConfig::CONFIG["MAJOR"], RbConfig::CONFIG["MINOR"]].join(".")
+  libdir = File.join(RbConfig::CONFIG["libdir"], "ruby", version)
 
   # Mac OS X 10.5 and higher declare bindir and sbindir as
   # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin
@@ -222,26 +228,26 @@ def prepare_installation
   # which is not generally where people expect executables to be installed
   # These settings are appropriate defaults for all OS X versions.
   if RUBY_PLATFORM =~ /^universal-darwin[\d\.]+$/
-    Config::CONFIG['bindir'] = "/usr/bin"
-    Config::CONFIG['sbindir'] = "/usr/sbin"
+    RbConfig::CONFIG['bindir'] = "/usr/bin"
+    RbConfig::CONFIG['sbindir'] = "/usr/sbin"
   end
 
   if not InstallOptions.bindir.nil?
     bindir = InstallOptions.bindir
   else
-    bindir = Config::CONFIG['bindir']
+    bindir = RbConfig::CONFIG['bindir']
   end
 
   if not InstallOptions.sbindir.nil?
     sbindir = InstallOptions.sbindir
   else
-    sbindir = Config::CONFIG['sbindir']
+    sbindir = RbConfig::CONFIG['sbindir']
   end
 
   if not InstallOptions.sitelibdir.nil?
     sitelibdir = InstallOptions.sitelibdir
   else
-    sitelibdir = Config::CONFIG["sitelibdir"]
+    sitelibdir = RbConfig::CONFIG["sitelibdir"]
     if sitelibdir.nil?
       sitelibdir = $:.find { |x| x =~ /site_ruby/ }
       if sitelibdir.nil?
@@ -255,7 +261,7 @@ def prepare_installation
   if not InstallOptions.mandir.nil?
     mandir = InstallOptions.mandir
   else
-    mandir = Config::CONFIG['mandir']
+    mandir = RbConfig::CONFIG['mandir']
   end
 
   # To be deprecated once people move over to using --destdir option
@@ -373,7 +379,7 @@ def run_tests(test_list)
 end
 
 ##
-# Install file(s) from ./bin to Config::CONFIG['bindir']. Patch it on the way
+# Install file(s) from ./bin to RbConfig::CONFIG['bindir']. Patch it on the way
 # to insert a #! line; on a Unix install, the command is named as expected
 # (e.g., bin/rdoc becomes rdoc); the shebang line handles running it. Under
 # windows, we add an '.rb' extension and let file associations do their stuff.
@@ -388,11 +394,11 @@ def install_binfile(from, op_file, target)
 
   fail "Cannot find a temporary directory" unless tmp_dir
   tmp_file = File.join(tmp_dir, '_tmp')
-  ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+  ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
 
   File.open(from) do |ip|
     File.open(tmp_file, "w") do |op|
-      ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+      ruby = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
       op.puts "#!#{ruby}"
       contents = ip.readlines
       if contents[0] =~ /^#!/
@@ -417,16 +423,12 @@ def install_binfile(from, op_file, target)
 
     if not installed_wrapper
       tmp_file2 = File.join(tmp_dir, '_tmp_wrapper')
-      cwn = File.join(Config::CONFIG['bindir'], op_file)
       cwv = <<-EOS
 @echo off
-if "%OS%"=="Windows_NT" goto WinNT
-#{ruby} -x "#{cwn}" %1 %2 %3 %4 %5 %6 %7 %8 %9
-goto done
-:WinNT
-#{ruby} -x "#{cwn}" %*
-goto done
-:done
+setlocal
+set RUBY_BIN=%~dp0
+set RUBY_BIN=%RUBY_BIN:\\=/%
+"%RUBY_BIN%ruby.exe" -x "%RUBY_BIN%facter" %*
 EOS
       File.open(tmp_file2, "w") { |cw| cw.puts cwv }
       FileUtils.install(tmp_file2, File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)

data/lib/facter.rb

@@ -20,11 +20,12 @@ module Facter
 
   require 'facter/util/fact'
   require 'facter/util/collection'
+  require 'facter/util/monkey_patches'
 
   include Comparable
   include Enumerable
 
-  FACTERVERSION = '1.6.4'
+  FACTERVERSION = '1.6.5'
   # = Facter
   # Functions as a hash of 'facts' you might care about about your
   # system, such as mac address, IP address, Video card, etc.

data/lib/facter/domain.rb

@@ -23,12 +23,12 @@ Facter.add(:domain) do
     # Get the domain from various sources; the order of these
     # steps is important
 
-    if name = Facter::Util::Resolution.exec('hostname') and
-      name =~ /.*?\.(.+$)/
+    if name = Facter::Util::Resolution.exec('hostname') \
+      and name =~ /.*?\.(.+$)/
 
       $1
-    elsif domain = Facter::Util::Resolution.exec('dnsdomainname') and
-      domain =~ /.+\..+/
+    elsif domain = Facter::Util::Resolution.exec('dnsdomainname') \
+      and domain =~ /.+\..+/
 
       domain
     elsif FileTest.exists?("/etc/resolv.conf")

data/lib/facter/ec2.rb

@@ -1,20 +1,5 @@
-# Original fact Tim Dysinger
-# Additional work from KurtBe
-# Additional work for Paul Nasrat
-# Additional work modelled on Ohai EC2 fact
-
+require 'facter/util/ec2'
 require 'open-uri'
-require 'timeout'
-
-def can_connect?(wait_sec=2)
-  url = "http://169.254.169.254:80/"
-  Timeout::timeout(wait_sec) {open(url)}
-  return true
-  rescue Timeout::Error
-    return false
-  rescue
-    return false
-end
 
 def metadata(id = "")
   open("http://169.254.169.254/2008-02-01/meta-data/#{id||=''}").read.
@@ -23,9 +8,8 @@ def metadata(id = "")
     if key[-1..-1] != '/'
       value = open("http://169.254.169.254/2008-02-01/meta-data/#{key}").read.
         split("\n")
-      value = value.size>1 ? value : value.first
       symbol = "ec2_#{key.gsub(/\-|\//, '_')}".to_sym
-      Facter.add(symbol) { setcode { value } }
+      Facter.add(symbol) { setcode { value.join(',') } }
     else
       metadata(key)
     end
@@ -34,21 +18,15 @@ end
 
 def userdata()
   begin
-     value = OpenURI.open_uri("http://169.254.169.254/2008-02-01/user-data/").read.split
-     Facter.add(:ec2_userdata) { setcode { value } }
+    value = open("http://169.254.169.254/2008-02-01/user-data/").read.split
+    Facter.add(:ec2_userdata) { setcode { value } }
   rescue OpenURI::HTTPError
   end
 end
 
-def has_euca_mac?
-  !!(Facter.value(:macaddress) =~ %r{^[dD]0:0[dD]:})
-end
-
-def has_ec2_arp?
-  !!(Facter.value(:arp) == "fe:ff:ff:ff:ff:ff")
-end
+if (Facter::Util::EC2.has_euca_mac? || Facter::Util::EC2.has_ec2_arp?) &&
+  Facter::Util::EC2.can_connect?
 
-if (has_euca_mac? || has_ec2_arp?) && can_connect?
   metadata
   userdata
 else

data/lib/facter/hardwareisa.rb

@@ -12,5 +12,4 @@
 
 Facter.add(:hardwareisa) do
   setcode 'uname -p'
-  confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific PSBM SLC Ascendos SuSE SLES Debian Ubuntu Gentoo FreeBSD OpenBSD NetBSD DragonFly OEL OracleLinux OVS GNU/kFreeBSD}
 end

data/lib/facter/hardwaremodel.rb

@@ -29,6 +29,6 @@ Facter.add(:hardwaremodel) do
   confine :operatingsystem => :windows
   setcode do
     require 'rbconfig'
-    Config::CONFIG['host_cpu']
+    RbConfig::CONFIG['host_cpu']
   end
 end

data/lib/facter/lsbmajdistrelease.rb

@@ -15,7 +15,7 @@
 require 'facter'
 
 Facter.add("lsbmajdistrelease") do
-  confine :operatingsystem => %w{Linux Fedora RedHat CentOS Scientific PSBM SLC Ascendos SuSE SLES Debian Ubuntu Gentoo OEL OracleLinux OVS GNU/kFreeBSD}
+  confine :kernel => %w{Linux GNU/kFreeBSD}
   setcode do
     if /(\d*)\./i =~ Facter.value(:lsbdistrelease)
       result=$1

data/lib/facter/macaddress.rb

@@ -10,7 +10,7 @@
 require 'facter/util/macaddress'
 
 Facter.add(:macaddress) do
-  confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific PSBM SLC Ascendos SuSE SLES Debian Gentoo Ubuntu OEL OracleLinux OVS GNU/kFreeBSD}
+  confine :kernel => %w{SunOS Linux GNU/kFreeBSD}
   setcode do
     ether = []
     output = Facter::Util::Resolution.exec("/sbin/ifconfig -a")

data/lib/facter/memory.rb

@@ -116,7 +116,7 @@ if Facter.value(:kernel) == "OpenBSD"
 
   Facter::Memory.vmstat_find_free_memory()
 
-  Facter.add("MemoryTotal") do
+  Facter.add("memorysize") do
     confine :kernel => :openbsd
     memtotal = Facter::Util::Resolution.exec("sysctl hw.physmem | cut -d'=' -f2")
     setcode do
@@ -153,7 +153,7 @@ if Facter.value(:kernel) == "Darwin"
 
   Facter::Memory.vmstat_darwin_find_free_memory()
 
-  Facter.add("MemoryTotal") do
+  Facter.add("memorysize") do
     confine :kernel => :Darwin
     memtotal = Facter::Util::Resolution.exec("sysctl hw.memsize | cut -d':' -f2")
     setcode do
@@ -220,7 +220,7 @@ if Facter.value(:kernel) == "windows"
     end
   end
 
-  Facter.add("MemoryTotal") do
+  Facter.add("memorysize") do
     confine :kernel => :windows
     setcode do
       mem = 0
@@ -254,7 +254,7 @@ Facter.add("SwapFree") do
   end
 end
 
-Facter.add("MemoryTotal") do
+Facter.add("memorysize") do
   confine :kernel => :dragonfly
   setcode do
     Facter::Memory.vmstat_find_free_memory()
@@ -262,3 +262,14 @@ Facter.add("MemoryTotal") do
     Facter::Memory.scale_number(memtotal.to_f,"")
   end
 end
+
+# http://projects.puppetlabs.com/issues/11436
+#
+# Unifying naming for the amount of physical memory in a given host.
+# This fact is DEPRECATED and will be removed in Facter 2.0 per
+# http://projects.puppetlabs.com/issues/11466
+Facter.add("MemoryTotal") do
+  setcode do
+    Facter.value("memorysize")
+  end
+end

data/lib/facter/operatingsystem.rb

@@ -14,7 +14,13 @@ require 'facter/lsb'
 
 Facter.add(:operatingsystem) do
   confine :kernel => :sunos
-  setcode do "Solaris" end
+  setcode do
+    if FileTest.exists?("/etc/debian_version")
+      "Nexenta"
+    else
+      "Solaris"
+    end
+  end
 end
 
 Facter.add(:operatingsystem) do
@@ -44,8 +50,6 @@ Facter.add(:operatingsystem) do
       else
         "OEL"
       end
-    elsif FileTest.exists?("/etc/arch-release")
-      "Arch"
     elsif FileTest.exists?("/etc/vmware-release")
       "VMWareESX"
     elsif FileTest.exists?("/etc/redhat-release")
@@ -84,7 +88,7 @@ Facter.add(:operatingsystem) do
       "Slackware"
     elsif FileTest.exists?("/etc/alpine-release")
       "Alpine"
-    elsif Facter.value(:lsbdistdescription) =~ /Amazon Linux/
+    elsif FileTest.exists?("/etc/system-release")
       "Amazon"
     end
   end

data/lib/facter/osfamily.rb

@@ -22,7 +22,7 @@ Facter.add(:osfamily) do
       "Debian"
     when "SLES", "SLED", "OpenSuSE", "SuSE"
       "Suse"
-    when "Solaris"
+    when "Solaris", "Nexenta"
       "Solaris"
     else
       Facter.value("kernel")

data/lib/facter/uniqueid.rb

@@ -1,4 +1,4 @@
 Facter.add(:uniqueid) do
   setcode 'hostid'
-  confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS Scientific PSBM SLC Ascendos SuSE SLES Debian Ubuntu Gentoo AIX OEL OracleLinux OVS GNU/kFreeBSD}
+  confine :kernel => %w{SunOS Linux AIX GNU/kFreeBSD}
 end

data/lib/facter/util/collection.rb

@@ -31,9 +31,8 @@ class Facter::Util::Collection
       end
     end
 
-    if block
-      resolve = fact.add(&block)
-      # Set any resolve-appropriate options
+    if block_given? and resolve = fact.add(&block)
+      # If the resolve was actually added, set any resolve-appropriate options
       options.each do |opt, value|
         method = opt.to_s + "="
         if resolve.respond_to?(method)

data/lib/facter/util/config.rb

@@ -1,9 +1,9 @@
+require 'rbconfig'
+
 # A module to return config related data
 #
 module Facter::Util::Config
-  require 'rbconfig'
-
   def self.is_windows?
-    Config::CONFIG['host_os'] =~ /mswin|win32|dos|mingw|cygwin/i
+    RbConfig::CONFIG['host_os'] =~ /mswin|win32|dos|mingw|cygwin/i
   end
 end

data/lib/facter/util/ec2.rb

@@ -0,0 +1,49 @@
+require 'timeout'
+require 'open-uri'
+
+# Provide a set of utility static methods that help with resolving the EC2
+# fact.
+module Facter::Util::EC2
+  class << self
+    # Test if we can connect to the EC2 api. Return true if able to connect.
+    # On failure this function fails silently and returns false.
+    #
+    # The +wait_sec+ parameter provides you with an adjustable timeout.
+    #
+    def can_connect?(wait_sec=2)
+      url = "http://169.254.169.254:80/"
+      Timeout::timeout(wait_sec) {open(url)}
+      return true
+      rescue Timeout::Error
+        return false
+      rescue
+        return false
+    end
+
+    # Test if this host has a mac address used by Eucalyptus clouds, which
+    # normally is +d0:0d+.
+    def has_euca_mac?
+      !!(Facter.value(:macaddress) =~ %r{^[dD]0:0[dD]:})
+    end
+
+    # Test if the host has an arp entry in its cache that matches the EC2 arp,
+    # which is normally +fe:ff:ff:ff:ff:ff+.
+    def has_ec2_arp?
+      mac_address = "fe:ff:ff:ff:ff:ff"
+      if Facter.value(:kernel) == 'windows'
+        arp_command = "arp -a"
+        mac_address.gsub!(":","-")
+      else
+        arp_command = "arp -an"
+      end
+
+      arp_table = Facter::Util::Resolution.exec(arp_command)
+      if not arp_table.nil?
+        arp_table.each_line do |line|
+          return true if line.include?(mac_address)
+        end
+      end
+      return false
+    end
+  end
+end