facter 1.5.6 → 1.5.7

data/Rakefile

@@ -1,6 +1,9 @@
 # Rakefile for facter
 
 $: << File.expand_path('lib')
+$LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
+
+Dir['tasks/**/*.rake'].each { |t| load t } 
 
 require './lib/facter.rb'
 require 'rake'
@@ -44,65 +47,25 @@ end
 Rake::GemPackageTask.new(spec) do |pkg|
 end
 
+task :default do
+    sh %{rake -T}
+end
+
 desc "Run the specs under spec/"
 task :spec do
     require 'spec'
     require 'spec/rake/spectask'
-    # require 'rcov'
-    Spec::Rake::SpecTask.new do |t| 
-        t.spec_opts = ['--format','s', '--loadby','mtime'] 
-        t.spec_files = FileList['spec/**/*.rb']
-    end 
-end
-
-desc "Prep CI RSpec tests"
-task :ci_prep do
-    require 'rubygems'
     begin
-        gem 'ci_reporter'
-        require 'ci/reporter/rake/rspec'
-        require 'ci/reporter/rake/test_unit'
-        ENV['CI_REPORTS'] = 'results'
-    rescue LoadError 
-       puts 'Missing ci_reporter gem. You must have the ci_reporter gem installed to run the CI spec tests'
+        require 'rcov'
+    rescue LoadError
     end
-end
-
-desc "Run the CI RSpec tests"
-task :ci_spec => [:ci_prep, 'ci:setup:rpsec', :spec]
 
-desc "Send patch information to the puppet-dev list"
-task :mail_patches do
-    if Dir.glob("00*.patch").length > 0
-        raise "Patches already exist matching '00*.patch'; clean up first"
-    end
-
-    unless %x{git status} =~ /On branch (.+)/
-        raise "Could not get branch from 'git status'"
-    end
-    branch = $1
-
-    unless branch =~ %r{^([^\/]+)/([^\/]+)/([^\/]+)$}
-        raise "Branch name does not follow <type>/<parent>/<name> model; cannot autodetect parent branch"
-    end
-
-    type, parent, name = $1, $2, $3
-
-    # Create all of the patches
-    sh "git format-patch -C -M -s -n --subject-prefix='PATCH/facter' #{parent}..HEAD"
-
-    # And then mail them out.
-
-    # If we've got more than one patch, add --compose
-    if Dir.glob("00*.patch").length > 1
-        compose = "--compose"
-    else
-        compose = ""
-    end
-
-    # Now send the mail.
-    sh "git send-email #{compose} --no-signed-off-by-cc --suppress-from --to puppet-dev@googlegroups.com 00*.patch"
-
-    # Finally, clean up the patches
-    sh "rm 00*.patch"
+    Spec::Rake::SpecTask.new do |t|
+        t.spec_opts = ['--format','s', '--loadby','mtime']
+        t.spec_files = FileList['spec/**/*.rb']
+        if defined?(Rcov)
+            t.rcov = true
+            t.rcov_opts = ['--exclude', 'spec/*,test/*,results/*,/usr/lib/*,/usr/local/lib/*']
+        end
+     end
 end

data/install.rb

@@ -205,13 +205,14 @@ def prepare_installation
     version = [Config::CONFIG["MAJOR"], Config::CONFIG["MINOR"]].join(".")
     libdir = File.join(Config::CONFIG["libdir"], "ruby", version)
 
-    # Mac OS X 10.5 declares bindir and sbindir as
+    # Mac OS X 10.5 and higher declare bindir and sbindir as
     # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin
     # /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/sbin
     # which is not generally where people expect executables to be installed
-    if RUBY_PLATFORM == "universal-darwin9.0"
-        Config::CONFIG['bindir'] = "/usr/bin"
-        Config::CONFIG['sbindir'] = "/usr/sbin"
+    # 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"
     end
 
     if not InstallOptions.bindir.nil?

data/lib/facter.rb

@@ -27,7 +27,7 @@ module Facter
     include Comparable
     include Enumerable
 
-    FACTERVERSION = '1.5.6'
+    FACTERVERSION = '1.5.7'
     # = Facter
     # Functions as a hash of 'facts' you might care about about your
     # system, such as mac address, IP address, Video card, etc.
@@ -120,7 +120,7 @@ module Facter
                 name = name.to_s.sub(/\?$/,'')
             end
 
-            if fact = @collection.fact(name)
+            if fact = collection.fact(name)
                 if question
                     value = fact.value.downcase
                     args.each do |arg|

data/lib/facter/ipaddress.rb

@@ -19,7 +19,7 @@ Facter.add(:ipaddress) do
 end
 
 Facter.add(:ipaddress) do
-    confine :kernel => %w{FreeBSD OpenBSD solaris}
+    confine :kernel => %w{FreeBSD OpenBSD}
     setcode do
         ip = nil
         output = %x{/sbin/ifconfig}
@@ -39,7 +39,7 @@ Facter.add(:ipaddress) do
 end
 
 Facter.add(:ipaddress) do
-    confine :kernel => %w{NetBSD}
+    confine :kernel => %w{NetBSD SunOS}
     setcode do
         ip = nil
         output = %x{/sbin/ifconfig -a}

data/lib/facter/manufacturer.rb

@@ -5,15 +5,26 @@
 
 require 'facter/util/manufacturer'
 
-query = {
-    '[Ss]ystem [Ii]nformation' => [
-        { 'Manufacturer:'      => 'manufacturer' },
-        { 'Product(?: Name)?:' => 'productname' },
-        { 'Serial Number:'     => 'serialnumber' }
-    ],
-    '(Chassis Information|system enclosure or chassis)' => [
-        { '(?:Chassis )?Type:' => 'type' }
-    ]
-}
+if Facter.value(:kernel) == "OpenBSD"
+    mfg_keys = {
+        'hw.vendor'   => 'manufacturer',
+        'hw.product'  => 'productname',
+        'hw.serialno' => 'serialnumber'
+    }
+
+    Facter::Manufacturer.sysctl_find_system_info(mfg_keys)
+else
+    query = {
+        '[Ss]ystem [Ii]nformation' => [
+            { 'Manufacturer:'      => 'manufacturer' },
+            { 'Product(?: Name)?:' => 'productname' },
+            { 'Serial Number:'     => 'serialnumber' }
+        ],
+        '(Chassis Information|system enclosure or chassis)' => [
+            { '(?:Chassis )?Type:' => 'type' }
+        ]
+    }
+
+    Facter::Manufacturer.dmi_find_system_info(query)
+end
 
-Facter::Manufacturer.dmi_find_system_info(query)

data/lib/facter/netmask.rb

@@ -9,7 +9,7 @@
 require 'facter/util/netmask'
 
 Facter.add("netmask") do
-    confine :kernel => [ :sunos, :linux ]
+    confine :kernel => [ :sunos, :linux, :freebsd, :openbsd, :netbsd, :darwin ]
     setcode do
         Facter::NetMask.get_netmask
     end

data/lib/facter/operatingsystemrelease.rb

@@ -1,67 +1,27 @@
 Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => :fedora
+    confine :operatingsystem => %w{CentOS Fedora oel ovs RedHat}
     setcode do
-        File::open("/etc/fedora-release", "r") do |f|
-            line = f.readline.chomp
-            if line =~ /\(Rawhide\)$/
-                "Rawhide"
-            elsif line =~ /release (\d+)/
-                $1
-            end
+        case Facter.value(:operatingsystem)
+        when "CentOS", "RedHat"
+            releasefile = "/etc/redhat-release"
+        when "Fedora"
+            releasefile = "/etc/fedora-release"
+        when "oel"
+            releasefile = "/etc/enterprise-release"
+        when "ovs"
+            releasefile = "/etc/ovs-release"
         end
-    end
-end
-
-Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{RedHat}
-    setcode do
-        File::open("/etc/redhat-release", "r") do |f|
+        File::open(releasefile, "r") do |f|
             line = f.readline.chomp
             if line =~ /\(Rawhide\)$/
                 "Rawhide"
-            elsif line =~ /release (\d+)/
+            elsif line =~ /release (\d[\d.]*)/
                 $1
             end
         end
     end
 end
 
-Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => :oel
-    setcode do
-        File::open("/etc/enterprise-release", "r") do |f|
-            line = f.readline.chomp
-            if line =~ /release (\d+)/
-                $1
-            end
-        end
-    end
-end
-
-Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => :ovs
-    setcode do
-        File::open("/etc/ovs-release", "r") do |f|
-            line = f.readline.chomp
-            if line =~ /release (\d+)/
-                $1
-            end
-        end
-    end
-end
-
-Facter.add(:operatingsystemrelease) do
-    confine :operatingsystem => %w{CentOS}
-    setcode do
-        centos_release = Facter::Util::Resolution.exec("sed -r -e 's/CentOS release //' -e 's/ \\((Branch|Final)\\)//' /etc/redhat-release")
-        if centos_release =~ /^5/
-            release = Facter::Util::Resolution.exec('rpm -q --qf \'%{VERSION}.%{RELEASE}\' centos-release | cut -d. -f1,2')
-        else
-            release = centos_release
-        end
-    end
-end
-
 Facter.add(:operatingsystemrelease) do
     confine :operatingsystem => %w{Debian}
     setcode do

data/lib/facter/path.rb

@@ -0,0 +1,5 @@
+Facter.add(:path) do
+    setcode do
+        ENV['PATH']
+    end
+end

data/lib/facter/util/ip.rb

@@ -51,7 +51,7 @@ module Facter::Util::IP
         # at the end of interfaces.  So, we have to trim those trailing
         # characters.  I tried making the regex better but supporting all
         # platforms with a single regex is probably a bit too much.
-        output.scan(/^\w+[.:]?\d+[.:]?\d*[.:]?\w*/).collect { |i| i.sub(/:$/, '') }
+        output.scan(/^\w+[.:]?\d+[.:]?\d*[.:]?\w*/).collect { |i| i.sub(/:$/, '') }.uniq
     end
 
     def self.get_all_interface_output
@@ -84,6 +84,13 @@ module Facter::Util::IP
         if not FileTest.executable?("/sbin/ip")
             return nil
         end
+        # A bonding interface can never be an alias interface. Alias
+        # interfaces do have a colon in their name and the ip link show
+        # command throws an error message when we pass it an alias
+        # interface.
+        if interface =~ /:/
+            return nil
+        end
         regex = /SLAVE[,>].* (bond[0-9]+)/
             ethbond = regex.match(%x{/sbin/ip link show #{interface}})
         if ethbond

data/lib/facter/util/loader.rb

@@ -69,7 +69,11 @@ class Facter::Util::Loader
 
     def load_file(file)
         # We have to specify Kernel.load, because we have a load method.
-        Kernel.load(file)
+        begin
+            Kernel.load(file)
+        rescue ScriptError => detail
+            warn "Error loading fact #{file} #{detail}"
+        end
     end
 
     # Load facts from the environment.  If no name is provided,

data/lib/facter/util/macosx.rb

@@ -56,12 +56,16 @@ module Facter::Util::Macosx
     def self.sw_vers
         ver = Hash.new
         [ "productName", "productVersion", "buildVersion" ].each do |option|
-            ver["macosx_#{option}"] = %x{sw_vers -#{option}}.strip
+            ver["macosx_#{option}"] = Facter::Util::Resolution.exec("/usr/bin/sw_vers -#{option}").strip
         end
         productversion = ver["macosx_productVersion"]
         if not productversion.nil?
-            ver["macosx_productversion_major"] = productversion.scan(/(\d+\.\d+)/)[0][0]
-            ver["macosx_productversion_minor"] = productversion.scan(/(\d+)\.(\d+)\.(\d+)/)[0].last
+            versions = productversion.scan(/(\d+)\.(\d+)\.*(\d*)/)[0]
+            ver["macosx_productversion_major"] = "#{versions[0]}.#{versions[1]}"
+            if versions[2].empty?  # 10.x should be treated as 10.x.0
+                versions[2] = "0"
+            end
+            ver["macosx_productversion_minor"] = versions[2]
         end
         ver
     end

data/lib/facter/util/manufacturer.rb

@@ -9,7 +9,7 @@ module Facter::Manufacturer
             return nil unless FileTest.exists?("/usr/sbin/dmidecode")
 
             output=%x{/usr/sbin/dmidecode 2>/dev/null}
-        when 'OpenBSD', 'FreeBSD'
+        when 'FreeBSD'
             return nil unless FileTest.exists?("/usr/local/sbin/dmidecode")
 
             output=%x{/usr/local/sbin/dmidecode 2>/dev/null}
@@ -32,7 +32,7 @@ module Facter::Manufacturer
                         if line =~ /#{key}/ and ( line =~ /#{value} 0x\d+ \(([-\w].*)\)\n*./ or line =~ /#{value} ([-\w].*)\n*./ )
                             result = $1
                             Facter.add(facterkey) do
-                                confine :kernel => [ :linux, :freebsd, :netbsd, :openbsd, :sunos ]
+                                confine :kernel => [ :linux, :freebsd, :netbsd, :sunos ]
                                 setcode do
                                     result
                                 end
@@ -43,4 +43,15 @@ module Facter::Manufacturer
             end
         end
     end
+
+    def self.sysctl_find_system_info(name)
+        name.each do |sysctlkey,facterkey|
+            Facter.add(facterkey) do
+                confine :kernel => :openbsd
+                setcode do
+                    Facter::Util::Resolution.exec("sysctl -n " + sysctlkey)
+                end
+            end
+        end
+    end
 end

data/lib/facter/util/netmask.rb

@@ -14,7 +14,13 @@ module Facter::NetMask
         when 'SunOS'
             ops = {
                 :ifconfig => '/usr/sbin/ifconfig -a',
-                :regex => %r{\s+ inet\s+? #{Facter.ipaddress} \+? mask (\w{8})}x,
+                :regex => %r{\s+ inet \s #{Facter.ipaddress} \s netmask \s (\w{8})}x,
+                :munge => Proc.new { |mask| mask.scan(/../).collect do |byte| byte.to_i(16) end.join('.') }
+            }
+        when 'FreeBSD','NetBSD','OpenBSD', 'Darwin'
+            ops = {
+                :ifconfig => '/sbin/ifconfig -a',
+                :regex => %r{\s+ inet \s #{Facter.ipaddress} \s netmask \s 0x(\w{8})}x,
                 :munge => Proc.new { |mask| mask.scan(/../).collect do |byte| byte.to_i(16) end.join('.') }
             }
         end

data/lib/facter/util/resolution.rb

@@ -111,6 +111,7 @@ class Facter::Util::Resolution
     # How we get a value for our resolution mechanism.
     def value
         result = nil
+        return result if @code == nil and @interpreter == nil
         begin
             Timeout.timeout(limit) do
                 if @code.is_a?(Proc)

data/lib/facter/util/virtual.rb

@@ -0,0 +1,43 @@
+module Facter::Util::Virtual
+    def self.openvz?
+        FileTest.exists?("/proc/vz/veinfo")
+    end
+
+    def self.openvz_type
+        return nil unless self.openvz?
+        if FileTest.exists?("/proc/vz/version")
+            result = "openvzhn"
+        else
+            result = "openvzve"
+        end
+    end
+
+    def self.zone?
+        z = Facter::Util::Resolution.exec("/sbin/zonename")
+        return false unless z
+        return z.chomp != 'global'
+    end
+
+    def self.vserver?
+        return false unless FileTest.exists?("/proc/self/status")
+        txt = File.read("/proc/self/status")
+        return true if txt =~ /^(s_context|VxID):[[:blank:]]*[1-9]/
+        return false
+    end
+
+    def self.vserver_type
+        if self.vserver?
+            if FileTest.exists?("/proc/virtual")
+                "vserver_host"
+            else
+                "vserver"
+            end
+        end
+    end
+
+    def self.xen?
+        ["/proc/sys/xen", "/sys/bus/xen", "/proc/xen" ].detect do |f|
+            FileTest.exists?(f)
+        end
+    end
+end

data/lib/facter/virtual.rb

@@ -1,52 +1,39 @@
+require 'facter/util/virtual'
+
 Facter.add("virtual") do
     confine :kernel => %w{Linux FreeBSD OpenBSD SunOS}
 
     result = "physical"
 
     setcode do
-    require 'thread'
 
-        if FileTest.exists?("/sbin/zonename")
-            z = %x{"/sbin/zonename"}.chomp
-            if z != 'global'
-                result = 'zone' 
-            end
-        end
+        result = "zone" if Facter::Util::Virtual.zone?
 
-        if FileTest.exists?("/proc/vz/veinfo")
-            if FileTest.exists?("/proc/vz/version")
-                result = "openvzhn"
-            else
-                result = "openvzve"
-            end
+        if Facter::Util::Virtual.openvz?
+            result = Facter::Util::Virtual.openvz_type()
         end
 
-        if FileTest.exists?("/proc/self/status")
-            txt = File.read("/proc/self/status")
-            if txt =~ /^(s_context|VxID):[[:blank:]]*[1-9]/
-                result = "vserver"
-            end
-        end
-
-        if FileTest.exists?("/proc/virtual")
-            result = "vserver_host"
+        if Facter::Util::Virtual.vserver?
+            result = Facter::Util::Virtual.vserver_type()
         end
 
-        # new Xen domains have this in dom0 not domu :(
-        if FileTest.exists?("/proc/sys/xen/independent_wallclock")
-            result = "xenu" 
-        end
-        if FileTest.exists?("/sys/bus/xen")
-            result = "xenu" 
-        end
+        if Facter::Util::Virtual.xen?
+            # new Xen domains have this in dom0 not domu :(
+            if FileTest.exists?("/proc/sys/xen/independent_wallclock")
+                result = "xenu"
+            end
+            if FileTest.exists?("/sys/bus/xen")
+                result = "xenu"
+            end
         
-        if FileTest.exists?("/proc/xen/capabilities")
-            txt = File.read("/proc/xen/capabilities")
-            if txt =~ /control_d/i
-                result = "xen0" 
+            if FileTest.exists?("/proc/xen/capabilities")
+                txt = File.read("/proc/xen/capabilities")
+                if txt =~ /control_d/i
+                    result = "xen0"
+                end
             end
         end
- 
+
         if result == "physical"
             output = Facter::Util::Resolution.exec('lspci')
             if not output.nil?
@@ -70,11 +57,10 @@ Facter.add("virtual") do
                     end
                 end
             end
-        end
-
-        # VMware server 1.0.3 rpm places vmware-vmx in this place, other versions or platforms may not.
-        if FileTest.exists?("/usr/lib/vmware/bin/vmware-vmx")
-            result = "vmware_server"
+            # VMware server 1.0.3 rpm places vmware-vmx in this place, other versions or platforms may not.
+            if FileTest.exists?("/usr/lib/vmware/bin/vmware-vmx")
+                result = "vmware_server"
+            end
         end
 
         result
@@ -86,7 +72,7 @@ Facter.add("is_virtual") do
 
     setcode do
         case Facter.value(:virtual)
-        when "xenu", "openvzve", "vmware" 
+        when "xenu", "openvzve", "vmware"
             true
         else 
             false